Use generic objects in Layout3D

[r2c2.git] / source / 3d / object.h

diff --git a/source/3d/object.h b/source/3d/object.h
index 5696627f7e8e59a9285178dbdb43d6c13b939eea..aa6ce80aaf81641a05b1df13d420852240fbfeb1 100644 (file)
--- a/source/3d/object.h
+++ b/source/3d/object.h
@@ -8,15 +8,21 @@
 
 namespace R2C2 {
 
+class Layout3D;
+
 class Object3D: public sigc::trackable
 {
 protected:
+       Layout3D &layout;
        Object &object;
        Msp::GL::Matrix matrix;
 
-       Object3D(Object &);
+       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;