Use texture unit numbers instead of slot names in RenderPass

[libs/gl.git] / source / technique.cpp

diff --git a/source/technique.cpp b/source/technique.cpp
index d913f4d1aa490b0264c8f94600c9ed93d571f55d..9cbb005a54b8272bd36ab9e6c2c4f493411fb4cb 100644 (file)
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -27,7 +27,7 @@ bool Technique::has_pass(const GL::Tag &tag) const
 
 const RenderPass &Technique::get_pass(const GL::Tag &tag) const
 {
-       PassMap::const_iterator i=passes.find(tag);
+       PassMap::const_iterator i = passes.find(tag);
        if(i==passes.end())
                throw KeyError("Unknown pass");
        return i->second;
@@ -54,7 +54,7 @@ void Technique::Loader::init()
 
 void Technique::Loader::inherit(const string &n)
 {
-       obj.passes=get_collection().get<Technique>(n)->get_passes();
+       obj.passes = get_collection().get<Technique>(n)->get_passes();
        InheritLoader ldr(obj, get_collection());
        load_sub_with(ldr);
 }
@@ -80,14 +80,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<Texture>(name);
+       Texture *tex = get_collection().get<Texture>(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 &)
                { }