X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.cpp;h=d76e8ebe6bfcb136b54c965ce593abf9bba01cfe;hb=4b7008978ce5b67e7e1db14b4a359e4ab1881bbd;hp=1a898d4cd5383c21e0104fe8a5bfef7758c45188;hpb=47bff0c8939de3ae20b5ced1ee2f6a264397dcee;p=r2c2.git

diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index 1a898d4..d76e8eb 100644
--- a/source/3d/tracktype.cpp
+++ b/source/3d/tracktype.cpp
@@ -1,13 +1,13 @@
 /* $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
 */
 
 #include <algorithm>
 #include <cmath>
-#include <msp/gl/meshbuilder.h>
+#include <msp/gl/technique.h>
 #include "catalogue.h"
 #include "tracktype.h"
 
@@ -16,7 +16,7 @@ using namespace Msp;
 
 namespace {
 
-bool compare_z(const Marklin::Point &p1, const Marklin::Point &p2)
+bool compare_z(const R2C2::Point &p1, const R2C2::Point &p2)
 {
 	return p1.z<p2.z;
 }
@@ -27,7 +27,7 @@ Iter graham_scan(Iter begin, Iter end)
 	// http://en.wikipedia.org/wiki/Graham_scan
 
 	// Find point with lowest X coordinate
-	Marklin::Point lowest = *begin;
+	R2C2::Point lowest = *begin;
 	for(Iter i=begin; i!=end; ++i)
 		if(i->x<lowest.x || (i->x==lowest.x && i->y>lowest.y))
 			lowest = *i;
@@ -69,12 +69,11 @@ Iter graham_scan(Iter begin, Iter end)
 
 }
 
-namespace Marklin {
+namespace R2C2 {
 
-TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
+TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
 	catalogue(cat3d),
-	ballast_mesh((GL::NORMAL3, GL::COLOR4_UBYTE, GL::VERTEX3)),
-	rail_mesh((GL::NORMAL3, GL::COLOR4_UBYTE, GL::VERTEX3))
+	mesh((GL::NORMAL3, GL::TEXCOORD2, GL::VERTEX3))
 {
 	const Catalogue &cat = cat3d.get_catalogue();
 	const vector<TrackPart> &parts = tt.get_parts();
@@ -82,32 +81,49 @@ TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
 	const Profile &ballast_profile = cat.get_ballast_profile();
 	const Point &ballast_min = ballast_profile.get_min_coords();
 	const Point &ballast_max = ballast_profile.get_max_coords();
+	float ballast_h = ballast_max.y-ballast_min.y;
 
 	const Profile &rail_profile = cat.get_rail_profile();
 	const Point &rail_min = rail_profile.get_min_coords();
 	const Point &rail_max = rail_profile.get_max_coords();
+	float rail_h = rail_max.y-rail_min.y;
 
 	float gauge = cat.get_gauge();
 
 	{
 		unsigned index = 0;
-		GL::MeshBuilder bld(ballast_mesh);
-		bld.color(0.25f, 0.25f, 0.25f);
+		GL::MeshBuilder bld(mesh);
+		bld.texcoord(0.25, 0.5);
 		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 			build_part(*i, ballast_profile, Point(0, -ballast_min.y), bld, index);
-	}
 
-	{
-		unsigned index = 0;
-		GL::MeshBuilder bld(rail_mesh);
-		bld.color(0.85f, 0.85f, 0.85f);
-		float y = ballast_max.y-ballast_min.y-rail_min.y;
+		bld.texcoord(0.75, 0.5);
+		float y = ballast_h-rail_min.y;
 		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 			build_part(*i, rail_profile, Point(-gauge/2-rail_max.x, y), bld, index);
 		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 			build_part(*i, rail_profile, Point(gauge/2-rail_min.x, y), bld, index);
 	}
 
+	object.set_mesh(&mesh);
+	object.set_technique(catalogue.get<GL::Technique>(cat.get_track_technique()));
+ 
+	unsigned paths = tt.get_paths();
+	for(unsigned i=0; paths; ++i, paths>>=1)
+	{
+		GL::Mesh *m = 0;
+		if(paths&1)
+		{
+			m = new GL::Mesh(GL::VERTEX3);
+			GL::MeshBuilder bld(*m);
+			unsigned index = 0;
+			for(vector<TrackPart>::const_iterator j=parts.begin(); j!=parts.end(); ++j)
+				if(j->get_path()==i)
+					build_part(*j, cat.get_path_profile(), Point(0, ballast_h+1.5*rail_h), bld, index);
+		}
+		path_meshes.push_back(m);
+	}
+
 	min_z = max_z = border.front().z;
 	for(vector<Point>::iterator i=border.begin(); i!=border.end(); ++i)
 	{
@@ -117,6 +133,12 @@ TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
 	border.erase(graham_scan(border.begin(), border.end()), border.end());
 }
 
+TrackType3D::~TrackType3D()
+{
+	for(vector<GL::Mesh *>::iterator i=path_meshes.begin(); i!=path_meshes.end(); ++i)
+		delete *i;
+}
+
 void TrackType3D::get_bounds(float angle, Point &minp, Point &maxp) const
 {
 	float c = cos(-angle);
@@ -138,21 +160,17 @@ void TrackType3D::get_bounds(float angle, Point &minp, Point &maxp) const
 	}
 }
 
-void TrackType3D::render(const GL::Tag &tag) const
+const GL::Mesh &TrackType3D::get_path_mesh(unsigned p) const
 {
-	if(tag==0)
-	{
-		catalogue.get_ballast_material().bind();
-		ballast_mesh.draw();
-		catalogue.get_rail_material().bind();
-		rail_mesh.draw();
-	}
+	if(p>=path_meshes.size() || !path_meshes[p])
+		throw InvalidParameterValue("Invalid path");
+	return *path_meshes[p];
 }
 
 void TrackType3D::build_part(const TrackPart &part, const Profile &profile, const Point &offset, GL::MeshBuilder &bld, unsigned &base_index)
 {
 	float plen = part.get_length();
-	unsigned nsegs = (part.is_curved() ? static_cast<unsigned>(plen*16)+1 : 1);
+	unsigned nsegs = (part.is_curved() ? static_cast<unsigned>(plen*32)+1 : 1);
 
 	unsigned n_points = profile.get_n_points();
 	for(unsigned i=0; i<=nsegs; ++i)
@@ -199,4 +217,4 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons
 	base_index += (nsegs+1)*(n_points-1)*2;
 }
 
-} // namespace Marklin
+} // namespace R2C2