From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 16 Jan 2013 16:53:58 +0000 (+0200)
Subject: Restore ability to handle raw image files
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=9072069993704481d93b71add1f1ecda1009ae88;hp=f3d8d9510ac81c23f67025983aa7171ec5adcda9;p=libs%2Fgltk.git

Restore ability to handle raw image files
---

diff --git a/source/resources.cpp b/source/resources.cpp
index 3e0f851..045096e 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -10,7 +10,7 @@ Resources::Resources():
 	default_font(0)
 {
 	add_type<Graphic>().keyword("graphic");
-	add_type<GL::Texture2D>().keyword("texture");
+	add_type<GL::Texture2D>().keyword("texture").creator(&Resources::create_texture);
 	add_type<GL::Font>().keyword("font");
 	add_type<Style>().keyword("style");
 }
@@ -23,6 +23,23 @@ const GL::Font &Resources::get_default_font() const
 	return *default_font;
 }
 
+GL::Texture2D *Resources::create_texture(const string &name)
+{
+	string ext = FS::extpart(name);
+	if(ext==".png" || ext==".jpg")
+	{
+		IO::Seekable *io = open_from_sources(name);
+		Graphics::Image image;
+		image.load_io(*io);
+		GL::Texture2D *tex = new GL::Texture2D;
+		tex->set_min_filter(GL::LINEAR);
+		tex->image(image);
+		return tex;
+	}
+	else
+		return 0;
+}
+
 
 Resources::Loader::Loader(Resources &r):
 	Collection::Loader(r),
diff --git a/source/resources.h b/source/resources.h
index e68d89f..77987e8 100644
--- a/source/resources.h
+++ b/source/resources.h
@@ -38,6 +38,9 @@ public:
 	Resources();
 
 	const GL::Font &get_default_font() const;
+
+private:
+	GL::Texture2D *create_texture(const std::string &);
 };
 
 } // namespace GLtk