More miscellaneous changes.

[architektonas] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index 8b89b9437a309b96d9fdfba9b0f3eac338610012..83236414a39fd1a4fdb2886891e1c493832b39db 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -25,9 +25,9 @@ QRectF Global::selection;
 
 int Global::tool = TTNone;
 int Global::toolState = TSNone;
+bool Global::toolSuppressCrosshair = false;
 
 double Global::gridSpacing;
-int Global::currentLayer = 0;
 Point Global::snapPoint;
 bool Global::snapPointIsValid = false;
 uint32_t Global::objectID = 1;
@@ -38,8 +38,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;