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

Merge remote-tracking branch 'origin/Particle-Update'

Browse Source 
Former-commit-id: 272203af1d740dc32e9714e00e4f889db6b13350
This commit is contained in:
Lynix
2015-01-19 02:23:07 +01:00
parent ead44173ba b79a4c503c
commit 304b46b17d
12 changed files with 326 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,7 @@ class NAZARA_API NzMaterial : public NzResource
void Enable(nzRendererParameter renderParameter, bool enable);
void EnableAlphaTest(bool alphaTest);
void EnableDepthSorting(bool depthSorting);
void EnableLighting(bool lighting);
void EnableTransform(bool transform);
@@ -90,6 +91,7 @@ class NAZARA_API NzMaterial : public NzResource
bool HasSpecularMap() const;
bool IsAlphaTestEnabled() const;
bool IsDepthSortingEnabled() const;
bool IsEnabled(nzRendererParameter renderParameter) const;
bool IsLightingEnabled() const;
bool IsTransformEnabled() const;
@@ -163,6 +165,7 @@ class NAZARA_API NzMaterial : public NzResource
NzUberShaderConstRef m_uberShader;
mutable ShaderInstance m_shaders[nzShaderFlags_Max+1];
bool m_alphaTestEnabled;
bool m_depthSortingEnabled;
bool m_lightingEnabled;
bool m_transformEnabled;
float m_alphaThreshold;