X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=398cfa773fd4390c1cb4e83e2afba75ed046eaac;hb=deb5512a6b35e73dc2c19ac4d2800cff87dd2e71;hp=daa5127046fbd4fc895ceecc9ccf99473e3b2b5b;hpb=e06428cc60e07d9ef33af8b559d60f23894130fb;p=architektonas

diff --git a/src/structs.h b/src/structs.h
index daa5127..398cfa7 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -25,78 +25,74 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone };
 	bool selected;    \
 	bool hovered;     \
 	bool hitPoint[4]; \
-	bool hitObject;
+	bool hitObject;   \
+	Point p[4];
 
 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), hitObject(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), hitObject(false), p1(pt1), radius(r) {}
+		style(l), selected(false), hovered(false), hitObject(false), radius(r) { p[0] = pt1; }
 };
 
 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), hitObject(false), p1(pt1), p2(pt2), radius1(r1), radius2(r2) {}
+		style(l), selected(false), hovered(false), hitObject(false), radius1(r1), radius2(r2) { p[0] = pt1; p[1] = pt2; }
 };
 
 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), hitObject(false), p1(pt1), radius(r), angle1(a1), angle2(a2) {}
+		style(l), selected(false), hovered(false), hitObject(false), radius(r), angle1(a1), angle2(a2) { p[0] = pt1; }
 };
 
 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), hitObject(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), hitObject(false), p1(pt), s(str) {}
+		style(LSSolid), selected(false), hovered(false), hitObject(false), s(str) { p[0] = pt1; }
 };
 
 struct Container {
 	OBJECT_COMMON;
-	Point p1;
 	std::vector<void *> objects;
 	double angle;
 	double scale;