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

Fixed typo 

Former-commit-id: 291aec9c9969efdadd90017ea6cb81466c2d06e2
This commit is contained in:
Lynix 2013-09-23 00:22:46 +02:00
parent ffbff9e707
commit aa4d5f5ab8
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics/ForwardRenderQueue.hpp
View File

@ -105,7 +105,7 @@ class NAZARA_API NzForwardRenderQueue : public NzAbstractRenderQueue, NzResource
std::vector<TransparentSkeletalModel> transparentSkeletalModels; std::vector<TransparentSkeletalModel> transparentSkeletalModels;
std::vector<TransparentStaticModel> transparentStaticModels; std::vector<TransparentStaticModel> transparentStaticModels;
std::vector<const NzDrawable*> otherDrawables; std::vector<const NzDrawable*> otherDrawables;
LightContainer directionnalLights; LightContainer directionalLights;
LightContainer lights; LightContainer lights;
}; };

2
include/Nazara/Graphics/ForwardRenderTechnique.hpp
View File

@ -35,7 +35,7 @@ class NAZARA_API NzForwardRenderTechnique : public NzAbstractRenderTechnique
NzForwardRenderQueue m_renderQueue; NzForwardRenderQueue m_renderQueue;
NzIndexBufferRef m_indexBuffer; NzIndexBufferRef m_indexBuffer;
NzLightManager m_directionnalLights; NzLightManager m_directionalLights;
NzLightManager m_lights; NzLightManager m_lights;
NzVertexBuffer m_spriteBuffer; NzVertexBuffer m_spriteBuffer;
unsigned int m_maxLightsPerObject; unsigned int m_maxLightsPerObject;

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

@ -53,7 +53,7 @@ void NzForwardRenderQueue::AddLight(const NzLight* light)
switch (light->GetLightType()) switch (light->GetLightType())
{ {
case nzLightType_Directional: case nzLightType_Directional:
directionnalLights.push_back(light); directionalLights.push_back(light);
break; break;
case nzLightType_Point: case nzLightType_Point:
@ -201,7 +201,7 @@ void NzForwardRenderQueue::AddSubMesh(const NzMaterial* material, const NzSubMes
void NzForwardRenderQueue::Clear(bool fully) void NzForwardRenderQueue::Clear(bool fully)
{ {
directionnalLights.clear(); directionalLights.clear();
lights.clear(); lights.clear();
otherDrawables.clear(); otherDrawables.clear();
transparentsModels.clear(); transparentsModels.clear();

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

@ -76,7 +76,7 @@ void NzForwardRenderTechnique::Clear(const NzScene* scene)
void NzForwardRenderTechnique::Draw(const NzScene* scene) void NzForwardRenderTechnique::Draw(const NzScene* scene)
{ {
m_directionnalLights.SetLights(&m_renderQueue.directionnalLights[0], m_renderQueue.directionnalLights.size()); m_directionalLights.SetLights(&m_renderQueue.directionalLights[0], m_renderQueue.directionalLights.size());
m_lights.SetLights(&m_renderQueue.lights[0], m_renderQueue.lights.size()); m_lights.SetLights(&m_renderQueue.lights[0], m_renderQueue.lights.size());
m_renderQueue.Sort(scene->GetViewer()); m_renderQueue.Sort(scene->GetViewer());
@ -201,9 +201,9 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene)
program->SendVector(program->GetUniformLocation(nzShaderUniform_EyePosition), viewer->GetEyePosition()); program->SendVector(program->GetUniformLocation(nzShaderUniform_EyePosition), viewer->GetEyePosition());
// On envoie les lumières directionnelles s'il y a (Les mêmes pour tous) // On envoie les lumières directionnelles s'il y a (Les mêmes pour tous)
lightCount = std::min(m_directionnalLights.GetLightCount(), 3U); lightCount = std::min(m_directionalLights.GetLightCount(), 3U);
for (unsigned int i = 0; i < lightCount; ++i) for (unsigned int i = 0; i < lightCount; ++i)
m_directionnalLights.GetLight(i)->Enable(program, i); m_directionalLights.GetLight(i)->Enable(program, i);
lastProgram = program; lastProgram = program;
} }
@ -430,9 +430,9 @@ void NzForwardRenderTechnique::DrawTransparentModels(const NzScene* scene)
program->SendVector(program->GetUniformLocation(nzShaderUniform_EyePosition), viewer->GetEyePosition()); program->SendVector(program->GetUniformLocation(nzShaderUniform_EyePosition), viewer->GetEyePosition());
// On envoie les lumières directionnelles s'il y a (Les mêmes pour tous) // On envoie les lumières directionnelles s'il y a (Les mêmes pour tous)
lightCount = std::min(m_directionnalLights.GetLightCount(), 3U); lightCount = std::min(m_directionalLights.GetLightCount(), 3U);
for (unsigned int i = 0; i < lightCount; ++i) for (unsigned int i = 0; i < lightCount; ++i)
m_directionnalLights.GetLight(i)->Enable(program, i); m_directionalLights.GetLight(i)->Enable(program, i);
lastProgram = program; lastProgram = program;
} }