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

diff --git a/source/graphic.h b/source/graphic.h
index 16d8cf4..32a0686 100644
--- a/source/graphic.h
+++ b/source/graphic.h
@@ -1,64 +1,52 @@
 #ifndef MSP_GLTK_GRAPHIC_H_
 #define MSP_GLTK_GRAPHIC_H_
 
+#include <msp/gl/primitivebuilder.h>
 #include <msp/gl/texture2d.h>
-#include <msp/parser/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
 
 class Resources;
 
-class Graphic
+/**
+Stores a single graphical element.  Graphics are used as parts of widgets.
+*/
+class MSPGLTK_API Graphic
 {
 public:
-	class Loader: public Parser::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Graphic, Resources>
 	{
 	public:
-		Loader(Graphic &);
-	private:
-		Graphic &graph;
+		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();
-	};
+private:
+	Sides border;
+	Sides shadow;
+	const GL::Texture2D *texture = nullptr;
+	Geometry slice;
+	bool repeat = false;
 
-	Graphic(const Resources &, const std::string &);
+public:
 	const Sides &get_border() const { return border; }
 	const Sides &get_shadow() const { return shadow; }
 	const GL::Texture2D *get_texture() const { return texture; }
 	unsigned get_width() const  { return slice.w; }
 	unsigned get_height() const { return slice.h; }
-	void render(unsigned, unsigned) const;
+	void build(unsigned, unsigned, GL::PrimitiveBuilder &) const;
 private:
-	const Resources &res;
-	std::string name;
-	Sides border;
-	Sides shadow;
-	const GL::Texture2D *texture;
-	Geometry slice;
+	void create_coords(float, float, float, float, float, std::vector<float> &) const;
+	void create_texcoords(float, float, float, float, float, std::vector<float> &) const;
 };
 
 } // namespace GLtk