GUI functionality fixes.

[architektonas] / src / geometry.h

diff --git a/src/geometry.h b/src/geometry.h
index 02cfada77dee1c68b9e658adf335b6a7c9110d45..bc532da4a9a3e0e206a06144ba9b01dff22ab1bd 100644 (file)
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -8,19 +8,18 @@ class Geometry
 {
        public:
                // All methods are class methods for this class
-//unused               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(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 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__