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

Material::Apply now apply shader 

Former-commit-id: f0b221a29eb7a678b5544f20468d1956c7233f25
This commit is contained in:
Lynix 2013-01-29 01:59:40 +01:00
parent ba9ad75f58
commit 56e66673d9
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Nazara/Renderer/Material.cpp
View File

@ -78,33 +78,29 @@ NzMaterial::~NzMaterial()
void NzMaterial::Apply() const void NzMaterial::Apply() const
{ {
const NzShader* shader = NzRenderer::GetShader(); if (!m_shader)
#if NAZARA_RENDERER_SAFE UpdateShader();
if (!shader)
{
NazaraError("No shader bound");
return;
}
#endif
int ambientColorLocation = shader->GetUniformLocation("MaterialAmbient"); NzRenderer::SetShader(m_shader);
int diffuseColorLocation = shader->GetUniformLocation("MaterialDiffuse");
int shininessLocation = shader->GetUniformLocation("MaterialShininess"); int ambientColorLocation = m_shader->GetUniformLocation("MaterialAmbient");
int specularColorLocation = shader->GetUniformLocation("MaterialSpecular"); int diffuseColorLocation = m_shader->GetUniformLocation("MaterialDiffuse");
int shininessLocation = m_shader->GetUniformLocation("MaterialShininess");
int specularColorLocation = m_shader->GetUniformLocation("MaterialSpecular");
if (ambientColorLocation != -1) if (ambientColorLocation != -1)
shader->SendColor(ambientColorLocation, m_ambientColor); m_shader->SendColor(ambientColorLocation, m_ambientColor);
if (diffuseColorLocation != -1) if (diffuseColorLocation != -1)
shader->SendColor(diffuseColorLocation, m_diffuseColor); m_shader->SendColor(diffuseColorLocation, m_diffuseColor);
if (m_diffuseMap) if (m_diffuseMap)
{ {
int diffuseMapLocation = shader->GetUniformLocation("MaterialDiffuseMap"); int diffuseMapLocation = m_shader->GetUniformLocation("MaterialDiffuseMap");
if (diffuseMapLocation != -1) if (diffuseMapLocation != -1)
{ {
nzUInt8 textureUnit; nzUInt8 textureUnit;
if (shader->SendTexture(diffuseMapLocation, m_diffuseMap, &textureUnit)) if (m_shader->SendTexture(diffuseMapLocation, m_diffuseMap, &textureUnit))
NzRenderer::SetTextureSampler(textureUnit, m_diffuseSampler); NzRenderer::SetTextureSampler(textureUnit, m_diffuseSampler);
else else
NazaraWarning("Failed to send diffuse map"); NazaraWarning("Failed to send diffuse map");
@ -113,11 +109,11 @@ void NzMaterial::Apply() const
if (m_heightMap) if (m_heightMap)
{ {
int heightMapLocation = shader->GetUniformLocation("MaterialHeightMap"); int heightMapLocation = m_shader->GetUniformLocation("MaterialHeightMap");
if (heightMapLocation != -1) if (heightMapLocation != -1)
{ {
nzUInt8 textureUnit; nzUInt8 textureUnit;
if (shader->SendTexture(heightMapLocation, m_heightMap, &textureUnit)) if (m_shader->SendTexture(heightMapLocation, m_heightMap, &textureUnit))
NzRenderer::SetTextureSampler(textureUnit, m_diffuseSampler); NzRenderer::SetTextureSampler(textureUnit, m_diffuseSampler);
else else
NazaraWarning("Failed to send height map"); NazaraWarning("Failed to send height map");
@ -126,11 +122,11 @@ void NzMaterial::Apply() const
if (m_normalMap) if (m_normalMap)
{ {
int normalMapLocation = shader->GetUniformLocation("MaterialNormalMap"); int normalMapLocation = m_shader->GetUniformLocation("MaterialNormalMap");
if (normalMapLocation != -1) if (normalMapLocation != -1)
{ {
nzUInt8 textureUnit; nzUInt8 textureUnit;
if (shader->SendTexture(normalMapLocation, m_normalMap, &textureUnit)) if (m_shader->SendTexture(normalMapLocation, m_normalMap, &textureUnit))
NzRenderer::SetTextureSampler(textureUnit, m_diffuseSampler); NzRenderer::SetTextureSampler(textureUnit, m_diffuseSampler);
else else
NazaraWarning("Failed to send normal map"); NazaraWarning("Failed to send normal map");
@ -138,18 +134,18 @@ void NzMaterial::Apply() const
} }
if (shininessLocation != -1) if (shininessLocation != -1)
shader->SendFloat(shininessLocation, m_shininess); m_shader->SendFloat(shininessLocation, m_shininess);
if (specularColorLocation != -1) if (specularColorLocation != -1)
shader->SendColor(specularColorLocation, m_specularColor); m_shader->SendColor(specularColorLocation, m_specularColor);
if (m_specularMap) if (m_specularMap)
{ {
int specularMapLocation = shader->GetUniformLocation("MaterialSpecularMap"); int specularMapLocation = m_shader->GetUniformLocation("MaterialSpecularMap");
if (specularMapLocation != -1) if (specularMapLocation != -1)
{ {
nzUInt8 textureUnit; nzUInt8 textureUnit;
if (shader->SendTexture(specularMapLocation, m_specularMap, &textureUnit)) if (m_shader->SendTexture(specularMapLocation, m_specularMap, &textureUnit))
NzRenderer::SetTextureSampler(textureUnit, m_specularSampler); NzRenderer::SetTextureSampler(textureUnit, m_specularSampler);
else else
NazaraWarning("Failed to send specular map"); NazaraWarning("Failed to send specular map");