Use different stopping margin depending on whether the next track is a turnout

[r2c2.git] / source / 3d / path.cpp

diff --git a/source/3d/path.cpp b/source/3d/path.cpp
index e413ace021d2bec89cb7b132832b5b93919621db..2e1521087da8e36ab10121ea512834d35fd23740 100644 (file)
--- a/source/3d/path.cpp
+++ b/source/3d/path.cpp
@@ -1,12 +1,13 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <msp/gl/matrix.h>
-#include "libmarklin/tracktype.h"
+#include <msp/gl/renderer.h>
+#include "libr2c2/tracktype.h"
 #include "layout.h"
 #include "path.h"
 #include "track.h"
@@ -14,7 +15,7 @@ Distributed under the GPL
 
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Path3D::Path3D(const Track3D &t):
        track(t),
@@ -61,24 +62,30 @@ void Path3D::set_layer(float l)
        z_offs = l*track.get_track().get_layout().get_catalogue().get_gauge()*0.01;
 }
 
-void Path3D::render(const GL::Tag &tag) const
+long Path3D::get_instance_key() const
 {
-       if(tag==0)
+       return reinterpret_cast<long>(&track.get_type());
+}
+
+void Path3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
+{
+       if(tag=="unlit")
        {
                unsigned mask = (automatic ? 1<<track.get_track().get_active_path() : paths);
                mask &= track.get_track().get_type().get_paths();
                if(!mask)
                        return;
 
-               GL::PushMatrix push_mat;
-               track.apply_matrix();
-               GL::translate(0, 0, z_offs);
+               GL::MatrixStack::Push push_mtx(renderer.matrix_stack());
+               GL::Matrix matrix = track.get_matrix();
+               matrix.translate(0, 0, z_offs);
+               renderer.matrix_stack() *= matrix;
 
                glColor4f(color.r, color.g, color.b, color.a);
                for(unsigned i=0; mask; ++i, mask>>=1)
                        if(mask&1)
-                               track.get_type().get_path_mesh(i).draw();
+                               track.get_type().get_path_mesh(i).draw(renderer);
        }
 }
 
-} // namespace Marklin
+} // namespace R2C2