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

diff --git a/source/resources.cpp b/source/resources.cpp
index 045096e..8cdd0ad 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -6,15 +6,37 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Resources::Resources():
-	default_font(0)
+Resources::Resources()
 {
+	init();
+}
+
+Resources::Resources(const FS::Path &fn)
+{
+	init();
+
+	dir_src = new DataFile::DirectorySource;
+	dir_src->add_directory(FS::dirname(fn));
+	add_source(*dir_src);
+
+	DataFile::load(*this, fn.str());
+}
+
+void Resources::init()
+{
+	default_font = 0;
+	dir_src = 0;
 	add_type<Graphic>().keyword("graphic");
 	add_type<GL::Texture2D>().keyword("texture").creator(&Resources::create_texture);
 	add_type<GL::Font>().keyword("font");
 	add_type<Style>().keyword("style");
 }
 
+Resources::~Resources()
+{
+	delete dir_src;
+}
+
 const GL::Font &Resources::get_default_font() const
 {
 	if(!default_font)
@@ -27,17 +49,19 @@ 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;
+		if(IO::Seekable *io = open_from_sources(name))
+		{
+			Graphics::Image image;
+			image.load_io(*io);
+			delete io;
+
+			GL::Texture2D *tex = new GL::Texture2D;
+			tex->set_min_filter(GL::LINEAR);
+			tex->image(image);
+			return tex;
+		}
+
+	return 0;
 }