X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=5857e52d8813b8c29053e7dd107d882d7bf0f35c;hb=3df8cb5c78fbb0b919bcb79677c6c788b8028482;hp=e64f42ed3dde6394fde1749979f24e163f57ba5a;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index e64f42e..5857e52 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -1,13 +1,19 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #include <cmath>
 #include <GL/gl.h>
 #include <msp/gl/misc.h>
+#include "libmarklin/tracktype.h"
 #include "track.h"
 
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
 namespace Marklin {
 
 Track3D::Track3D(Track &t, unsigned q):
@@ -51,11 +57,11 @@ void Track3D::get_bounds(float angle, Point &minp, Point &maxp) const
 	}
 }
 
-void Track3D::render()
+void Track3D::render() const
 {
 	prepare_render();
 
-	glPushName((unsigned)this);
+	glPushName(reinterpret_cast<unsigned>(this));
 
 	varray.apply();
 	glColor4f(0.25*color.r, 0.25*color.g, 0.25*color.b, 1);
@@ -70,35 +76,35 @@ void Track3D::render()
 	glPopMatrix();
 }
 
-void Track3D::render_endpoints()
+void Track3D::render_endpoints() const
 {
 	prepare_render();
 
-	const Point &pos=track.get_position();
-	const Track::EndpointSeq &endpoints=track.get_endpoints();
-	for(Track::EndpointSeq::const_iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
+	const vector<Endpoint> &endpoints=track.get_type().get_endpoints();
+	for(unsigned i=0; i<endpoints.size(); ++i)
 	{
-		GL::set(GL_CULL_FACE, i->link);
-		if(i->link)
+		const Endpoint &ep=endpoints[i];
+		GL::set(GL_CULL_FACE, track.get_link(i));
+		if(track.get_link(i))
 			glColor4f(0.5, 0, 1, 0.5);
 		else
 			glColor4f(1, 0, 0.5, 0.5);
 
-		float c=cos(i->rot);
-		float s=sin(i->rot);
+		float c=cos(ep.dir);
+		float s=sin(ep.dir);
 
 		glBegin(GL_QUADS);
-		glVertex3f(i->pos.x-s*0.025, i->pos.y+c*0.025, 0);
-		glVertex3f(i->pos.x+s*0.025, i->pos.y-c*0.025, 0);
-		glVertex3f(i->pos.x+s*0.025, i->pos.y-c*0.025, pos.z+i->pos.z+0.02);
-		glVertex3f(i->pos.x-s*0.025, i->pos.y+c*0.025, pos.z+i->pos.z+0.02);
+		glVertex3f(ep.pos.x-s*0.025, ep.pos.y+c*0.025, 0);
+		glVertex3f(ep.pos.x+s*0.025, ep.pos.y-c*0.025, 0);
+		glVertex3f(ep.pos.x+s*0.025, ep.pos.y-c*0.025, 0.02);
+		glVertex3f(ep.pos.x-s*0.025, ep.pos.y+c*0.025, 0.02);
 		glEnd();
 	}
 
 	glPopMatrix();
 }
 
-void Track3D::render_route(int route)
+void Track3D::render_route(int route) const
 {
 	prepare_render();
 
@@ -114,7 +120,7 @@ void Track3D::render_route(int route)
 	glPopMatrix();
 }
 
-void Track3D::prepare_render()
+void Track3D::prepare_render() const
 {
 	const Point &pos=track.get_position();
 	float rot=track.get_rotation();
@@ -127,20 +133,20 @@ void Track3D::prepare_render()
 void Track3D::build_object()
 {
 	varray.clear();
-	RefPtr<GL::VertexArrayBuilder> builder=varray.modify();
+	GL::VertexArrayBuilder builder(varray);
 
 	base_seq.clear();
 	rail_seq.clear();
 	route_seq.clear();
-	route_seq.resize(track.get_n_routes());
+	route_seq.resize(track.get_type().get_n_routes());
 
-	const Track::PartSeq &parts=track.get_parts();
+	const vector<TrackPart> &parts=track.get_type().get_parts();
 	unsigned index=0;
-	for(Track::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		build_part(*i, *builder, index);
+	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+		build_part(*i, builder, index);
 }
 
-void Track3D::build_part(const Track::Part &part, GL::VertexArrayBuilder &va_builder, unsigned &base_index)
+void Track3D::build_part(const TrackPart &part, GL::VertexArrayBuilder &va_builder, unsigned &base_index)
 {
 	static vector<Point> profile;
 	if(profile.empty())
@@ -165,63 +171,30 @@ void Track3D::build_part(const Track::Part &part, GL::VertexArrayBuilder &va_bui
 	}
 	static unsigned psize=profile.size();
 
-	const float &radius=part.radius;
-	const float &x=part.x;
-	const float &y=part.y;
-	const float &length=part.length;
-	const float &dir=part.dir;
+	unsigned nsegs=(part.radius ? static_cast<unsigned>(part.length*(1<<quality))+1 : 1);
+	float plen=part.length;
+	if(part.radius)
+		plen*=abs(part.radius);
 
-	unsigned nsegs;
-	if(radius)
+	for(unsigned i=0; i<=nsegs; ++i)
 	{
-		nsegs=(unsigned)(part.length*(1<<quality))+1;
-		Point center(x-sin(dir)*radius, y+cos(dir)*radius, 0);
-		float r=fabs(radius);
-		float start=((radius<0)?M_PI:0)+dir;
-		float angle=(radius<0)?-length:length;
-		int inv=(radius<0)?-1:1;
-		for(unsigned i=0; i<=nsegs; ++i)
-		{
-			float a=start+i*angle/nsegs;
-			float c=cos(a);
-			float s=sin(a);
-
-			for(unsigned j=0; j<profile.size(); ++j)
-			{
-				unsigned k=j&~1;
-				float dy=profile[k+1].y-profile[k].y;
-				float dz=profile[k+1].z-profile[k].z;
-				float d=sqrt(dy*dy+dz*dz);
-				va_builder.normal(s*dz/d, -c*dz/d, dy/d);
-
-				Point p(center.x+s*(r-profile[j].y*inv), center.y-c*(r-profile[j].y*inv), profile[j].z+i*track.get_slope()/nsegs);
-				va_builder.vertex(p.x, p.y, p.z);
-				if(profile[j].z==0)
-					border.push_back(p);
-			}
-		}
-	}
-	else
-	{
-		nsegs=1;
-		float c=cos(dir);
-		float s=sin(dir);
-		for(unsigned i=0; i<2; ++i)
+		float a=part.dir+(part.radius ? i*plen/nsegs/part.radius : 0);
+		float c=cos(a);
+		float s=sin(a);
+		Point p=part.get_point(i*plen/nsegs);
+
+		for(unsigned j=0; j<profile.size(); ++j)
 		{
-			for(unsigned j=0; j<profile.size(); ++j)
-			{
-				unsigned k=j&~1;
-				float dy=profile[k+1].y-profile[k].y;
-				float dz=profile[k+1].z-profile[k].z;
-				float d=sqrt(dy*dy+dz*dz);
-				va_builder.normal(s*dz/d, -c*dz/d, dy/d);
-
-				float len=(part.dead_end && i==1 && j>=6) ? length/2 : length;
-				Point p(x+c*len*i-s*profile[j].y, y+s*len*i+c*profile[j].y, profile[j].z+i*track.get_slope());
-				va_builder.vertex(p.x, p.y, p.z);
-				if(profile[j].z==0)
-					border.push_back(p);
-			}
+			unsigned k=j&~1;
+			float dy=profile[k+1].y-profile[k].y;
+			float dz=profile[k+1].z-profile[k].z;
+			float d=sqrt(dy*dy+dz*dz);
+			va_builder.normal(s*dz/d, -c*dz/d, dy/d);
+
+			Point v(p.x+c*profile[j].x-s*profile[j].y, p.y+c*profile[j].y+s*profile[j].x, profile[j].z+i*track.get_slope()/nsegs);
+			va_builder.vertex(v.x, v.y, v.z);
+			if(profile[j].z==0)
+				border.push_back(v);
 		}
 	}