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

Added shader flags

Browse Source 
Renamed ShaderBuilder enum to ShaderFlags


Former-commit-id: b3440bac5491f0a0a90cbd7f9ed8e396c16c0864
This commit is contained in:
Lynix
2013-03-01 21:54:41 +01:00
parent d0a6a75f14
commit 347b267d43
7 changed files with 84 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ class NAZARA_API NzMaterial : public NzResource
NzMaterial(NzMaterial&& material);
~NzMaterial();
void Apply() const;
void Apply(const NzShader* shader) const;
void EnableAlphaBlending(bool alphaBlending);
void EnableFaceCulling(bool faceCulling);
@@ -46,6 +46,7 @@ class NAZARA_API NzMaterial : public NzResource
void EnableZWrite(bool zWrite);
NzColor GetAmbientColor() const;
const NzShader* GetCustomShader() const;
NzColor GetDiffuseColor() const;
NzTexture* GetDiffuseMap() const;
NzTextureSampler& GetDiffuseSampler();
@@ -55,7 +56,7 @@ class NAZARA_API NzMaterial : public NzResource
nzFaceFilling GetFaceFilling() const;
NzTexture* GetHeightMap() const;
NzTexture* GetNormalMap() const;
const NzShader* GetShader() const;
nzUInt32 GetShaderFlags() const;
float GetShininess() const;
NzColor GetSpecularColor() const;
NzTexture* GetSpecularMap() const;
@@ -64,6 +65,8 @@ class NAZARA_API NzMaterial : public NzResource
nzBlendFunc GetSrcBlend() const;
nzRendererComparison GetZTestCompare() const;
bool HasCustomShader() const;
bool IsAlphaBlendingEnabled() const;
bool IsFaceCullingEnabled() const;
bool IsLightingEnabled() const;
@@ -85,7 +88,7 @@ class NAZARA_API NzMaterial : public NzResource
void SetFaceFilling(nzFaceFilling filling);
void SetHeightMap(NzTexture* map);
void SetNormalMap(NzTexture* map);
void SetShader(const NzShader* shader);
void SetCustomShader(const NzShader* shader);
void SetShininess(float shininess);
void SetSpecularColor(const NzColor& specular);
void SetSpecularMap(NzTexture* map);
@@ -99,25 +102,23 @@ class NAZARA_API NzMaterial : public NzResource
static NzMaterial* GetDefault();
private:
void UpdateShader() const;
nzBlendFunc m_dstBlend;
nzBlendFunc m_srcBlend;
nzFaceCulling m_faceCulling;
nzFaceFilling m_faceFilling;
nzRendererComparison m_zTestCompareFunc;
nzUInt32 m_shaderFlags;
NzColor m_ambientColor;
NzColor m_diffuseColor;
NzColor m_specularColor;
NzTextureSampler m_diffuseSampler;
NzTextureSampler m_specularSampler;
mutable const NzShader* m_shader;
mutable const NzShader* m_customShader;
NzTexture* m_diffuseMap;
NzTexture* m_heightMap;
NzTexture* m_normalMap;
NzTexture* m_specularMap;
bool m_alphaBlendingEnabled;
bool m_autoShader;
bool m_faceCullingEnabled;
bool m_lightingEnabled;
bool m_zTestEnabled;