X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgeometry.h;h=bc532da4a9a3e0e206a06144ba9b01dff22ab1bd;hb=eb39f1bb5e6518c5dc4f4dbd3c88912a97192e95;hp=d19d48c8c1735fdd81d2f89494dff85c3abc0a95;hpb=9590e4ed45fd4e05eccc16bd8e9d51596aea5a6d;p=architektonas

diff --git a/src/geometry.h b/src/geometry.h
index d19d48c..bc532da 100644
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -1,24 +1,25 @@
 #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);
 		static double ParameterOfLineAndPoint(Point, Point, Point);
+		static double DistanceToLineFromPoint(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 void Intersects(Object *, Object *);
+		static void CheckLineToLineIntersection(Object *, Object *);
+		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);
+		static Point Midpoint(Line *);
 };
 
 #endif 	// __GEOMETRY_H__