Implement mouse wheel scrolling in List

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

diff --git a/source/resources.cpp b/source/resources.cpp
index 11fc1fabe8a0a467ba82019337cc2d2851674e42..8cdd0ad8f0b12066adf3b3dfeed9c2029ec304ee 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -1,4 +1,3 @@
-#include <msp/core/except.h>
 #include <msp/fs/utils.h>
 #include "resources.h"
 
@@ -7,61 +6,62 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Resources::Resources():
-       path("."),
-       default_font(0)
+Resources::Resources()
 {
        init();
 }
 
-Resources::Resources(const FS::Path &fn):
-       path(FS::dirname(fn)),
-       default_font(0)
+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()
 {
-       add_keyword<Graphic>("graphic");
-       add_keyword<GL::Texture2D>("texture");
-
-       add_creator(&Resources::create_font);
-       add_creator(&Resources::create_texture);
+       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");
 }
 
-void Resources::set_path(const FS::Path &p)
+Resources::~Resources()
 {
-       /* XXX bad, should change Collection API to allow creators to form paths
-       relative to the datafile location */
-       path = p;
+       delete dir_src;
 }
 
 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(*fnt, (path/name).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->load_image((path/name).str());
-       tex->set_min_filter(GL::LINEAR);
-       return tex.release();
+       string ext = FS::extpart(name);
+       if(ext==".png" || ext==".jpg")
+               if(IO::Seekable *io = open_from_sources(name))
+               {
+                       Graphics::Image image;
+                       image.load_io(*io);
+                       delete io;
+
+                       GL::Texture2D *tex = new GL::Texture2D;
+                       tex->set_min_filter(GL::LINEAR);
+                       tex->image(image);
+                       return tex;
+               }
+
+       return 0;
 }
 
 
@@ -71,12 +71,11 @@ 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)
@@ -89,13 +88,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