Reintroduce the Resources constructor that immediately loads a file

[libs/gltk.git] / source / resources.cpp

diff --git a/source/resources.cpp b/source/resources.cpp
index 045096e52dea7c31a55c872211cd781e276d3449..36be79e7914272d76a30c4c5af904c8fa5dc6cee 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -6,15 +6,37 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Resources::Resources():
-       default_font(0)
+Resources::Resources()
 {
+       init();
+}
+
+Resources::Resources(const FS::Path &fn)
+{
+       init();
+
+       dir_src = new DataFile::DirectorySource;
+       dir_src->add_directory(FS::dirname(fn));
+       add_source(*dir_src);
+
+       DataFile::load(*this, fn.str());
+}
+
+void Resources::init()
+{
+       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");
 }
 
+Resources::~Resources()
+{
+       delete dir_src;
+}
+
 const GL::Font &Resources::get_default_font() const
 {
        if(!default_font)