X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.h;h=6418b7f92587bdcec5730ed0fc811f73a38d7dff;hb=3c890e51a9763ffcee49e15753453a7da248272b;hp=8143b8d0e10183ab5e735d94daf252ad27f7b3b8;hpb=f507d97c1b1118834a70332f5f79d8479a6964c0;p=architektonas

diff --git a/src/global.h b/src/global.h
index 8143b8d..6418b7f 100644
--- a/src/global.h
+++ b/src/global.h
@@ -5,21 +5,26 @@
 // to do any instantiation shite.
 
 #include <stdint.h>
-#include <QRectF>
+#include <string>
+#include <vector>
+#include "rect.h"
 #include "vector.h"
 
 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
 {
 	public:
 		static double gridSpacing;
 		static bool selectionInProgress;
-		static QRectF selection;
-		static int currentLayer;
+		static Rect selection;
 		static QFont * font;
 		static Point snapPoint;
 		static bool snapPointIsValid;
@@ -34,13 +39,35 @@ class Global
 		static bool ignoreClicks;
 		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__
-