]> Shamusworld >> Repos - architektonas/blobdiff - src/structs.h
Make selections encompass Dimension objects.
[architektonas] / src / structs.h
index bc68adf76801316d1b790aa3d72695b879b0a3c8..7fe1f09e96eca0c5d018c315a15d5498c598c676 100644 (file)
@@ -24,9 +24,9 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone };
        int style;        \
        bool selected;    \
        bool hovered;     \
-       bool hitPoint[4]; \
+       bool hitPoint[5]; \
        bool hitObject;   \
-       Point p[4];       \
+       Point p[5];       \
        double angle[2];  \
        double radius[2];
 
@@ -73,11 +73,14 @@ struct Dimension {
        OBJECT_COMMON;
        int subtype;
        double offset;
+       Point lp[2];            // Line point, the actual dimension line
+       Object * obj[2];        // Pointer to attached objects (circle, lines for angle)
 
        Dimension(): type(OTDimension), id(Global::objectID++) {}
        Dimension(Vector pt1, Vector pt2, DimensionType dt = DTLinear, float th = 1.0, uint32_t c = 0x0000FF, int l = LSSolid):
-               type(OTDimension), id(Global::objectID++), layer(0), color(c), thickness(th),
-               style(l), selected(false), hovered(false), hitObject(false), subtype(dt) { p[0] = pt1; p[1] = pt2; }
+               type(OTDimension), id(Global::objectID++), layer(0), color(c),
+               thickness(th), style(l), selected(false), hovered(false),
+               hitObject(false), subtype(dt), offset(0) { p[0] = pt1; p[1] = pt2; }
 };
 
 struct Text {