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=bc68adf76801316d1b790aa3d72695b879b0a3c8;hpb=e78daf62eb771ee29a59035d16cf63c1e6ebe144;p=architektonas diff --git a/src/structs.h b/src/structs.h index bc68adf..ea2245f 100644 --- a/src/structs.h +++ b/src/structs.h @@ -2,19 +2,27 @@ #define __STRUCTS_H__ #include -#include #include +#include #include "global.h" +#include "rect.h" #include "vector.h" -enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer, OTCount }; +enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTDimension, OTPolyline, OTSpline, OTText, OTContainer, OTCount }; -enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader }; +enum DimensionType { DTLinear = 0, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader, DTCount }; -enum ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, TTPolygon, TTSpline, TTRotate, TTMirror, TTTrim, TTTriangulate, TTDelete }; +enum ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, TTPolygon, TTSpline, TTRotate, TTMirror, TTTrim, TTTriangulate, TTDelete, TTParallel }; 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; \ uint32_t id; \ @@ -24,111 +32,107 @@ 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]; \ - double angle[2]; \ - double radius[2]; + Point p[5]; \ + double angle[3]; \ + double radius[2]; \ + double length; + +struct Object { + OBJECT_COMMON; +}; struct Line { OBJECT_COMMON; - 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), hitObject(false) { p[0] = pt1; p[1] = 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; - Circle(): type(OTCircle), id(Global::objectID++) {} - 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), hitObject(false) - { p[0] = pt1; radius[0] = r; } + Circle(); + Circle(Vector pt1, double r, float th = 1.0, uint32_t c = 0, int l = LSSolid); }; struct Ellipse { OBJECT_COMMON; - Ellipse(): type(OTEllipse), id(Global::objectID++) {} - 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), hitObject(false) - { p[0] = pt1; p[1] = pt2; radius[0] = r1; radius[1] = 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; - Arc(): type(OTArc), id(Global::objectID++) {} - 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), hitObject(false) - { p[0] = pt1; radius[0] = r; angle[0] = a1, angle[1] = 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; 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; } + 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; + Rect extents; + bool measured; std::string s; - Text(): type(OTText), id(Global::objectID++) {} - Text(Vector pt1, 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), hitObject(false), s(str) { p[0] = pt1; } + Text(); + Text(Vector pt1, const char * str, float th = 10.0, uint32_t c = 0); }; -struct Polygon { +struct Polyline { OBJECT_COMMON; - - Polygon(): type(OTPolygon), id(Global::objectID++) {} + 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 Spline { OBJECT_COMMON; - Spline(): type(OTSpline), id(Global::objectID++) {} + Spline(); }; struct Container { OBJECT_COMMON; - std::vector objects; + VPVector objects; double scale; bool topLevel; + Object * clicked; - Container(bool tl = false): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false), topLevel(tl) {} -// void DeleteContents(void) {} -/* void DeleteContents(Container * c) - { - std::vector::iterator i; - - for(i=c->objects.begin(); i!=c->objects.end(); i++) - { - Object * obj = (Object *)(*i); - - if (obj->type == OTContainer) - DeleteContainer((Container *)obj); - - delete *i; - } - }*/ -}; + 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) -struct Object { - OBJECT_COMMON; + Container(bool tl = false); + void Add(void * obj); + void Add(VPVector objs); }; #endif // __STRUCTS_H__ -