Allow materials to be overridden when inheriting a technique

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

diff --git a/source/technique.cpp b/source/technique.cpp
index b809abdebb69fdcf4d1a015473285713d5c297f6..15406a931e10e8a6249434d91a9d7002180efeea 100644 (file)
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -28,6 +28,14 @@ const RenderPass &Technique::get_pass(const GL::Tag &tag) const
        return get_item(passes, tag);
 }
 
+bool Technique::has_shaders() const
+{
+       for(PassMap::const_iterator i=passes.begin(); i!=passes.end(); ++i)
+               if(i->second.get_shader_program())
+                       return true;
+       return false;
+}
+
 
 Technique::Loader::Loader(Technique &t):
        DataFile::CollectionObjectLoader<Technique>(t, 0)
@@ -49,7 +57,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);
 }
@@ -69,18 +77,33 @@ void Technique::Loader::pass(const string &n)
 Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
        DataFile::CollectionObjectLoader<Technique>(t, &c)
 {
+       add("material", &InheritLoader::material);
        add("texture", &InheritLoader::texture);
 }
 
-void Technique::InheritLoader::texture(const std::string &slot, const string &name)
+void Technique::InheritLoader::material(const string &pass_tag, const string &name)
+{
+       RenderPass &pass = get_item(obj.passes, pass_tag);
+       const Material &mat = get_collection().get<Material>(name);
+       if(const Material *base_mat = pass.get_material())
+       {
+               for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
+                       if(i->second.get_material()==base_mat)
+                               i->second.set_material(&mat);
+       }
+       else
+               pass.set_material(&mat);
+}
+
+void Technique::InheritLoader::texture(const string &slot, 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)
        {
                int index = i->second.get_texture_index(slot);
                if(index<0)
                        continue;
-               i->second.set_texture(index, tex);
+               i->second.set_texture(index, &tex);
        }
 }