From 0e6215a47e4ff206bb43b8096a7f3eae019e4946 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 19 Dec 2012 00:38:06 +0100 Subject: [PATCH] (Material) Added non-constant sampler access Former-commit-id: d2799fc353628afda09fdc45b04134aa541ee480 --- include/Nazara/Renderer/Material.hpp | 2 ++ src/Nazara/Renderer/Material.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/Nazara/Renderer/Material.hpp b/include/Nazara/Renderer/Material.hpp index 7a9cc6f12..52638ab48 100644 --- a/include/Nazara/Renderer/Material.hpp +++ b/include/Nazara/Renderer/Material.hpp @@ -43,6 +43,7 @@ class NAZARA_API NzMaterial : public NzResource NzColor GetAmbientColor() const; NzColor GetDiffuseColor() const; const NzTexture* GetDiffuseMap() const; + NzTextureSampler& GetDiffuseSampler(); const NzTextureSampler& GetDiffuseSampler() const; nzBlendFunc GetDstBlend() const; nzFaceCulling GetFaceCulling() const; @@ -50,6 +51,7 @@ class NAZARA_API NzMaterial : public NzResource float GetShininess() const; NzColor GetSpecularColor() const; const NzTexture* GetSpecularMap() const; + NzTextureSampler& GetSpecularSampler(); const NzTextureSampler& GetSpecularSampler() const; nzBlendFunc GetSrcBlend() const; nzRendererComparison GetZTestCompare() const; diff --git a/src/Nazara/Renderer/Material.cpp b/src/Nazara/Renderer/Material.cpp index febbf9139..b47e13331 100644 --- a/src/Nazara/Renderer/Material.cpp +++ b/src/Nazara/Renderer/Material.cpp @@ -125,6 +125,11 @@ NzColor NzMaterial::GetDiffuseColor() const return m_diffuseColor; } +NzTextureSampler& NzMaterial::GetDiffuseSampler() +{ + return m_diffuseSampler; +} + const NzTextureSampler& NzMaterial::GetDiffuseSampler() const { return m_diffuseSampler; @@ -165,6 +170,11 @@ const NzTexture* NzMaterial::GetSpecularMap() const return m_specularMap; } +NzTextureSampler& NzMaterial::GetSpecularSampler() +{ + return m_specularSampler; +} + const NzTextureSampler& NzMaterial::GetSpecularSampler() const { return m_specularSampler;