X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fendpoint.cpp;h=aedd6894491cac216cee0741bd2cf0f45fb7be80;hb=7b4155fa0581d7c5fe198e4fb1dea61fa0846eec;hp=23bd20f130653966cacab27a85f49af42ea9f176;hpb=754ac497179474d0266b55e881a084fef7d5d6a1;p=r2c2.git

diff --git a/source/3d/endpoint.cpp b/source/3d/endpoint.cpp
index 23bd20f..aedd689 100644
--- a/source/3d/endpoint.cpp
+++ b/source/3d/endpoint.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <cmath>
 #include <msp/gl/matrix.h>
 #include <msp/gl/misc.h>
@@ -20,7 +13,7 @@ namespace R2C2 {
 Endpoint3D::Endpoint3D(const Track3D &t, unsigned i):
 	track(t),
 	index(i),
-	mesh(track.get_layout().get_catalogue().get_endpoint_mesh())
+	mesh(track.get_layout().get_catalogue().get_endpoint_mesh(track.get_track().get_type().get_appearance()))
 {
 	track.get_layout().get_endpoint_scene().add(*this);
 }
@@ -34,13 +27,12 @@ void Endpoint3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
 {
 	if(tag=="unlit")
 	{
-		Point p = track.get_track().get_endpoint_position(index);
-		float a = track.get_track().get_endpoint_direction(index)+M_PI;
+		Snap sn = track.get_track().get_snap_node(index);
 
 		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);
+		matrix.translate(sn.position);
+		matrix.rotate(sn.rotation+Angle::half_turn(), 0, 0, 1);
 		renderer.matrix_stack() *= matrix;
 
 		if(track.get_track().get_link(index))