Miscellaneous compilation fixes

[r2c2.git] / source / engineer / trainview.cpp

diff --git a/source/engineer/trainview.cpp b/source/engineer/trainview.cpp
index 805fec5cfdf375f96dcd56bcbe8ca8d70c8ec3ca..1ab236f4c797a7464bc7e42d5d8369d92b89febd 100644 (file)
--- a/source/engineer/trainview.cpp
+++ b/source/engineer/trainview.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gl/tests.h>
 #include <msp/gltk/button.h>
 #include <msp/gltk/image.h>
@@ -40,9 +33,9 @@ TrainView::TrainView(Engineer &e, const Train &t):
 
        pipeline.add_renderable(engineer.get_layout_3d().get_scene());
 
-       GL::PipelinePass *pass = &pipeline.add_pass(0);
-       pass->depth_test = &GL::DepthTest::lequal();
-       pass->lighting = &engineer.get_lighting();
+       GL::Pipeline::Pass *pass = &pipeline.add_pass(0);
+       pass->set_depth_test(&GL::DepthTest::lequal());
+       pass->set_lighting(&engineer.get_lighting());
 
        GLtk::Image *image;
        add(*(image = new GLtk::Image(&tex)));
@@ -92,7 +85,7 @@ void TrainView::set_forward(bool f)
 void TrainView::prepare()
 {
        const Vehicle &veh = train.get_vehicle(0);
-       const Point &pos = veh.get_position();
+       const Vector &pos = veh.get_position();
        float angle = veh.get_direction();
        if(!forward)
                angle += M_PI;
@@ -118,7 +111,7 @@ void TrainView::prepare()
 
        GL::Bind _bind_fbo(fbo);
        fbo.clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
-       pipeline.render_all();
+       pipeline.render();
 }
 
 void TrainView::button_release(int x, int y, unsigned btn)