X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fgeometry.h;h=410c7e05e501435098045ce154638876a3ee4316;hb=84afe881653a02a16b19d4da37435b8701b1a826;hp=89360884d1bdc0f1259c0db2e3b59499fb8864ae;hpb=fd5a80446b2abfdfb9d8951fcc03fb1b55ad707c;p=architektonas diff --git a/src/geometry.h b/src/geometry.h index 8936088..410c7e0 100644 --- a/src/geometry.h +++ b/src/geometry.h @@ -3,8 +3,9 @@ #include "vector.h" -class Line; class Circle; +class Dimension; +class Line; class Geometry { @@ -16,7 +17,10 @@ class Geometry 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 FindAnglesForSides(double s1, double s2, double s3, double * a1, double * a2, double * a3); }; #endif // __GEOMETRY_H__