From c6b20da8b5141c2c83f27ed79e747dcc41475496 Mon Sep 17 00:00:00 2001 From: samcake Date: Fri, 22 May 2015 13:12:03 -0700 Subject: [PATCH] fix typos --- libraries/render/src/render/DrawTask.cpp | 16 +++++++--------- libraries/render/src/render/Scene.h | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp index c97b3e43c2..f44291ea15 100755 --- a/libraries/render/src/render/DrawTask.cpp +++ b/libraries/render/src/render/DrawTask.cpp @@ -25,17 +25,15 @@ void DrawSceneTask::run(const SceneContextPointer& sceneContext) { } auto scene = sceneContext->_scene; - auto itemBucketMap = scene->getMasterBucketMap(); + auto itemBucketMap = scene->getMasterBucket(); + RenderArgs args; // render opaques - auto& opaqueShapeItems = itemBucketMap.find(ItemKey::Builder().withTypeShape().build()); - if (opaqueShapeItems != itemBucketMap.end()) { - - for (auto id : opaqueShapeItems.second) { - auto item = scene->getItem(id); - item.render() - } + auto& opaqueShapeItems = itemBucketMap[ItemFilter::Builder::opaqueShape()]; + + for (auto id : opaqueShapeItems) { + auto item = scene->getItem(id); + item.render(&args); } - }; diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h index 921bad3bbf..5d33d74fca 100644 --- a/libraries/render/src/render/Scene.h +++ b/libraries/render/src/render/Scene.h @@ -144,7 +144,7 @@ public: class Less { public: - bool operator() (const ItemFilter& left, const ItemFilter& right) { + bool operator() (const ItemFilter& left, const ItemFilter& right) const { if (left._value.to_ulong() > right._value.to_ulong()) { return left._mask.to_ulong() < right._mask.to_ulong(); } else {