Some renaming for windows compiler

This commit is contained in:
Clément Brisset 2015-06-05 13:23:58 +01:00
parent 94ba84a84c
commit f19c0d8eec
2 changed files with 15 additions and 15 deletions

View file

@ -241,9 +241,9 @@ template <> void render::jobRun(const DrawOpaque& job, const SceneContextPointer
ItemIDs culledItems; ItemIDs culledItems;
if (renderContext->_cullOpaque) { if (renderContext->_cullOpaque) {
renderDetails.pointTo(RenderDetails::OPAQUE); renderDetails.pointTo(RenderDetails::OPAQUE_ITEM);
cullItems(sceneContext, renderContext, renderedItems, culledItems); cullItems(sceneContext, renderContext, renderedItems, culledItems);
renderDetails.pointTo(RenderDetails::OTHER); renderDetails.pointTo(RenderDetails::OTHER_ITEM);
renderedItems = culledItems; renderedItems = culledItems;
} }
@ -307,9 +307,9 @@ template <> void render::jobRun(const DrawTransparent& job, const SceneContextPo
ItemIDs culledItems; ItemIDs culledItems;
if (renderContext->_cullTransparent) { if (renderContext->_cullTransparent) {
renderDetails.pointTo(RenderDetails::TRANSLUCENT); renderDetails.pointTo(RenderDetails::TRANSLUCENT_ITEM);
cullItems(sceneContext, renderContext, inItems, culledItems); cullItems(sceneContext, renderContext, inItems, culledItems);
renderDetails.pointTo(RenderDetails::OTHER); renderDetails.pointTo(RenderDetails::OTHER_ITEM);
renderedItems = culledItems; renderedItems = culledItems;
} }

View file

@ -25,12 +25,12 @@ class Context;
class RenderDetails { class RenderDetails {
public: public:
enum Type { enum Type {
OPAQUE, OPAQUE_ITEM,
TRANSLUCENT, TRANSLUCENT_ITEM,
OTHER OTHER_ITEM
}; };
struct Items { struct Item {
int _considered = 0; int _considered = 0;
int _rendered = 0; int _rendered = 0;
int _outOfView = 0; int _outOfView = 0;
@ -41,21 +41,21 @@ public:
int _trianglesRendered = 0; int _trianglesRendered = 0;
int _quadsRendered = 0; int _quadsRendered = 0;
Items _opaque; Item _opaque;
Items _translucent; Item _translucent;
Items _other; Item _other;
Items* _item = &_other; Item* _item = &_other;
void pointTo(Type type) { void pointTo(Type type) {
switch (type) { switch (type) {
case OPAQUE: case OPAQUE_ITEM:
_item = &_opaque; _item = &_opaque;
break; break;
case TRANSLUCENT: case TRANSLUCENT_ITEM:
_item = &_translucent; _item = &_translucent;
break; break;
case OTHER: case OTHER_ITEM:
_item = &_other; _item = &_other;
break; break;
} }