X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fglobal.cpp;h=624c94f8b136fdd4d33cefec48032ff94fb0bc72;hb=d00cd5f46252ca0fb3df6e8191dc75f8991b2aa2;hp=52569532521599d9ed4250039431e05619286b62;hpb=db0a3d91f37031e155cc8eac7cfdec9889f233ee;p=architektonas

diff --git a/src/global.cpp b/src/global.cpp
index 5256953..624c94f 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,15 +12,48 @@ 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;
+
+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;
+
+Vector Global::origin(-10.0, -10.0);
+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;