X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=7037d4b3384374568bc662a9edc1df3299776ba3;hb=815194201203afd6fa59e650e1007a355c829544;hp=38e75d7c034d4526f08662ec732deb7d8493f83d;hpb=c1f038acb91eb3bfaa34dfd4729d19ed3f871a42;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index 38e75d7..7037d4b 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -1,5 +1,7 @@
+#include <msp/gl/meshbuilder.h>
 #include "geometry.h"
 #include "part.h"
+#include "partcache.h"
 #include "resources.h"
 
 using namespace std;
@@ -7,63 +9,91 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Part::Part(const Resources &r, const string &n):
-	res(r),
-	name(n),
-	fill_x(true),
-	fill_y(true)
+Part::Part(const string &n):
+	name(n)
 {
 	for(unsigned i=0; i<N_STATES_; ++i)
-		graphic[i]=0;
+		graphic[i] = 0;
 }
 
 const Graphic *Part::get_graphic(State state) const
 {
 	if(state>N_STATES_)
-		throw InvalidParameterValue("Invalid state");
+		throw invalid_argument("Part::get_graphic");
 
 	return graphic[state];
 }
 
-void Part::render(const Geometry &geom, State state) const
+void Part::build(const Geometry &parent, State state, CachedPart &cache) const
 {
-	const Graphic::Sides &shadow=graphic[state]->get_shadow();
-	unsigned gw=(fill_x ? geom.w : graphic[state]->get_width())-shadow.left-shadow.right;
-	unsigned gh=(fill_y ? geom.h : graphic[state]->get_height())-shadow.top-shadow.bottom;
-	align.apply(geom, gw, gh);
-	graphic[state]->render(gw, gh);
+	if(!graphic[state])
+	{
+		cache.texture = 0;
+		return;
+	}
+
+	cache.texture = graphic[state]->get_texture();
+	cache.clear_mesh();
+
+	Geometry rgeom = geom;
+	align.apply(rgeom, parent, margin);
+	GL::MeshBuilder bld(*cache.mesh);
+	bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+	graphic[state]->build(rgeom.w, rgeom.h, bld);
 }
 
 
-Part::Loader::Loader(Part &p):
-	part(p)
+Part::Loader::Loader(Part &p, Resources &r):
+	DataFile::CollectionObjectLoader<Part>(p, &r)
 {
 	add("graphic", &Loader::graphic);
 	add("align",   &Loader::align);
 	add("fill",    &Loader::fill);
+	add("margin",  &Loader::margin);
+	add("size",    &Loader::size);
+}
+
+Part::Loader::~Loader()
+{
+	for(unsigned i=0; i<N_STATES_; ++i)
+		if(obj.graphic[i])
+		{
+			const Graphic &grph = *obj.graphic[i];
+			const Sides &shadow = grph.get_shadow();
+			obj.geom.w = max(obj.geom.w, grph.get_width()-shadow.left-shadow.right);
+			obj.geom.h = max(obj.geom.h, grph.get_height()-shadow.bottom-shadow.top);
+		}
 }
 
 void Part::Loader::graphic(State s, const string &n)
 {
-	part.graphic[s]=&part.res.get_graphic(n);
-	if(s==NORMAL)
-	{
-		for(unsigned i=0; i<N_STATES_; ++i)
-			if(!part.graphic[i])
-				part.graphic[i]=part.graphic[s];
-	}
+	Graphic *grph = &get_collection().get<Graphic>(n);
+	for(int i=0; i<N_STATES_; ++i)
+		if((i&s)==s)
+			obj.graphic[i] = grph;
+}
+
+void Part::Loader::align(float x, float y)
+{
+	obj.align.x = x;
+	obj.align.y = y;
+}
+
+void Part::Loader::fill(float w, float h)
+{
+	obj.align.w = w;
+	obj.align.h = h;
 }
 
-void Part::Loader::align(int x, int y)
+void Part::Loader::margin()
 {
-	part.align.x=x;
-	part.align.y=y;
+	load_sub(obj.margin);
 }
 
-void Part::Loader::fill(bool x, bool y)
+void Part::Loader::size(unsigned w, unsigned h)
 {
-	part.fill_x=x;
-	part.fill_y=y;
+	obj.geom.w = w;
+	obj.geom.h = h;
 }
 
 } // namespace GLtk