X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphic.h;h=a9722ad97ff3e498187fffae3ff229a4654e66ae;hb=be8ea35fe6eabe4c68d2d337634f21c63c964265;hp=f4cc907223a3ea6fd9a009fefb0f4b0013bbd6f9;hpb=c062ca892fc6e10f74a76991b5d4b4349c046b5f;p=libs%2Fgltk.git

diff --git a/source/graphic.h b/source/graphic.h
index f4cc907..a9722ad 100644
--- a/source/graphic.h
+++ b/source/graphic.h
@@ -2,7 +2,7 @@
 #define MSP_GLTK_GRAPHIC_H_
 
 #include <msp/gl/texture2d.h>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "geometry.h"
 
 namespace Msp {
@@ -13,20 +13,24 @@ class Resources;
 class Graphic
 {
 public:
-	class Loader: public Parser::Loader
+	class Loader: public DataFile::Loader
 	{
-	public:
-		Loader(Graphic &);
 	private:
 		Graphic &graph;
+		Resources &res;
+
+	public:
+		typedef Resources Collection;
 
+		Loader(Graphic &, Resources &);
+	private:
 		void texture(const std::string &);
 		void slice(unsigned, unsigned, unsigned, unsigned);
 		void border();
 		void shadow();
 	};
 
-	Graphic(const Resources &, const std::string &);
+	Graphic();
 	const Sides &get_border() const { return border; }
 	const Sides &get_shadow() const { return shadow; }
 	const GL::Texture2D *get_texture() const { return texture; }
@@ -34,8 +38,6 @@ public:
 	unsigned get_height() const { return slice.h; }
 	void render(unsigned, unsigned) const;
 private:
-	const Resources &res;
-	std::string name;
 	Sides border;
 	Sides shadow;
 	const GL::Texture2D *texture;