X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgeometry.h;h=865dc6d0f6b36ed3a6050bcdde45d3c7e0912d78;hb=4a979ddae8aa6b3556f24e8b961f7787c4b40cbe;hp=410c7e05e501435098045ce154638876a3ee4316;hpb=7f3a6b11585376eecd80979ec3da2346c5314d88;p=architektonas

diff --git a/src/geometry.h b/src/geometry.h
index 410c7e0..865dc6d 100644
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -1,25 +1,24 @@
 #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 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);
+//		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);
 };