X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=11dc2d329dd29cfca2ec9385b72361f6260e54b8;hb=01a513693c7856a3d7ab8860667d7dc68852af18;hp=dca3e8d3d82158947b33ae743a3deb0cf6ecf0ee;hpb=9d61da0868b3e61ab0cfb1bc98dcfd8374aa3356;p=libs%2Fgl.git

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index dca3e8d3..11dc2d32 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -5,12 +5,13 @@
 #include "camera.h"
 #include "font.h"
 #include "keyframe.h"
+#include "light.h"
 #include "lighting.h"
 #include "material.h"
 #include "mesh.h"
 #include "module.h"
 #include "object.h"
-#include "pipelinetemplate.h"
+#include "sequencetemplate.h"
 #include "pose.h"
 #include "program.h"
 #include "resourcemanager.h"
@@ -43,12 +44,13 @@ 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);
 	add_type<Module>().suffix(".glsl").suffix(".spv").creator(&Resources::create_module);
 	add_type<Object>().keyword("object");
-	add_type<PipelineTemplate>().suffix(".pipe").keyword("pipeline");
+	add_type<SequenceTemplate>().suffix(".seq").keyword("sequence");
 	add_type<Pose>().keyword("pose");
 	add_type<Program>().keyword("shader").creator(&Resources::create_program);
 	add_type<Sampler>().suffix(".samp").keyword("sampler");
@@ -208,6 +210,15 @@ Module *Resources::create_module(const string &name)
 			return module.release();
 		}
 	}
+	else if(ext==".spv")
+	{
+		if((io = open_raw(FS::basepart(name)+".glsl")))
+		{
+			RefPtr<SpirVModule> module = new SpirVModule;
+			module->load_source(*io, this, name);
+			return module.release();
+		}
+	}
 
 	return 0;
 }
@@ -229,5 +240,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