X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=ea2245f65197b537945ff5a99edc7121a3344e96;hb=refs%2Fheads%2Fmaster;hp=1bbfc3fdc589fc3ed619808f8be390c5bd725a0c;hpb=8d80165e3ab9173b8689b3b3420b40bf3020161f;p=architektonas diff --git a/src/structs.h b/src/structs.h index 1bbfc3f..ea2245f 100644 --- a/src/structs.h +++ b/src/structs.h @@ -2,16 +2,26 @@ #define __STRUCTS_H__ #include -#include #include +#include #include "global.h" +#include "rect.h" #include "vector.h" -enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTDimension, OTSpline, OTText, OTContainer }; +enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTDimension, OTPolyline, OTSpline, OTText, OTContainer, OTCount }; + +enum DimensionType { DTLinear = 0, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader, DTCount }; -enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader }; +enum ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, TTPolygon, TTSpline, TTRotate, TTMirror, TTTrim, TTTriangulate, TTDelete, TTParallel }; -enum ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, TTPolygon, TTSpline, TTRotate, TTMirror, TTTrim, TTTriangulate, TTDelete }; +enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone }; + +enum BasicUnit { BUInch = 0, BUFoot, BUYard, BUMile, BUMM, BUCM, BUM, BUKM, BUCount }; + +extern const char objName[OTCount][16]; +extern const char dimName[DTCount][32]; +extern const char buShortName[BUCount][8]; +extern const double buInInches[BUCount]; #define OBJECT_COMMON \ int type; \ @@ -22,90 +32,107 @@ enum ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, int style; \ bool selected; \ bool hovered; \ - bool hitPoint[4]; \ - bool hitObject; + bool hitPoint[5]; \ + bool hitObject; \ + Point p[5]; \ + double angle[3]; \ + double radius[2]; \ + double length; + +struct Object { + OBJECT_COMMON; +}; struct Line { OBJECT_COMMON; - Point p1; - Point p2; - Line(): type(OTLine), id(Global::objectID++) {} - 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) {} + Line(); + Line(Vector pt1, Vector pt2, float th = 1.0, uint32_t c = 0, int l = LSSolid); + Vector Vect(void); + Vector Unit(void); + double Length(void); }; struct Circle { OBJECT_COMMON; - Point p1; - double radius; - 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) {} + Circle(); + Circle(Vector pt1, double r, float th = 1.0, uint32_t c = 0, int l = LSSolid); }; 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) {} + + Ellipse(); + Ellipse(Vector pt1, Vector pt2, double r1, double r2, float th = 1.0, uint32_t c = 0, int l = LSSolid); }; struct Arc { OBJECT_COMMON; - Point p1; - double radius; - double angle1; - double angle2; - - 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) {} + + Arc(); + Arc(Vector ctr, double r, double a1, double a2, float th = 1.0, uint32_t c = 0, int l = LSSolid); + Arc(Vector ctr, double r, Point p1, Point p2, float th = 1.0, uint32_t c = 0, int l = LSSolid); + Rect Bounds(void); }; struct Dimension { OBJECT_COMMON; int subtype; - Point p1; - Point p2; double offset; + Point lp[2]; // Line point, the actual dimension line + Object * obj[2]; // Pointer to attached objects (circle, lines for angle) - 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) {} + Dimension(); + Dimension(Vector pt1, Vector pt2, DimensionType dt = DTLinear, double offs = 0, float th = 1.0, uint32_t c = 0x0000FF, int l = LSSolid); }; struct Text { OBJECT_COMMON; - Point p1; + Rect extents; + bool measured; 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) {} + Text(); + Text(Vector pt1, const char * str, float th = 10.0, uint32_t c = 0); }; -struct Container { +struct Polyline { OBJECT_COMMON; - Point p1; - std::vector objects; - double angle; - double scale; - - Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false) {} + std::vector points; +// bool closed; //need this? could just repeat the endpoint as well... +// Object * clicked; + int ptNum; + + Polyline(float th = 1.0, uint32_t c = 0, int l = LSSolid); + Polyline(std::vector, float th = 1.0, uint32_t c = 0, int l = LSSolid); + void Add(Point); + void Add(std::vector); + Rect Bounds(void); + void Translate(Point); }; -struct Object { +struct Spline { OBJECT_COMMON; + + Spline(); }; +struct Container { + OBJECT_COMMON; + VPVector objects; + double scale; + bool topLevel; + Object * clicked; -#endif // __STRUCTS_H__ + int baseUnit; // Type of BasicUnit as seen above + int unitStyle; // 0 = decimal, 1 = fractional + int decimalPrecision; // 0-5, which, +1, is # of decimal places + int fractionalPrecision; // 0-5, which, +1, is 1/(2^n) + Container(bool tl = false); + void Add(void * obj); + void Add(VPVector objs); +}; + +#endif // __STRUCTS_H__