Use GL::Renderer in TrackWrap

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

diff --git a/source/designer/trackwrap.h b/source/designer/trackwrap.h
index 09bacda3e7f8be18ba9dd43ffa802b93b2c89255..070794e48c0b6a7deab175950ab3cc14dc64a9a1 100644 (file)
--- a/source/designer/trackwrap.h
+++ b/source/designer/trackwrap.h
@@ -1,16 +1,10 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef TRACKWRAP_H_
 #define TRACKWRAP_H_
 
 #include <msp/gl/mesh.h>
 #include <msp/gl/renderable.h>
-#include "libmarklin/track.h"
+#include "libr2c2/track.h"
+#include "3d/layout.h"
 
 class Designer;
 class Selection;
@@ -20,23 +14,24 @@ class TrackWrap: public Msp::GL::Renderable
 private:
        struct Wrap
        {
-               Marklin::Track *track;
+               R2C2::Track *track;
                Msp::GL::Mesh *mesh;
        };
 
-       Designer &designer;
+       R2C2::Layout3D &layout;
        Selection &selection;
-       std::map<const Marklin::TrackType *, Msp::GL::Mesh *> meshes;
+       std::map<const R2C2::TrackType *, Msp::GL::Mesh *> meshes;
        std::list<Wrap> wraps;
 
 public:
-       TrackWrap(Designer &, Selection &);
+       TrackWrap(R2C2::Layout3D &, Selection &);
+       ~TrackWrap();
 
-       virtual void render(const Msp::GL::Tag &) const;
+       virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 
 private:
        void selection_changed();
-       Msp::GL::Mesh &get_mesh(const Marklin::TrackType &);
+       Msp::GL::Mesh &get_mesh(const R2C2::TrackType &);
 };
 
 #endif