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

Added Alpha Test

Browse Source 
Former-commit-id: 59dc6ef8f1dbff49bb13cf452bf75326ad7a6257
This commit is contained in:
Lynix
2013-06-27 19:02:31 +02:00
parent 9d8ce1ce4b
commit 30cb518c74
5 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/Nazara/Renderer/Enums.hpp
View File

@@ -150,15 +150,16 @@ enum nzShaderFlags
nzShaderFlags_None = 0,
nzShaderFlags_AlphaMapping = 0x001,
nzShaderFlags_Deferred = 0x002,
nzShaderFlags_DiffuseMapping = 0x004,
nzShaderFlags_EmissiveMapping = 0x008,
nzShaderFlags_FlipUVs = 0x010,
nzShaderFlags_Instancing = 0x020,
nzShaderFlags_Lighting = 0x040,
nzShaderFlags_NormalMapping = 0x080,
nzShaderFlags_ParallaxMapping = 0x100,
nzShaderFlags_SpecularMapping = 0x200
nzShaderFlags_AlphaTest = 0x002,
nzShaderFlags_Deferred = 0x004,
nzShaderFlags_DiffuseMapping = 0x008,
nzShaderFlags_EmissiveMapping = 0x010,
nzShaderFlags_FlipUVs = 0x020,
nzShaderFlags_Instancing = 0x040,
nzShaderFlags_Lighting = 0x080,
nzShaderFlags_NormalMapping = 0x100,
nzShaderFlags_ParallaxMapping = 0x200,
nzShaderFlags_SpecularMapping = 0x400
};
enum nzShaderLanguage
@@ -176,6 +177,7 @@ enum nzShaderUniform
nzShaderUniform_CameraPosition,
nzShaderUniform_LightCount,
nzShaderUniform_MaterialAlphaMap,
nzShaderUniform_MaterialAlphaThreshold,
nzShaderUniform_MaterialAmbient,
nzShaderUniform_MaterialDiffuse,
nzShaderUniform_MaterialDiffuseMap,

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

@@ -51,9 +51,11 @@ class NAZARA_API NzMaterial : public NzResource
void Apply(const NzShader* shader) const;
void Enable(nzRendererParameter renderParameter, bool enable);
void EnableAlphaTest(bool alphaTest);
void EnableLighting(bool lighting);
NzTexture* GetAlphaMap() const;
float GetAlphaThreshold() const;
NzColor GetAmbientColor() const;
const NzShader* GetCustomShader() const;
nzRendererComparison GetDepthFunc() const;
@@ -79,6 +81,7 @@ class NAZARA_API NzMaterial : public NzResource
bool HasCustomShader() const;
bool IsEnabled(nzRendererParameter renderParameter) const;
bool IsAlphaTestEnabled() const;
bool IsLightingEnabled() const;
bool LoadFromFile(const NzString& filePath, const NzMaterialParams& params = NzMaterialParams());
@@ -89,6 +92,7 @@ class NAZARA_API NzMaterial : public NzResource
bool SetAlphaMap(const NzString& texturePath);
void SetAlphaMap(NzTexture* map);
void SetAlphaThreshold(float alphaThreshold);
void SetAmbientColor(const NzColor& ambient);
void SetCustomShader(const NzShader* shader);
void SetDepthFunc(nzRendererComparison depthFunc);
@@ -138,7 +142,9 @@ class NAZARA_API NzMaterial : public NzResource
NzTextureRef m_heightMap;
NzTextureRef m_normalMap;
NzTextureRef m_specularMap;
bool m_alphaTestEnabled;
bool m_lightingEnabled;
float m_alphaThreshold;
float m_shininess;
static NzMaterial* s_defaultMaterial;