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

(Material) Added non-constant sampler access

Browse Source 
Former-commit-id: d2799fc353628afda09fdc45b04134aa541ee480
This commit is contained in:
Lynix
2012-12-19 00:38:06 +01:00
parent 10730de74e
commit 0e6215a47e
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Renderer/Material.hpp
View File

@@ -43,6 +43,7 @@ class NAZARA_API NzMaterial : public NzResource
NzColor GetAmbientColor() const; NzColor GetAmbientColor() const;
NzColor GetDiffuseColor() const; NzColor GetDiffuseColor() const;
const NzTexture* GetDiffuseMap() const; const NzTexture* GetDiffuseMap() const;
NzTextureSampler& GetDiffuseSampler();
const NzTextureSampler& GetDiffuseSampler() const; const NzTextureSampler& GetDiffuseSampler() const;
nzBlendFunc GetDstBlend() const; nzBlendFunc GetDstBlend() const;
nzFaceCulling GetFaceCulling() const; nzFaceCulling GetFaceCulling() const;
@@ -50,6 +51,7 @@ class NAZARA_API NzMaterial : public NzResource
float GetShininess() const; float GetShininess() const;
NzColor GetSpecularColor() const; NzColor GetSpecularColor() const;
const NzTexture* GetSpecularMap() const; const NzTexture* GetSpecularMap() const;
NzTextureSampler& GetSpecularSampler();
const NzTextureSampler& GetSpecularSampler() const; const NzTextureSampler& GetSpecularSampler() const;
nzBlendFunc GetSrcBlend() const; nzBlendFunc GetSrcBlend() const;
nzRendererComparison GetZTestCompare() const; nzRendererComparison GetZTestCompare() const;

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

@@ -125,6 +125,11 @@ NzColor NzMaterial::GetDiffuseColor() const
return m_diffuseColor; return m_diffuseColor;
} }
NzTextureSampler& NzMaterial::GetDiffuseSampler()
{
return m_diffuseSampler;
}
const NzTextureSampler& NzMaterial::GetDiffuseSampler() const const NzTextureSampler& NzMaterial::GetDiffuseSampler() const
{ {
return m_diffuseSampler; return m_diffuseSampler;
@@ -165,6 +170,11 @@ const NzTexture* NzMaterial::GetSpecularMap() const
return m_specularMap; return m_specularMap;
} }
NzTextureSampler& NzMaterial::GetSpecularSampler()
{
return m_specularSampler;
}
const NzTextureSampler& NzMaterial::GetSpecularSampler() const const NzTextureSampler& NzMaterial::GetSpecularSampler() const
{ {
return m_specularSampler; return m_specularSampler;