X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.h;h=597ceadf0fa5762cef44c0cb7ff33adb8a68548c;hb=b8bab716d9302fbb04d97679ee499eac781f1b22;hp=fb057652e2b3a4956778a610d3d4a9186835df7f;hpb=8d80165e3ab9173b8689b3b3420b40bf3020161f;p=architektonas

diff --git a/src/global.h b/src/global.h
index fb05765..597cead 100644
--- a/src/global.h
+++ b/src/global.h
@@ -5,6 +5,8 @@
 // to do any instantiation shite.
 
 #include <stdint.h>
+#include <string>
+#include <vector>
 #include <QRectF>
 #include "vector.h"
 
@@ -12,6 +14,10 @@ class QFont;
 
 enum LineStyle { LSNone, LSSolid, LSDash, LSDot, LSDashDot, LSDashDotDot };
 
+typedef std::vector<void *> VPVector;
+typedef std::vector<void *>::iterator VPVectorIter;
+typedef std::vector<bool> BVector;
+typedef std::vector<std::string> SVector;
 
 class Global
 {
@@ -19,7 +25,6 @@ class Global
 		static double gridSpacing;
 		static bool selectionInProgress;
 		static QRectF selection;
-		static int currentLayer;
 		static QFont * font;
 		static Point snapPoint;
 		static bool snapPointIsValid;
@@ -35,13 +40,34 @@ class Global
 		static bool dontMove;
 		static uint32_t objectID;
 		static int tool;
+		static int toolState;
+		static bool toolSuppressCrosshair;
+		static double parallelDist;
+		static int parallelNum;
+		static int parallelBU;
 
 		static Point origin;
 		static double zoom;
 		static Vector screenSize;
 
 		static float scale;
+
+		static float penWidth;
+		static int penStyle;
+		static uint32_t penColor;
+		static bool penStamp;
+		static bool penDropper;
+
+		static Point intersectPoint[16]; // Overkill, yes
+		static double intersectParam[16]; // Ditto
+		static int numIntersectPoints;
+		static int numIntersectParams;
+
+		static int activeLayer;
+		static int numLayers;
+		static BVector layerHidden;
+		static BVector layerLocked;
+		static SVector layerName;
 };
 
 #endif	// __GLOBALS_H__
-