Misc. fixes & additions

[architektonas] / src / circle.h

diff --git a/src/circle.h b/src/circle.h
index 1a000da1e976fc9067cef114afe54979cc211d84..3cf6a44f41ae4a1d28041bc06344d45a2f66ddca 100644 (file)
--- 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();
@@ -14,25 +16,31 @@ class Circle: public Object
                virtual bool Collided(Vector);
                virtual void PointerMoved(Vector);
                virtual void PointerReleased(void);
-//             virtual bool NeedsUpdate(void);
+               virtual bool HitTest(Point);
+               virtual void Enumerate(FILE *);
+               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 oldPoint;                                        // Used for dragging
+               Vector dragPoint;                                       // Used for rendering edge dragging
+               double oldRadius2;
 
        private:
-               bool dragging;
-               bool draggingHandle1;
-               bool draggingHandle2;
-//             bool needUpdate;
+               bool draggingEdge;
+               bool draggingCenter;
                bool objectWasDragged;
                bool hitCenter, hitCircle;
                bool oldHitCenter, oldHitCircle;
+               double oldRadius;
 };
 
 #endif // __CIRCLE_H__