X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=c9db211b2172480300732c6106526c75e6070bbc;hb=d4257f651ab8341d926d97d5c85d72ce64f8778b;hp=e83f33eb529078f80c1bd08d426c40dc49a9a08e;hpb=dff7004fa078d55911664c0f513b5dc6c9449420;p=libs%2Fgl.git

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index e83f33eb..c9db211b 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -5,6 +5,7 @@
 #include "camera.h"
 #include "font.h"
 #include "keyframe.h"
+#include "light.h"
 #include "lighting.h"
 #include "material.h"
 #include "mesh.h"
@@ -43,6 +44,7 @@ Resources::Resources():
 	add_type<Camera>().keyword("camera");
 	add_type<Font>().keyword("font");
 	add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
+	add_type<Light>().keyword("light");
 	add_type<Lighting>().suffix(".lightn").keyword("lighting");
 	add_type<Material>().suffix(".mat").creator(&Resources::create_material);
 	add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
@@ -229,5 +231,19 @@ Program *Resources::create_program(const string &name)
 	return 0;
 }
 
+
+Resources::Loader::Loader(Resources &r):
+	DerivedObjectLoader<Resources, Collection::Loader>(r)
+{
+	add("scene", &Loader::scene);
+}
+
+void Resources::Loader::scene(const string &name)
+{
+	Scene::GenericLoader ldr(obj);
+	load_sub_with(ldr);
+	obj.add(name, ldr.get_scene());
+}
+
 } // namespace GL
 } // namespace Msp