X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=8cdd0ad8f0b12066adf3b3dfeed9c2029ec304ee;hb=f0b600c3b1739f7e088da6ab8eb7c2e67adf592c;hp=650140ba4552f59b066f00cc5677b5d34dfd9734;hpb=d7ae291415a21cc886fe318070b41ac8d3e57a30;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 650140b..8cdd0ad 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -1,4 +1,4 @@
-#include <msp/core/except.h>
+#include <msp/fs/utils.h>
 #include "resources.h"
 
 using namespace std;
@@ -6,44 +6,62 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Resources::Resources():
-	path("."),
-	default_font(0)
+Resources::Resources()
 {
-	add_keyword<GL::Font>("font");
-	add_keyword<Graphic>("graphic");
-	add_keyword<Style>("style");
+	init();
+}
+
+Resources::Resources(const FS::Path &fn)
+{
+	init();
+
+	dir_src = new DataFile::DirectorySource;
+	dir_src->add_directory(FS::dirname(fn));
+	add_source(*dir_src);
 
-	add_creator(&Resources::create_font);
-	add_creator(&Resources::create_texture);
+	DataFile::load(*this, fn.str());
 }
 
-void Resources::set_path(const Path &p)
+void Resources::init()
 {
-	path=p;
+	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)
-		throw InvalidState("No default font");
+		throw logic_error("!default_font");
 
 	return *default_font;
 }
 
-GL::Font *Resources::create_font(const string &name)
-{
-	RefPtr<GL::Font> fnt=new GL::Font;
-	DataFile::load(*fnt, (path/(name+".font")).str());
-	return fnt.release();
-}
-
 GL::Texture2D *Resources::create_texture(const string &name)
 {
-	RefPtr<GL::Texture2D> tex=new GL::Texture2D;
-	tex->image((path/(name+".png")).str());
-	tex->set_min_filter(GL::LINEAR);
-	return tex.release();
+	string ext = FS::extpart(name);
+	if(ext==".png" || ext==".jpg")
+		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;
 }
 
 
@@ -51,16 +69,22 @@ Resources::Loader::Loader(Resources &r):
 	Collection::Loader(r),
 	res(r)
 {
+	add("default_font", &Loader::default_font);
 	add("font", &Loader::font);
 }
 
+void Resources::Loader::default_font(const string &name)
+{
+	res.default_font = &res.get<GL::Font>(name);
+}
+
 void Resources::Loader::font(const string &name)
 {
-	RefPtr<GL::Font> fnt=new GL::Font;
-	load_sub(*fnt);
+	RefPtr<GL::Font> fnt = new GL::Font;
+	load_sub(*fnt, res);
 	res.add(name, fnt.get());
 	if(!res.default_font)
-		res.default_font=fnt.get();
+		res.default_font = fnt.get();
 	fnt.release();
 }