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

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index d52dbe34..e83f33eb 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -8,19 +8,21 @@
 #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 "programcompiler.h"
 #include "resourcemanager.h"
 #include "resources.h"
 #include "sampler.h"
+#include "scene.h"
 #include "technique.h"
 #include "texture1d.h"
 #include "texture2d.h"
 #include "texture2darray.h"
 #include "texturecube.h"
+#include "glsl/compiler.h"
 
 using namespace std;
 
@@ -28,6 +30,7 @@ namespace Msp {
 namespace GL {
 
 void init_shaderlib(DataFile::BuiltinSource &);
+void init_builtin_data(DataFile::BuiltinSource &);
 
 Resources::Resources():
 	default_tex_filter(Texture::can_generate_mipmap() ? LINEAR_MIPMAP_LINEAR : LINEAR),
@@ -43,11 +46,13 @@ Resources::Resources():
 	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").suffix(".glsl").creator(&Resources::create_program);
+	add_type<Program>().keyword("shader").creator(&Resources::create_program);
 	add_type<Sampler>().suffix(".samp").keyword("sampler");
+	add_type<Scene>().suffix(".scene").creator(&Resources::create_scene);
 	add_type<Technique>().suffix(".tech").keyword("technique");
 	add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d");
 	add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d").creator(&Resources::create_texture2d);
@@ -65,6 +70,7 @@ const DataFile::CollectionSource &Resources::get_builtins()
 
 	if(!init_done)
 	{
+		init_builtin_data(builtins);
 		init_shaderlib(builtins);
 		init_done = true;
 	}
@@ -120,6 +126,19 @@ Mesh *Resources::create_mesh(const string &name)
 	return 0;
 }
 
+Scene *Resources::create_scene(const string &name)
+{
+	if(RefPtr<IO::Seekable> io = open_raw(name))
+	{
+		DataFile::Parser parser(*io, name);
+		Scene::GenericLoader ldr(*this);
+		ldr.load(parser);
+		return ldr.get_scene();
+	}
+
+	return 0;
+}
+
 Texture2D *Resources::create_texture2d(const string &name)
 {
 	string ext = FS::extpart(name);
@@ -128,20 +147,23 @@ Texture2D *Resources::create_texture2d(const string &name)
 
 	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
-		Graphics::Image image;
-		if(!resource_manager)
-			image.load_io(*io);
-
-		RefPtr<Texture2D> tex = new Texture2D(resource_manager);
+		RefPtr<Texture2D> tex;
 
 		if(ext==".tex2d")
 		{
+			tex = new Texture2D(resource_manager);
 			DataFile::Parser parser(*io, name);
 			Texture2D::Loader ldr(*tex, *this);
 			ldr.load(parser);
 		}
 		else
 		{
+			// Verify that the image is loadable
+			Graphics::Image image;
+			if(!resource_manager)
+				image.load_io(*io);
+
+			tex = new Texture2D(resource_manager);
 			Sampler &samp = tex->get_default_sampler();
 			if(is_mipmapped(default_tex_filter))
 			{
@@ -152,32 +174,56 @@ Texture2D *Resources::create_texture2d(const string &name)
 				samp.set_mag_filter(default_tex_filter);
 			samp.set_min_filter(default_tex_filter);
 			samp.set_max_anisotropy(default_tex_anisotropy);
+
+			if(resource_manager)
+				resource_manager->set_resource_location(*tex, *this, name);
+			else
+				tex->image(image);
 		}
 
-		if(resource_manager)
-			resource_manager->set_resource_location(*tex, *this, name);
-		else
-			tex->image(image);
 		return tex.release();
 	}
 
 	return 0;
 }
 
-Program *Resources::create_program(const string &name)
+Module *Resources::create_module(const string &name)
 {
 	string ext = FS::extpart(name);
-	if(ext==".shader")
+	if(ext!=".glsl" && ext!=".spv")
 		return 0;
 
 	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
-		ProgramCompiler compiler;
-		compiler.compile(*io, this, name);
-		RefPtr<Program> program = new Program;
-		compiler.add_shaders(*program);
-		program->link();
-		return program.release();
+		if(ext==".glsl")
+		{
+			RefPtr<GlslModule> module = new GlslModule;
+			module->load_source(*io, this, name);
+			return module.release();
+		}
+		else if(ext==".spv")
+		{
+			RefPtr<SpirVModule> module = new SpirVModule;
+			module->load_code(*io);
+			return module.release();
+		}
+	}
+
+	return 0;
+}
+
+Program *Resources::create_program(const string &name)
+{
+	string ext = FS::extpart(name);
+	string base = FS::basepart(name);
+	string ext2 = FS::extpart(base);
+	if(ext==".shader" && (ext2==".glsl" || ext2==".spv"))
+	{
+		Module &module = get<Module>(base);
+		RefPtr<Program> shprog = new Program;
+		shprog->add_stages(module);
+		shprog->link();
+		return shprog.release();
 	}
 
 	return 0;