X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=6920e491cb92203f7555a57efc1c1268b209d22c;hb=84fc4387b9a6051819da5c9ed688de1ec372c7f7;hp=b9f6e9b9bcf78a32c10ddbb269f854c759b14d75;hpb=db0a3d91f37031e155cc8eac7cfdec9889f233ee;p=architektonas

diff --git a/src/structs.h b/src/structs.h
index b9f6e9b..6920e49 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -4,55 +4,110 @@
 #include <stdint.h>
 #include <vector>
 #include <string>
+#include "global.h"
 #include "vector.h"
 
+enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer };
+
+enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader };
+
+enum ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, TTPolygon, TTSpline, TTRotate, TTMirror, TTTrim, TTTriangulate, TTDelete };
+
+enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone };
+
 #define OBJECT_COMMON \
-	int type;       \
-	uint32_t id;    \
-	int layer;      \
-	uint32_t color; \
-	float thickness;
+	int type;         \
+	uint32_t id;      \
+	int layer;        \
+	uint32_t color;   \
+	float thickness;  \
+	int style;        \
+	bool selected;    \
+	bool hovered;     \
+	bool hitPoint[4]; \
+	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), 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)
+		{ p[0] = pt1; radius[0] = r; }
+};
+
+struct Ellipse {
+	OBJECT_COMMON;
+
+	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)
+		{ 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), hitObject(false)
+		{ p[0] = pt1; radius[0] = r; angle[0] = a1, angle[1] = a2; }
+};
+
+struct Dimension {
+	OBJECT_COMMON;
+	int subtype;
+	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) { p[0] = pt1; p[1] = pt2; }
 };
 
 struct Text {
 	OBJECT_COMMON;
-	Point p1;
 	std::string s;
+
+	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), 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;
-};
 
-struct Dimension {
-	OBJECT_COMMON;
-	int subtype;
-	Point p1;
-	Point p2;
-	double offset;
+	Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false) {}
 };
 
 struct Object {