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

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index 2582b887..05f85de2 100644
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -16,9 +16,13 @@
 #include <msp/gl/lighting.h>
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>
+#include <msp/gl/pipeline.h>
+#include <msp/gl/renderer.h>
 #include <msp/gl/resources.h>
+#include <msp/gl/simplescene.h>
 #include <msp/gl/technique.h>
 #include <msp/gl/tests.h>
+#include <msp/gl/windowview.h>
 #include <msp/input/mouse.h>
 #include <msp/io/print.h>
 #include <msp/time/timestamp.h>
@@ -30,6 +34,15 @@ using namespace Msp;
 class Viewer: public RegisteredApplication<Viewer>
 {
 private:
+	struct Options
+	{
+		list<string> resource_locations;
+		string animation_name;
+		string renderable_name;
+
+		Options(int, char **);
+	};
+
 	class Resources: public GL::Resources
 	{
 	private:
@@ -43,9 +56,12 @@ private:
 		void add_pack(const string &);
 	};
 
+	Options opts;
 	Graphics::SimpleGLWindow window;
 	Input::Mouse mouse;
 	Resources resources;
+	GL::WindowView view;
+	GL::Pipeline pipeline;
 	GL::Renderable *renderable;
 	GL::AnimatedObject *anim_object;
 	GL::AnimationPlayer *anim_player;
@@ -81,9 +97,21 @@ private:
 };
 
 
+Viewer::Options::Options(int argc, char **argv)
+{
+	GetOpt getopt;
+	getopt.add_option('r', "resources", resource_locations, GetOpt::REQUIRED_ARG);
+	getopt.add_option('a', "animation", animation_name, GetOpt::REQUIRED_ARG);
+	getopt.add_argument("renderable", renderable_name);
+	getopt(argc, argv);
+}
+
 Viewer::Viewer(int argc, char **argv):
+	opts(argc, argv),
 	window(1024, 768, false),
 	mouse(window),
+	view(window, window.get_gl_context()),
+	pipeline(view),
 	renderable(0),
 	anim_object(0),
 	anim_player(0),
@@ -94,16 +122,7 @@ Viewer::Viewer(int argc, char **argv):
 	light_pitch(0),
 	dragging(0)
 {
-	list<string> resource_locations;
-	string animation_name;
-	string renderable_name;
-	GetOpt getopt;
-	getopt.add_option('r', "resources", resource_locations, GetOpt::REQUIRED_ARG);
-	getopt.add_option('a', "animation", animation_name, GetOpt::REQUIRED_ARG);
-	getopt.add_argument("renderable", renderable_name);
-	getopt(argc, argv);
-
-	for(list<string>::const_iterator i=resource_locations.begin(); i!=resource_locations.end(); ++i)
+	for(list<string>::const_iterator i=opts.resource_locations.begin(); i!=opts.resource_locations.end(); ++i)
 	{
 		if(FS::is_dir(*i))
 			resources.add_directory(*i);
@@ -119,18 +138,18 @@ Viewer::Viewer(int argc, char **argv):
 
 	GL::Object *object = 0;
 
-	string ext = FS::extpart(renderable_name);
+	string ext = FS::extpart(opts.renderable_name);
 	if(ext==".mesh")
 	{
 		GL::Mesh *mesh = 0;
-		if(FS::exists(renderable_name))
+		if(FS::exists(opts.renderable_name))
 		{
 			mesh = new GL::Mesh;
-			DataFile::load(*mesh, renderable_name);
-			resources.add("__"+renderable_name, mesh);
+			DataFile::load(*mesh, opts.renderable_name);
+			resources.add("__"+opts.renderable_name, mesh);
 		}
 		else
-			mesh = &resources.get<GL::Mesh>(renderable_name);
+			mesh = &resources.get<GL::Mesh>(opts.renderable_name);
 
 		object = new GL::Object;
 		GL::Technique *tech = new GL::Technique;
@@ -143,19 +162,22 @@ Viewer::Viewer(int argc, char **argv):
 		resources.add("__.object", object);
 	}
 	else if(ext==".object")
+		renderable = load<GL::Object>(opts.renderable_name);
+	else if(ext==".scene")
 	{
-		object = load<GL::Object>(renderable_name);
-		renderable = object;
+		GL::SimpleScene *scene = new GL::SimpleScene;
+		DataFile::load(*scene, opts.renderable_name, resources);
+		renderable = scene;
 	}
 	else
 		throw usage_error("Unknown renderable type");
 
-	if(!animation_name.empty())
+	if(!opts.animation_name.empty())
 	{
 		if(!object)
 			throw usage_error("Must have an object to animate");
 
-		GL::Animation *anim = load<GL::Animation>(animation_name);
+		GL::Animation *anim = load<GL::Animation>(opts.animation_name);
 		anim_player = new GL::AnimationPlayer;
 		anim_object = new GL::AnimatedObject(*object);
 		anim_player->play(*anim_object, *anim);
@@ -172,6 +194,14 @@ 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());
+
+	view.set_content(&pipeline);
+	view.set_camera(&camera);
 }
 
 template<typename T>
@@ -214,17 +244,7 @@ void Viewer::tick()
 	}
 
 	window.tick();
-
-	GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
-
-	camera.apply();
-
-	GL::Bind bind_lighting(lighting);
-	GL::Bind bind_depth(GL::DepthTest::lequal());
-	GL::Bind bind_blend(GL::Blend::alpha());
-	renderable->render();
-
-	window.swap_buffers();
+	view.render();
 }
 
 void Viewer::button_press(unsigned btn)