X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.h;h=6a1c603c050766487a27995270c65d136f55ba91;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=d183fc6c1cd2b94ac03f9401688e13240a27464e;hpb=b51fd94242badcd3807a39c339979f4f358120cd;p=libs%2Fgltk.git

diff --git a/source/resources.h b/source/resources.h
index d183fc6..6a1c603 100644
--- a/source/resources.h
+++ b/source/resources.h
@@ -2,10 +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 {
@@ -15,12 +20,8 @@ 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
 {
-private:
-	FS::Path path;
-	GL::Font *default_font;
-
 public:
 	class Loader: public Collection::Loader
 	{
@@ -32,13 +33,26 @@ 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 = nullptr;
+	DataFile::DirectorySource *dir_src = nullptr;
+
 public:
 	Resources();
+	Resources(const FS::Path &);
+	~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 &);
 };
 
 } // namespace GLtk