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 a92e7208ca6883015cd978eb5c9218700538faec..72c8921b1c03663181645623ac8485386afe83e8 100644 (file)
--- 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;
@@ -16,83 +10,88 @@ namespace Msp {
 namespace GLtk {
 
 Part::Part(const string &n):
-       name(n),
-       fill_x(true),
-       fill_y(true)
+       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, PartCache &cache) const
 {
-       if(!graphic[state])
+       if(!graphic[state] || !graphic[state]->get_texture())
                return;
 
-       Geometry rgeom=geom;
-       if(fill_x)
-               rgeom.w=parent.w-margin.left-margin.right;
-       if(fill_y)
-               rgeom.h=parent.h-margin.bottom-margin.top;
+       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);
 }
 
 
 Part::Loader::Loader(Part &p, Resources &r):
-       part(p),
-       res(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(part.graphic[i])
+               if(obj.graphic[i])
                {
-                       const Sides &shadow=part.graphic[i]->get_shadow();
-                       part.geom.w=max(part.geom.w, part.graphic[i]->get_width()-shadow.left-shadow.right);
-                       part.geom.h=max(part.geom.h, part.graphic[i]->get_height()-shadow.bottom-shadow.top);
+                       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);
                }
-               else
-                       part.graphic[i]=part.graphic[NORMAL];
-       }
+}
+
+void Part::Loader::graphic_normal(const string &n)
+{
+       graphic(NORMAL, n);
 }
 
 void Part::Loader::graphic(State s, const string &n)
 {
-       part.graphic[s]=res.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;
 }
 
 void Part::Loader::align(float x, float y)
 {
-       part.align.x=x;
-       part.align.y=y;
+       obj.align.x = x;
+       obj.align.y = y;
 }
 
-void Part::Loader::fill(bool x, bool y)
+void Part::Loader::fill(float w, float h)
 {
-       part.fill_x=x;
-       part.fill_y=y;
+       obj.align.w = w;
+       obj.align.h = h;
 }
 
 void Part::Loader::margin()
 {
-       load_sub(part.margin);
+       load_sub(obj.margin);
+}
+
+void Part::Loader::size(unsigned w, unsigned h)
+{
+       obj.geom.w = w;
+       obj.geom.h = h;
 }
 
 } // namespace GLtk