X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.h;h=1fd030d03438674510ac66e7cb6c49e13cfca5df;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hp=8fb2185448b7d20c291b07e3560486a75660e779;hpb=c2635c5a3dca6a6cea5562fd387beb0662b18cf0;p=libs%2Fgltk.git

diff --git a/source/resources.h b/source/resources.h
index 8fb2185..1fd030d 100644
--- a/source/resources.h
+++ b/source/resources.h
@@ -1,18 +1,16 @@
-/* $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/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 {
@@ -22,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:
-	Path path;
-	GL::Font *default_font;
-
 public:
 	class Loader: public Collection::Loader
 	{
@@ -41,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 &);
 };