X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.cpp;h=624c94f8b136fdd4d33cefec48032ff94fb0bc72;hb=d9f34cb7917e396a1df805687234d5473d82283b;hp=8b89b9437a309b96d9fdfba9b0f3eac338610012;hpb=ff2a28347dc30eccc28e7cd7298cccde7aa49d2c;p=architektonas

diff --git a/src/global.cpp b/src/global.cpp
index 8b89b94..624c94f 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -25,9 +25,12 @@ QRectF 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;
@@ -38,8 +41,19 @@ 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;
-std::vector<bool> Global::layerHidden;
-std::vector<bool> Global::layerLocked;
-
+BVector Global::layerHidden;
+BVector Global::layerLocked;
+SVector Global::layerName;