X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=66f6f082b927d2d6cdd5499a859f23bde6eadff2;hb=fcde8390ad577fe434dcd4b29e0f410d29f867c9;hp=d52dbe34fb61c745e74c4cad108cdd0a604990e7;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp index d52dbe34..66f6f082 100644 --- a/source/resources/resources.cpp +++ b/source/resources/resources.cpp @@ -5,22 +5,25 @@ #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 "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 +31,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), @@ -40,20 +44,35 @@ Resources::Resources(): add_type().keyword("camera"); add_type().keyword("font"); add_type().suffix(".kframe").keyword("keyframe"); + add_type().keyword("light"); add_type().suffix(".lightn").keyword("lighting"); - add_type().suffix(".mat").creator(&Resources::create_material); - add_type().keyword("mesh").creator(&Resources::create_mesh); + add_type().suffix(".mat") + .creator(&Resources::create_material).notify(&Resources::set_debug_name); + add_type().keyword("mesh") + .creator(&Resources::create_mesh).notify(&Resources::set_debug_name); + add_type().suffix(".glsl").suffix(".spv") + .creator(&Resources::create_module); add_type().keyword("object"); - add_type().suffix(".pipe").keyword("pipeline"); + add_type().suffix(".seq").keyword("sequence"); add_type().keyword("pose"); - add_type().keyword("shader").suffix(".glsl").creator(&Resources::create_program); - add_type().suffix(".samp").keyword("sampler"); - add_type().suffix(".tech").keyword("technique"); - add_type().base().suffix(".tex1d").keyword("texture1d"); - add_type().base().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d").creator(&Resources::create_texture2d); - add_type().base().suffix(".tex3d").keyword("texture3d"); - add_type().base().suffix(".texcb").keyword("texture_cube"); - add_type().base().suffix(".tex2da").keyword("texture2d_array"); + add_type().keyword("shader") + .creator(&Resources::create_program).notify(&Resources::set_debug_name); + add_type().suffix(".samp").keyword("sampler") + .notify(&Resources::set_debug_name); + add_type().suffix(".scene") + .creator(&Resources::create_scene); + add_type().suffix(".tech").keyword("technique") + .notify(&Resources::set_debug_name); + add_type().base().suffix(".tex1d").keyword("texture1d") + .notify(&Resources::set_debug_name); + add_type().base().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d") + .creator(&Resources::create_texture2d).notify(&Resources::set_debug_name); + add_type().base().suffix(".tex3d").keyword("texture3d") + .notify(&Resources::set_debug_name); + add_type().base().suffix(".texcb").keyword("texture_cube") + .notify(&Resources::set_debug_name); + add_type().base().suffix(".tex2da").keyword("texture2d_array") + .notify(&Resources::set_debug_name); add_source(get_builtins()); } @@ -65,6 +84,7 @@ const DataFile::CollectionSource &Resources::get_builtins() if(!init_done) { + init_builtin_data(builtins); init_shaderlib(builtins); init_done = true; } @@ -120,6 +140,19 @@ Mesh *Resources::create_mesh(const string &name) return 0; } +Scene *Resources::create_scene(const string &name) +{ + if(RefPtr 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 +161,23 @@ Texture2D *Resources::create_texture2d(const string &name) if(RefPtr io = open_raw(name)) { - Graphics::Image image; - if(!resource_manager) - image.load_io(*io); - - RefPtr tex = new Texture2D(resource_manager); + RefPtr 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,36 +188,91 @@ 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 = open_raw(name)) { - ProgramCompiler compiler; - compiler.compile(*io, this, name); - RefPtr program = new Program; - compiler.add_shaders(*program); - program->link(); - return program.release(); + if(ext==".glsl") + { + RefPtr module = new GlslModule; + module->load_source(*io, this, name); + return module.release(); + } + else if(ext==".spv") + { + RefPtr module = new SpirVModule; + module->load_code(*io); + return module.release(); + } + } + else if(ext==".spv") + { + if((io = open_raw(FS::basepart(name)+".glsl"))) + { + RefPtr module = new SpirVModule; + module->load_source(*io, this, name); + 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(base); + RefPtr shprog = new Program; + shprog->add_stages(module); + shprog->link(); + return shprog.release(); } return 0; } +template +void Resources::set_debug_name(const string &name, T &item) +{ +#ifdef DEBUG + item.set_debug_name(name); +#endif +} + + +Resources::Loader::Loader(Resources &r): + DerivedObjectLoader(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