X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=2fd6950370df6580fe08cdf54139bef9b6d50316;hb=fcd9e657d0c86cfa4c5bb951ccad2ff5f242863a;hp=d1fd371c483e71290f71b33139c2b3507af2566f;hpb=7db48f2836ec42c6e2dbeff336634a03bc6d7a62;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index d1fd371c..2fd69503 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -29,7 +29,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 +53,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);
@@ -62,9 +77,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)
@@ -76,7 +92,11 @@ 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);
+		// 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
+			tex->image(image, srgb_conversion);
 		return tex.release();
 	}