X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fviewer.cpp;h=c54d7278c4cba0a23a4a935850a2eb25ead4d816;hb=adc26a2e141a2853b6c5025130c46a46cece4b84;hp=4c7b01e8ac71172d4f23e272dc6de276f5dba58c;hpb=d4e380914f02800b7d915a8748ac9ccd7029bc3b;p=libs%2Fgl.git

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index 4c7b01e8..c54d7278 100644
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -11,8 +11,8 @@
 #include <msp/gl/animationplayer.h>
 #include <msp/gl/blend.h>
 #include <msp/gl/camera.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>
@@ -71,7 +71,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;
@@ -177,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;
@@ -195,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);
@@ -226,7 +226,7 @@ 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_up_direction(GL::Vector3(0, 0, 1));
@@ -368,7 +368,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));
 }