X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.h;h=f7d5d7c0a493b02c31d07070ef7bcdcc511e0baf;hb=e04e3a62d9f98d0cee6a4cf1e23a3019af8a37a7;hp=ec775d16fbf42fd1443bec267375bddb3d984f63;hpb=921bf050ffe5fc81a9ab377e634180e659ee5d5d;p=architektonas

diff --git a/src/object.h b/src/object.h
index ec775d1..f7d5d7c 100644
--- a/src/object.h
+++ b/src/object.h
@@ -17,6 +17,8 @@ enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTElli
 
 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,11 +38,11 @@ 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(Point, double);
 		virtual void Scale(Point, double);
@@ -49,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);
@@ -62,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;
@@ -75,7 +77,6 @@ class Object
 	protected:
 		ObjectState oldState;
 		bool needUpdate;
-//		Dimension * attachedDimension;
 		std::vector<Connection> connected;
 
 		// Class variables