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

diff --git a/source/graphic.h b/source/graphic.h
index 16d8cf4..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,39 +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();
 	};
 
-	struct Sides
-	{
-		class Loader: public Parser::Loader
-		{
-		public:
-			Loader(Sides &);
-			Sides &get_object() { return sides; }
-		private:
-			Sides &sides;
-		};
-
-		unsigned top;
-		unsigned right;
-		unsigned bottom;
-		unsigned left;
-
-		Sides();
-	};
-
-	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; }
@@ -53,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;