X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=bef3c52f93879fa24f545b90ca9cf4cdc97ac813;hb=742d2aa9bb46bce4f690474fa22f5980e175e55e;hp=c1b33fb2958ee3133aae136199c345df547a0039;hpb=790c1a6d97f73f7457c7fad7e82fa29e5b6accd5;p=architektonas

diff --git a/src/structs.h b/src/structs.h
index c1b33fb..bef3c52 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -94,10 +94,10 @@ struct Dimension {
 	Dimension(): type(OTDimension), id(Global::objectID++), selected(false),
 		hovered(false), hitObject(false)
 		{ hitPoint[0] = hitPoint[1] = hitPoint[2] = hitPoint[3] = hitPoint[4] = false; }
-	Dimension(Vector pt1, Vector pt2, DimensionType dt = DTLinear, float th = 1.0, uint32_t c = 0x0000FF, int l = LSSolid):
+	Dimension(Vector pt1, Vector pt2, DimensionType dt = DTLinear, double offs = 0, 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), offset(0)
+		hitObject(false), subtype(dt), offset(offs)
 		{ p[0] = pt1; p[1] = pt2; hitPoint[0] = hitPoint[1] = hitPoint[2] = hitPoint[3] = hitPoint[4] = false; }
 };
 
@@ -128,13 +128,14 @@ struct Spline {
 
 struct Container {
 	OBJECT_COMMON;
-	std::vector<void *> objects;
+	VPVector objects;
 	double scale;
 	bool topLevel;
 	Object * clicked;
 
 	Container(bool tl = false): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false), topLevel(tl), clicked(NULL) {}
 	void Add(void * obj) { objects.push_back(obj); }
+	void Add(VPVector objs) { objects.insert(objects.end(), objs.begin(), objs.end()); }
 //	void DeleteContents(void) {}
 /*	void DeleteContents(Container * c)
 	{