X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcircle.h;h=43b297cfe74701eb1bb8c3c3812286db247a20e2;hb=84afe881653a02a16b19d4da37435b8701b1a826;hp=57cde7bdd623815d58e7f7c10ec91bead01fee7b;hpb=676007c81e292079daaa7188f4fbf2757ae77ef8;p=architektonas diff --git a/src/circle.h b/src/circle.h index 57cde7b..43b297c 100644 --- a/src/circle.h +++ b/src/circle.h @@ -5,6 +5,8 @@ class Circle: public Object { + friend class Geometry; + public: Circle(Vector, double, Object * p = 0); ~Circle(); @@ -12,19 +14,25 @@ class Circle: public 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 HitTest(Point); virtual void Enumerate(FILE *); -// virtual Object * Copy(void); + virtual Object * Copy(void); + virtual QRectF Extents(void); + virtual void Rotate(Point, double); + virtual void Mirror(Point, Point); + virtual void Save(void); + virtual void Restore(void); protected: - bool HitTest(Point); - void SaveState(void); - bool StateChanged(void); + void SaveHitState(void); + bool HitStateChanged(void); protected: double radius; // Center is Object::position Vector dragPoint; // Used for rendering edge dragging + double oldRadius2; private: bool draggingEdge; @@ -32,6 +40,7 @@ class Circle: public Object bool objectWasDragged; bool hitCenter, hitCircle; bool oldHitCenter, oldHitCircle; + double oldRadius; }; #endif // __CIRCLE_H__