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

diff --git a/src/global.cpp b/src/global.cpp
index be2f219..a60fe8c 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -2,8 +2,9 @@
 // This page intentionally left (mostly) blank
 //
 
-#include <QFont>
 #include "global.h"
+#include <QFont>
+#include "structs.h"
 
 // Initialize static variables
 
@@ -11,16 +12,25 @@ bool Global::fixedAngle = false;
 bool Global::fixedLength = false;
 QFont * Global::font = 0;
 int Global::viewportHeight = 0;
+
 bool Global::deleteActive = false;
 bool Global::dimensionActive = false;
 bool Global::snapToGrid = true;
+
 //snapToPoints all well here?
 bool Global::ignoreClicks = false;
 bool Global::dontMove = false;
 bool Global::selectionInProgress = false;
-QRectF Global::selection;
+Rect Global::selection;
+
+int Global::tool = TTNone;
+int Global::toolState = TSNone;
+bool Global::toolSuppressCrosshair = false;
+double Global::parallelDist = 1.0;
+int Global::parallelNum = 1;
+int Global::parallelBU = BUInch;
+
 double Global::gridSpacing;
-int Global::currentLayer = 0;
 Point Global::snapPoint;
 bool Global::snapPointIsValid = false;
 uint32_t Global::objectID = 1;
@@ -30,3 +40,20 @@ double Global::zoom = 1.0;
 Vector Global::screenSize(200.0, 200.0);
 
 float Global::scale = 0.5;
+
+float Global::penWidth = 1.0;
+int Global::penStyle = 1;
+uint32_t Global::penColor = 0x000000;
+bool Global::penStamp = false;
+bool Global::penDropper = false;
+
+Point Global::intersectPoint[16]; // Overkill, yes
+double Global::intersectParam[16]; // Ditto
+int Global::numIntersectPoints = 0;
+int Global::numIntersectParams = 0;
+
+int Global::activeLayer = 0;
+int Global::numLayers = 1;
+BVector Global::layerHidden;
+BVector Global::layerLocked;
+SVector Global::layerName;