Rename Effect::enabled_passes to enabled_methods

diff --git a/source/effects/effect.cpp b/source/effects/effect.cpp
index 584117e74533e3a629aa5746ae3adc27f8da1a6a..4ab867ff23f538a0a52fbb08e4dbe0dc750691be 100644 (file)
--- a/source/effects/effect.cpp
+++ b/source/effects/effect.cpp
@@ -6,17 +6,17 @@ namespace GL {
 Effect::Effect(Renderable &r):
        renderable(r)
 {
-       enabled_passes.insert(Tag());
+       enabled_methods.insert(Tag());
 }
 
-void Effect::enable_for_pass(Tag tag)
+void Effect::enable_for_method(Tag tag)
 {
-       enabled_passes.insert(tag);
+       enabled_methods.insert(tag);
 }
 
-void Effect::disable_for_pass(Tag tag)
+void Effect::disable_for_method(Tag tag)
 {
-       enabled_passes.erase(tag);
+       enabled_methods.erase(tag);
 }
 
 } // namespace GL

diff --git a/source/effects/effect.h b/source/effects/effect.h
index d763f251bd473b7b22e58c2230400805442d2fdd..9bf49c22b812a585200a0c28890932dcadadf093 100644 (file)
--- a/source/effects/effect.h
+++ b/source/effects/effect.h
@@ -16,15 +16,15 @@ class Effect: public Renderable
 {
 protected:
        Renderable &renderable;
-       std::set<Tag> enabled_passes;
+       std::set<Tag> enabled_methods;
 
 protected:
        Effect(Renderable &);
 public:
        virtual ~Effect() { }
 
-       void enable_for_pass(Tag);
-       void disable_for_pass(Tag);
+       void enable_for_method(Tag);
+       void disable_for_method(Tag);
 
        virtual const Matrix *get_matrix() const { return renderable.get_matrix(); }
        virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return renderable.get_bounding_sphere(); }

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index bf09085ba862db8b06aac7606dd05a0f41ec0454..782a3d2ab0845b4815520852de8436b8b86c0fb5 100644 (file)
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -165,7 +165,7 @@ void EnvironmentMap::finish_frame()
 
 void EnvironmentMap::render(Renderer &renderer, Tag tag) const
 {
-       if(!enabled_passes.count(tag))
+       if(!enabled_methods.count(tag))
                return renderer.render(renderable, tag);
 
        Renderer::Push _push_rend(renderer);

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index c8c1e6ebd77df30dcdfc77f55d95a55b56a11c9d..6c49f79fc9a70ba1fc97be427197a6054b24651b 100644 (file)
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -250,7 +250,7 @@ void ShadowMap::finish_frame()
 
 void ShadowMap::render(Renderer &renderer, Tag tag) const
 {
-       if(!enabled_passes.count(tag))
+       if(!enabled_methods.count(tag))
                return renderer.render(renderable, tag);
 
        Renderer::Push _push_rend(renderer);