X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=tools%2Fviewer.cpp;h=a1853e922f19485097ee644e80900b76c9913b1f;hp=e7af702418cc871ce5567cc016b1cf2b27166ab1;hb=HEAD;hpb=a8383f1163cd020e2ce2c030e93defd2f9909a1d

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index e7af7024..36a5dc9b 100644
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -5,14 +5,16 @@
 #include <msp/datafile/packsource.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/graphics/simplewindow.h>
+#include <msp/graphics/display.h>
+#include <msp/graphics/window.h>
 #include <msp/gl/animatedobject.h>
 #include <msp/gl/animation.h>
 #include <msp/gl/animationplayer.h>
 #include <msp/gl/blend.h>
 #include <msp/gl/camera.h>
+#include <msp/gl/device.h>
+#include <msp/gl/directionallight.h>
 #include <msp/gl/framebuffer.h>
-#include <msp/gl/light.h>
 #include <msp/gl/lighting.h>
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>
@@ -23,10 +25,10 @@
 #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/strings/regex.h>
 #include <msp/time/timestamp.h>
 #include <msp/time/utils.h>
 
@@ -42,7 +44,6 @@ private:
 		string animation_name;
 		string renderable_name;
 		Graphics::WindowOptions wnd_opts;
-		Graphics::GLOptions gl_opts;
 
 		Options(int, char **);
 	};
@@ -63,7 +64,7 @@ private:
 	Options opts;
 	Graphics::Display display;
 	Graphics::Window window;
-	Graphics::GLContext gl_ctx;
+	GL::Device gl_device;
 	Input::Mouse mouse;
 	Resources resources;
 	GL::WindowView view;
@@ -71,7 +72,7 @@ private:
 	GL::Renderable *renderable;
 	GL::AnimatedObject *anim_object;
 	GL::AnimationPlayer *anim_player;
-	GL::Light light;
+	GL::DirectionalLight light;
 	GL::Lighting lighting;
 	GL::Camera camera;
 	float yaw;
@@ -105,24 +106,34 @@ private:
 
 Viewer::Options::Options(int argc, char **argv)
 {
+	string window_size;
+
 	GetOpt getopt;
 	getopt.add_option('r', "resources", resource_locations, GetOpt::REQUIRED_ARG);
 	getopt.add_option('a', "animation", animation_name, GetOpt::REQUIRED_ARG);
+	getopt.add_option('w', "window-size", window_size, 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;
+	if (!window_size.empty())
+	{
+		RegMatch m = Regex("^([1-9][0-9]*)x([1-9][0-9]*)$").match(window_size);
+		if(!m)
+			throw usage_error("Invalid window size");
+
+		wnd_opts.width = lexical_cast<unsigned>(m[1].str);
+		wnd_opts.height = lexical_cast<unsigned>(m[2].str);
+	}
 }
 
 Viewer::Viewer(int argc, char **argv):
 	opts(argc, argv),
 	window(display, opts.wnd_opts),
-	gl_ctx(window, opts.gl_opts),
+	gl_device(window),
 	mouse(window),
-	view(window, gl_ctx),
+	view(window),
 	sequence(0),
 	renderable(0),
 	anim_object(0),
@@ -165,7 +176,7 @@ Viewer::Viewer(int argc, char **argv):
 
 		object = new GL::Object;
 		GL::Technique *tech = new GL::Technique;
-		tech->add_pass(0);
+		tech->add_method(0);
 		object->set_mesh(mesh);
 		object->set_technique(tech);
 		renderable = object;
@@ -183,7 +194,7 @@ Viewer::Viewer(int argc, char **argv):
 			IO::BufferedFile in(opts.renderable_name);
 			DataFile::Parser parser(in, opts.renderable_name);
 			ldr.load(parser);
-			renderable = ldr.get_scene();
+			renderable = ldr.get_object();
 		}
 		else
 			renderable = &resources.get<GL::Scene>(opts.renderable_name);
@@ -192,6 +203,7 @@ Viewer::Viewer(int argc, char **argv):
 	{
 		GL::SequenceTemplate *tmpl = load<GL::SequenceTemplate>(opts.renderable_name);
 		GL::SequenceBuilder bld(*tmpl);
+		bld.set_debug_name(FS::basename(opts.renderable_name));
 		sequence = bld.build(view);
 	}
 	else
@@ -214,19 +226,21 @@ Viewer::Viewer(int argc, char **argv):
 	mouse.signal_button_release.connect(sigc::bind_return(sigc::mem_fun(this, &Viewer::button_release), false));
 	mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Viewer::axis_motion), false));
 
-	light.set_position(GL::Vector4(0, 0, 1, 0));
+	light.set_direction(GL::Vector3(0, 0, -1));
 	lighting.attach(light);
 
+	camera.set_debug_name("Camera");
 	camera.set_up_direction(GL::Vector3(0, 0, 1));
 	update_camera();
 
 	if(!sequence)
 	{
-		sequence = new GL::Sequence(view);
+		sequence = new GL::Sequence();
+		sequence->set_debug_name("Sequence");
+		sequence->set_clear_enabled(true);
 		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());
+		step.set_depth_test(GL::LEQUAL);
 	}
 
 	view.set_content(sequence);
@@ -356,7 +370,7 @@ void Viewer::update_light()
 	float sy = sin(light_yaw);
 	float cp = cos(light_pitch);
 	float sp = sin(light_pitch);
-	light.set_position(GL::Vector4(-cy*cp, -sy*cp, -sp, 0));
+	light.set_direction(GL::Vector3(cy*cp, sy*cp, sp));
 }