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

diff --git a/src/global.h b/src/global.h
index 33fcd7a..6418b7f 100644
--- a/src/global.h
+++ b/src/global.h
@@ -4,18 +4,27 @@
 // Global variable class. Note that all vars are class vars, so we don't have
 // to do any instantiation shite.
 
-#include <QRectF>
+#include <stdint.h>
+#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;
@@ -29,12 +38,36 @@ class Global
 		static bool snapToGrid;
 		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;
 
-		// Coming soon...
 		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__
-