X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=32f59d93d6e5a85f0bea998fd6bc446deb3fe88f;hb=e6e6f0fe81a2f92985e65ae0de708974194d81a3;hp=66f6f082b927d2d6cdd5499a859f23bde6eadff2;hpb=fcde8390ad577fe434dcd4b29e0f410d29f867c9;p=libs%2Fgl.git

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index 66f6f082..32f59d93 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -2,27 +2,33 @@
 #include <msp/fs/utils.h>
 #include "animation.h"
 #include "armature.h"
+#include "basicmaterial.h"
 #include "camera.h"
+#include "error.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 "occludedscene.h"
+#include "orderedscene.h"
+#include "pbrmaterial.h"
 #include "sequencetemplate.h"
 #include "pose.h"
 #include "program.h"
 #include "resourcemanager.h"
 #include "resources.h"
 #include "sampler.h"
-#include "scene.h"
+#include "simplescene.h"
 #include "technique.h"
 #include "texture1d.h"
 #include "texture2d.h"
 #include "texture2darray.h"
 #include "texturecube.h"
+#include "unlitmaterial.h"
+#include "zsortedscene.h"
 #include "glsl/compiler.h"
 
 using namespace std;
@@ -33,48 +39,82 @@ 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),
-	default_tex_anisotropy(1.0f),
+Resources *Resources::global_resources = 0;
+
+Resources::Resources(bool set_as_global):
 	srgb_conversion(false),
 	resource_manager(0)
 {
 	add_type<Animation>().suffix(".anim").keyword("animation");
 	add_type<Armature>().suffix(".arma").keyword("armature");
-	add_type<Camera>().keyword("camera");
+	add_type<BasicMaterial>().base<Material>().suffix(".mat")
+		.creator([this](const string &n) -> BasicMaterial * { create_generic<Material>(n); return 0; })
+		.notify(&set_debug_name<Material>);
+	add_type<Camera>().keyword("camera")
+		.notify(&set_debug_name<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).notify(&Resources::set_debug_name<Material>);
+	add_type<Lighting>().suffix(".lightn").keyword("lighting")
+		.notify(&set_debug_name<Lighting>);
 	add_type<Mesh>().keyword("mesh")
-		.creator(&Resources::create_mesh).notify(&Resources::set_debug_name<Mesh>);
+		.creator([this](const string &n){ return create_mesh(n); })
+		.notify(&set_debug_name<Mesh>);
 	add_type<Module>().suffix(".glsl").suffix(".spv")
-		.creator(&Resources::create_module);
+		.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) -> OccludedScene * { create_generic<Scene>(n); return 0; });
+	add_type<OrderedScene>().base<Scene>().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<Material>);
 	add_type<SequenceTemplate>().suffix(".seq").keyword("sequence");
 	add_type<Pose>().keyword("pose");
 	add_type<Program>().keyword("shader")
-		.creator(&Resources::create_program).notify(&Resources::set_debug_name<Program>);
+		.creator([this](const string &n){ return create_program(n); })
+		.notify(&set_debug_name<Program>);
 	add_type<Sampler>().suffix(".samp").keyword("sampler")
-		.notify(&Resources::set_debug_name<Sampler>);
-	add_type<Scene>().suffix(".scene")
-		.creator(&Resources::create_scene);
+		.notify(&set_debug_name<Sampler>);
+	add_type<SimpleScene>().base<Scene>().suffix(".scene")
+		.creator([this](const string &n) -> SimpleScene * { create_generic<Scene>(n); return 0; });
 	add_type<Technique>().suffix(".tech").keyword("technique")
-		.notify(&Resources::set_debug_name<Technique>);
+		.notify(&set_debug_name<Technique>);
 	add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d")
-		.notify(&Resources::set_debug_name<Texture1D>);
+		.notify(&set_debug_name<Texture1D>);
 	add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d")
-		.creator(&Resources::create_texture2d).notify(&Resources::set_debug_name<Texture2D>);
+		.creator([this](const string &n){ return create_texture2d(n); })
+		.notify(&set_debug_name<Texture2D>);
 	add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d")
-		.notify(&Resources::set_debug_name<Texture3D>);
+		.notify(&set_debug_name<Texture3D>);
 	add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube")
-		.notify(&Resources::set_debug_name<TextureCube>);
+		.notify(&set_debug_name<TextureCube>);
 	add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array")
-		.notify(&Resources::set_debug_name<Texture2DArray>);
+		.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")
+		.creator([this](const string &n) -> ZSortedScene * { create_generic<Scene>(n); return 0; });
 
 	add_source(get_builtins());
+
+	if(set_as_global && !global_resources)
+		global_resources = this;
+}
+
+Resources::~Resources()
+{
+	if(this==global_resources)
+		global_resources = 0;
+}
+
+Resources &Resources::get_global()
+{
+	if(!global_resources)
+		throw invalid_operation("no global resources");
+	return *global_resources;
 }
 
 const DataFile::CollectionSource &Resources::get_builtins()
@@ -92,16 +132,6 @@ const DataFile::CollectionSource &Resources::get_builtins()
 	return builtins;
 }
 
-void Resources::set_default_texture_filter(TextureFilter tf)
-{
-	default_tex_filter = tf;
-}
-
-void Resources::set_default_texture_anisotropy(float a)
-{
-	default_tex_anisotropy = a;
-}
-
 void Resources::set_srgb_conversion(bool c)
 {
 	srgb_conversion = c;
@@ -112,14 +142,15 @@ void Resources::set_resource_manager(ResourceManager *m)
 	resource_manager = m;
 }
 
-Material *Resources::create_material(const string &name)
+template<typename T>
+T *Resources::create_generic(const string &name)
 {
 	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
 		DataFile::Parser parser(*io, name);
-		Material::GenericLoader ldr(this);
+		typename T::GenericLoader ldr(*this);
 		ldr.load(parser);
-		return ldr.get_material();
+		ldr.store_object(*this, name);
 	}
 
 	return 0;
@@ -140,19 +171,6 @@ 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);
@@ -178,16 +196,6 @@ Texture2D *Resources::create_texture2d(const string &name)
 				image.load_io(*io);
 
 			tex = new Texture2D(resource_manager);
-			Sampler &samp = tex->get_default_sampler();
-			if(is_mipmapped(default_tex_filter))
-			{
-				tex->set_auto_generate_mipmap(true);
-				samp.set_mag_filter(LINEAR);
-			}
-			else
-				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);
@@ -245,7 +253,6 @@ Program *Resources::create_program(const string &name)
 		Module &module = get<Module>(base);
 		RefPtr<Program> shprog = new Program;
 		shprog->add_stages(module);
-		shprog->link();
 		return shprog.release();
 	}
 
@@ -271,7 +278,7 @@ void Resources::Loader::scene(const string &name)
 {
 	Scene::GenericLoader ldr(obj);
 	load_sub_with(ldr);
-	obj.add(name, ldr.get_scene());
+	obj.add(name, ldr.get_object());
 }
 
 } // namespace GL