The entire row should be divided when initially making a column basic

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

diff --git a/source/resources.cpp b/source/resources.cpp
index b7586e886ee41df0eb711230c1ebe4bfcba8402c..36be79e7914272d76a30c4c5af904c8fa5dc6cee 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -6,12 +6,35 @@ 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");
+       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
@@ -22,6 +45,23 @@ const GL::Font &Resources::get_default_font() const
        return *default_font;
 }
 
+GL::Texture2D *Resources::create_texture(const string &name)
+{
+       string ext = FS::extpart(name);
+       if(ext==".png" || ext==".jpg")
+       {
+               IO::Seekable *io = open_from_sources(name);
+               Graphics::Image image;
+               image.load_io(*io);
+               GL::Texture2D *tex = new GL::Texture2D;
+               tex->set_min_filter(GL::LINEAR);
+               tex->image(image);
+               return tex;
+       }
+       else
+               return 0;
+}
+
 
 Resources::Loader::Loader(Resources &r):
        Collection::Loader(r),
@@ -29,7 +69,6 @@ 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)
@@ -47,13 +86,5 @@ void Resources::Loader::font(const string &name)
        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