Use GL::Renderables and a Pipeline for rendering

[r2c2.git] / source / designer / designer.h

diff --git a/source/designer/designer.h b/source/designer/designer.h
index e103a749a4f41a2d4c0bd286f1975dee00c9b7bb..1407d50d6fb1fc2dcf0ab2ac1b738bbfa655b941 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -14,7 +14,10 @@ Distributed under the GPL
 #include <msp/gbase/window.h>
 #include <msp/gbase/glcontext.h>
 #include <msp/gl/font.h>
-#include <msp/gl/mesh.h>
+#include <msp/gl/light.h>
+#include <msp/gl/lighting.h>
+#include <msp/gl/object.h>
+#include <msp/gl/pipeline.h>
 #include <msp/gltk/label.h>
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
@@ -60,8 +63,11 @@ private:
        std::string filename;
        Marklin::Layout *layout;
        Marklin::Layout3D *layout_3d;
-       Msp::GL::Mesh *base_mesh;
+       Msp::GL::Object *base_object;
        Marklin::Route *cur_route;
+       Msp::GL::Pipeline *pipeline;
+       Msp::GL::Lighting lighting;
+       Msp::GL::Light light;
 
        Mode mode;
        Selection *selection;