diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp index 8011b3a715..c0a1639f8b 100755 --- a/libraries/render/src/render/DrawTask.cpp +++ b/libraries/render/src/render/DrawTask.cpp @@ -241,9 +241,9 @@ template <> void render::jobRun(const DrawOpaque& job, const SceneContextPointer ItemIDs culledItems; if (renderContext->_cullOpaque) { - renderDetails.pointTo(RenderDetails::OPAQUE); + renderDetails.pointTo(RenderDetails::OPAQUE_ITEM); cullItems(sceneContext, renderContext, renderedItems, culledItems); - renderDetails.pointTo(RenderDetails::OTHER); + renderDetails.pointTo(RenderDetails::OTHER_ITEM); renderedItems = culledItems; } @@ -307,9 +307,9 @@ template <> void render::jobRun(const DrawTransparent& job, const SceneContextPo ItemIDs culledItems; if (renderContext->_cullTransparent) { - renderDetails.pointTo(RenderDetails::TRANSLUCENT); + renderDetails.pointTo(RenderDetails::TRANSLUCENT_ITEM); cullItems(sceneContext, renderContext, inItems, culledItems); - renderDetails.pointTo(RenderDetails::OTHER); + renderDetails.pointTo(RenderDetails::OTHER_ITEM); renderedItems = culledItems; } diff --git a/libraries/shared/src/RenderArgs.h b/libraries/shared/src/RenderArgs.h index cdfdfb9c5f..84b3a202b4 100644 --- a/libraries/shared/src/RenderArgs.h +++ b/libraries/shared/src/RenderArgs.h @@ -25,12 +25,12 @@ class Context; class RenderDetails { public: enum Type { - OPAQUE, - TRANSLUCENT, - OTHER + OPAQUE_ITEM, + TRANSLUCENT_ITEM, + OTHER_ITEM }; - struct Items { + struct Item { int _considered = 0; int _rendered = 0; int _outOfView = 0; @@ -41,21 +41,21 @@ public: int _trianglesRendered = 0; int _quadsRendered = 0; - Items _opaque; - Items _translucent; - Items _other; + Item _opaque; + Item _translucent; + Item _other; - Items* _item = &_other; + Item* _item = &_other; void pointTo(Type type) { switch (type) { - case OPAQUE: + case OPAQUE_ITEM: _item = &_opaque; break; - case TRANSLUCENT: + case TRANSLUCENT_ITEM: _item = &_translucent; break; - case OTHER: + case OTHER_ITEM: _item = &_other; break; }