Miscellaneous compilation fixes

[r2c2.git] / source / 3d / view.cpp

diff --git a/source/3d/view.cpp b/source/3d/view.cpp
index 006abda20b9173268c63fee4cc79f4b7a0ee3c09..4cd553d48575accca0ddcae31b83044dfd83e9aa 100644 (file)
--- 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"
@@ -22,9 +15,9 @@ View3D::View3D(Layout3D &l, unsigned w, unsigned 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
@@ -52,7 +45,7 @@ void View3D::view_all(bool tight)
 
 void View3D::render()
 {
-       pipeline.render_all();
+       pipeline.render();
 }
 
 } // namespace R2C2