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

Refactored materials

Browse Source 
(Renderer) Removed Apply function
(Renderer) Renamed SetTextureSampling to SetTextureSampler
Updated demo


Former-commit-id: d40a9ce05df35b078e645927451093da44eec314
This commit is contained in:
Lynix
2012-12-18 16:17:30 +01:00
parent 8b67d17e38
commit 10730de74e
5 changed files with 119 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
#include <Nazara/Core/ResourceLoader.hpp>
#include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Renderer/Texture.hpp>
#include <Nazara/Renderer/TextureSampler.hpp>
struct NAZARA_API NzMaterialParams
{
@@ -33,6 +34,8 @@ class NAZARA_API NzMaterial : public NzResource
NzMaterial();
~NzMaterial();
void Apply() const;
void EnableAlphaBlending(bool alphaBlending);
void EnableZTest(bool zTest);
void EnableZWrite(bool zWrite);
@@ -40,14 +43,14 @@ class NAZARA_API NzMaterial : public NzResource
NzColor GetAmbientColor() const;
NzColor GetDiffuseColor() const;
const NzTexture* GetDiffuseMap() const;
const NzTextureSampler& GetDiffuseSampler() const;
nzBlendFunc GetDstBlend() const;
nzFaceCulling GetFaceCulling() const;
nzFaceFilling GetFaceFilling() const;
nzSamplerFilter GetSamplerFilter() const;
nzSamplerWrap GetSamplerWrap() const;
float GetShininess() const;
NzColor GetSpecularColor() const;
const NzTexture* GetSpecularMap() const;
const NzTextureSampler& GetSpecularSampler() const;
nzBlendFunc GetSrcBlend() const;
nzRendererComparison GetZTestCompare() const;
@@ -64,14 +67,15 @@ class NAZARA_API NzMaterial : public NzResource
void SetAmbientColor(const NzColor& ambient);
void SetDiffuseColor(const NzColor& diffuse);
void SetDiffuseMap(const NzTexture* map);
void SetDiffuseSampler(const NzTextureSampler& sampler);
void SetDstBlend(nzBlendFunc func);
void SetFaceCulling(nzFaceCulling culling);
void SetFaceFilling(nzFaceFilling filling);
void SetSamplerFilter(nzSamplerFilter filter);
void SetSamplerWrap(nzSamplerWrap wrapMode);
void SetShininess(float shininess);
void SetSpecularColor(const NzColor& specular);
void SetSpecularMap(const NzTexture* map);
void SetSpecularSampler(const NzTextureSampler& sampler);
void SetSrcBlend(nzBlendFunc func);
void SetZTestCompare(nzRendererComparison compareFunc);
@@ -83,11 +87,11 @@ class NAZARA_API NzMaterial : public NzResource
nzFaceCulling m_faceCulling;
nzFaceFilling m_faceFilling;
nzRendererComparison m_zTestCompareFunc;
nzSamplerFilter m_samplerFilter;
nzSamplerWrap m_samplerWrap;
NzColor m_ambientColor;
NzColor m_diffuseColor;
NzColor m_specularColor;
NzTextureSampler m_diffuseSampler;
NzTextureSampler m_specularSampler;
const NzTexture* m_diffuseMap;
const NzTexture* m_specularMap;
bool m_alphaBlendingEnabled;

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

@@ -30,8 +30,6 @@ class NAZARA_API NzRenderer
NzRenderer() = delete;
~NzRenderer() = delete;
static void ApplyMaterial(const NzMaterial* material);
static void Clear(unsigned long flags = nzRendererClear_Color | nzRendererClear_Depth);
static void DrawIndexedPrimitives(nzPrimitiveType primitive, unsigned int firstIndex, unsigned int indexCount);
@@ -77,8 +75,8 @@ class NAZARA_API NzRenderer
static void SetStencilReferenceValue(unsigned int refValue);
static void SetStencilZFailOperation(nzStencilOperation zfailOperation);
static bool SetTarget(NzRenderTarget* target);
static void SetTexture(unsigned int unit, const NzTexture* texture);
static void SetTextureSampling(unsigned int unit, const NzTextureSampler& sampler);
static void SetTexture(nzUInt8 unit, const NzTexture* texture);
static void SetTextureSampler(nzUInt8 textureUnit, const NzTextureSampler& sampler);
static bool SetVertexBuffer(const NzVertexBuffer* vertexBuffer);
static void SetViewport(const NzRectui& viewport);