Allow an empty graphic to be specified in part definitions

[libs/gltk.git] / source / part.cpp

diff --git a/source/part.cpp b/source/part.cpp
index 127397924f19cf5039b2fe8f1b34df780be8ed8f..72c8921b1c03663181645623ac8485386afe83e8 100644 (file)
--- 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,8 +12,7 @@ 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
@@ -23,15 +23,16 @@ const Graphic *Part::get_graphic(State state) const
        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.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+       graphic[state]->build(rgeom.w, rgeom.h, bld);
 }
 
 
@@ -57,9 +58,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() ? 0 : &get_collection().get<Graphic>(n));
        for(int i=0; i<N_STATES_; ++i)
                if((i&s)==s)
                        obj.graphic[i] = grph;