X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=7cbdd2c5069f3bc8f51311bfa52e3183f7457787;hb=147ec71f9fe3bd6b7ce25a7b74122f0282a99393;hp=a37496b93771190add82369f87cea33fa6b0ce2c;hpb=be92396630a2065e43c21d9d1904e97014844cff;p=libs%2Fgl.git

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index a37496b9..7cbdd2c5 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -64,10 +64,10 @@ Resources::Resources(bool set_as_global):
 		.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")
+	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; })
@@ -81,7 +81,7 @@ Resources::Resources(bool set_as_global):
 		.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>);
@@ -103,7 +103,7 @@ Resources::Resources(bool set_as_global):
 	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());
@@ -166,7 +166,7 @@ T *Resources::create_generic(const string &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))
@@ -182,9 +182,16 @@ Mesh *Resources::create_mesh(const string &name)
 
 Texture *Resources::create_texture(const string &name)
 {
+	bool managed = (resource_manager && name[0]!='_');
+
 	string ext = FS::extpart(name);
 	if(ext==".tex")
-		return create_generic<Texture, GenericResourceLoader<Texture>>(name);
+	{
+		if(managed)
+			return create_generic<Texture, GenericResourceLoader<Texture>>(name);
+		else
+			return create_generic<Texture>(name);
+	}
 
 	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
@@ -192,14 +199,16 @@ Texture *Resources::create_texture(const string &name)
 
 		// Verify that the image is loadable
 		Graphics::Image image;
-		if(!resource_manager)
+		if(!managed)
 			image.load_io(*io);
 
 		tex = new Texture2D;
-		tex->set_manager(resource_manager);
 
-		if(resource_manager)
+		if(managed)
+		{
+			tex->set_manager(resource_manager);
 			resource_manager->set_resource_location(*tex, *this, name);
+		}
 		else
 			tex->image(image);