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

diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index aad2ca8..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"
 
@@ -16,7 +17,6 @@ TrackType3D::TrackType3D(Catalogue3D &c, const TrackType &tt):
 	own_data(false)
 {
 	const TrackAppearance &appearance = tt.get_appearance();
-	const Catalogue &cat = catalogue.get_catalogue();
 	const vector<TrackPart> &parts = tt.get_parts();
 
 	const Profile &ballast_profile = appearance.get_ballast_profile();
@@ -34,7 +34,7 @@ TrackType3D::TrackType3D(Catalogue3D &c, const TrackType &tt):
 	const Vector &tie_max = tie_profile.get_max_coords();
 	float tie_h = tie_max.y-tie_min.y;
 
-	float gauge = cat.get_gauge();
+	float gauge = appearance.get_gauge();
 
 	string obj_name = tt.get_object();
 	if(!obj_name.empty())
@@ -172,9 +172,6 @@ void TrackType3D::build_ties(const TrackPart &part, const Profile &profile, floa
 {
 	float plen = part.get_length();
 	unsigned count = plen/spacing+0.5;
-	(void)length;
-	(void)offset;
-	(void)profile;
 
 	unsigned n_vertices = profile.get_n_vertices();
 	float min_y = profile.get_min_coords().y;