X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.h;h=87b8364148053581d142070d274fe24439f1e47c;hb=999cd0294889e5eecd61df18a697d2c55ed6c0d6;hp=c12215c04eb9c72095a22f55b7f921e36ee03607;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/resources.h b/source/resources.h
index c12215c..87b8364 100644
--- a/source/resources.h
+++ b/source/resources.h
@@ -1,17 +1,11 @@
-/* $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/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 "style.h"
 
@@ -24,10 +18,6 @@ instance in constructor.
 */
 class Resources: public DataFile::Collection
 {
-private:
-	Path path;
-	GL::Font *default_font;
-
 public:
 	class Loader: public Collection::Loader
 	{
@@ -39,15 +29,24 @@ 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;
+	DataFile::DirectorySource *dir_src;
+
+public:
 	Resources();
+	Resources(const FS::Path &);
+private:
+	void init();
+public:
+	~Resources();
 
-	void set_path(const Path &);
 	const GL::Font &get_default_font() const;
+
 private:
-	GL::Font *create_font(const std::string &);
 	GL::Texture2D *create_texture(const std::string &);
 };