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

Added matrices inverse to Renderer uniforms 

Former-commit-id: 06333817aa0537e6dae80f8c72061f206023256a
This commit is contained in:
Lynix 2013-08-28 03:07:17 +02:00
parent b1cd99a08b
commit 00fe872f27
3 changed files with 115 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,15 @@ enum nzMatrixType
nzMatrixType_WorldView,
nzMatrixType_WorldViewProj,
nzMatrixType_Max = nzMatrixType_WorldViewProj
// Matrice inversées
nzMatrixType_InvProjection,
nzMatrixType_InvView,
nzMatrixType_InvViewProj,
nzMatrixType_InvWorld,
nzMatrixType_InvWorldView,
nzMatrixType_InvWorldViewProj,
nzMatrixType_Max = nzMatrixType_InvWorldViewProj
};
enum nzPixelBufferType
@ -187,7 +195,13 @@ enum nzShaderTarget
enum nzShaderUniform
{
nzShaderUniform_EyePosition,
nzShaderUniform_InvProjMatrix,
nzShaderUniform_InvTargetSize,
nzShaderUniform_InvViewMatrix,
nzShaderUniform_InvViewProjMatrix,
nzShaderUniform_InvWorldMatrix,
nzShaderUniform_InvWorldViewMatrix,
nzShaderUniform_InvWorldViewProjMatrix,
nzShaderUniform_MaterialAlphaMap,
nzShaderUniform_MaterialAlphaThreshold,
nzShaderUniform_MaterialAmbient,

6
src/Nazara/Renderer/GLSLProgram.cpp
View File

@ -606,7 +606,13 @@ bool NzGLSLProgram::PostLinkage()
#define CacheUniform(name) m_uniformLocations[nzShaderUniform_##name] = GetUniformLocation(#name)
CacheUniform(EyePosition);
CacheUniform(InvProjMatrix);
CacheUniform(InvTargetSize);
CacheUniform(InvViewMatrix);
CacheUniform(InvViewProjMatrix);
CacheUniform(InvWorldMatrix);
CacheUniform(InvWorldViewMatrix);
CacheUniform(InvWorldViewProjMatrix);
CacheUniform(MaterialAlphaMap);
CacheUniform(MaterialAlphaThreshold);
CacheUniform(MaterialAmbient);

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

@ -915,30 +915,53 @@ void NzRenderer::SetMatrix(nzMatrixType type, const NzMatrix4f& matrix)
// Invalidation des combinaisons
switch (type)
{
// Matrices de base
case nzMatrixType_Projection:
s_matrices[nzMatrixType_InvProjection].updated = false;
s_matrices[nzMatrixType_InvViewProj].updated = false;
s_matrices[nzMatrixType_InvWorldViewProj].updated = false;
s_matrices[nzMatrixType_ViewProj].updated = false;
s_matrices[nzMatrixType_WorldViewProj].updated = false;
break;
case nzMatrixType_View:
s_matrices[nzMatrixType_InvView].updated = false;
s_matrices[nzMatrixType_InvViewProj].updated = false;
s_matrices[nzMatrixType_InvWorld].updated = false;
s_matrices[nzMatrixType_InvWorldViewProj].updated = false;
s_matrices[nzMatrixType_ViewProj].updated = false;
s_matrices[nzMatrixType_World].updated = false;
s_matrices[nzMatrixType_WorldViewProj].updated = false;
break;
case nzMatrixType_World:
s_matrices[nzMatrixType_InvWorld].updated = false;
s_matrices[nzMatrixType_InvWorldView].updated = false;
s_matrices[nzMatrixType_InvWorldViewProj].updated = false;
s_matrices[nzMatrixType_WorldView].updated = false;
s_matrices[nzMatrixType_WorldViewProj].updated = false;
break;
// Matrices combinées
case nzMatrixType_ViewProj:
s_matrices[nzMatrixType_InvViewProj].updated = false;
break;
case nzMatrixType_WorldView:
s_matrices[nzMatrixType_InvWorldView].updated = false;
s_matrices[nzMatrixType_WorldViewProj].updated = false;
break;
case nzMatrixType_WorldViewProj:
s_matrices[nzMatrixType_InvWorldViewProj].updated = false;
break;
case nzMatrixType_InvProjection:
case nzMatrixType_InvView:
case nzMatrixType_InvViewProj:
case nzMatrixType_InvWorld:
case nzMatrixType_InvWorldView:
case nzMatrixType_InvWorldViewProj:
break;
}
@ -1265,6 +1288,13 @@ bool NzRenderer::EnsureStateUpdate()
s_matrices[nzMatrixType_WorldView].location = programImpl->GetUniformLocation(nzShaderUniform_WorldViewMatrix);
s_matrices[nzMatrixType_WorldViewProj].location = programImpl->GetUniformLocation(nzShaderUniform_WorldViewProjMatrix);
s_matrices[nzMatrixType_InvProjection].location = programImpl->GetUniformLocation(nzShaderUniform_InvProjMatrix);
s_matrices[nzMatrixType_InvView].location = programImpl->GetUniformLocation(nzShaderUniform_InvViewMatrix);
s_matrices[nzMatrixType_InvViewProj].location = programImpl->GetUniformLocation(nzShaderUniform_InvViewProjMatrix);
s_matrices[nzMatrixType_InvWorld].location = programImpl->GetUniformLocation(nzShaderUniform_InvWorldMatrix);
s_matrices[nzMatrixType_InvWorldView].location = programImpl->GetUniformLocation(nzShaderUniform_InvWorldViewMatrix);
s_matrices[nzMatrixType_InvWorldViewProj].location = programImpl->GetUniformLocation(nzShaderUniform_InvWorldViewProjMatrix);
s_uniformTargetSizeUpdated = false;
s_updateFlags |= Update_Matrices; // Changement de programme, on renvoie toutes les matrices demandées
@ -1570,11 +1600,14 @@ void NzRenderer::UpdateMatrix(nzMatrixType type)
switch (type)
{
// Matrices de base
case nzMatrixType_Projection:
case nzMatrixType_View:
case nzMatrixType_World:
s_matrices[type].updated = true;
break;
// Matrices combinées
case nzMatrixType_ViewProj:
s_matrices[nzMatrixType_ViewProj].matrix = s_matrices[nzMatrixType_View].matrix * s_matrices[nzMatrixType_Projection].matrix;
s_matrices[nzMatrixType_ViewProj].updated = true;
@ -1594,6 +1627,67 @@ void NzRenderer::UpdateMatrix(nzMatrixType type)
s_matrices[nzMatrixType_WorldViewProj].matrix.Concatenate(s_matrices[nzMatrixType_Projection].matrix);
s_matrices[nzMatrixType_WorldViewProj].updated = true;
break;
// Matrices inversées
case nzMatrixType_InvProjection:
if (!s_matrices[nzMatrixType_Projection].updated)
UpdateMatrix(nzMatrixType_Projection);
if (!s_matrices[nzMatrixType_Projection].matrix.GetInverse(&s_matrices[nzMatrixType_InvProjection].matrix))
NazaraWarning("Failed to inverse Proj matrix");
s_matrices[nzMatrixType_InvProjection].updated = true;
break;
case nzMatrixType_InvView:
if (!s_matrices[nzMatrixType_View].updated)
UpdateMatrix(nzMatrixType_View);
if (!s_matrices[nzMatrixType_View].matrix.GetInverse(&s_matrices[nzMatrixType_InvView].matrix))
NazaraWarning("Failed to inverse View matrix");
s_matrices[nzMatrixType_InvView].updated = true;
break;
case nzMatrixType_InvViewProj:
if (!s_matrices[nzMatrixType_ViewProj].updated)
UpdateMatrix(nzMatrixType_ViewProj);
if (!s_matrices[nzMatrixType_ViewProj].matrix.GetInverse(&s_matrices[nzMatrixType_InvViewProj].matrix))
NazaraWarning("Failed to inverse ViewProj matrix");
s_matrices[nzMatrixType_InvViewProj].updated = true;
break;
case nzMatrixType_InvWorld:
if (!s_matrices[nzMatrixType_World].updated)
UpdateMatrix(nzMatrixType_World);
if (!s_matrices[nzMatrixType_World].matrix.GetInverse(&s_matrices[nzMatrixType_InvWorld].matrix))
NazaraWarning("Failed to inverse World matrix");
s_matrices[nzMatrixType_InvWorld].updated = true;
break;
case nzMatrixType_InvWorldView:
if (!s_matrices[nzMatrixType_WorldView].updated)
UpdateMatrix(nzMatrixType_WorldView);
if (!s_matrices[nzMatrixType_WorldView].matrix.GetInverse(&s_matrices[nzMatrixType_InvWorldView].matrix))
NazaraWarning("Failed to inverse WorldView matrix");
s_matrices[nzMatrixType_InvWorldView].updated = true;
break;
case nzMatrixType_InvWorldViewProj:
if (!s_matrices[nzMatrixType_WorldViewProj].updated)
UpdateMatrix(nzMatrixType_WorldViewProj);
if (!s_matrices[nzMatrixType_WorldViewProj].matrix.GetInverse(&s_matrices[nzMatrixType_InvWorldViewProj].matrix))
NazaraWarning("Failed to inverse WorldViewProj matrix");
s_matrices[nzMatrixType_InvWorldViewProj].updated = true;
break;
}
}