X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fresources.cpp;h=886b41654b571571e1cf545ac7d3d766f3f750cc;hb=34724c2c2f2d30cf66e74ef3e848547171c7fee9;hp=35af009697647a8a2900718b46728ff3a0c8e2c3;hpb=c2635c5a3dca6a6cea5562fd387beb0662b18cf0;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 35af009..886b416 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -17,15 +17,14 @@ Resources::Resources():
 	path("."),
 	default_font(0)
 {
-	add_keyword<GL::Font>("font");
 	add_keyword<Graphic>("graphic");
-	add_keyword<Style>("style");
+	add_keyword<GL::Texture2D>("texture");
 
 	add_creator(&Resources::create_font);
 	add_creator(&Resources::create_texture);
 }
 
-void Resources::set_path(const Path &p)
+void Resources::set_path(const FS::Path &p)
 {
 	path=p;
 }
@@ -41,7 +40,7 @@ const GL::Font &Resources::get_default_font() const
 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);
+	DataFile::load<GL::Font, Resources &>(*fnt, (path/name).str(), *this);
 	if(!default_font)
 		default_font=fnt.get();
 	return fnt.release();
@@ -50,7 +49,7 @@ GL::Font *Resources::create_font(const string &name)
 GL::Texture2D *Resources::create_texture(const string &name)
 {
 	RefPtr<GL::Texture2D> tex=new GL::Texture2D;
-	tex->load_image((path/(name+".png")).str());
+	tex->load_image((path/name).str());
 	tex->set_min_filter(GL::LINEAR);
 	return tex.release();
 }
@@ -62,6 +61,7 @@ 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)
@@ -72,12 +72,20 @@ void Resources::Loader::default_font(const string &name)
 void Resources::Loader::font(const string &name)
 {
 	RefPtr<GL::Font> fnt=new GL::Font;
-	load_sub(*fnt);
+	load_sub(*fnt, res);
 	res.add(name, fnt.get());
 	if(!res.default_font)
 		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