X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fstructs.h;h=e0e17c89bf8dd5ce82ce381cfd555051557ee79c;hb=da1348151182fe5340495ff8243e662b96c1fbfa;hp=b63921248aca8fc1071d8b8fdd8f2b4b777faff6;hpb=a398911ea125eb6b25320e96599e0ae39b720cf8;p=architektonas

diff --git a/src/structs.h b/src/structs.h
index b639212..e0e17c8 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -7,7 +7,7 @@
 #include "global.h"
 #include "vector.h"
 
-enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTDimension, OTSpline, OTText, OTContainer };
+enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer };
 
 enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader };
 
@@ -25,83 +25,89 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone };
 	bool selected;    \
 	bool hovered;     \
 	bool hitPoint[4]; \
-	bool hitObject;
+	bool hitObject;   \
+	Point p[4];       \
+	double angle[2];  \
+	double radius[2];
 
 struct Line {
 	OBJECT_COMMON;
-	Point p1;
-	Point p2;
 
 	Line(): type(OTLine), id(Global::objectID++) {}
 	Line(Vector pt1, Vector pt2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
 		type(OTLine), id(Global::objectID++), layer(0), color(c), thickness(th),
-		style(l), selected(false), hovered(false), p1(pt1), p2(pt2) {}
+		style(l), selected(false), hovered(false), hitObject(false) { p[0] = pt1; p[1] = pt2; }
 };
 
 struct Circle {
 	OBJECT_COMMON;
-	Point p1;
-	double radius;
 
+	Circle(): type(OTCircle), id(Global::objectID++) {}
 	Circle(Vector pt1, double r, float th = 1.0, uint32_t c = 0, int l = LSSolid):
 		type(OTCircle), id(Global::objectID++), layer(0), color(c), thickness(th),
-		style(l), selected(false), hovered(false), p1(pt1), radius(r) {}
+		style(l), selected(false), hovered(false), hitObject(false)
+		{ p[0] = pt1; radius[0] = r; }
 };
 
 struct Ellipse {
 	OBJECT_COMMON;
-	Point p1;
-	Point p2;
-	double radius1;
-	double radius2;
 
+	Ellipse(): type(OTEllipse), id(Global::objectID++) {}
 	Ellipse(Vector pt1, Vector pt2, double r1, double r2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
 		type(OTEllipse), id(Global::objectID++), layer(0), color(c), thickness(th),
-		style(l), selected(false), hovered(false), p1(pt1), p2(pt2), radius1(r1), radius2(r2) {}
+		style(l), selected(false), hovered(false), hitObject(false)
+		{ p[0] = pt1; p[1] = pt2; radius[0] = r1; radius[1] = r2; }
 };
 
 struct Arc {
 	OBJECT_COMMON;
-	Point p1;
-	double radius;
-	double angle1;
-	double angle2;
 
+	Arc(): type(OTArc), id(Global::objectID++) {}
 	Arc(Vector pt1, double r, double a1, double a2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
 		type(OTArc), id(Global::objectID++), layer(0), color(c), thickness(th),
-		style(l), selected(false), hovered(false), p1(pt1), radius(r), angle1(a1), angle2(a2) {}
+		style(l), selected(false), hovered(false), hitObject(false)
+		{ p[0] = pt1; radius[0] = r; angle[0] = a1, angle[1] = a2; }
 };
 
 struct Dimension {
 	OBJECT_COMMON;
 	int subtype;
-	Point p1;
-	Point p2;
 	double offset;
 
+	Dimension(): type(OTDimension), id(Global::objectID++) {}
 	Dimension(Vector pt1, Vector pt2, DimensionType dt = DTLinear, float th = 1.0, uint32_t c = 0x0000FF, int l = LSSolid):
 		type(OTDimension), id(Global::objectID++), layer(0), color(c), thickness(th),
-		style(l), selected(false), hovered(false), subtype(dt), p1(pt1), p2(pt2) {}
+		style(l), selected(false), hovered(false), hitObject(false), subtype(dt) { p[0] = pt1; p[1] = pt2; }
 };
 
 struct Text {
 	OBJECT_COMMON;
-	Point p1;
 	std::string s;
 
-	Text(Vector pt, char * str, float th = 10.0, uint32_t c = 0):
+	Text(): type(OTText), id(Global::objectID++) {}
+	Text(Vector pt1, char * str, float th = 10.0, uint32_t c = 0):
 		type(OTText), id(Global::objectID++), layer(0), color(c), thickness(th),
-		style(LSSolid), selected(false), hovered(false), p1(pt), s(str) {}
+		style(LSSolid), selected(false), hovered(false), hitObject(false), s(str) { p[0] = pt1; }
+};
+
+struct Polygon {
+	OBJECT_COMMON;
+
+	Polygon(): type(OTPolygon), id(Global::objectID++) {}
+};
+
+struct Spline {
+	OBJECT_COMMON;
+
+	Spline(): type(OTSpline), id(Global::objectID++) {}
 };
 
 struct Container {
 	OBJECT_COMMON;
-	Point p1;
 	std::vector<void *> objects;
-	double angle;
 	double scale;
 
-	Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false) {}
+	Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false) {}
 };
 
 struct Object {