X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=1df93a29ca76a60f49904636dd7151dc682c2765;hb=80dcfa55c913037066e43fa115ae56fa51b974f2;hp=47e6e61161bb0845befa987756251e53c7e47527;hpb=6109a2122226e1c71e9cc71e4c21036e99e43601;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index 47e6e61..1df93a2 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -40,12 +40,15 @@ void Track3D::get_bounds(float angle, Point &minp, Point &maxp) const
 {
 	const Point &pos = track.get_position();
 	float rot = track.get_rotation();
+	float slope = track.get_slope();
 
 	float c = cos(-angle);
 	float s = sin(-angle);
 
 	minp.x = maxp.x = c*pos.x-s*pos.y;
 	minp.y = maxp.y = s*pos.x+c*pos.y;
+	minp.z = pos.z+min(slope, 0.0f);
+	maxp.z = pos.z+0.01+max(slope, 0.0f);
 
 	float c2 = cos(rot-angle);
 	float s2 = sin(rot-angle);
@@ -132,17 +135,17 @@ void Track3D::render_endpoints() const
 	glPopMatrix();
 }
 
-void Track3D::render_route(int route) const
+void Track3D::render_path(int path) const
 {
 	prepare_render(true);
 
 	varray.apply();
-	if(route>=0 && static_cast<unsigned>(route)<route_seq.size())
-		glDrawElements(GL_QUADS, route_seq[route].size(), GL_UNSIGNED_INT, &route_seq[route][0]);
+	if(path>=0 && static_cast<unsigned>(path)<path_seq.size())
+		glDrawElements(GL_QUADS, path_seq[path].size(), GL_UNSIGNED_INT, &path_seq[path][0]);
 	else
 	{
-		for(unsigned i=0; i<route_seq.size(); ++i)
-			glDrawElements(GL_QUADS, route_seq[i].size(), GL_UNSIGNED_INT, &route_seq[i][0]);
+		for(unsigned i=0; i<path_seq.size(); ++i)
+			glDrawElements(GL_QUADS, path_seq[i].size(), GL_UNSIGNED_INT, &path_seq[i][0]);
 	}
 
 	glPopMatrix();
@@ -167,8 +170,8 @@ void Track3D::build_object()
 
 	base_seq.clear();
 	rail_seq.clear();
-	route_seq.clear();
-	route_seq.resize(track.get_type().get_n_routes());
+	path_seq.clear();
+	path_seq.resize(track.get_type().get_n_paths());
 
 	const vector<TrackPart> &parts = track.get_type().get_parts();
 	unsigned index = 0;
@@ -244,10 +247,10 @@ void Track3D::build_part(const TrackPart &part, GL::VertexArrayBuilder &va_build
 			rail_seq.push_back(base_index+(i+1)*psize+1+j*2);
 			rail_seq.push_back(base_index+i*psize+1+j*2);
 		}
-		route_seq[part.route].push_back(base_index+i*psize+18);
-		route_seq[part.route].push_back(base_index+(i+1)*psize+18);
-		route_seq[part.route].push_back(base_index+(i+1)*psize+19);
-		route_seq[part.route].push_back(base_index+i*psize+19);
+		path_seq[part.path].push_back(base_index+i*psize+18);
+		path_seq[part.path].push_back(base_index+(i+1)*psize+18);
+		path_seq[part.path].push_back(base_index+(i+1)*psize+19);
+		path_seq[part.path].push_back(base_index+i*psize+19);
 	}
 
 	base_index += (nsegs+1)*psize;