Lines respond to mouse movement, added Text rendering.

[architektonas] / src / structs.h

diff --git a/src/structs.h b/src/structs.h
index a6b52ccb69a5fa3f4b70d3b58e65bba10e10eaf7..f1b5ce1cf722dc06b6fd4b4050173f75f3834e17 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -7,7 +7,10 @@
 #include "global.h"
 #include "vector.h"
 
-enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer, OTSpline };
+enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTDimension, OTSpline, OTText, OTContainer };
+
+enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader };
+
 
 #define OBJECT_COMMON \
        int type;         \
@@ -16,7 +19,10 @@ enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTElli
        uint32_t color;   \
        float thickness;  \
        int style;        \
-       bool selected;
+       bool selected;    \
+       bool hovered;     \
+       bool hitPoint[4]; \
+       bool hitObject;
 
 struct Line {
        OBJECT_COMMON;
@@ -24,9 +30,9 @@ struct Line {
        Point p2;
 
        Line(): type(OTLine), id(Global::objectID++) {}
-       Line(Vector pt1, Vector pt2, float th = 1.0, uint32_t c = 0, int l = 0):
-               type(OTLine), id(Global::objectID++), layer(l), color(c), thickness(th),
-               style(0), selected(false), p1(pt1), p2(pt2) {}
+       Line(Vector pt1, Vector pt2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
+               type(OTLine), id(Global::objectID++), layer(0), color(c), thickness(th),
+               style(l), selected(false), hovered(false), p1(pt1), p2(pt2) {}
 };
 
 struct Circle {
@@ -34,9 +40,21 @@ struct Circle {
        Point p1;
        double radius;
 
-       Circle(Vector pt1, double r, float th = 1.0, uint32_t c = 0, int l = 0):
-               type(OTCircle), id(Global::objectID++), layer(l), color(c), thickness(th),
-               style(0), selected(false), p1(pt1), radius(r) {}
+       Circle(Vector pt1, double r, float th = 1.0, uint32_t c = 0, int l = LSSolid):
+               type(OTCircle), id(Global::objectID++), layer(0), color(c), thickness(th),
+               style(l), selected(false), hovered(false), p1(pt1), radius(r) {}
+};
+
+struct Ellipse {
+       OBJECT_COMMON;
+       Point p1;
+       Point p2;
+       double radius1;
+       double radius2;
+
+       Ellipse(Vector pt1, Vector pt2, double r1, double r2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
+               type(OTEllipse), id(Global::objectID++), layer(0), color(c), thickness(th),
+               style(l), selected(false), hovered(false), p1(pt1), p2(pt2), radius1(r1), radius2(r2) {}
 };
 
 struct Arc {
@@ -46,15 +64,31 @@ struct Arc {
        double angle1;
        double angle2;
 
-       Arc(Vector pt1, double r, double a1, double a2, float th = 1.0, uint32_t c = 0, int l = 0):
-               type(OTArc), id(Global::objectID++), layer(l), color(c), thickness(th),
-               style(0), selected(false), p1(pt1), radius(r), angle1(a1), angle2(a2) {}
+       Arc(Vector pt1, double r, double a1, double a2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
+               type(OTArc), id(Global::objectID++), layer(0), color(c), thickness(th),
+               style(l), selected(false), hovered(false), p1(pt1), radius(r), angle1(a1), angle2(a2) {}
+};
+
+struct Dimension {
+       OBJECT_COMMON;
+       int subtype;
+       Point p1;
+       Point p2;
+       double offset;
+
+       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), subtype(dt), p1(pt1), p2(pt2) {}
 };
 
 struct Text {
        OBJECT_COMMON;
        Point p1;
        std::string s;
+
+       Text(Vector pt, char * str, float th = 10.0, uint32_t c = 0):
+               type(OTText), id(Global::objectID++), layer(0), color(c), thickness(th),
+               style(LSSolid), selected(false), hovered(false), p1(pt), s(str) {}
 };
 
 struct Container {
@@ -63,14 +97,8 @@ struct Container {
        std::vector<void *> objects;
        double angle;
        double scale;
-};
 
-struct Dimension {
-       OBJECT_COMMON;
-       int subtype;
-       Point p1;
-       Point p2;
-       double offset;
+       Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false) {}
 };
 
 struct Object {