X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=61d05c9b3d831867e8b36af2f1f8cb70bb916c58;hb=6a7510a74193ad442bfe82d8377606c3cb66e6b2;hp=79c5e85fbe47764e0cca300f15c8acb3ff350450;hpb=9d696772b2194b67d8e3e4da11169900eab58c0d;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 79c5e85f..61d05c9b 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"
@@ -20,7 +21,7 @@ namespace Msp {
 namespace GL {
 
 Resources::Resources():
-	default_tex_filter(LINEAR_MIPMAP_LINEAR),
+	default_tex_filter(SGIS_generate_mipmap ? LINEAR_MIPMAP_LINEAR : LINEAR),
 	srgb_conversion(false),
 	resource_manager(0)
 {
@@ -29,7 +30,7 @@ Resources::Resources():
 	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");
@@ -53,6 +54,21 @@ 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);
@@ -77,7 +93,6 @@ Texture2D *Resources::create_texture2d(const string &name)
 			tex->set_mag_filter(default_tex_filter);
 		tex->set_min_filter(default_tex_filter);
 
-		// TODO Somehow pass the srgb flag if a resource manager is in use
 		if(resource_manager)
 			resource_manager->set_resource_location(*tex, *this, name);
 		else