Added preliminary circle-to-circle intersection code.

[architektonas] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index be2f219bcda8257c32fff40d50177ba720351c9a..8dc2f98d76693b99c3470746288355119590e3de 100644 (file)
--- 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,14 +12,20 @@ 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;
+
 double Global::gridSpacing;
 int Global::currentLayer = 0;
 Point Global::snapPoint;
@@ -30,3 +37,14 @@ double Global::zoom = 1.0;
 Vector Global::screenSize(200.0, 200.0);
 
 float Global::scale = 0.5;
+
+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;
+