Foundations of using physics simulation for trains

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

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index a5c5dbf62a166904a5e3203d28b53af8a637284c..ade3d132bcef669759bff1c6796e14699a9ce177 100644 (file)
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -11,6 +11,7 @@ Distributed under the GPL
 #include "libmarklin/tracktype.h"
 #include "endpoint.h"
 #include "layout.h"
+#include "path.h"
 #include "track.h"
 #include "tracktype.h"
 
@@ -22,7 +23,8 @@ namespace Marklin {
 Track3D::Track3D(Layout3D &l, Track &t):
        layout(l),
        track(t),
-       type(layout.get_catalogue().get_track(track.get_type()))
+       type(layout.get_catalogue().get_track(track.get_type())),
+       path(new Path3D(*this))
 {
        layout.add_track(*this);
        layout.get_scene().add(*this);
@@ -77,16 +79,21 @@ Point Track3D::get_node() const
        return Point(pos.x+c*center.x-s*center.y, pos.y+s*center.x+c*center.y, pos.z+0.02);
 }
 
-void Track3D::render(const GL::Tag &tag) const
+void Track3D::apply_matrix() const
 {
-       GL::PushMatrix push_mat;
-
        const Point &pos = track.get_position();
        float rot = track.get_rotation();
 
        glTranslatef(pos.x, pos.y, pos.z);
        glRotatef(rot*180/M_PI, 0, 0, 1);
        glRotatef(track.get_slope()/track.get_type().get_total_length()*180/M_PI, 0, -1, 0);
+}
+
+void Track3D::render(const GL::Tag &tag) const
+{
+       GL::PushMatrix push_mat;
+
+       apply_matrix();
 
        glPushName(reinterpret_cast<unsigned>(this));