Use nullptr instead of 0 for pointers

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

diff --git a/source/resources.h b/source/resources.h
index 87b8364148053581d142070d274fe24439f1e47c..6a1c603c050766487a27995270c65d136f55ba91 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -2,11 +2,15 @@
 #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 "mspgltk_api.h"
 #include "style.h"
 
 namespace Msp {
@@ -16,7 +20,7 @@ namespace GLtk {
 Stores resources such as styles and graphics.  All widgets require a Resources
 instance in constructor.
 */
-class Resources: public DataFile::Collection
+class MSPGLTK_API Resources: public DataFile::Collection
 {
 public:
        class Loader: public Collection::Loader
@@ -33,20 +37,21 @@ public:
 
 private:
        FS::Path path;
-       GL::Font *default_font;
-       DataFile::DirectorySource *dir_src;
+       GL::Font *default_font = nullptr;
+       DataFile::DirectorySource *dir_src = nullptr;
 
 public:
        Resources();
        Resources(const FS::Path &);
-private:
-       void init();
-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 &);
 };