From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 17 Aug 2014 14:44:10 +0000 (+0300)
Subject: Make the viewer capable of viewing scenes
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=b760fa04a65deaceb4c793ba24ca4f4e01bdbc82;p=libs%2Fgl.git

Make the viewer capable of viewing scenes
---

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index 3e12321f..d2a384f4 100644
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -18,6 +18,7 @@
 #include <msp/gl/object.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/input/mouse.h>
@@ -144,9 +145,12 @@ Viewer::Viewer(int argc, char **argv):
 		resources.add("__.object", object);
 	}
 	else if(ext==".object")
+		renderable = load<GL::Object>(renderable_name);
+	else if(ext==".scene")
 	{
-		object = load<GL::Object>(renderable_name);
-		renderable = object;
+		GL::SimpleScene *scene = new GL::SimpleScene;
+		DataFile::load(*scene, renderable_name, resources);
+		renderable = scene;
 	}
 	else
 		throw usage_error("Unknown renderable type");