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

Fixed compile errors introducted in 228ecfe7e5f59d8c4091c3ebfee8190f66cf62ed [formerly 837c414856dbb7b5be20fd745359b3f1e7791c20]

Browse Source 
Former-commit-id: efe88a0a209916b0aeea2813ec074182ab3a7adf
This commit is contained in:
Lynix
2015-01-25 17:19:35 +01:00
parent a185f03abc
commit 9e96a2061f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Graphics/DeferredGeometryPass.cpp
View File

@@ -142,7 +142,7 @@ bool NzDeferredGeometryPass::Process(const NzScene* scene, unsigned int firstWor
instanceMatrices += renderedInstanceCount; instanceMatrices += renderedInstanceCount;
// Et on affiche // Et on affiche
InstancedDrawFunc(renderedInstanceCount, meshData.primitiveMode, 0, indexCount); instancedDrawFunc(renderedInstanceCount, meshData.primitiveMode, 0, indexCount);
} }
} }
else else
@@ -153,7 +153,7 @@ bool NzDeferredGeometryPass::Process(const NzScene* scene, unsigned int firstWor
for (const NzMatrix4f& matrix : instances) for (const NzMatrix4f& matrix : instances)
{ {
NzRenderer::SetMatrix(nzMatrixType_World, matrix); NzRenderer::SetMatrix(nzMatrixType_World, matrix);
DrawFunc(meshData.primitiveMode, 0, indexCount); drawFunc(meshData.primitiveMode, 0, indexCount);
} }
} }

8
src/Nazara/Graphics/ForwardRenderTechnique.cpp
View File

@@ -544,7 +544,7 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene) const
instanceMatrices += renderedInstanceCount; instanceMatrices += renderedInstanceCount;
// Et on affiche // Et on affiche
InstancedDrawFunc(renderedInstanceCount, meshData.primitiveMode, 0, indexCount); instancedDrawFunc(renderedInstanceCount, meshData.primitiveMode, 0, indexCount);
} }
} }
@@ -598,7 +598,7 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene) const
NzLight::Disable(shader, shaderUniforms->lightUniforms, shaderUniforms->lightOffset*i); NzLight::Disable(shader, shaderUniforms->lightUniforms, shaderUniforms->lightOffset*i);
// Et on passe à l'affichage // Et on passe à l'affichage
DrawFunc(meshData.primitiveMode, 0, indexCount); drawFunc(meshData.primitiveMode, 0, indexCount);
} }
NzRenderer::Enable(nzRendererParameter_Blend, false); NzRenderer::Enable(nzRendererParameter_Blend, false);
@@ -613,7 +613,7 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene) const
for (const NzMatrix4f& matrix : instances) for (const NzMatrix4f& matrix : instances)
{ {
NzRenderer::SetMatrix(nzMatrixType_World, matrix); NzRenderer::SetMatrix(nzMatrixType_World, matrix);
DrawFunc(meshData.primitiveMode, 0, indexCount); drawFunc(meshData.primitiveMode, 0, indexCount);
} }
} }
} }
@@ -706,7 +706,7 @@ void NzForwardRenderTechnique::DrawTransparentModels(const NzScene* scene) const
NzLight::Disable(shader, shaderUniforms->lightUniforms, shaderUniforms->lightOffset*i); NzLight::Disable(shader, shaderUniforms->lightUniforms, shaderUniforms->lightOffset*i);
NzRenderer::SetMatrix(nzMatrixType_World, matrix); NzRenderer::SetMatrix(nzMatrixType_World, matrix);
DrawFunc(meshData.primitiveMode, 0, indexCount); drawFunc(meshData.primitiveMode, 0, indexCount);
} }
} }