X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=36be79e7914272d76a30c4c5af904c8fa5dc6cee;hb=b15a68afd1d1c36cb953bc29bf234413991c911d;hp=f146bbc9a281b6f19423005dd6d45a3b5d5550ed;hpb=4d1dbf9ab44b915c4f35855cb70742e8fc834d12;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index f146bbc..36be79e 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,46 +6,60 @@ 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");
-
-	add_creator(&Resources::create_font);
-	add_creator(&Resources::create_texture);
+	init();
 }
 
-void Resources::set_path(const Path &p)
+Resources::Resources(const FS::Path &fn)
 {
-	path=p;
+	init();
+
+	dir_src = new DataFile::DirectorySource;
+	dir_src->add_directory(FS::dirname(fn));
+	add_source(*dir_src);
+
+	DataFile::load(*this, fn.str());
 }
 
-const GL::Font &Resources::get_default_font() const
+void Resources::init()
 {
-	if(!default_font)
-		throw InvalidState("No default font");
+	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");
+}
 
-	return *default_font;
+Resources::~Resources()
+{
+	delete dir_src;
 }
 
-GL::Font *Resources::create_font(const string &name)
+const GL::Font &Resources::get_default_font() const
 {
-	RefPtr<GL::Font> fnt=new GL::Font;
-	DataFile::load<GL::Font, Resources &>(*fnt, (path/(name+".font")).str(), *this);
 	if(!default_font)
-		default_font=fnt.get();
-	return fnt.release();
+		throw logic_error("!default_font");
+
+	return *default_font;
 }
 
 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")
+	{
+		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;
 }
 
 
@@ -59,16 +73,16 @@ Resources::Loader::Loader(Resources &r):
 
 void Resources::Loader::default_font(const string &name)
 {
-	res.default_font=&res.get<GL::Font>(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();
 }