X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.cpp;h=404d30576113a97ad9516b04677d087f81ad4346;hb=89b8b0c60579d8ef0cf9a13521e7bf7c7864883f;hp=8f9377bf7345624c61acffb6b9de11735a4ec656;hpb=eb0057e8a8145032152e4c417fcd102ef5a21484;p=architektonas

diff --git a/src/object.cpp b/src/object.cpp
index 8f9377b..404d305 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -16,6 +16,7 @@
 //
 
 #include "object.h"
+#include <stdlib.h>
 
 // Initialize static variables
 bool Object::fixedAngle = false;
@@ -25,22 +26,32 @@ int Object::viewportHeight = 0;
 bool Object::deleteActive = false;
 bool Object::dimensionActive = false;
 bool Object::snapToGrid = true;
+//snapToPoints all well here?
+bool Object::ignoreClicks = false;
+bool Object::dontMove = false;
+bool Object::selectionInProgress = false;
+QRectF Object::selection;
 
 
-Object::Object(): position(Vector(0, 0)), parent(0), state(OSInactive), oldState(OSInactive),
-	needUpdate(false), attachedDimension(0)
+Object::Object(): position(Vector(0, 0)), parent(0), type(OTObject),
+	state(OSInactive), oldState(OSInactive), needUpdate(false)
+	//, attachedDimension(0)
 {
 }
 
 
-Object::Object(Vector v,  Object * passedInParent/*= 0*/): position(v), parent(passedInParent),
-	state(OSInactive), oldState(OSInactive), needUpdate(false), attachedDimension(0)
+Object::Object(Vector v,  Object * passedInParent/*= 0*/): position(v),
+	parent(passedInParent), state(OSInactive), oldState(OSInactive),
+	needUpdate(false)//, attachedDimension(0)
 {
 }
 
 
 Object::~Object()
 {
+printf("Object: Destroyed!\n");
+	for(uint i=0; i<connected.size(); i++)
+		connected[i].object->DisconnectAll(this);
 }
 
 
@@ -77,6 +88,12 @@ Object::~Object()
 }
 
 
+/*virtual*/ bool Object::HitTest(Point)
+{
+	return false;
+}
+
+
 // This is intended to be overridden by the Container class, for object morphing
 /*virtual*/ void Object::Transmute(Object *, Object *)
 {
@@ -113,6 +130,107 @@ Object::~Object()
 }
 
 
+// This returns a point on the object at 'parameter', which is between 0 and 1.
+// Default is to return the object's position.
+/*virtual*/ Vector Object::GetPointAtParameter(double)
+{
+	return position;
+}
+
+
+// Since these functions are pretty much non-object specific, we can implement
+// them here. :-)
+/*virtual*/ void Object::Connect(Object * obj, double parameter)
+{
+	connected.push_back(Connection(obj, parameter));
+}
+
+
+/*virtual*/ void Object::Disconnect(Object * obj, double parameter)
+{
+#if 0
+	for(uint i=0; i<connected.size(); i++)
+	{
+		if (connected[i].object == obj && connected[i].t == parameter)
+		{
+			connected.erase(connected.begin() + i);
+			return;
+		}
+	}
+#else
+	std::vector<Connection>::iterator i;
+
+	for(i=connected.begin(); i!=connected.end(); i++)
+	{
+		if (((*i).object == obj) && ((*i).t == parameter))
+		{
+			connected.erase(i);
+			return;
+		}
+	}
+#endif
+}
+
+
+/*virtual*/ void Object::DisconnectAll(Object * obj)
+{
+#if 0
+	// According the std::vector docs, only items at position i and beyond are
+	// invalidated, everything before i is still valid. So we use that here.
+	for(uint i=0; i<connected.size();)
+	{
+		// If we found our object, erase it from the vector but don't advance
+		// the iterator. Otherwise, advance the iterator. :-)
+		if (connected[i].object == obj)
+			connected.erase(connected.begin() + i);
+		else
+			i++;
+	}
+#else
+	std::vector<Connection>::iterator i;
+
+	for(i=connected.begin(); i!=connected.end(); )
+	{
+		if ((*i).object == obj)
+			connected.erase(i);
+		else
+			i++;
+	}
+#endif
+}
+
+
+/*virtual*/ QRectF Object::Extents(void)
+{
+	// Generic object returns an empty rect...
+	return QRectF();
+}
+
+
+#if 0
+/*virtual*/ ObjectType Object::Type(void)
+{
+	return OTObject;
+}
+#endif
+
+
+/*virtual*/ void Object::Translate(Vector amount)
+{
+	position += amount;
+}
+
+
+/*virtual*/ void Object::Rotate(Vector, double)
+{
+}
+
+
+/*virtual*/ void Object::Scale(Vector, double)
+{
+}
+
+
 ObjectState Object::GetState(void)
 {
 	return state;
@@ -125,10 +243,10 @@ void Object::Reparent(Object * newParent)
 }
 
 
-Dimension * Object::GetAttachedDimension(void)
+/*Dimension * Object::GetAttachedDimension(void)
 {
 	return attachedDimension;
-}
+}*/
 
 
 // Class methods...