X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=825fc2517875771874c564989ea9da04c27e144f;hb=033732b500a35f3737bad515349d884cb3f123f0;hp=35af009697647a8a2900718b46728ff3a0c8e2c3;hpb=c2635c5a3dca6a6cea5562fd387beb0662b18cf0;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 35af009..825fc25 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include <msp/core/except.h>
+#include <msp/fs/utils.h>
 #include "resources.h"
 
 using namespace std;
@@ -17,17 +18,32 @@ Resources::Resources():
 	path("."),
 	default_font(0)
 {
-	add_keyword<GL::Font>("font");
+	init();
+}
+
+Resources::Resources(const FS::Path &fn):
+	path(FS::dirname(fn)),
+	default_font(0)
+{
+	init();
+
+	DataFile::load(*this, fn.str());
+}
+
+void Resources::init()
+{
 	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;
+	/* 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
@@ -40,17 +56,17 @@ 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);
+	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();
 }
@@ -62,22 +78,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