X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fobject.h;h=5696627f7e8e59a9285178dbdb43d6c13b939eea;hb=895fdb9568cda40898e5bb646061c14a41dc0124;hp=a9ac7156f6e8af3cc864637b3c21590c5dafb708;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/3d/object.h b/source/3d/object.h
index a9ac715..5696627 100644
--- a/source/3d/object.h
+++ b/source/3d/object.h
@@ -1,26 +1,28 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #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() { }
 
-	virtual Point get_node() const = 0;
+	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