X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.cpp;h=a1ffc361f4e29aef712678228504109c1f11bf01;hb=508ee4bfcc0f8fb1373fb7af251c59c873ef896f;hp=f6b3d5fb8b053635cbb1732c9885860f59cc61e6;hpb=5116fff210cdc3f0fbdae13046cc60450aad5e8f;p=r2c2.git

diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index f6b3d5f..a1ffc36 100644
--- a/source/3d/tracktype.cpp
+++ b/source/3d/tracktype.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <cmath>
 #include <msp/gl/technique.h>
+#include "libr2c2/trackappearance.h"
 #include "catalogue.h"
 #include "tracktype.h"
 
@@ -9,26 +10,31 @@ using namespace Msp;
 
 namespace R2C2 {
 
-TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
-	catalogue(cat3d),
+TrackType3D::TrackType3D(Catalogue3D &c, const TrackType &tt):
+	ObjectType3D(c),
 	mesh(0),
 	object(0),
 	own_data(false)
 {
-	const Catalogue &cat = cat3d.get_catalogue();
+	const TrackAppearance &appearance = tt.get_appearance();
 	const vector<TrackPart> &parts = tt.get_parts();
 
-	const Profile &ballast_profile = cat.get_ballast_profile();
+	const Profile &ballast_profile = appearance.get_ballast_profile();
 	const Vector &ballast_min = ballast_profile.get_min_coords();
 	const Vector &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 Profile &rail_profile = appearance.get_rail_profile();
 	const Vector &rail_min = rail_profile.get_min_coords();
 	const Vector &rail_max = rail_profile.get_max_coords();
 	float rail_h = rail_max.y-rail_min.y;
 
-	float gauge = cat.get_gauge();
+	const Profile &tie_profile = appearance.get_tie_profile();
+	const Vector &tie_min = tie_profile.get_min_coords();
+	const Vector &tie_max = tie_profile.get_max_coords();
+	float tie_h = tie_max.y-tie_min.y;
+
+	float gauge = appearance.get_gauge();
 
 	string obj_name = tt.get_object();
 	if(!obj_name.empty())
@@ -40,12 +46,17 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
 		GL::MeshBuilder bld(*mesh);
 
 		unsigned index = 0;
-		bld.texcoord(0.25, 0.5);
+		bld.texcoord(0.17, 0.5);
+		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+			build_part(*i, ballast_profile, Vector(0, 0, -ballast_min.y), false, bld, index);
+
+		float y = ballast_h-tie_min.y;
+		bld.texcoord(0.83, 0.5);
 		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-			build_part(*i, ballast_profile, Vector(0, -ballast_min.y, 0), false, bld, index);
+			build_ties(*i, tie_profile, appearance.get_tie_length(), appearance.get_tie_spacing(), Vector(0, 0, y), bld, index);
 
-		bld.texcoord(0.75, 0.5);
-		float y = ballast_h-rail_min.y;
+		bld.texcoord(0.5, 0.5);
+		y = ballast_h+tie_h-rail_min.y;
 		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 			build_part(*i, rail_profile, Vector(0, gauge/2, y), true, bld, index);
 		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
@@ -53,7 +64,7 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
 
 		object = new GL::Object;
 		object->set_mesh(mesh);
-		object->set_technique(&catalogue.get<GL::Technique>(cat.get_track_technique()));
+		object->set_technique(&catalogue.get<GL::Technique>(appearance.get_technique()));
 
 		own_data = true;
 	}
@@ -117,8 +128,8 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons
 	unsigned n_vertices = profile.get_n_vertices();
 	for(unsigned i=0; i<=nsegs; ++i)
 	{
-		TrackPoint basep = part.get_point(i*plen/nsegs);
-		Transform trans = Transform::rotation(basep.dir, Vector(0, 0, 1));
+		OrientedPoint basep = part.get_point(i*plen/nsegs);
+		Transform trans = Transform::rotation(basep.rotation, Vector(0, 0, 1));
 
 		for(unsigned j=0; j<n_vertices; ++j)
 		{
@@ -126,7 +137,7 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons
 			Vector p(0, -v.pos.x, v.pos.y);
 			if(mirror)
 				p.y = -p.y;
-			p = basep.pos+trans.transform(offset+p);
+			p = basep.position+trans.transform(offset+p);
 
 			Vector n(0, -v.normal.x, v.normal.y);
 			if(mirror)
@@ -157,4 +168,81 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons
 	base_index += (nsegs+1)*n_vertices;
 }
 
+void TrackType3D::build_ties(const TrackPart &part, const Profile &profile, float length, float spacing, const Vector &offset, GL::MeshBuilder &bld, unsigned &base_index)
+{
+	float plen = part.get_length();
+	unsigned count = plen/spacing+0.5;
+
+	unsigned n_vertices = profile.get_n_vertices();
+	float min_y = profile.get_min_coords().y;
+	vector<Vector> cap_vertices;
+	for(unsigned i=0; i+1<n_vertices; )
+	{
+		const Profile::Vertex &v = profile.get_vertex(i);
+		if(cap_vertices.size()>=2)
+		{
+			if(i+2<n_vertices)
+				cap_vertices.push_back(Vector(v.pos.x, min_y, 0));
+			else
+				cap_vertices.push_back(profile.get_vertex(n_vertices-1).pos);
+		}
+		cap_vertices.push_back(v.pos);
+
+		++i;
+		if(!profile.get_vertex(i).smooth)
+			++i;
+	}
+
+	for(unsigned i=0; i<count; ++i)
+	{
+		OrientedPoint basep = part.get_point((i+0.5)*plen/count);
+		Transform trans = Transform::rotation(basep.rotation, Vector(0, 0, 1));
+
+		unsigned strip = 0;
+		for(unsigned j=0; j<n_vertices; ++j)
+		{
+			const Profile::Vertex &v = profile.get_vertex(j);
+
+			Vector n = trans.transform(Vector(0, -v.normal.x, v.normal.y));
+			bld.normal(n.x, n.y, n.z);
+
+			if(!strip)
+				bld.begin(GL::TRIANGLE_STRIP);
+
+			for(unsigned k=0; k<2; ++k)
+			{
+				Vector p((k-0.5)*length, -v.pos.x, v.pos.y);
+				p = basep.position+trans.transform(offset+p);
+				bld.vertex(p.x, p.y, p.z);
+			}
+
+			if(++strip>=2 && !profile.get_vertex(j).smooth)
+			{
+				bld.end();
+				strip = 0;
+			}
+		}
+		if(strip)
+			bld.end();
+
+		for(unsigned j=0; j<2; ++j)
+		{
+			Vector n = trans.transform(Vector(j*2.0-1, 0, 0));
+			bld.normal(n.x, n.y, n.z);
+
+			bld.begin(GL::TRIANGLE_STRIP);
+			for(unsigned k=0; k<cap_vertices.size(); ++k)
+			{
+				const Vector &v = cap_vertices[k^j];
+				Vector p((j-0.5)*length, -v.x, v.y);
+				p = basep.position+trans.transform(offset+p);
+				bld.vertex(p.x, p.y, p.z);
+			}
+			bld.end();
+		}
+
+		base_index += 2*(n_vertices+cap_vertices.size());
+	}
+}
+
 } // namespace R2C2