X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=32709e30e2ebf521bd6bcf69eeb262069f517e4f;hb=55dbeb5e04516699b8415104e346243d5e4c48c9;hp=9583994710f5acab1d6b8517e9277ae223b082be;hpb=448decd4cb4baedc7975263a09cb065c25711547;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 95839947..32709e30 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -1,4 +1,5 @@
 #include <msp/fs/utils.h>
+#include <msp/gl/extensions/sgis_generate_mipmap.h>
 #include "animation.h"
 #include "armature.h"
 #include "font.h"
@@ -8,9 +9,12 @@
 #include "object.h"
 #include "pose.h"
 #include "program.h"
+#include "resourcemanager.h"
 #include "resources.h"
 #include "technique.h"
+#include "texture1d.h"
 #include "texture2d.h"
+#include "texture2darray.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -19,21 +23,25 @@ namespace Msp {
 namespace GL {
 
 Resources::Resources():
-	default_tex_filter(LINEAR_MIPMAP_LINEAR),
-	srgb_conversion(false)
+	default_tex_filter(SGIS_generate_mipmap ? LINEAR_MIPMAP_LINEAR : LINEAR),
+	srgb_conversion(false),
+	resource_manager(0)
 {
 	add_type<Animation>().suffix(".anim").keyword("animation");
 	add_type<Armature>().suffix(".arma").keyword("armature");
 	add_type<Font>().keyword("font");
 	add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
 	add_type<Material>().suffix(".mat").keyword("material");
-	add_type<Mesh>().keyword("mesh");
+	add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
 	add_type<Object>().keyword("object");
 	add_type<Pose>().keyword("pose");
 	add_type<Program>().keyword("shader");
 	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);
+	add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d");
 	add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube");
+	add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array");
 }
 
 void Resources::set_default_texture_filter(TextureFilter tf)
@@ -46,6 +54,26 @@ void Resources::set_srgb_conversion(bool c)
 	srgb_conversion = c;
 }
 
+void Resources::set_resource_manager(ResourceManager *m)
+{
+	resource_manager = m;
+}
+
+Mesh *Resources::create_mesh(const string &name)
+{
+	if(!resource_manager)
+		return 0;
+
+	if(RefPtr<IO::Seekable> io = open_from_sources(name))
+	{
+		RefPtr<GL::Mesh> mesh = new GL::Mesh(resource_manager);
+		resource_manager->set_resource_location(*mesh, *this, name);
+		return mesh.release();
+	}
+
+	return 0;
+}
+
 Texture2D *Resources::create_texture2d(const string &name)
 {
 	string ext = FS::extpart(name);
@@ -55,9 +83,10 @@ Texture2D *Resources::create_texture2d(const string &name)
 	if(RefPtr<IO::Seekable> io = open_from_sources(name))
 	{
 		Graphics::Image image;
-		image.load_io(*io);
+		if(!resource_manager)
+			image.load_io(*io);
 
-		RefPtr<GL::Texture2D> tex = new GL::Texture2D;
+		RefPtr<GL::Texture2D> tex = new GL::Texture2D(resource_manager);
 
 		if(default_tex_filter==NEAREST_MIPMAP_NEAREST || default_tex_filter==NEAREST_MIPMAP_LINEAR ||
 			default_tex_filter==LINEAR_MIPMAP_NEAREST || default_tex_filter==LINEAR_MIPMAP_LINEAR)
@@ -69,7 +98,10 @@ Texture2D *Resources::create_texture2d(const string &name)
 			tex->set_mag_filter(default_tex_filter);
 		tex->set_min_filter(default_tex_filter);
 
-		tex->image(image, srgb_conversion);
+		if(resource_manager)
+			resource_manager->set_resource_location(*tex, *this, name);
+		else
+			tex->image(image, srgb_conversion);
 		return tex.release();
 	}