Do not clear previous assignments on assignment to array subscript

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

diff --git a/source/technique.h b/source/technique.h
index ad988c2763c412f35d6d471151e5e97a60ca7cbe..f80e2f6144e0f59d32bade49829c721df5b15d27 100644 (file)
--- a/source/technique.h
+++ b/source/technique.h
@@ -1,5 +1,5 @@
-#ifndef TECHNIQUE_H_
-#define TECHNIQUE_H_
+#ifndef MSP_GL_TECHNIQUE_H_
+#define MSP_GL_TECHNIQUE_H_
 
 #include "renderpass.h"
 #include "tag.h"
@@ -11,6 +11,7 @@ class Material;
 class Texture;
 
 /**
+Ties multiple tagged render passes together.
 */
 class Technique
 {
@@ -32,9 +33,11 @@ private:
        {
        public:
                InheritLoader(Technique &, Collection &);
-       
+
        private:
+               void material(const std::string &, const std::string &);
                void texture(const std::string &, const std::string &);
+               void uniforms();
        };
 
 public:
@@ -44,10 +47,13 @@ private:
        PassMap passes;
 
 public:
-       RenderPass &add_pass(const GL::Tag &);
-       bool has_pass(const GL::Tag &) const;
-       const RenderPass &get_pass(const GL::Tag &) const;
+       RenderPass &add_pass(const Tag &);
+       bool has_pass(const Tag &) const;
+       const RenderPass &get_pass(const Tag &) const;
        const PassMap &get_passes() const { return passes; }
+       bool replace_texture(const std::string &, const Texture &);
+       bool replace_material(const std::string &, const Material &);
+       bool replace_uniforms(const ProgramData &);
        bool has_shaders() const;
 };