X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=3241852f1ed32c606ad8c0dd07ea6a97e34684db;hb=a861c2729a356173059177a0b800de2b31c9b49c;hp=f9b03ed00220fc78659ee591730cc6f2125e0414;hpb=449fb5de95ddb2ac9da4bd72a1c12150505d5549;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index f9b03ed..3241852 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -1,231 +1,84 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <cmath>
-#include <GL/gl.h>
+#include <msp/gl/matrix.h>
 #include <msp/gl/misc.h>
 #include "libmarklin/tracktype.h"
+#include "endpoint.h"
+#include "layout.h"
 #include "track.h"
+#include "tracktype.h"
 
 using namespace std;
 using namespace Msp;
 
 namespace Marklin {
 
-Track3D::Track3D(Track &t, unsigned q):
+Track3D::Track3D(Layout3D &l, Track &t):
+	layout(l),
 	track(t),
-	color(1, 1, 1),
-	varray((GL::NORMAL3, GL::VERTEX3)),
-	quality(q)
+	type(layout.get_catalogue().get_track(track.get_type()))
 {
-	build_object();
-}
-
-void Track3D::set_color(const Msp::GL::Color &c)
-{
-	color=c;
-}
-
-void Track3D::set_quality(unsigned q)
-{
-	quality=q;
-	build_object();
-}
-
-void Track3D::get_bounds(float angle, Point &minp, Point &maxp) const
-{
-	const Point &pos=track.get_position();
-	float rot=track.get_rotation();
-
-	float c=cos(-angle);
-	float s=sin(-angle);
-
-	minp.x=maxp.x=c*pos.x-s*pos.y;
-	minp.y=maxp.y=s*pos.x+c*pos.y;
+	layout.add_track(*this);
+	layout.get_scene().add(*this);
 
-	float c2=cos(rot-angle);
-	float s2=sin(rot-angle);
-
-	for(vector<Point>::const_iterator i=border.begin(); i!=border.end(); ++i)
-	{
-		float x=c*pos.x-s*pos.y + c2*i->x-s2*i->y;
-		float y=s*pos.x+c*pos.y + s2*i->x+c2*i->y;
-
-		minp.x=min(minp.x, x);
-		minp.y=min(minp.y, y);
-		maxp.x=max(maxp.x, x);
-		maxp.y=max(maxp.y, y);
-	}
+	const vector<Endpoint> &type_eps = track.get_type().get_endpoints();
+	for(unsigned i=0; i<type_eps.size(); ++i)
+		endpoints.push_back(new Endpoint3D(*this, i));
 }
 
-void Track3D::render() const
+Track3D::~Track3D()
 {
-	prepare_render();
-
-	glPushName(reinterpret_cast<unsigned>(this));
+	layout.remove_track(*this);
+	layout.get_scene().remove(*this);
 
-	varray.apply();
-	glColor4f(0.25*color.r, 0.25*color.g, 0.25*color.b, 1);
-	glDrawElements(GL_QUADS, base_seq.size(), GL_UNSIGNED_INT, &base_seq[0]);
-	if(quality>1)
-	{
-		glColor4f(0.85*color.r, 0.85*color.g, 0.85*color.b, 1);
-		glDrawElements(GL_QUADS, rail_seq.size(), GL_UNSIGNED_INT, &rail_seq[0]);
-	}
-
-	glPopName();
-	glPopMatrix();
-}
-
-void Track3D::render_endpoints() const
-{
-	prepare_render();
-
-	const vector<Endpoint> &endpoints=track.get_type().get_endpoints();
-	for(unsigned i=0; i<endpoints.size(); ++i)
-	{
-		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(ep.dir);
-		float s=sin(ep.dir);
-
-		glBegin(GL_QUADS);
-		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();
+	for(vector<Endpoint3D *>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
+		delete *i;
 }
 
-void Track3D::render_route(int route) const
+void Track3D::get_bounds(float angle, Point &minp, Point &maxp) const
 {
-	prepare_render();
-
-	varray.apply();
-	if(route>=0 && static_cast<unsigned>(route)<route_seq.size())
-		glDrawElements(GL_QUADS, route_seq[route].size(), GL_UNSIGNED_INT, &route_seq[route][0]);
+	type.get_bounds(angle-track.get_rotation(), minp, maxp);
+
+	float c = cos(-angle);
+	float s = sin(-angle);
+
+	const Point &pos = track.get_position();
+	minp.x += c*pos.x-s*pos.y;
+	maxp.x += c*pos.x-s*pos.y;
+	minp.y += s*pos.x+c*pos.y;
+	maxp.y += s*pos.x+c*pos.y;
+	minp.z += pos.z;
+	maxp.z += pos.z;
+
+	float slope = track.get_slope();
+	if(slope>0)
+		maxp.z += slope;
 	else
-	{
-		for(unsigned i=0; i<route_seq.size(); ++i)
-			glDrawElements(GL_QUADS, route_seq[i].size(), GL_UNSIGNED_INT, &route_seq[i][0]);
-	}
-
-	glPopMatrix();
+		minp.z += slope;
 }
 
-void Track3D::prepare_render() const
+void Track3D::render(const GL::Tag &tag) const
 {
-	const Point &pos=track.get_position();
-	float rot=track.get_rotation();
+	GL::PushMatrix push_mat;
+
+	const Point &pos = track.get_position();
+	float rot = track.get_rotation();
 
-	glPushMatrix();
 	glTranslatef(pos.x, pos.y, pos.z);
 	glRotatef(rot*180/M_PI, 0, 0, 1);
-}
+	glRotatef(track.get_slope()/track.get_type().get_total_length()*180/M_PI, 0, -1, 0);
 
-void Track3D::build_object()
-{
-	varray.clear();
-	GL::VertexArrayBuilder builder(varray);
-
-	base_seq.clear();
-	rail_seq.clear();
-	route_seq.clear();
-	route_seq.resize(track.get_type().get_n_routes());
-
-	const vector<TrackPart> &parts=track.get_type().get_parts();
-	unsigned index=0;
-	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		build_part(*i, builder, index);
-}
+	glPushName(reinterpret_cast<unsigned>(this));
 
-void Track3D::build_part(const TrackPart &part, GL::VertexArrayBuilder &va_builder, unsigned &base_index)
-{
-	static vector<Point> profile;
-	if(profile.empty())
-	{
-		profile.push_back(Point(0, -0.02, 0));
-		profile.push_back(Point(0, -0.014, 0.008));
-		profile.push_back(Point(0, -0.014, 0.008));
-		profile.push_back(Point(0, 0.014, 0.008));
-		profile.push_back(Point(0, 0.014, 0.008));
-		profile.push_back(Point(0, 0.02, 0));
-		for(unsigned i=0; i<2; ++i)
-		{
-			profile.push_back(Point(0, -0.009+i*0.017, 0.008));
-			profile.push_back(Point(0, -0.009+i*0.017, 0.0103));
-			profile.push_back(Point(0, -0.009+i*0.017, 0.0103));
-			profile.push_back(Point(0, -0.008+i*0.017, 0.0103));
-			profile.push_back(Point(0, -0.008+i*0.017, 0.0103));
-			profile.push_back(Point(0, -0.008+i*0.017, 0.008));
-		}
-		profile.push_back(Point(0, -0.002, 0.012));
-		profile.push_back(Point(0, 0.002, 0.012));
-	}
-	static unsigned psize=profile.size();
-
-	unsigned nsegs=(part.radius ? static_cast<unsigned>(part.length*(1<<quality))+1 : 1);
-	float plen=part.length;
-	if(part.radius)
-		plen*=abs(part.radius);
-
-	for(unsigned i=0; i<=nsegs; ++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)
-		{
-			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);
-		}
-	}
-
-	for(unsigned i=0; i<nsegs; ++i)
-	{
-		for(unsigned j=0; j<3; ++j)
-		{
-			base_seq.push_back(base_index+i*psize+j*2);
-			base_seq.push_back(base_index+(i+1)*psize+j*2);
-			base_seq.push_back(base_index+(i+1)*psize+1+j*2);
-			base_seq.push_back(base_index+i*psize+1+j*2);
-		}
-		for(unsigned j=3; j<9; ++j)
-		{
-			rail_seq.push_back(base_index+i*psize+j*2);
-			rail_seq.push_back(base_index+(i+1)*psize+j*2);
-			rail_seq.push_back(base_index+(i+1)*psize+1+j*2);
-			rail_seq.push_back(base_index+i*psize+1+j*2);
-		}
-		route_seq[part.route].push_back(base_index+i*psize+18);
-		route_seq[part.route].push_back(base_index+(i+1)*psize+18);
-		route_seq[part.route].push_back(base_index+(i+1)*psize+19);
-		route_seq[part.route].push_back(base_index+i*psize+19);
-	}
-
-	base_index+=(nsegs+1)*psize;
+	type.render(tag);
+
+	glPopName();
 }
 
 } // namespace Marklin