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

Renderer/RenderStates: Update RenderStates structure (preparing for renderer update)

Browse Source 
Former-commit-id: 392c7c33ff64d19e0fe3c7bdc8b22fe17c150887 [formerly d12a3c5f664fccebe0ee40a73bb0310e2d02287e]
Former-commit-id: 22743f015567a8471f97cb90a06175f600ef0f8f
This commit is contained in:
Lynix
2016-07-21 23:00:09 +02:00
parent 31bc8604a4
commit 56443c91e4
17 changed files with 339 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
include/Nazara/Graphics/Material.inl
View File

@@ -53,7 +53,36 @@ namespace Nz
{
NazaraAssert(renderParameter <= RendererParameter_Max, "Renderer parameter out of enum");
m_states.parameters[renderParameter] = enable;
switch (renderParameter)
{
case RendererParameter_Blend:
m_states.blending = enable;
return;
case RendererParameter_ColorWrite:
m_states.colorWrite = enable;
return;
case RendererParameter_DepthBuffer:
m_states.depthBuffer = enable;
return;
case RendererParameter_DepthWrite:
m_states.depthWrite = enable;
return;
case RendererParameter_FaceCulling:
m_states.faceCulling = enable;
return;
case RendererParameter_ScissorTest:
m_states.scissorTest = enable;
return;
case RendererParameter_StencilTest:
m_states.stencilTest = enable;
return;
}
}
/*!
@@ -257,7 +286,7 @@ namespace Nz
inline FaceSide Material::GetFaceCulling() const
{
return m_states.faceCulling;
return m_states.cullingSide;
}
/*!
@@ -489,7 +518,32 @@ namespace Nz
{
NazaraAssert(parameter <= RendererParameter_Max, "Renderer parameter out of enum");
return m_states.parameters[parameter];
switch (parameter)
{
case RendererParameter_Blend:
return m_states.blending;
case RendererParameter_ColorWrite:
return m_states.colorWrite;
case RendererParameter_DepthBuffer:
return m_states.depthBuffer;
case RendererParameter_DepthWrite:
return m_states.depthWrite;
case RendererParameter_FaceCulling:
return m_states.faceCulling;
case RendererParameter_ScissorTest:
return m_states.scissorTest;
case RendererParameter_StencilTest:
return m_states.stencilTest;
}
NazaraInternalError("Unhandled renderer parameter: 0x" + String::Number(parameter, 16));
return false;
}
/*!
@@ -778,7 +832,7 @@ namespace Nz
inline void Material::SetFaceCulling(FaceSide faceSide)
{
m_states.faceCulling = faceSide;
m_states.cullingSide = faceSide;
}
/*!