Initial bring-back of line to line intersection detection.

[architektonas] / src / geometry.h

diff --git a/src/geometry.h b/src/geometry.h
index 2776ae34d4146e69e74be9647ed1144d0027a803..865dc6d0f6b36ed3a6050bcdde45d3c7e0912d78 100644 (file)
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -1,21 +1,20 @@
 #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(Object *, Object *, double * tp = 0, double * up = 0, double * vp = 0, double * wp = 0);
+               static int CheckLineToLineIntersection(Object *, Object *, double *, double *);
 //             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);