Added line-to-circle intersection code.

[architektonas] / src / geometry.h

diff --git a/src/geometry.h b/src/geometry.h
index 1c4177b10e68120655b66ae9bc2ee48dcc068261..f1371e32241fa8aa66c5fad70d7336b046c5ff79 100644 (file)
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -8,18 +8,14 @@ class Geometry
 {
        public:
                // All methods are class methods for this class
-//unused               static Point IntersectionOfLineAndLine(Point, Point, Point, Point);
                static double ParameterOfLineAndPoint(Point, Point, Point);
                static Point MirrorPointAroundLine(Point, Point, Point);
                static Point RotatePointAroundPoint(Point, Point, double);
                static double Determinant(Point, Point);
-               static void Intersects(Object *, Object *);//, double * tp = 0, double * up = 0, double * vp = 0, double * wp = 0);
+               static void Intersects(Object *, Object *);
                static void CheckLineToLineIntersection(Object *, Object *);
-               static void CheckCircleToCircleIntersection(Object *, Object *);//, Point *, Point *);
-//             static int Intersects(Line *, Line *, double * tp = 0, double * up = 0);
-//             static int Intersects(Line *, Dimension *, double * tp = 0, double * up = 0);
-//             static int Intersects(Line * l, Circle * c, double * tp = 0, double * up = 0, double * vp = 0, double * wp = 0);
-//             static int Intersects(Circle * c1, Circle * c2, double * tp = 0, double * up = 0, double * vp = 0, double * wp = 0, Point * p1 = 0, Point * p2 = 0);
+               static void CheckCircleToCircleIntersection(Object *, Object *);
+               static void CheckLineToCircleIntersection(Object *, Object *);
                static void FindAnglesForSides(double s1, double s2, double s3, double * a1, double * a2, double * a3);
                static Point GetPointForParameter(Object *, double);
 };