X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.cpp;h=ab417cff171155a6c8bc4eea15b5903396b02503;hb=1d240350c24138e173eac660d31d56c7b8503b09;hp=47c85ab4dea6f85562346380ccaf86085358f1f7;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git

diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index 47c85ab..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-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <algorithm>
 #include <cmath>
 #include <msp/gl/technique.h>
@@ -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
 	{
@@ -117,7 +120,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>(cat.get_track_technique()));
 	}
  
 	unsigned paths = tt.get_paths();
@@ -174,8 +177,10 @@ void TrackType3D::get_bounds(float angle, Vector &minp, Vector &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];
 }