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

diff --git a/src/geometry.h b/src/geometry.h
index 2776ae3..865dc6d 100644
--- 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);