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

diff --git a/src/geometry.h b/src/geometry.h
index 410c7e0..b5e6c6b 100644
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -1,27 +1,29 @@
 #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 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 *);
+		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 *);
+		static void FindTangents(Object *, Point);
+		static void FindTangents(Object *, Object *);
+		static Point NearestTo(Point, Point, Point);
+		static Vector GetNormalOfPointAndLine(Point, Line *);
 };
 
 #endif 	// __GEOMETRY_H__
-