X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.cpp;h=ab417cff171155a6c8bc4eea15b5903396b02503;hb=e621dd4120cb253417167b4295e436cee095ccb0;hp=755f0080807771f7e1bd4ddf76d34a86c0affaf5;hpb=c5f5ec54e81a6a85f911fa1075a0939a7352fbfd;p=r2c2.git

diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index 755f008..ab417cf 100644
--- a/source/3d/tracktype.cpp
+++ b/source/3d/tracktype.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <algorithm>
 #include <cmath>
 #include <msp/gl/technique.h>
@@ -16,7 +9,7 @@ using namespace Msp;
 
 namespace {
 
-bool compare_z(const R2C2::Point &p1, const R2C2::Point &p2)
+bool compare_z(const R2C2::Vector &p1, const R2C2::Vector &p2)
 {
 	return p1.z<p2.z;
 }
@@ -27,7 +20,7 @@ Iter graham_scan(Iter begin, Iter end)
 	// http://en.wikipedia.org/wiki/Graham_scan
 
 	// Find point with lowest X coordinate
-	R2C2::Point lowest = *begin;
+	R2C2::Vector lowest = *begin;
 	for(Iter i=begin; i!=end; ++i)
 		if(i->x<lowest.x || (i->x==lowest.x && i->y>lowest.y))
 			lowest = *i;
@@ -80,13 +73,13 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
 	const vector<TrackPart> &parts = tt.get_parts();
 
 	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();
+	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 Point &rail_min = rail_profile.get_min_coords();
-	const Point &rail_max = rail_profile.get_max_coords();
+	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();
@@ -94,8 +87,18 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
 	string obj_name = tt.get_object();
 	if(!obj_name.empty())
 	{
-		object = catalogue.get<GL::Object>(obj_name);
-		// XXX border
+		object = &catalogue.get<GL::Object>(obj_name);
+		const GL::Mesh *m = object->get_mesh();
+		const GL::VertexArray &vertices = m->get_vertices();
+		int vertex_offs = vertices.get_format().offset(GL::VERTEX2);
+		if(vertex_offs>=0)
+		{
+			for(unsigned i=0; i<vertices.size(); ++i)
+			{
+				const float *v = vertices[i]+vertex_offs;
+				border.push_back(Vector(v[0], v[1]));
+			}
+		}
 	}
 	else
 	{
@@ -106,18 +109,18 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
 		unsigned index = 0;
 		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), false, bld, index);
+			build_part(*i, ballast_profile, Vector(0, -ballast_min.y), false, bld, index);
 
 		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, y), true, bld, index);
+			build_part(*i, rail_profile, Vector(-gauge/2, y), true, bld, index);
 		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-			build_part(*i, rail_profile, Point(gauge/2, y), false, bld, index);
+			build_part(*i, rail_profile, Vector(gauge/2, y), false, bld, index);
 
 		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>(cat.get_track_technique()));
 	}
  
 	unsigned paths = tt.get_paths();
@@ -131,13 +134,13 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
 			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), false, bld, index);
+					build_part(*j, cat.get_path_profile(), Vector(0, ballast_h+1.5*rail_h), false, 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)
+	for(vector<Vector>::iterator i=border.begin(); i!=border.end(); ++i)
 	{
 		min_z = min(min_z, i->z);
 		max_z = max(max_z, i->z);
@@ -151,16 +154,16 @@ TrackType3D::~TrackType3D()
 		delete *i;
 }
 
-void TrackType3D::get_bounds(float angle, Point &minp, Point &maxp) const
+void TrackType3D::get_bounds(float angle, Vector &minp, Vector &maxp) const
 {
 	float c = cos(-angle);
 	float s = sin(-angle);
 
-	minp = maxp = Point();
+	minp = maxp = Vector();
 	minp.z = min_z;
 	maxp.z = max_z;
 
-	for(vector<Point>::const_iterator i=border.begin(); i!=border.end(); ++i)
+	for(vector<Vector>::const_iterator i=border.begin(); i!=border.end(); ++i)
 	{
 		float x = c*i->x-s*i->y;
 		float y = s*i->x+c*i->y;
@@ -174,12 +177,14 @@ void TrackType3D::get_bounds(float angle, Point &minp, Point &maxp) const
 
 const GL::Mesh &TrackType3D::get_path_mesh(unsigned p) const
 {
-	if(p>=path_meshes.size() || !path_meshes[p])
-		throw InvalidParameterValue("Invalid path");
+	if(p>=path_meshes.size())
+		throw out_of_range("TrackType3D::get_path_mesh");
+	if(!path_meshes[p])
+		throw invalid_argument("TrackType3D::get_path_mesh");
 	return *path_meshes[p];
 }
 
-void TrackType3D::build_part(const TrackPart &part, const Profile &profile, const Point &offset, bool mirror, GL::MeshBuilder &bld, unsigned &base_index)
+void TrackType3D::build_part(const TrackPart &part, const Profile &profile, const Vector &offset, bool mirror, GL::MeshBuilder &bld, unsigned &base_index)
 {
 	float plen = part.get_length();
 	unsigned nsegs = (part.is_curved() ? static_cast<unsigned>(plen*32)+1 : 1);
@@ -194,14 +199,14 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons
 		for(unsigned j=0; j<n_vertices; ++j)
 		{
 			const Profile::Vertex &v = profile.get_vertex(mirror ? n_vertices-1-j : j);
-			Point p = v.pos;
+			Vector p = v.pos;
 			if(mirror)
 				p.x = -p.x;
 			p.z = basep.pos.z+p.y+offset.y;
 			p.y = basep.pos.y-c*(p.x+offset.x);
 			p.x = basep.pos.x+s*(p.x+offset.x);
 
-			Point n = v.normal;
+			Vector n = v.normal;
 			if(mirror)
 				n.x = -n.x;