Avoid nested block reservations completely

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

diff --git a/source/3d/track.h b/source/3d/track.h
index a9154b7c6bbb628fb486d7d934601224a03a37ce..9b70b630a5fd1f0a7e88bf418b21a66629901b1e 100644 (file)
--- a/source/3d/track.h
+++ b/source/3d/track.h
@@ -1,42 +1,43 @@
-#ifndef MARKLIN3D_TRACK_H_
-#define MARKLIN3D_TRACK_H_
+#ifndef R2C2_3D_TRACK_H_
+#define R2C2_3D_TRACK_H_
 
 #include <list>
-#include <msp/gl/vertexarray.h>
-#include <msp/gl/vertexarraybuilder.h>
-#include "libmarklin/track.h"
-#include "libmarklin/trackpart.h"
-#include "misc.h"
+#include <sigc++/trackable.h>
+#include <msp/gl/matrix.h>
+#include <msp/gl/objectinstance.h>
+#include "libr2c2/track.h"
+#include "libr2c2/trackpart.h"
+#include "object.h"
 
-namespace Marklin {
+namespace R2C2 {
 
-class Track3D
+class Endpoint3D;
+class Path3D;
+class TrackType3D;
+
+class Track3D: public Object3D, public Msp::GL::ObjectInstance
 {
+private:
+       Track &track;
+       const TrackType3D &type;
+       std::vector<Endpoint3D *> endpoints;
+
 public:
-       Track3D(Track &, unsigned);
-       void set_color(const Color &c)  { color=c; }
-       void set_quality(unsigned);
-       void get_bounds(float, Point &, Point &) const;
+       Track3D(Layout3D &, Track &);
+       ~Track3D();
+
+       Layout3D &get_layout() const { return layout; }
        Track &get_track() const { return track; }
-       void render();
-       void render_endpoints();
-       void render_route(int);
+       const TrackType3D &get_type() const { return type; }
+
+       virtual Vector get_node() const;
+       virtual bool is_visible() const { return true; }
+
+       virtual void setup_render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 private:
-       Track        &track;
-       Color        color;
-       std::vector<Point> border;
-       Msp::GL::VertexArray varray;
-       std::vector<unsigned> base_seq;
-       std::vector<unsigned> rail_seq;
-       std::vector<std::vector<unsigned> > route_seq;
-       unsigned quality;
-
-       void prepare_render();
-       void build_object();
-       void build_part(const TrackPart &, Msp::GL::VertexArrayBuilder &, unsigned &);
+       void link_changed(unsigned, Track *);
 };
-typedef std::list<Track3D *> Track3DSeq;
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif