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

diff --git a/source/part.cpp b/source/part.cpp
index 7eb19c7..aacc52a 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;
@@ -10,28 +11,26 @@ namespace GLtk {
 
 Part::Part(const string &n):
 	name(n)
-{
-	for(unsigned i=0; i<N_STATES_; ++i)
-		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 &parent, State state) const
+void Part::build(const Geometry &parent, State state, PartCache &cache) const
 {
-	if(!graphic[state])
+	if(!graphic[state] || !graphic[state]->get_texture())
 		return;
 
 	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.create_mesh(*this, *graphic[state]->get_texture()));
+	bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
+	graphic[state]->build(rgeom.w, rgeom.h, bld);
 }
 
 
@@ -45,7 +44,7 @@ Part::Loader::Loader(Part &p, Resources &r):
 	add("size",    &Loader::size);
 }
 
-Part::Loader::~Loader()
+void Part::Loader::finish()
 {
 	for(unsigned i=0; i<N_STATES_; ++i)
 		if(obj.graphic[i])
@@ -57,9 +56,14 @@ Part::Loader::~Loader()
 		}
 }
 
+void Part::Loader::graphic_normal(const string &n)
+{
+	graphic(NORMAL, n);
+}
+
 void Part::Loader::graphic(State s, const string &n)
 {
-	Graphic *grph = get_collection().get<Graphic>(n);
+	Graphic *grph = (n.empty() ? nullptr : &get_collection().get<Graphic>(n));
 	for(int i=0; i<N_STATES_; ++i)
 		if((i&s)==s)
 			obj.graphic[i] = grph;