sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed missing files from previous commit 

Former-commit-id: 0a757b5cfda97dd6f88d5a17b8dc41329c139d32
This commit is contained in:
Lynix 2013-09-06 18:05:39 +02:00
parent e92f388c65
commit 1ed8ea8ad5
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/Nazara/Renderer/Enums.hpp
View File

@ -33,15 +33,6 @@ enum nzBlendFunc
nzBlendFunc_Max = nzBlendFunc_Zero nzBlendFunc_Max = nzBlendFunc_Zero
}; };
enum nzFaceCulling
{
nzFaceCulling_Back,
nzFaceCulling_Front,
nzFaceCulling_FrontAndBack,
nzFaceCulling_Max = nzFaceCulling_FrontAndBack
};
enum nzFaceFilling enum nzFaceFilling
{ {
nzFaceFilling_Point, nzFaceFilling_Point,
@ -51,6 +42,15 @@ enum nzFaceFilling
nzFaceFilling_Max = nzFaceFilling_Fill nzFaceFilling_Max = nzFaceFilling_Fill
}; };
enum nzFaceSide
{
nzFaceSide_Back,
nzFaceSide_Front,
nzFaceSide_FrontAndBack,
nzFaceSide_Max = nzFaceSide_FrontAndBack
};
enum nzGpuQueryCondition enum nzGpuQueryCondition
{ {
nzGpuQueryCondition_Region_NoWait, nzGpuQueryCondition_Region_NoWait,

2
include/Nazara/Renderer/Renderer.hpp
View File

@ -79,7 +79,7 @@ class NAZARA_API NzRenderer
static void SetClearDepth(double depth); static void SetClearDepth(double depth);
static void SetClearStencil(unsigned int value); static void SetClearStencil(unsigned int value);
static void SetDepthFunc(nzRendererComparison compareFunc); static void SetDepthFunc(nzRendererComparison compareFunc);
static void SetFaceCulling(nzFaceCulling cullingMode); static void SetFaceCulling(nzFaceSide faceSide);
static void SetFaceFilling(nzFaceFilling fillingMode); static void SetFaceFilling(nzFaceFilling fillingMode);
static void SetIndexBuffer(const NzIndexBuffer* indexBuffer); static void SetIndexBuffer(const NzIndexBuffer* indexBuffer);
static void SetLineWidth(float size); static void SetLineWidth(float size);

8
src/Nazara/Renderer/Renderer.cpp
View File

@ -886,17 +886,17 @@ void NzRenderer::SetDepthFunc(nzRendererComparison compareFunc)
s_states.depthFunc = compareFunc; s_states.depthFunc = compareFunc;
} }
void NzRenderer::SetFaceCulling(nzFaceCulling cullingMode) void NzRenderer::SetFaceCulling(nzFaceSide faceSide)
{ {
#ifdef NAZARA_DEBUG #ifdef NAZARA_DEBUG
if (cullingMode > nzFaceCulling_Max) if (faceSide > nzFaceSide_Max)
{ {
NazaraError("Face culling out of enum"); NazaraError("Face side out of enum");
return; return;
} }
#endif #endif
s_states.faceCulling = cullingMode; s_states.faceCulling = faceSide;
} }
void NzRenderer::SetFaceFilling(nzFaceFilling fillingMode) void NzRenderer::SetFaceFilling(nzFaceFilling fillingMode)