X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=e83c1bb178e5adea2acc6525acfdc01c0b8b87f1;hb=9fdbf99cdb3c5620e665c3ecb34e83d778cb311a;hp=3b0f4f9154648b88d7254cb6f575854de341193b;hpb=be8ea35fe6eabe4c68d2d337634f21c63c964265;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 3b0f4f9..e83c1bb 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;
@@ -10,40 +10,53 @@ Resources::Resources():
 	path("."),
 	default_font(0)
 {
-	add_keyword<GL::Font>("font");
-	add_keyword<Graphic>("graphic");
-	add_keyword<Style>("style");
+	init();
+}
+
+Resources::Resources(const FS::Path &fn):
+	path(FS::dirname(fn)),
+	default_font(0)
+{
+	init();
+
+	DataFile::load(*this, fn.str());
+}
 
-	add_creator(&Resources::create_font);
-	add_creator(&Resources::create_texture);
+void Resources::init()
+{
+	add_type<Graphic>().keyword("graphic");
+	add_type<GL::Texture2D>().keyword("texture").creator(&Resources::create_texture);
+	add_type<GL::Font>().creator(&Resources::create_font);
 }
 
-void Resources::set_path(const Path &p)
+void Resources::set_path(const FS::Path &p)
 {
-	path=p;
+	/* XXX bad, should change Collection API to allow creators to form paths
+	relative to the datafile location */
+	path = p;
 }
 
 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<GL::Font, Resources &>(*fnt, (path/(name+".font")).str(), *this);
+	RefPtr<GL::Font> fnt = new GL::Font;
+	DataFile::load(*fnt, (path/name).str(), *this);
 	if(!default_font)
-		default_font=fnt.get();
+		default_font = fnt.get();
 	return fnt.release();
 }
 
 GL::Texture2D *Resources::create_texture(const string &name)
 {
-	RefPtr<GL::Texture2D> tex=new GL::Texture2D;
-	tex->load_image((path/(name+".png")).str());
+	RefPtr<GL::Texture2D> tex = new GL::Texture2D;
+	tex->load_image((path/name).str());
 	tex->set_min_filter(GL::LINEAR);
 	return tex.release();
 }
@@ -55,22 +68,31 @@ 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)
 {
-	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();
 }
 
+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