From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 17 Jan 2013 12:29:20 +0000 (+0200)
Subject: Rename Track3D::get_matrix to create_matrix to avoid a conflict
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=51779f52d3f1fe23e2bdb8864c88b5edd49c57ed;p=r2c2.git

Rename Track3D::get_matrix to create_matrix to avoid a conflict
---

diff --git a/source/3d/path.cpp b/source/3d/path.cpp
index 44c54ab..fe4a246 100644
--- 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 793dec5..72973f3 100644
--- 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 3ad7667..f3bfb45 100644
--- 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 *);