X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fview.cpp;h=017a526df71b215ca192218116f79b3fd97c7178;hb=e3e3a940c75dcad126d5cf08f0802efdab914568;hp=6b5115d1ed79a2fd143b40cce34ac3e3d8bfd39a;hpb=bde934f7d5ba07a9442a305192e10024820d13ed;p=r2c2.git

diff --git a/source/3d/view.cpp b/source/3d/view.cpp
index 6b5115d..017a526 100644
--- a/source/3d/view.cpp
+++ b/source/3d/view.cpp
@@ -28,7 +28,7 @@ View3D::View3D(Layout3D &l, unsigned w, unsigned h):
 
 void View3D::view_all(bool tight)
 {
-	const set<Track *> &tracks = layout.get_layout().get_tracks();
+	const set<Track *> &tracks = layout.get_layout().get_all<Track>();
 	Geometry::BoundingBox<float, 3> bbox;
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		bbox = bbox|(*i)->get_bounding_box();
@@ -36,11 +36,11 @@ void View3D::view_all(bool tight)
 	const Vector &minp = bbox.get_minimum_point();
 	const Vector &maxp = bbox.get_maximum_point();
 
-	float t = tan(camera.get_field_of_view()/2)*2;
+	float t = tan(camera.get_field_of_view()/2.0f)*2.0f;
 	float size = max((maxp.y-minp.y+0.1), (maxp.x-minp.x+0.1)/camera.get_aspect());
 	float dist = size/t;
 	if(!tight)
-		dist += sin(camera.get_field_of_view()/2)*size;
+		dist += sin(camera.get_field_of_view()/2.0f)*size;
 	GL::Vector3 center = (minp+maxp)/2.0f;
 	const GL::Vector3 &look = camera.get_look_direction();
 	camera.set_position(center-look*dist);