-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <algorithm>
#include <cmath>
#include <cstdlib>
#include <limits>
#include <signal.h>
-#include <msp/core/except.h>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
-#include <msp/gbase/display.h>
-#include <msp/gbase/window.h>
+#include <msp/graphics/display.h>
+#include <msp/graphics/window.h>
#include <msp/gl/blend.h>
#include <msp/gl/framebuffer.h>
#include <msp/gl/matrix.h>
#include <msp/gl/tests.h>
#include <msp/gl/transform.h>
#include <msp/io/print.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
#include "libr2c2/driver.h"
using namespace R2C2;
using namespace Msp;
-Application::RegApp<Engineer> Engineer::reg;
-
Engineer::Engineer(int argc, char **argv):
options(argc, argv),
window(options.screen_w, options.screen_h, options.fullscreen),
lighting.set_ambient(GL::Color(0.4));
lighting.attach(0, light);
- GL::PipelinePass *pass = &pipeline.add_pass(0);
- pass->depth_test = &GL::DepthTest::lequal();
- pass->lighting = &lighting;
+ GL::Pipeline::Pass *pass = &pipeline.add_pass(0);
+ pass->set_depth_test(&GL::DepthTest::lequal());
+ pass->set_lighting(&lighting);
pass = &pipeline.add_pass("unlit");
- pass->depth_test = &GL::DepthTest::lequal();
+ pass->set_depth_test(&GL::DepthTest::lequal());
pass = &pipeline.add_pass("overlay");
- pass->blend = &GL::Blend::alpha();
+ pass->set_blend(&GL::Blend::alpha());
view_all();
GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
- pipeline.render_all();
+ pipeline.render();
if(pointer_moved)
{