X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=7037d4b3384374568bc662a9edc1df3299776ba3;hb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;hp=f2797f9058ad66fe8633256c286eb3b794fe8cab;hpb=73afd124ab87e8bace98db55517a56c797a9b8c7;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index f2797f9..7037d4b 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#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;
@@ -25,20 +19,27 @@ Part::Part(const string &n):
 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);
 }
 
 
@@ -66,7 +67,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;