Fixed Rotate tool to work with Arcs.

[architektonas] / src / geometry.cpp

diff --git a/src/geometry.cpp b/src/geometry.cpp
index 1ec93db7e1430b2752cc4e77a2b2d9d30ce61aeb..e0ad270c019d3e297c61786efe00974218384caf 100644 (file)
--- a/src/geometry.cpp
+++ b/src/geometry.cpp
@@ -83,10 +83,14 @@ Point Geometry::MirrorPointAroundLine(Point point, Point tail, Point head)
 }
 
 
+//
+// point: The point we're rotating
+// rotationPoint: The point we're rotating around
+//
 Point Geometry::RotatePointAroundPoint(Point point, Point rotationPoint, double angle)
 {
-       Vector v = Vector(point, rotationPoint);
-//     Vector v = Vector(rotationPoint, point);
+//     Vector v = Vector(point, rotationPoint);
+       Vector v = Vector(rotationPoint, point);
        double px = (v.x * cos(angle)) - (v.y * sin(angle));
        double py = (v.x * sin(angle)) + (v.y * cos(angle));
 
@@ -126,6 +130,7 @@ bool Geometry::Intersects(Object * obj1, Object * obj2, double * t, double * s)
 }
 #endif
 
+#if 0
 // Finds the intersection between two lines (if any)
 int Geometry::Intersects(Line * l1, Line * l2, double * tp/*= 0*/, double * up/*= 0*/)
 {
@@ -384,7 +389,7 @@ int Geometry::Intersects(Circle * c1, Circle * c2, double * tp/*= 0*/, double *
 
        return 2;
 }
-
+#endif
 
 // should we just do common trig solves, like AAS, ASA, SAS, SSA?
 // Law of Cosines: