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

Graphics/Material: Fix texture getters 

Former-commit-id: 00799529501c489498c4afd7e42195157b74ba22
This commit is contained in:
Lynix 2015-07-02 12:24:04 +02:00
parent 529673ebc1
commit 9a7c356f75
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/Nazara/Graphics/Material.hpp
View File

@ -67,26 +67,26 @@ class NAZARA_GRAPHICS_API NzMaterial : public NzRefCounted, public NzResource
inline void EnableShadowReceive(bool receiveShadows); inline void EnableShadowReceive(bool receiveShadows);
inline void EnableTransform(bool transform); inline void EnableTransform(bool transform);
inline NzTexture* GetAlphaMap() const; inline const NzTextureRef& GetAlphaMap() const;
inline float GetAlphaThreshold() const; inline float GetAlphaThreshold() const;
inline NzColor GetAmbientColor() const; inline NzColor GetAmbientColor() const;
inline nzRendererComparison GetDepthFunc() const; inline nzRendererComparison GetDepthFunc() const;
inline NzColor GetDiffuseColor() const; inline NzColor GetDiffuseColor() const;
inline NzTexture* GetDiffuseMap() const; inline const NzTextureRef& GetDiffuseMap() const;
inline NzTextureSampler& GetDiffuseSampler(); inline NzTextureSampler& GetDiffuseSampler();
inline const NzTextureSampler& GetDiffuseSampler() const; inline const NzTextureSampler& GetDiffuseSampler() const;
inline nzBlendFunc GetDstBlend() const; inline nzBlendFunc GetDstBlend() const;
inline NzTexture* GetEmissiveMap() const; inline const NzTextureRef& GetEmissiveMap() const;
inline nzFaceSide GetFaceCulling() const; inline nzFaceSide GetFaceCulling() const;
inline nzFaceFilling GetFaceFilling() const; inline nzFaceFilling GetFaceFilling() const;
inline NzTexture* GetHeightMap() const; inline const NzTextureRef& GetHeightMap() const;
inline NzTexture* GetNormalMap() const; inline const NzTextureRef& GetNormalMap() const;
inline const NzRenderStates& GetRenderStates() const; inline const NzRenderStates& GetRenderStates() const;
inline const NzUberShader* GetShader() const; inline const NzUberShader* GetShader() const;
inline const NzUberShaderInstance* GetShaderInstance(nzUInt32 flags = nzShaderFlags_None) const; inline const NzUberShaderInstance* GetShaderInstance(nzUInt32 flags = nzShaderFlags_None) const;
inline float GetShininess() const; inline float GetShininess() const;
inline NzColor GetSpecularColor() const; inline NzColor GetSpecularColor() const;
inline NzTexture* GetSpecularMap() const; inline const NzTextureRef& GetSpecularMap() const;
inline NzTextureSampler& GetSpecularSampler(); inline NzTextureSampler& GetSpecularSampler();
inline const NzTextureSampler& GetSpecularSampler() const; inline const NzTextureSampler& GetSpecularSampler() const;
inline nzBlendFunc GetSrcBlend() const; inline nzBlendFunc GetSrcBlend() const;

12
include/Nazara/Graphics/Material.inl
View File

@ -69,7 +69,7 @@ inline void NzMaterial::EnableTransform(bool transform)
InvalidateShaders(); InvalidateShaders();
} }
inline NzTexture* NzMaterial::GetAlphaMap() const inline const NzTextureRef& NzMaterial::GetAlphaMap() const
{ {
return m_alphaMap; return m_alphaMap;
} }
@ -104,7 +104,7 @@ inline const NzTextureSampler& NzMaterial::GetDiffuseSampler() const
return m_diffuseSampler; return m_diffuseSampler;
} }
NzTexture* NzMaterial::GetDiffuseMap() const const NzTextureRef& NzMaterial::GetDiffuseMap() const
{ {
return m_diffuseMap; return m_diffuseMap;
} }
@ -114,7 +114,7 @@ inline nzBlendFunc NzMaterial::GetDstBlend() const
return m_states.dstBlend; return m_states.dstBlend;
} }
inline NzTexture* NzMaterial::GetEmissiveMap() const inline const NzTextureRef& NzMaterial::GetEmissiveMap() const
{ {
return m_emissiveMap; return m_emissiveMap;
} }
@ -129,12 +129,12 @@ inline nzFaceFilling NzMaterial::GetFaceFilling() const
return m_states.faceFilling; return m_states.faceFilling;
} }
inline NzTexture* NzMaterial::GetHeightMap() const inline const NzTextureRef& NzMaterial::GetHeightMap() const
{ {
return m_heightMap; return m_heightMap;
} }
inline NzTexture* NzMaterial::GetNormalMap() const inline const NzTextureRef& NzMaterial::GetNormalMap() const
{ {
return m_normalMap; return m_normalMap;
} }
@ -168,7 +168,7 @@ inline NzColor NzMaterial::GetSpecularColor() const
return m_specularColor; return m_specularColor;
} }
inline NzTexture* NzMaterial::GetSpecularMap() const inline const NzTextureRef& NzMaterial::GetSpecularMap() const
{ {
return m_specularMap; return m_specularMap;
} }