Adjust things to conform to changes in other libraries

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

diff --git a/source/resources.h b/source/resources.h
index c61d38abdffac50070c6019add97cbcdbbcf5617..772b72958735a6d34379ff3129204ab11249c27e 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -1,16 +1,13 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_RESOURCES_H_
 #define MSP_GLTK_RESOURCES_H_
 
 #include <msp/gl/font.h>
+#include <msp/gl/module.h>
+#include <msp/gl/program.h>
+#include <msp/gl/sampler.h>
 #include <msp/gl/texture.h>
 #include <msp/datafile/collection.h>
+#include <msp/datafile/directorysource.h>
 #include <msp/fs/path.h>
 #include "graphic.h"
 #include "style.h"
@@ -24,10 +21,6 @@ instance in constructor.
 */
 class Resources: public DataFile::Collection
 {
-private:
-       FS::Path path;
-       GL::Font *default_font;
-
 public:
        class Loader: public Collection::Loader
        {
@@ -39,15 +32,28 @@ public:
        private:
                void default_font(const std::string &);
                void font(const std::string &);
-               void style(const std::string &);
        };
 
+private:
+       FS::Path path;
+       GL::Font *default_font;
+       DataFile::DirectorySource *dir_src;
+
+public:
        Resources();
+       Resources(const FS::Path &);
+private:
+       void init();
+public:
+       ~Resources();
 
-       void set_path(const FS::Path &);
        const GL::Font &get_default_font() const;
+       const GL::Sampler &get_default_sampler() const;
+
 private:
-       GL::Font *create_font(const std::string &);
+       GL::Module *create_module(const std::string &);
+       GL::Program *create_program(const std::string &);
+       GL::Sampler *create_sampler(const std::string &);
        GL::Texture2D *create_texture(const std::string &);
 };