X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fviewer.cpp;h=b0e3420dab0395394f02ec0aa8525a8b04bff089;hb=23d4100160bfa33359ce297b6b36244abcaa5f82;hp=b05e6695c0a9d2438295ce2421d60e60bc75024d;hpb=11266e8093e56524a68de1d0a08d275de95c56a0;p=libs%2Fgl.git

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index b05e6695..b0e3420d 100644
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -23,7 +23,6 @@
 #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>
@@ -178,7 +177,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;
@@ -196,7 +195,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);
@@ -235,11 +234,11 @@ Viewer::Viewer(int argc, char **argv):
 
 	if(!sequence)
 	{
-		sequence = new GL::Sequence(view);
+		sequence = new GL::Sequence();
 		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);