X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fviewer.cpp;h=2c950e18e2acc22714ee9d3030ed7467371a0fe0;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=674fbf16aafed00631b4dc6e42f13a8f42c5c504;hpb=75870f0241d874fd4f60ea73bd55b32452b72fc5;p=libs%2Fgl.git

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index 674fbf16..2c950e18 100644
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -23,10 +23,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>
 
@@ -105,14 +105,26 @@ 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;
+	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);
+	}
 	gl_opts.gl_version_major = Graphics::GLOptions::LATEST_VERSION;
 	gl_opts.core_profile = true;
 }
@@ -215,7 +227,7 @@ Viewer::Viewer(int argc, char **argv):
 	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));
-	lighting.attach(0, light);
+	lighting.attach(light);
 
 	camera.set_up_direction(GL::Vector3(0, 0, 1));
 	update_camera();
@@ -225,8 +237,8 @@ Viewer::Viewer(int argc, char **argv):
 		sequence = new GL::Sequence(view);
 		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);
+		step.set_blend(GL::Blend(GL::SRC_ALPHA, GL::ONE_MINUS_SRC_ALPHA));
 	}
 
 	view.set_content(sequence);