Rename Track3D::get_matrix to create_matrix to avoid a conflict

diff --git a/source/3d/path.cpp b/source/3d/path.cpp
index 44c54ab35dc8defbce1df8a4535100dacbd5b29d..fe4a2467b57df59c64e9d3aea9f4396af922eccb 100644 (file)
--- a/source/3d/path.cpp
+++ b/source/3d/path.cpp
@@ -71,7 +71,7 @@ void Path3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
                        return;
 
                GL::MatrixStack::Push push_mtx(renderer.matrix_stack());
-               GL::Matrix matrix = track.get_matrix();
+               GL::Matrix matrix = track.create_matrix();
                matrix.translate(0, 0, z_offs);
                renderer.matrix_stack() *= matrix;
 

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)

diff --git a/source/3d/track.h b/source/3d/track.h
index 3ad76672e2aa0243bd4457692437d6174ec90f61..f3bfb458bb93333dae9716f365563d238b98d1f5 100644 (file)
--- a/source/3d/track.h
+++ b/source/3d/track.h
@@ -38,7 +38,7 @@ public:
        virtual Vector get_node() const;
        virtual bool is_visible() const { return true; }
 
-       Msp::GL::Matrix get_matrix() const;
+       Msp::GL::Matrix create_matrix() const;
        virtual void setup_render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 private:
        void link_changed(unsigned, Track *);