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 d83c2087543e75c1e6371f0c74cd6a7cdc6d0e2b..772b72958735a6d34379ff3129204ab11249c27e 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -2,6 +2,9 @@
 #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>
@@ -18,11 +21,6 @@ instance in constructor.
 */
 class Resources: public DataFile::Collection
 {
-private:
-       FS::Path path;
-       GL::Font *default_font;
-       DataFile::DirectorySource *dir_src;
-
 public:
        class Loader: public Collection::Loader
        {
@@ -36,6 +34,11 @@ public:
                void font(const std::string &);
        };
 
+private:
+       FS::Path path;
+       GL::Font *default_font;
+       DataFile::DirectorySource *dir_src;
+
 public:
        Resources();
        Resources(const FS::Path &);
@@ -45,8 +48,12 @@ public:
        ~Resources();
 
        const GL::Font &get_default_font() const;
+       const GL::Sampler &get_default_sampler() const;
 
 private:
+       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 &);
 };