X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fview.cpp;h=8943abce36e7e2c0307fca0b4f9bea6ce24ab11f;hb=b0d402f30489b0618d21281781e1b8f683ed567b;hp=006abda20b9173268c63fee4cc79f4b7a0ee3c09;hpb=495c54e187ddbb7514c983e1829a69d82ccad5f3;p=r2c2.git

diff --git a/source/3d/view.cpp b/source/3d/view.cpp
index 006abda..8943abc 100644
--- a/source/3d/view.cpp
+++ b/source/3d/view.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gl/tests.h>
 #include "layout.h"
 #include "track.h"
@@ -17,42 +10,48 @@ namespace R2C2 {
 
 View3D::View3D(Layout3D &l, unsigned w, unsigned h):
 	layout(l),
+	width(w),
+	height(h),
 	pipeline(w, h)
 {
 	pipeline.set_camera(&camera);
 	pipeline.add_renderable_for_pass(layout.get_scene(), 0);
 
-	GL::PipelinePass *pass = &pipeline.add_pass(0);
-	pass->lighting = &layout.get_lighting();
-	pass->depth_test = &GL::DepthTest::lequal();
+	GL::Pipeline::Pass *pass = &pipeline.add_pass(0);
+	pass->set_lighting(&layout.get_lighting());
+	pass->set_depth_test(&GL::DepthTest::lequal());
 
 	camera.set_up_direction(GL::Vector3(0, 0, 1));
 	// Y+, 60° down
 	camera.set_look_direction(GL::Vector3(0, 0.5, -0.866));
+	camera.set_aspect(float(width)/height);
 
 	view_all();
 }
 
 void View3D::view_all(bool tight)
 {
-	Vector minp;
-	Vector maxp;
+	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();
 
-	layout.get_bounds(minp, maxp);
+	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;
-	GL::Vector3 center((minp.x+maxp.x)/2, (minp.y+maxp.y)/2, 0);
+		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(GL::Vector3(center.x-look.x*dist, center.y-look.y*dist, center.z-look.z*dist));
+	camera.set_position(center-look*dist);
 }
 
 void View3D::render()
 {
-	pipeline.render_all();
+	pipeline.render();
 }
 
 } // namespace R2C2