Mercurial > ldforge / file diff

--- a/src/ldObjectMath.cpp	Sat Aug 22 13:51:20 2015 +0300
+++ b/src/ldObjectMath.cpp	Sat Aug 22 15:37:02 2015 +0300
@@ -41,21 +41,21 @@
 	// ref: http://en.wikipedia.org/wiki/Transformation_matrix#Rotation_2
 	Matrix transform (
 	{
-		(l* l * (1 - cosangle)) + cosangle,
-		(m* l * (1 - cosangle)) - (n* sinangle),
-		(n* l * (1 - cosangle)) + (m* sinangle),
+		(l * l * (1 - cosangle)) + cosangle,
+		(m * l * (1 - cosangle)) - (n * sinangle),
+		(n * l * (1 - cosangle)) + (m * sinangle),
 
-		(l* m * (1 - cosangle)) + (n* sinangle),
-		(m* m * (1 - cosangle)) + cosangle,
-		(n* m * (1 - cosangle)) - (l* sinangle),
+		(l * m * (1 - cosangle)) + (n * sinangle),
+		(m * m * (1 - cosangle)) + cosangle,
+		(n * m * (1 - cosangle)) - (l * sinangle),
 
-		(l* n * (1 - cosangle)) - (m* sinangle),
-		(m* n * (1 - cosangle)) + (l* sinangle),
-		(n* n * (1 - cosangle)) + cosangle
+		(l * n * (1 - cosangle)) - (m * sinangle),
+		(m * n * (1 - cosangle)) + (l * sinangle),
+		(n * n * (1 - cosangle)) + cosangle
 	});
 
 	// Apply the above matrix to everything
-	for (LDObjectPtr obj : objects)
+	for (LDObject* obj : objects)
 	{
 		if (obj->numVertices())
 		{
@@ -68,7 +68,7 @@
 		}
 		elif (obj->hasMatrix())
 		{
-			LDMatrixObjectPtr mo = obj.dynamicCast<LDMatrixObject>();
+			LDMatrixObjectPtr mo = dynamic_cast<LDMatrixObject*> (obj);
 
 			// Transform the position
 			Vertex v = mo->position();
@@ -80,7 +80,7 @@
 		}
 		elif (obj->type() == OBJ_Vertex)
 		{
-			LDVertexPtr vert = obj.staticCast<LDVertex>();
+			LDVertexPtr vert = static_cast<LDVertex*> (obj);
 			Vertex v = vert->pos;
 			RotateVertex (v, rotpoint, transform);
 			vert->pos = v;