X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fobject.h;h=aa6ce80aaf81641a05b1df13d420852240fbfeb1;hb=3907520897611cb1b5f2f938c60d3eaff34477a5;hp=aa6698799b4ba97c616a8c1e94423105d5d489f2;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/3d/object.h b/source/3d/object.h
index aa66987..aa6ce80 100644
--- a/source/3d/object.h
+++ b/source/3d/object.h
@@ -1,19 +1,34 @@
 #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 Layout3D;
+
+class Object3D: public sigc::trackable
 {
 protected:
-	Object3D() { }
+	Layout3D &layout;
+	Object &object;
+	Msp::GL::Matrix matrix;
+
+	Object3D(Layout3D &, Object &);
 public:
-	virtual ~Object3D() { }
+	virtual ~Object3D();
 
+	Layout3D &get_layout() const { return layout; }
+	Object &get_object() const { return object; }
+
+	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