X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fobject.h;fp=source%2F3d%2Fobject.h;h=5696627f7e8e59a9285178dbdb43d6c13b939eea;hb=f23c8d8cbc4e72b45e3a719b2cf974ce35d054e9;hp=aa6698799b4ba97c616a8c1e94423105d5d489f2;hpb=107a7f787d406f1f664c4986557f9a896e0845ea;p=r2c2.git

diff --git a/source/3d/object.h b/source/3d/object.h
index aa66987..5696627 100644
--- a/source/3d/object.h
+++ b/source/3d/object.h
@@ -1,19 +1,28 @@
 #ifndef R2C2_3D_OBJECT_H_
 #define R2C2_3D_OBJECT_H_
 
+#include <sigc++/trackable.h>
+#include <msp/gl/matrix.h>
 #include "libr2c2/geometry.h"
+#include "libr2c2/object.h"
 
 namespace R2C2 {
 
-class Object3D
+class Object3D: public sigc::trackable
 {
 protected:
-	Object3D() { }
+	Object &object;
+	Msp::GL::Matrix matrix;
+
+	Object3D(Object &);
 public:
 	virtual ~Object3D() { }
 
+	const Msp::GL::Matrix &get_matrix() const { return matrix; }
 	virtual Vector get_node() const = 0;
 	virtual bool is_visible() const = 0;
+protected:
+	virtual void moved();
 };
 
 } // namespace R2C2