X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=20a03d264ba0016e3a03835bacf6f7d209750540;hb=92b64dc831492f1d6311a8baece66408f7659f67;hp=bef3c52f93879fa24f545b90ca9cf4cdc97ac813;hpb=bf5a50feb0f84a4627a65c5b82c3ca2d2eefe54b;p=architektonas

diff --git a/src/structs.h b/src/structs.h
index bef3c52..20a03d2 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -8,7 +8,7 @@
 #include "rect.h"
 #include "vector.h"
 
-enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer, OTCount };
+enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer, OTPolyline, OTCount };
 
 enum DimensionType { DTLinear = 0, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader, DTCount };
 
@@ -16,6 +16,8 @@ enum ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText,
 
 enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone };
 
+enum BasicUnit { BUInch = 0, BUFoot, BUYard, BUMile, BUMM, BUCM, BUM, BUKM, BUCount };
+
 const char objName[OTCount][16] = {
 	"None", "Line", "Circle", "Ellipse", "Arc", "Polygon", "Dimension",
 	"Spline", "Text", "Container"
@@ -25,6 +27,12 @@ const char dimName[DTCount][32] = {
 	"Circumferential", "Angular", "Leader"
 };
 
+const char buShortName[BUCount][8] = {
+	"in", "ft", "yd", "mi", "mm", "cm", "m", "km"
+};
+
+const double buInInches[BUCount] = { 1.0, 12.0, 36.0, 1.0/25.4, 1.0/2.54, 1.0/0.0254, 1.0/0.0000254 };
+
 #define OBJECT_COMMON \
 	int type;         \
 	uint32_t id;      \
@@ -37,7 +45,7 @@ const char dimName[DTCount][32] = {
 	bool hitPoint[5]; \
 	bool hitObject;   \
 	Point p[5];       \
-	double angle[2];  \
+	double angle[3];  \
 	double radius[2]; \
 	double length;
 
@@ -52,6 +60,9 @@ struct Line {
 	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; hitPoint[0] = hitPoint[1] = false; }
+	Vector Vect(void) { return Vector(p[0], p[1]); }
+	Vector Unit(void) { return Vector(p[0], p[1]).Unit(); }
+	double Length(void) { return Vector(p[0], p[1]).Magnitude(); }
 };
 
 struct Circle {
@@ -116,10 +127,22 @@ struct Text {
 
 struct Polygon {
 	OBJECT_COMMON;
+	int sides;
 
 	Polygon(): type(OTPolygon), id(Global::objectID++) {}
 };
 
+struct Polyline {
+	OBJECT_COMMON;
+	VPVector objects;
+	bool closed;
+	Object * clicked;
+
+	Polyline(): type(OTPolyline), id(Global::objectID++), selected(false), hovered(false), hitObject(false), clicked(NULL) {}
+	void Add(void * obj) { objects.push_back(obj); }
+	void Add(VPVector objs) { objects.insert(objects.end(), objs.begin(), objs.end()); }
+};
+
 struct Spline {
 	OBJECT_COMMON;
 
@@ -154,4 +177,3 @@ struct Container {
 };
 
 #endif	// __STRUCTS_H__
-