diff --git a/include/Nazara/Renderer/Enums.hpp b/include/Nazara/Renderer/Enums.hpp index 92acfecf0..a5760a454 100644 --- a/include/Nazara/Renderer/Enums.hpp +++ b/include/Nazara/Renderer/Enums.hpp @@ -33,15 +33,6 @@ enum nzBlendFunc nzBlendFunc_Max = nzBlendFunc_Zero }; -enum nzFaceCulling -{ - nzFaceCulling_Back, - nzFaceCulling_Front, - nzFaceCulling_FrontAndBack, - - nzFaceCulling_Max = nzFaceCulling_FrontAndBack -}; - enum nzFaceFilling { nzFaceFilling_Point, @@ -51,6 +42,15 @@ enum nzFaceFilling nzFaceFilling_Max = nzFaceFilling_Fill }; +enum nzFaceSide +{ + nzFaceSide_Back, + nzFaceSide_Front, + nzFaceSide_FrontAndBack, + + nzFaceSide_Max = nzFaceSide_FrontAndBack +}; + enum nzGpuQueryCondition { nzGpuQueryCondition_Region_NoWait, diff --git a/include/Nazara/Renderer/Renderer.hpp b/include/Nazara/Renderer/Renderer.hpp index b7f040d9a..e7b8f34b4 100644 --- a/include/Nazara/Renderer/Renderer.hpp +++ b/include/Nazara/Renderer/Renderer.hpp @@ -79,7 +79,7 @@ class NAZARA_API NzRenderer static void SetClearDepth(double depth); static void SetClearStencil(unsigned int value); static void SetDepthFunc(nzRendererComparison compareFunc); - static void SetFaceCulling(nzFaceCulling cullingMode); + static void SetFaceCulling(nzFaceSide faceSide); static void SetFaceFilling(nzFaceFilling fillingMode); static void SetIndexBuffer(const NzIndexBuffer* indexBuffer); static void SetLineWidth(float size); diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index 8c8ec834b..c1a06248f 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -886,17 +886,17 @@ void NzRenderer::SetDepthFunc(nzRendererComparison compareFunc) s_states.depthFunc = compareFunc; } -void NzRenderer::SetFaceCulling(nzFaceCulling cullingMode) +void NzRenderer::SetFaceCulling(nzFaceSide faceSide) { #ifdef NAZARA_DEBUG - if (cullingMode > nzFaceCulling_Max) + if (faceSide > nzFaceSide_Max) { - NazaraError("Face culling out of enum"); + NazaraError("Face side out of enum"); return; } #endif - s_states.faceCulling = cullingMode; + s_states.faceCulling = faceSide; } void NzRenderer::SetFaceFilling(nzFaceFilling fillingMode)