X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcircle.h;h=43b297cfe74701eb1bb8c3c3812286db247a20e2;hb=f507d97c1b1118834a70332f5f79d8479a6964c0;hp=cc5159fd581a2da6bd8f32052d550d46a5a387d3;hpb=bd9b40058a376c946318a444dd6c77737ec6ac98;p=architektonas

diff --git a/src/circle.h b/src/circle.h
index cc5159f..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,20 +14,33 @@ 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 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:
+		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__