X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftechnique.cpp;h=9d13a8976ac4b40f56f077b4a4fcf5120bdea4f1;hb=249ce48a66074d0f0b6e23caeb77fad7c3d238ae;hp=74505c8e0b15ce6d457cf08369592c2e8084bfa8;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git diff --git a/source/technique.cpp b/source/technique.cpp index 74505c8e..9d13a897 100644 --- a/source/technique.cpp +++ b/source/technique.cpp @@ -20,6 +20,14 @@ using namespace std; namespace Msp { namespace GL { +RenderPass &Technique::add_pass(const GL::Tag &tag) +{ + if(passes.count(tag)) + throw KeyError("Duplicate pass"); + + return passes[tag]; +} + bool Technique::has_pass(const GL::Tag &tag) const { return passes.count(tag); @@ -80,14 +88,14 @@ Technique::InheritLoader::InheritLoader(Technique &t, Collection &c): add("texture", &InheritLoader::texture); } -void Technique::InheritLoader::texture(const string &slot, const string &name) +void Technique::InheritLoader::texture(unsigned index, const string &name) { Texture *tex = get_collection().get(name); for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i) { try { - i->second.set_texture(slot, tex); + i->second.set_texture(index, tex); } catch(const KeyError &) { }