Rename Track3D::get_matrix to create_matrix to avoid a conflict

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

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index 793dec5888f9167e99f250ab3f86ceb529ce7ba3..72973f3a9b4bc03501af1777d004a275f14cc5b6 100644 (file)
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -83,7 +83,7 @@ Vector Track3D::get_node() const
        return Vector(pos.x+c*center.x-s*center.y, pos.y+s*center.x+c*center.y, pos.z+0.02);
 }
 
-GL::Matrix Track3D::get_matrix() const
+GL::Matrix Track3D::create_matrix() const
 {
        const Vector &pos = track.get_position();
        float rot = track.get_rotation();
@@ -98,7 +98,7 @@ GL::Matrix Track3D::get_matrix() const
 
 void Track3D::setup_render(Msp::GL::Renderer &renderer, const GL::Tag &) const
 {
-       renderer.matrix_stack() *= get_matrix();
+       renderer.matrix_stack() *= create_matrix();
 }
 
 void Track3D::link_changed(unsigned i, Track *trk)