Preliminary support for Polylines.

[architektonas] / src / geometry.h

diff --git a/src/geometry.h b/src/geometry.h
index 410c7e05e501435098045ce154638876a3ee4316..0a05b373460224f2a1e12d39463ccacbc12a57a6 100644 (file)
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -1,27 +1,32 @@
 #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 *);
+               static Circle FindCircleForThreePoints(Point, Point, Point);
+               static double Determinant3x3(double, double, double, double, double, double, double, double, double);
+               static Arc Unpack(Point, Point, double);
 };
 
 #endif         // __GEOMETRY_H__
-