X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fviewer.cpp;h=ffdc4ec6eb513e4ad2955ddfedc8004f53032692;hb=dff7004fa078d55911664c0f513b5dc6c9449420;hp=05f85de2430c5f2854ac40c9fc6e2015d6d48a64;hpb=4bc50a3c977af89ab4a79aa777bb99322cda053d;p=libs%2Fgl.git

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index 05f85de2..ffdc4ec6 100644
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -16,7 +16,7 @@
 #include <msp/gl/lighting.h>
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>
-#include <msp/gl/pipeline.h>
+#include <msp/gl/sequence.h>
 #include <msp/gl/renderer.h>
 #include <msp/gl/resources.h>
 #include <msp/gl/simplescene.h>
@@ -39,6 +39,8 @@ private:
 		list<string> resource_locations;
 		string animation_name;
 		string renderable_name;
+		Graphics::WindowOptions wnd_opts;
+		Graphics::GLOptions gl_opts;
 
 		Options(int, char **);
 	};
@@ -57,11 +59,13 @@ private:
 	};
 
 	Options opts;
-	Graphics::SimpleGLWindow window;
+	Graphics::Display display;
+	Graphics::Window window;
+	Graphics::GLContext gl_ctx;
 	Input::Mouse mouse;
 	Resources resources;
 	GL::WindowView view;
-	GL::Pipeline pipeline;
+	GL::Sequence sequence;
 	GL::Renderable *renderable;
 	GL::AnimatedObject *anim_object;
 	GL::AnimationPlayer *anim_player;
@@ -104,14 +108,20 @@ Viewer::Options::Options(int argc, char **argv)
 	getopt.add_option('a', "animation", animation_name, GetOpt::REQUIRED_ARG);
 	getopt.add_argument("renderable", renderable_name);
 	getopt(argc, argv);
+
+	wnd_opts.width = 1024;
+	wnd_opts.height = 768;
+	gl_opts.gl_version_major = Graphics::GLOptions::LATEST_VERSION;
+	gl_opts.core_profile = true;
 }
 
 Viewer::Viewer(int argc, char **argv):
 	opts(argc, argv),
-	window(1024, 768, false),
+	window(display, opts.wnd_opts),
+	gl_ctx(window, opts.gl_opts),
 	mouse(window),
-	view(window, window.get_gl_context()),
-	pipeline(view),
+	view(window, gl_ctx),
+	sequence(view),
 	renderable(0),
 	anim_object(0),
 	anim_player(0),
@@ -165,9 +175,16 @@ Viewer::Viewer(int argc, char **argv):
 		renderable = load<GL::Object>(opts.renderable_name);
 	else if(ext==".scene")
 	{
-		GL::SimpleScene *scene = new GL::SimpleScene;
-		DataFile::load(*scene, opts.renderable_name, resources);
-		renderable = scene;
+		if(FS::exists(opts.renderable_name))
+		{
+			GL::Scene::GenericLoader ldr(resources);
+			IO::BufferedFile in(opts.renderable_name);
+			DataFile::Parser parser(in, opts.renderable_name);
+			ldr.load(parser);
+			renderable = ldr.get_scene();
+		}
+		else
+			renderable = &resources.get<GL::Scene>(opts.renderable_name);
 	}
 	else
 		throw usage_error("Unknown renderable type");
@@ -195,12 +212,12 @@ Viewer::Viewer(int argc, char **argv):
 	camera.set_up_direction(GL::Vector3(0, 0, 1));
 	update_camera();
 
-	GL::Pipeline::Pass &pass = pipeline.add_pass(0, *renderable);
-	pass.set_lighting(&lighting);
-	pass.set_depth_test(&GL::DepthTest::lequal());
-	pass.set_blend(&GL::Blend::alpha());
+	GL::Sequence::Step &step = sequence.add_step(0, *renderable);
+	step.set_lighting(&lighting);
+	step.set_depth_test(&GL::DepthTest::lequal());
+	step.set_blend(&GL::Blend::alpha());
 
-	view.set_content(&pipeline);
+	view.set_content(&sequence);
 	view.set_camera(&camera);
 }
 
@@ -243,7 +260,7 @@ void Viewer::tick()
 		anim_player->tick(dt);
 	}
 
-	window.tick();
+	display.tick();
 	view.render();
 }