X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=3f3aa6cfd1590632fb7f2be3f48873ced9e63644;hb=a72309e64614bb1e230f9842d94dc261be1301e6;hp=99148f8fb3c234bfd17a0b2a3452ba9594d6967e;hpb=8dce175e31941c2f6e92ce52204e9b61a071d4f9;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 99148f8..3f3aa6c 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -36,9 +36,6 @@ Catalogue3D::Catalogue3D(Catalogue &c):
 	for(Catalogue::TrackMap::const_iterator i=trks.begin(); i!=trks.end(); ++i)
 		track_added(*i->second);
 
-	ballast_material.set_diffuse(GL::Color(0.25, 0.25, 0.25));
-	rail_material.set_diffuse(GL::Color(0.85, 0.85, 0.85));
-
 	build_endpoint_mesh();
 }
 
@@ -81,12 +78,12 @@ void Catalogue3D::vehicle_added(const VehicleType &veh)
 void Catalogue3D::build_endpoint_mesh()
 {
 	const Profile &ballast_profile = catalogue.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();
 
 	const Profile &rail_profile = catalogue.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 gauge = catalogue.get_gauge();