X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fendpoint.cpp;h=440d3f7d7e8a0362fabee8f1673bd12f1662fcc3;hb=dbaa67c30705a9993d2626cec588c7320f1eef17;hp=c11f45f9bced45a8ff5ca857d78f513b3d0329bc;hpb=47341c72a70e6cf9d8e963705a50197bbc20a87d;p=r2c2.git

diff --git a/source/3d/endpoint.cpp b/source/3d/endpoint.cpp
index c11f45f..440d3f7 100644
--- a/source/3d/endpoint.cpp
+++ b/source/3d/endpoint.cpp
@@ -1,6 +1,6 @@
 /* $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
 */
@@ -8,13 +8,14 @@ Distributed under the GPL
 #include <cmath>
 #include <msp/gl/matrix.h>
 #include <msp/gl/misc.h>
+#include <msp/gl/renderer.h>
 #include "endpoint.h"
 #include "layout.h"
 #include "track.h"
 
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Endpoint3D::Endpoint3D(const Track3D &t, unsigned i):
 	track(t),
@@ -29,25 +30,26 @@ Endpoint3D::~Endpoint3D()
 	track.get_layout().get_endpoint_scene().remove(*this);
 }
 
-void Endpoint3D::render(const GL::Tag &tag) const
+void Endpoint3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
 {
-	if(tag==0)
+	if(tag=="unlit")
 	{
 		Point p = track.get_track().get_endpoint_position(index);
 		float a = track.get_track().get_endpoint_direction(index)+M_PI;
 
-		GL::PushMatrix push_mat;
-		GL::translate(p.x, p.y, p.z);
-		GL::rotate(a*180/M_PI, 0, 0, 1);
+		GL::MatrixStack::Push push_mtx(renderer.matrix_stack());
+		GL::Matrix matrix;
+		matrix.translate(p.x, p.y, p.z);
+		matrix.rotate(a, 0, 0, 1);
+		renderer.matrix_stack() *= matrix;
 
-		GL::set(GL_CULL_FACE, track.get_track().get_link(index));
 		if(track.get_track().get_link(index))
 			glColor4f(0.5, 0, 1, 0.5);
 		else
 			glColor4f(1, 0, 0.5, 0.5);
 
-		mesh.draw();
+		mesh.draw(renderer);
 	}
 }
 
-} // namespace Marklin
+} // namespace R2C2