X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainview.cpp;h=1ab236f4c797a7464bc7e42d5d8369d92b89febd;hb=66c2c7ca5a4bd369293959bc211b040834343381;hp=a2dedf9e0f4f03df1011baf1f5581809bea92fed;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git diff --git a/source/engineer/trainview.cpp b/source/engineer/trainview.cpp index a2dedf9..1ab236f 100644 --- 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 #include #include @@ -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))); @@ -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)