Simplify constructors with C++11

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

diff --git a/source/resources.h b/source/resources.h
index 3d39393bac979b144f54d152d73dc69563355c5e..1fd030d03438674510ac66e7cb6c49e13cfca5df 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -2,21 +2,26 @@
 #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/path/path.h>
+#include <msp/datafile/directorysource.h>
+#include <msp/fs/path.h>
 #include "graphic.h"
+#include "mspgltk_api.h"
 #include "style.h"
 
 namespace Msp {
 namespace GLtk {
 
-class Resources: public DataFile::Collection
+/**
+Stores resources such as styles and graphics.  All widgets require a Resources
+instance in constructor.
+*/
+class MSPGLTK_API Resources: public DataFile::Collection
 {
-private:
-       Path path;
-       GL::Font *default_font;
-
 public:
        class Loader: public Collection::Loader
        {
@@ -30,12 +35,23 @@ public:
                void font(const std::string &);
        };
 
+private:
+       FS::Path path;
+       GL::Font *default_font = 0;
+       DataFile::DirectorySource *dir_src = 0;
+
+public:
        Resources();
+       Resources(const FS::Path &);
+       ~Resources();
 
-       void set_path(const 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 &);
 };