Derive Resources from DataFile::Collection

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

diff --git a/source/resources.cpp b/source/resources.cpp
index aad671c393729adc4608d3d6024378bcf44bbe35..650140ba4552f59b066f00cc5677b5d34dfd9734 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -1,4 +1,4 @@
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 #include "resources.h"
 
 using namespace std;
@@ -7,24 +7,20 @@ namespace Msp {
 namespace GLtk {
 
 Resources::Resources():
+       path("."),
        default_font(0)
-{ }
-
-Resources::~Resources()
 {
-       for(FontMap::iterator i=fonts.begin(); i!=fonts.end(); ++i)
-               delete i->second;
-       for(TextureMap::iterator i=textures.begin(); i!=textures.end(); ++i)
-               delete i->second;
+       add_keyword<GL::Font>("font");
+       add_keyword<Graphic>("graphic");
+       add_keyword<Style>("style");
+
+       add_creator(&Resources::create_font);
+       add_creator(&Resources::create_texture);
 }
 
-const GL::Font &Resources::get_font(const string &name) const
+void Resources::set_path(const Path &p)
 {
-       FontMap::const_iterator i=fonts.find(name);
-       if(i==fonts.end())
-               throw KeyError("Unknown font "+name);
-
-       return *i->second;
+       path=p;
 }
 
 const GL::Font &Resources::get_default_font() const
@@ -35,88 +31,38 @@ const GL::Font &Resources::get_default_font() const
        return *default_font;
 }
 
-const GL::Texture2D &Resources::get_texture(const string &name) const
-{
-       TextureMap::const_iterator i=textures.find(name);
-       if(i==textures.end())
-               throw KeyError("Unknown texture "+name);
-
-       return *i->second;
-}
-
-const Graphic &Resources::get_graphic(const string &name) const
+GL::Font *Resources::create_font(const string &name)
 {
-       GraphicMap::const_iterator i=graphics.find(name);
-       if(i==graphics.end())
-               throw KeyError("Unknown graphic "+name);
-
-       return i->second;
+       RefPtr<GL::Font> fnt=new GL::Font;
+       DataFile::load(*fnt, (path/(name+".font")).str());
+       return fnt.release();
 }
 
-const Style &Resources::get_style(const string &wdg, const string &name) const
+GL::Texture2D *Resources::create_texture(const string &name)
 {
-       StyleMap::const_iterator i=styles.find(StyleId(wdg, name));
-       if(i==styles.end())
-               throw KeyError("Unknown style "+name+" for widget "+wdg);
-
-       return i->second;
+       RefPtr<GL::Texture2D> tex=new GL::Texture2D;
+       tex->image((path/(name+".png")).str());
+       tex->set_min_filter(GL::LINEAR);
+       return tex.release();
 }
 
 
 Resources::Loader::Loader(Resources &r):
+       Collection::Loader(r),
        res(r)
 {
-       add("font",    &Loader::font);
-       add("texture", &Loader::texture);
-       add("graphic", &Loader::graphic);
-       add("style",   &Loader::style);
+       add("font", &Loader::font);
 }
 
-void Resources::Loader::font(const string &fn)
+void Resources::Loader::font(const string &name)
 {
        RefPtr<GL::Font> fnt=new GL::Font;
-       DataFile::load(*fnt, fn);
-
-       res.fonts.insert(FontMap::value_type(fn.substr(0, fn.rfind('.')), fnt.get()));
+       load_sub(*fnt);
+       res.add(name, fnt.get());
        if(!res.default_font)
                res.default_font=fnt.get();
        fnt.release();
 }
 
-void Resources::Loader::texture(const string &fn)
-{
-       RefPtr<GL::Texture2D> tex=new GL::Texture2D;
-       tex->image(fn);
-       tex->set_min_filter(GL::LINEAR);
-
-       res.textures.insert(TextureMap::value_type(fn.substr(0, fn.rfind('.')), tex.release()));
-}
-
-void Resources::Loader::graphic(const std::string &n)
-{
-       Graphic graph(res, n);
-       load_sub(graph);
-       if(!graph.get_texture())
-               throw Exception("Graphic without texture");
-
-       res.graphics.insert(GraphicMap::value_type(n, graph));
-}
-
-void Resources::Loader::style(const string &w, const string &n)
-{
-       Style stl(res, w, n);
-       load_sub(stl);
-
-       res.styles.insert(StyleMap::value_type(StyleId(w, n), stl));
-}
-
-
-bool Resources::StyleId::operator<(const StyleId &other) const
-{
-       if(widget<other.widget)
-               return true;
-       return widget==other.widget && name<other.name;
-}
-
 } // namespace GLtk
 } // namespace Msp