X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.h;h=18faa979093537e3a42e03201362220fa5ed3e56;hb=fce575a51ba1f26418869c20e63b9f388e118ab6;hp=6495524d05022ce6502e8fd7f6bd29ff8ad07d04;hpb=ff2a28347dc30eccc28e7cd7298cccde7aa49d2c;p=architektonas

diff --git a/src/global.h b/src/global.h
index 6495524..18faa97 100644
--- a/src/global.h
+++ b/src/global.h
@@ -5,6 +5,7 @@
 // to do any instantiation shite.
 
 #include <stdint.h>
+#include <string>
 #include <vector>
 #include <QRectF>
 #include "vector.h"
@@ -13,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
 {
@@ -20,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;
@@ -37,6 +41,7 @@ class Global
 		static uint32_t objectID;
 		static int tool;
 		static int toolState;
+		static bool toolSuppressCrosshair;
 
 		static Point origin;
 		static double zoom;
@@ -44,11 +49,22 @@ class Global
 
 		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 std::vector<bool> layerHidden;
-		static std::vector<bool> layerLocked;
+		static BVector layerHidden;
+		static BVector layerLocked;
+		static SVector layerName;
 };
 
 #endif	// __GLOBALS_H__
-