X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fview.cpp;h=ef03c4b7139f42cdb7d357c7310c8d6fc09f85dd;hb=78d36019ec11d62d6fd016fcbe19f566d11771ff;hp=5779616f6ce88ea2b82da9982298e169fca79777;hpb=77db8741430ca462e3b624dd42d5ead96be7f264;p=r2c2.git

diff --git a/source/3d/view.cpp b/source/3d/view.cpp
index 5779616..ef03c4b 100644
--- a/source/3d/view.cpp
+++ b/source/3d/view.cpp
@@ -13,13 +13,17 @@ View3D::View3D(Layout3D &l, unsigned w, unsigned h):
 	layout(l),
 	width(w),
 	height(h),
-	pipeline(w, h)
+	pipeline(w, h),
+	sky(layout.get_catalogue())
 {
 	pipeline.set_camera(&camera);
+	pipeline.add_renderable(sky);
 	pipeline.add_renderable_for_pass(layout.get_scene(), 0);
 	pipeline.add_renderable_for_pass(layout.get_scene(), "translucent");
 
-	GL::Pipeline::Pass *pass = &pipeline.add_pass(0);
+	GL::Pipeline::Pass *pass = &pipeline.add_pass("sky");
+
+	pass = &pipeline.add_pass(0);
 	pass->set_lighting(&layout.get_lighting());
 	pass->set_depth_test(&GL::DepthTest::lequal());
 
@@ -36,12 +40,12 @@ View3D::View3D(Layout3D &l, unsigned w, unsigned h):
 	view_all();
 }
 
-Ray View3D::create_ray(int x, int y)
+Ray View3D::create_ray(int x, int y) const
 {
 	return create_ray(x*2.0f/width-1.0f, y*2.0f/height-1.0f);
 }
 
-Ray View3D::create_ray(float x, float y)
+Ray View3D::create_ray(float x, float y) const
 {
 	const GL::Vector3 &start = camera.get_position();
 	GL::Vector4 ray = camera.unproject(GL::Vector4(x, y, 0, 0));
@@ -66,6 +70,7 @@ void View3D::view_all(bool tight)
 	GL::Vector3 center = (minp+maxp)/2.0f;
 	const GL::Vector3 &look = camera.get_look_direction();
 	camera.set_position(center-look*dist);
+	camera.set_depth_clip(dist*0.02, dist*50);
 }
 
 void View3D::render()