X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.h;h=f7d5d7c0a493b02c31d07070ef7bcdcc511e0baf;hb=57056be35f9295400dd873a17d8468b3287ebc0c;hp=4f50821f0dcdae32bf9cf5935d34090839019e58;hpb=fd5a80446b2abfdfb9d8951fcc03fb1b55ad707c;p=architektonas diff --git a/src/object.h b/src/object.h index 4f50821..f7d5d7c 100644 --- a/src/object.h +++ b/src/object.h @@ -27,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); @@ -43,7 +43,6 @@ class Object 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(Point, double); virtual void Scale(Point, double); @@ -52,8 +51,6 @@ class Object 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); @@ -65,9 +62,11 @@ 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; @@ -78,7 +77,6 @@ class Object protected: ObjectState oldState; bool needUpdate; -// Dimension * attachedDimension; std::vector connected; // Class variables