Rename "renderable" to "content" in Effects and Scenes

[libs/gl.git] / source / render / occludedscene.cpp

diff --git a/source/render/occludedscene.cpp b/source/render/occludedscene.cpp
index bfe17349fd13ee836234c9297ec5476e6039d9f7..0d8a5b857698d17d3a67e91e2367d674424eec05 100644 (file)
--- a/source/render/occludedscene.cpp
+++ b/source/render/occludedscene.cpp
@@ -21,20 +21,20 @@ OccludedScene::OccludedScene():
 
 void OccludedScene::add(Renderable &r)
 {
-       auto i = lower_bound(renderables, &r);
-       if(i==renderables.end() || *i!=&r)
+       auto i = lower_bound(content, &r);
+       if(i==content.end() || *i!=&r)
        {
-               renderables.insert(i, &r);
+               content.insert(i, &r);
                cache_dirty = true;
        }
 }
 
 void OccludedScene::remove(Renderable &r)
 {
-       auto i = lower_bound(renderables, &r);
-       if(i!=renderables.end() && *i==&r)
+       auto i = lower_bound(content, &r);
+       if(i!=content.end() && *i==&r)
        {
-               renderables.erase(i);
+               content.erase(i);
                cache_dirty = true;
        }
 }
@@ -44,13 +44,13 @@ void OccludedScene::populate_cache() const
        if(!cache_dirty)
                return;
 
-       if(queries.get_size()<renderables.size())
-               queries.resize(renderables.size());
-       if(occluded_cache.size()<renderables.size())
-               occluded_cache.resize(renderables.size());
+       if(queries.get_size()<content.size())
+               queries.resize(content.size());
+       if(occluded_cache.size()<content.size())
+               occluded_cache.resize(content.size());
 
        auto j = occluded_cache.begin();
-       for(Renderable *r: renderables)
+       for(Renderable *r: content)
                j++->renderable = r;
        for(; j!=occluded_cache.end(); ++j)
        {
@@ -76,7 +76,7 @@ void OccludedScene::finish_frame()
 
 void OccludedScene::render(Renderer &renderer, Tag tag) const
 {
-       if(renderables.empty())
+       if(content.empty())
                return;
 
        populate_cache();
@@ -119,7 +119,7 @@ void OccludedScene::render(Renderer &renderer, Tag tag) const
        }
 
        // Move all objects within the frustum to the beginning of the array
-       for(auto i=occluded_cache.begin(), j=i+renderables.size()-1; i!=j; )
+       for(auto i=occluded_cache.begin(), j=i+content.size()-1; i!=j; )
        {
                if(i->in_frustum)
                        ++i;