#include <msp/fs/utils.h>
#include "animation.h"
#include "armature.h"
+#include "backend.h"
#include "basicmaterial.h"
#include "camera.h"
#include "directionallight.h"
Resources *Resources::global_resources = 0;
Resources::Resources(bool set_as_global):
- srgb_conversion(false),
resource_manager(0)
{
add_type<Animation>().suffix(".anim").keyword("animation");
.creator([this](const string &n){ return create_mesh(n); })
.notify(&set_debug_name<Mesh>);
add_type<Module>().suffix(".glsl").suffix(".spv")
- .creator([this](const string &n){ return create_module(n); });
- add_type<Object>().keyword("object");
- add_type<OccludedScene>().base<Scene>().suffix(".scene")
+ .creator([this](const string &n){ return create_module(n); })
+ .notify(&set_debug_name<Module>);
+ add_type<Object>().base<Renderable>().keyword("object");
+ add_type<OccludedScene>().base<Scene>().base<Renderable>().suffix(".scene")
.creator([this](const string &n) -> OccludedScene * { create_generic<Scene>(n); return 0; });
- add_type<OrderedScene>().base<Scene>().suffix(".scene")
+ add_type<OrderedScene>().base<Scene>().base<Renderable>().suffix(".scene")
.creator([this](const string &n) -> OrderedScene * { create_generic<Scene>(n); return 0; });
add_type<PbrMaterial>().base<Material>().suffix(".mat")
.creator([this](const string &n) -> PbrMaterial * { create_generic<Material>(n); return 0; })
.notify(&set_debug_name<Program>);
add_type<Sampler>().suffix(".samp").keyword("sampler")
.notify(&set_debug_name<Sampler>);
- add_type<SimpleScene>().base<Scene>().suffix(".scene")
+ add_type<SimpleScene>().base<Scene>().base<Renderable>().suffix(".scene")
.creator([this](const string &n) -> SimpleScene * { create_generic<Scene>(n); return 0; });
add_type<Technique>().suffix(".tech").keyword("technique")
.notify(&set_debug_name<Technique>);
- add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d")
+ add_type<Texture1D>().base<Texture>().suffix(".tex")
+ .creator([this](const string &n) -> Texture1D * { create_texture(n); return 0; })
.notify(&set_debug_name<Texture1D>);
- add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d")
- .creator([this](const string &n){ return create_texture2d(n); })
+ add_type<Texture2D>().base<Texture>().suffix(".tex").suffix(".png").suffix(".jpg")
+ .creator([this](const string &n) -> Texture2D * { create_texture(n); return 0; })
.notify(&set_debug_name<Texture2D>);
- add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d")
+ add_type<Texture3D>().base<Texture>().suffix(".tex")
+ .creator([this](const string &n) -> Texture3D * { create_texture(n); return 0; })
.notify(&set_debug_name<Texture3D>);
- add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube")
+ add_type<TextureCube>().base<Texture>().suffix(".tex")
+ .creator([this](const string &n) -> TextureCube * { create_texture(n); return 0; })
.notify(&set_debug_name<TextureCube>);
- add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array")
+ add_type<Texture2DArray>().base<Texture>().suffix(".tex")
+ .creator([this](const string &n) -> Texture2DArray * { create_texture(n); return 0; })
.notify(&set_debug_name<Texture2DArray>);
add_type<UnlitMaterial>().base<Material>().suffix(".mat")
.creator([this](const string &n) -> UnlitMaterial * { create_generic<Material>(n); return 0; })
.notify(&set_debug_name<Material>);
- add_type<ZSortedScene>().base<Scene>().suffix(".scene")
+ add_type<ZSortedScene>().base<Scene>().base<Renderable>().suffix(".scene")
.creator([this](const string &n) -> ZSortedScene * { create_generic<Scene>(n); return 0; });
add_source(get_builtins());
return builtins;
}
-void Resources::set_srgb_conversion(bool c)
-{
- srgb_conversion = c;
-}
-
void Resources::set_resource_manager(ResourceManager *m)
{
resource_manager = m;
}
-template<typename T>
+template<typename T, typename L>
T *Resources::create_generic(const string &name)
{
if(RefPtr<IO::Seekable> io = open_raw(name))
{
DataFile::Parser parser(*io, name);
- typename T::GenericLoader ldr(*this);
+ L ldr(*this);
ldr.load(parser);
ldr.store_object(*this, name);
}
Mesh *Resources::create_mesh(const string &name)
{
- if(!resource_manager)
+ if(!resource_manager || name[0]=='_')
return 0;
if(RefPtr<IO::Seekable> io = open_raw(name))
return 0;
}
-Texture2D *Resources::create_texture2d(const string &name)
+Texture *Resources::create_texture(const string &name)
{
+ bool managed = (resource_manager && name[0]!='_');
+
string ext = FS::extpart(name);
- if(ext==".tex2d" && !resource_manager)
- return 0;
+ if(ext==".tex")
+ {
+ if(managed)
+ return create_generic<Texture, GenericResourceLoader<Texture>>(name);
+ else
+ return create_generic<Texture>(name);
+ }
if(RefPtr<IO::Seekable> io = open_raw(name))
{
RefPtr<Texture2D> tex;
- if(ext==".tex2d")
+ // Verify that the image is loadable
+ Graphics::Image image;
+ if(!managed)
+ image.load_io(*io);
+
+ tex = new Texture2D;
+
+ if(managed)
{
- tex = new Texture2D;
tex->set_manager(resource_manager);
- DataFile::Parser parser(*io, name);
- Texture2D::Loader ldr(*tex, *this);
- ldr.load(parser);
+ resource_manager->set_resource_location(*tex, *this, name);
}
else
- {
- // Verify that the image is loadable
- Graphics::Image image;
- if(!resource_manager)
- image.load_io(*io);
-
- tex = new Texture2D(resource_manager);
-
- if(resource_manager)
- resource_manager->set_resource_location(*tex, *this, name);
- else
- tex->image(image);
- }
+ tex->image(image);
- return tex.release();
+ add(name, tex.get());
+ tex.release();
}
return 0;
{
if(ext==".glsl")
{
- RefPtr<GlslModule> module = new GlslModule;
+ RefPtr<Module> module;
+ if(get_backend_api()==VULKAN)
+ module = new SpirVModule;
+ else
+ module = new GlslModule;
module->load_source(*io, this, name);
return module.release();
}
Resources::Loader::Loader(Resources &r):
DerivedObjectLoader<Resources, Collection::Loader>(r)
{
- add("scene", &Loader::scene);
+ add("light", &Loader::generic<Light>);
+ add("material", &Loader::generic<Material>);
+ add("scene", &Loader::generic<Scene>);
+ add("texture", &Loader::generic<Texture, GenericResourceLoader<Texture>>);
}
-void Resources::Loader::scene(const string &name)
+template<typename T, typename L>
+void Resources::Loader::generic(const string &name)
{
- Scene::GenericLoader ldr(obj);
+ L ldr(obj);
load_sub_with(ldr);
- obj.add(name, ldr.get_object());
+ ldr.store_object(obj, name);
+}
+
+
+template<typename T>
+void Resources::GenericResourceLoader<T>::type(const DataFile::Symbol &t)
+{
+ T::GenericLoader::type(t);
+ this->object->set_manager(resources.resource_manager);
}
} // namespace GL
projects / libs / gl.git / blobdiff