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

diff --git a/source/resources.cpp b/source/resources.cpp
index f146bbc..3e0f851 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;
@@ -7,47 +7,22 @@ namespace Msp {
 namespace GLtk {
 
 Resources::Resources():
-	path("."),
 	default_font(0)
 {
-	add_keyword<GL::Font>("font");
-	add_keyword<Graphic>("graphic");
-	add_keyword<Style>("style");
-
-	add_creator(&Resources::create_font);
-	add_creator(&Resources::create_texture);
-}
-
-void Resources::set_path(const Path &p)
-{
-	path=p;
+	add_type<Graphic>().keyword("graphic");
+	add_type<GL::Texture2D>().keyword("texture");
+	add_type<GL::Font>().keyword("font");
+	add_type<Style>().keyword("style");
 }
 
 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);
-	if(!default_font)
-		default_font=fnt.get();
-	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();
-}
-
 
 Resources::Loader::Loader(Resources &r):
 	Collection::Loader(r),
@@ -59,16 +34,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();
 }