From a8ab9e2c746e475f52f9eb53d0003e224e27e1b9 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 3 Aug 2013 17:14:30 +0200 Subject: [PATCH] Added Material::HasCustomShaderProgram Former-commit-id: bdd119b41d5312a65aec2d781a78283343ef4b4c --- include/Nazara/Renderer/Material.hpp | 1 + src/Nazara/Renderer/Material.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/include/Nazara/Renderer/Material.hpp b/include/Nazara/Renderer/Material.hpp index 492b66d7f..318b36312 100644 --- a/include/Nazara/Renderer/Material.hpp +++ b/include/Nazara/Renderer/Material.hpp @@ -78,6 +78,7 @@ class NAZARA_API NzMaterial : public NzResource nzBlendFunc GetSrcBlend() const; bool HasAlphaMap() const; + bool HasCustomShaderProgram(nzShaderTarget target, nzUInt32 flags) const; bool HasDiffuseMap() const; bool HasEmissiveMap() const; bool HasHeightMap() const; diff --git a/src/Nazara/Renderer/Material.cpp b/src/Nazara/Renderer/Material.cpp index eda92286e..b765056c2 100644 --- a/src/Nazara/Renderer/Material.cpp +++ b/src/Nazara/Renderer/Material.cpp @@ -289,6 +289,11 @@ bool NzMaterial::HasAlphaMap() const return m_alphaMap.IsValid(); } +bool NzMaterial::HasCustomShaderProgram(nzShaderTarget target, nzUInt32 flags) const +{ + return m_programs[target][flags].custom; +} + bool NzMaterial::HasDiffuseMap() const { return m_diffuseMap.IsValid();