Initial bring-back of line to line intersection detection.

[architektonas] / src / object.h

diff --git a/src/object.h b/src/object.h
index b8fdd9db76f70b0a2cf8fbd5e797951c278183e3..ff29e1f7618328b5fa7689efc95c4ec6a6221b51 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -13,10 +13,12 @@ class Dimension;
 //class FILE;
 
 enum ObjectState { OSInactive, OSSelected };
-enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer };
+enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer, OTSpline };
 
 class Object
 {
+       friend class Geometry;
+
        public:
                Object();
                Object(Vector, Object * passedInParent = 0);
@@ -25,7 +27,7 @@ class Object
                virtual void Draw(Painter *);
                virtual Vector Center(void);
                virtual bool Collided(Vector);
-               virtual void PointerMoved(Vector);
+               virtual bool PointerMoved(Vector);
                virtual void PointerReleased(void);
                virtual bool NeedsUpdate(void);
                virtual bool HitTest(Point);
@@ -36,18 +38,19 @@ class Object
                virtual void Enumerate(FILE *);
                virtual Object * Copy(void);
                virtual Vector GetPointAtParameter(double parameter);
+//Not yet, soon though         virtual void MovePointAtParameter(double parameter, Vector);
                virtual void Connect(Object *, double);
                virtual void Disconnect(Object *, double);
                virtual void DisconnectAll(Object *);
                virtual QRectF Extents(void);
-//             virtual ObjectType Type(void);// = 0; // Pure virtual, must be implemented
                virtual void Translate(Vector);
-               virtual void Rotate(Vector, double);
-               virtual void Scale(Vector, double);
+               virtual void Rotate(Point, double);
+               virtual void Scale(Point, double);
+               virtual void Mirror(Point, Point);
+               virtual void Save(void);
+               virtual void Restore(void);
                ObjectState GetState(void);
                void Reparent(Object *);
-//             Dimension * GetAttachedDimension(void);
-//Hm.          Object * Connect(Object *);
 
                // Class methods
                static void SetFixedAngle(bool state = true);
@@ -59,18 +62,21 @@ class Object
                static void SetSnapMode(bool state = true);
                static Vector SnapPointToGrid(Vector);
 
-       protected:
+       public:
                Vector position;                                        // All objects have a position (doubles as reference point)
+       protected:
                Object * parent;
+//this needs to be added eventually
 //             Pen pen;
 //             Fill fill;
+               Point oldPosition;
        public:
                ObjectType type;
                ObjectState state;
+               unsigned int layer;
        protected:
                ObjectState oldState;
                bool needUpdate;
-//             Dimension * attachedDimension;
                std::vector<Connection> connected;
 
                // Class variables
@@ -90,6 +96,9 @@ class Object
                static bool selectionInProgress;
                static QRectF selection;
                static double gridSpacing;                      // Grid spacing in base units
+               static int currentLayer;
+               static Point snapPoint;
+               static bool snapPointIsValid;
 };
 
 #endif // __OBJECT_H__