New approach for displaying track state

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

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 09189ed82969df8b69d3bf1682b6387fb1119211..d5aad2634fbbe2343f4f2d38027347b531957f2b 100644 (file)
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,32 +1,67 @@
-#ifndef MARKLIN3D_LAYOUT_H_
-#define MARKLIN3D_LAYOUT_H_
+#ifndef R2C2_3D_LAYOUT_H_
+#define R2C2_3D_LAYOUT_H_
 
-#include "libmarklin/layout.h"
-#include "track.h"
+#include <sigc++/trackable.h>
+#include <msp/gl/instancescene.h>
+#include <msp/gl/light.h>
+#include <msp/gl/lighting.h>
+#include <msp/gl/simplescene.h>
+#include "libr2c2/layout.h"
+#include "catalogue.h"
 
-namespace Marklin {
+namespace R2C2 {
 
-class Layout3D
+class Object3D;
+class Utility3D;
+
+class Layout3D: public sigc::trackable
 {
+public:
+       typedef std::map<Object *, Object3D *> ObjectMap;
+
+private:
+       Layout &layout;
+       Catalogue3D catalogue;
+       ObjectMap objects;
+       std::set<Utility3D *> utilities;
+       Msp::GL::InstanceScene scene;
+       Msp::GL::SimpleScene ep_scene;
+       Msp::GL::InstanceScene path_scene;
+       Msp::GL::Light sun;
+       Msp::GL::Lighting lighting;
+
 public:
        Layout3D(Layout &);
        ~Layout3D();
 
-       void set_quality(unsigned);
-       const Track3DSeq &get_tracks() const { return tracks; }
-       void  render(bool =false);
-       Track3D *get_track(const Track *);
-       Track3D *pick_track(float, float, float);
-private:
-       Layout     &layout;
-       Track3DSeq tracks;
-       unsigned   quality;
+       Layout &get_layout() const { return layout; }
+       Catalogue3D &get_catalogue() { return catalogue; }
+       const Catalogue3D &get_catalogue() const { return catalogue; }
+       void get_bounds(Vector &, Vector &) const;
 
-       void track_added(Track *);
-       void track_removed(Track *);
+       void add(Object3D &);
+       Object3D &get(Object &) const;
+       const ObjectMap &get_all() const { return objects; }
+       void remove(Object3D &);
+
+       template<typename T>
+       T &get(Object &o) const
+       { return dynamic_cast<T &>(get(o)); }
+
+       void add(Utility3D &);
+       void remove(Utility3D &);
+
+       Msp::GL::Scene &get_scene() { return scene; }
+       Msp::GL::Scene &get_endpoint_scene() { return ep_scene; }
+       Msp::GL::Scene &get_path_scene() { return path_scene; }
+       const Msp::GL::Lighting &get_lighting() const { return lighting; }
+
+private:
+       void object_added(Object &);
+       void object_removed(Object &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif