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

Fixed repo

Browse Source 
Former-commit-id: 5992da5ec759f05dabf82009e660ec58eed96365
This commit is contained in:
Lynix
2012-11-29 10:15:10 +01:00
parent 0a2e19fa22
commit a2eb55e74a
14 changed files with 692 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,9 +55,9 @@ const NzTexture* NzMaterial::GetDiffuseMap() const
return m_diffuseMap;
}
nzBlendFunc NzMaterial::GetDstAlpha() const
nzBlendFunc NzMaterial::GetDstBlend() const
{
return m_dstAlpha;
return m_dstBlend;
}
nzFaceCulling NzMaterial::GetFaceCulling() const
@@ -85,9 +85,9 @@ const NzTexture* NzMaterial::GetSpecularMap() const
return m_specularMap;
}
nzBlendFunc NzMaterial::GetSrcAlpha() const
nzBlendFunc NzMaterial::GetSrcBlend() const
{
return m_srcAlpha;
return m_srcBlend;
}
nzRendererComparison NzMaterial::GetZTestCompare() const
@@ -142,12 +142,12 @@ void NzMaterial::Reset()
m_alphaBlendingEnabled = false;
m_ambientColor = NzColor::Black;
m_diffuseColor = NzColor::White;
m_dstAlpha = nzBlendFunc_Zero;
m_dstBlend = nzBlendFunc_Zero;
m_faceCulling = nzFaceCulling_Back;
m_faceFilling = nzFaceFilling_Fill;
m_shininess = 0;
m_specularColor = NzColor::White;
m_srcAlpha = nzBlendFunc_One;
m_srcBlend = nzBlendFunc_One;
m_zTestCompareFunc = nzRendererComparison_LessOrEqual;
m_zTestEnabled = true;
m_zWriteEnabled = true;
@@ -173,9 +173,9 @@ void NzMaterial::SetDiffuseMap(const NzTexture* map)
m_diffuseMap->AddResourceReference();
}
void NzMaterial::SetDstAlpha(nzBlendFunc func)
void NzMaterial::SetDstBlend(nzBlendFunc func)
{
m_dstAlpha = func;
m_dstBlend = func;
}
void NzMaterial::SetFaceCulling(nzFaceCulling culling)
@@ -208,9 +208,9 @@ void NzMaterial::SetSpecularMap(const NzTexture* map)
m_specularMap->AddResourceReference();
}
void NzMaterial::SetSrcAlpha(nzBlendFunc func)
void NzMaterial::SetSrcBlend(nzBlendFunc func)
{
m_srcAlpha = func;
m_srcBlend = func;
}
void NzMaterial::SetZTestCompare(nzRendererComparison compareFunc)