X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=045096e52dea7c31a55c872211cd781e276d3449;hb=9072069993704481d93b71add1f1ecda1009ae88;hp=b7586e886ee41df0eb711230c1ebe4bfcba8402c;hpb=b51fd94242badcd3807a39c339979f4f358120cd;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index b7586e8..045096e 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -10,8 +10,9 @@ 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");
 }
 
 const GL::Font &Resources::get_default_font() const
@@ -22,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),
@@ -29,7 +47,6 @@ Resources::Loader::Loader(Resources &r):
 {
 	add("default_font", &Loader::default_font);
 	add("font", &Loader::font);
-	add("style", &Loader::style);
 }
 
 void Resources::Loader::default_font(const string &name)
@@ -47,13 +64,5 @@ void Resources::Loader::font(const string &name)
 	fnt.release();
 }
 
-void Resources::Loader::style(const string &name)
-{
-	RefPtr<Style> stl = new Style(res);
-	load_sub(*stl, res);
-	res.add(name, stl.get());
-	stl.release();
-}
-
 } // namespace GLtk
 } // namespace Msp