X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fzsortedscene.cpp;h=25255dc693569a9d34b2adfc7b64f709089af63e;hp=af3c5b86140823968a12cc19cf36a747fe3b5c1c;hb=bdcae47bf2f4e49d2d9e4ba15e6f17171ce5fa0c;hpb=f853ca0a365ae8b43ba8b2f4d6f21cd1c2bd4bd5 diff --git a/source/render/zsortedscene.cpp b/source/render/zsortedscene.cpp index af3c5b86..25255dc6 100644 --- a/source/render/zsortedscene.cpp +++ b/source/render/zsortedscene.cpp @@ -10,10 +10,10 @@ namespace GL { void ZSortedScene::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); if(!sorted_cache.empty()) sorted_cache.push_back(&r); } @@ -21,10 +21,10 @@ void ZSortedScene::add(Renderable &r) void ZSortedScene::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); sorted_cache.clear(); } } @@ -41,10 +41,10 @@ void ZSortedScene::set_reference(DepthReference r) void ZSortedScene::populate_cache() const { - if(sorted_cache.empty() && !renderables.empty()) + if(sorted_cache.empty() && !content.empty()) { - sorted_cache.reserve(renderables.size()); - sorted_cache.insert(sorted_cache.end(), renderables.begin(), renderables.end()); + sorted_cache.reserve(content.size()); + sorted_cache.insert(sorted_cache.end(), content.begin(), content.end()); } } @@ -63,7 +63,7 @@ void ZSortedScene::finish_frame() void ZSortedScene::render(Renderer &renderer, Tag tag) const { - if(renderables.empty()) + if(content.empty()) return; populate_cache();