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

Added emissive mapping support

Browse Source 
Former-commit-id: f469b1bcada16f0f2350cc10e9dc25fcf3c24abe
This commit is contained in:
Lynix
2013-04-06 15:07:29 +02:00
parent aa6d4c5b52
commit 578523b4bf
4 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,14 +148,15 @@ enum nzShaderFlags
{
nzShaderFlags_None = 0,
nzShaderFlags_Deferred = 0x01,
nzShaderFlags_DiffuseMapping = 0x02,
nzShaderFlags_FlipUVs = 0x04,
nzShaderFlags_Instancing = 0x08,
nzShaderFlags_Lighting = 0x10,
nzShaderFlags_NormalMapping = 0x20,
nzShaderFlags_ParallaxMapping = 0x40,
nzShaderFlags_SpecularMapping = 0x80
nzShaderFlags_Deferred = 0x001,
nzShaderFlags_DiffuseMapping = 0x002,
nzShaderFlags_EmissiveMapping = 0x004,
nzShaderFlags_FlipUVs = 0x008,
nzShaderFlags_Instancing = 0x010,
nzShaderFlags_Lighting = 0x020,
nzShaderFlags_NormalMapping = 0x040,
nzShaderFlags_ParallaxMapping = 0x080,
nzShaderFlags_SpecularMapping = 0x100
};
enum nzShaderLanguage

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

@@ -56,6 +56,7 @@ class NAZARA_API NzMaterial : public NzResource
NzTextureSampler& GetDiffuseSampler();
const NzTextureSampler& GetDiffuseSampler() const;
nzBlendFunc GetDstBlend() const;
NzTexture* GetEmissiveMap() const;
nzFaceCulling GetFaceCulling() const;
nzFaceFilling GetFaceFilling() const;
NzTexture* GetHeightMap() const;
@@ -88,6 +89,7 @@ class NAZARA_API NzMaterial : public NzResource
void SetDiffuseMap(NzTexture* map);
void SetDiffuseSampler(const NzTextureSampler& sampler);
void SetDstBlend(nzBlendFunc func);
void SetEmissiveMap(NzTexture* map);
void SetFaceCulling(nzFaceCulling culling);
void SetFaceFilling(nzFaceFilling filling);
void SetHeightMap(NzTexture* map);
@@ -121,6 +123,7 @@ class NAZARA_API NzMaterial : public NzResource
NzTextureSampler m_specularSampler;
mutable NzShaderConstRef m_customShader;
NzTextureRef m_diffuseMap;
NzTextureRef m_emissiveMap;
NzTextureRef m_heightMap;
NzTextureRef m_normalMap;
NzTextureRef m_specularMap;