X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=f0ee4b920a226bd2108bd946523ae92cf4550447;hb=b30edd979e6e9c7acfaaf3a90903814a7e62a71e;hp=7eb19c7755f3a006bc7a81bc31d5c6841ce66361;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index 7eb19c7..f0ee4b9 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -1,6 +1,7 @@
-#include <msp/gl/transform.h>
+#include <msp/gl/meshbuilder.h>
 #include "geometry.h"
 #include "part.h"
+#include "partcache.h"
 #include "resources.h"
 
 using namespace std;
@@ -11,27 +12,33 @@ namespace GLtk {
 Part::Part(const string &n):
 	name(n)
 {
-	for(unsigned i=0; i<N_STATES_; ++i)
-		graphic[i] = 0;
+	fill(graphic, graphic+N_STATES_, static_cast<Graphic *>(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 &parent, State state) const
+void Part::build(const Geometry &parent, State state, CachedPart &cache) const
 {
 	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::translate(rgeom.x, rgeom.y, 0);
-	graphic[state]->render(rgeom.w, rgeom.h);
+	GL::MeshBuilder bld(*cache.mesh);
+	bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+	graphic[state]->build(rgeom.w, rgeom.h, bld);
 }
 
 
@@ -59,7 +66,7 @@ Part::Loader::~Loader()
 
 void Part::Loader::graphic(State s, const string &n)
 {
-	Graphic *grph = get_collection().get<Graphic>(n);
+	Graphic *grph = &get_collection().get<Graphic>(n);
 	for(int i=0; i<N_STATES_; ++i)
 		if((i&s)==s)
 			obj.graphic[i] = grph;