Added preliminary circle-to-circle intersection code.

[architektonas] / src / geometry.h

diff --git a/src/geometry.h b/src/geometry.h
index 410c7e05e501435098045ce154638876a3ee4316..1c4177b10e68120655b66ae9bc2ee48dcc068261 100644 (file)
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -1,26 +1,27 @@
 #ifndef __GEOMETRY_H__
 #define __GEOMETRY_H__
 
+#include "structs.h"
 #include "vector.h"
 
-class Circle;
-class Dimension;
-class Line;
-
 class Geometry
 {
        public:
                // All methods are class methods for this class
-               static Point IntersectionOfLineAndLine(Point, Point, Point, Point);
+//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 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 Intersects(Object *, Object *);//, double * tp = 0, double * up = 0, double * vp = 0, double * wp = 0);
+               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 FindAnglesForSides(double s1, double s2, double s3, double * a1, double * a2, double * a3);
+               static Point GetPointForParameter(Object *, double);
 };
 
 #endif         // __GEOMETRY_H__