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

Resolved conflicts

Browse Source 
Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47
This commit is contained in:
Lynix
2012-12-02 21:49:14 +01:00
parent 6a3087cc26 d0545eb760
commit 780da2cfa5
46 changed files with 1251 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,9 @@ enum nzTextureFilter
nzTextureFilter_Nearest,
nzTextureFilter_Trilinear,
nzTextureFilter_Max = nzTextureFilter_Trilinear
nzTextureFilter_Default,
nzTextureFilter_Max = nzTextureFilter_Default
};
enum nzTextureWrap

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

@@ -47,6 +47,7 @@ class NAZARA_API NzMaterial : public NzResource
NzColor GetSpecularColor() const;
const NzTexture* GetSpecularMap() const;
nzBlendFunc GetSrcBlend() const;
nzTextureFilter GetTextureFilter() const;
nzRendererComparison GetZTestCompare() const;
bool IsAlphaBlendingEnabled() const;
@@ -69,6 +70,8 @@ class NAZARA_API NzMaterial : public NzResource
void SetSpecularColor(const NzColor& specular);
void SetSpecularMap(const NzTexture* map);
void SetSrcBlend(nzBlendFunc func);
void SetTextureFilter(nzTextureFilter filter);
void SetTextureWrap(nzTextureWrap wrapMode);
void SetZTestCompare(nzRendererComparison compareFunc);
static const NzMaterial* GetDefault();
@@ -79,6 +82,8 @@ class NAZARA_API NzMaterial : public NzResource
nzFaceCulling m_faceCulling;
nzFaceFilling m_faceFilling;
nzRendererComparison m_zTestCompareFunc;
nzTextureFilter m_textureFilter;
nzTextureWrap m_textureWrap;
NzColor m_ambientColor;
NzColor m_diffuseColor;
NzColor m_specularColor;

2
include/Nazara/Renderer/Texture.hpp
View File

@@ -43,6 +43,8 @@ class NAZARA_API NzTexture : public NzResource, NzNonCopyable
unsigned int GetWidth() const;
nzTextureWrap GetWrapMode() const;
bool HasMipmaps() const;
bool IsCompressed() const;
bool IsCubemap() const;
bool IsTarget() const;