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

diff --git a/src/structs.h b/src/structs.h
index 20a03d2..8250a00 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -119,12 +119,13 @@ struct Text {
 	std::string s;
 
 	Text(): type(OTText), id(Global::objectID++) {}
-	Text(Vector pt1, char * str, float th = 10.0, uint32_t c = 0):
+	Text(Vector pt1, const 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),
 		measured(false), s(str) { p[0] = pt1; angle[0] = 0; }
 };
 
+//prolly don't need this, as this just a special case of a polyline...
 struct Polygon {
 	OBJECT_COMMON;
 	int sides;
@@ -134,13 +135,14 @@ struct Polygon {
 
 struct Polyline {
 	OBJECT_COMMON;
-	VPVector objects;
-	bool closed;
+	VPVector points;
+//need this?  could just repeat the endpoint as well...
+//	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()); }
+	void Add(void * obj) { points.push_back(obj); }
+	void Add(VPVector objs) { points.insert(points.end(), objs.begin(), objs.end()); }
 };
 
 struct Spline {
@@ -156,7 +158,12 @@ struct Container {
 	bool topLevel;
 	Object * clicked;
 
-	Container(bool tl = false): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false), topLevel(tl), clicked(NULL) {}
+	int baseUnit;            // Type of BasicUnit as seen above
+	int unitStyle;           // 0 = decimal, 1 = fractional
+	int decimalPrecision;    // 0-5, which, +1, is # of decimal places
+	int fractionalPrecision; // 0-5, which, +1, is 1/(2^n)
+
+	Container(bool tl = false): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false), topLevel(tl), clicked(NULL), baseUnit(0), unitStyle(0), decimalPrecision(3), fractionalPrecision(4) {}
 	void Add(void * obj) { objects.push_back(obj); }
 	void Add(VPVector objs) { objects.insert(objects.end(), objs.begin(), objs.end()); }
 //	void DeleteContents(void) {}