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

Relaxed constant access 

Former-commit-id: 885a7f065ccf9ff1fdbef23c88b852bb2e48fac7
This commit is contained in:
Lynix 2013-01-15 16:53:59 +01:00
parent 3080ed8a43
commit 09e0ab898d
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/Nazara/3D/Model.hpp
View File

@ -28,13 +28,13 @@ class NAZARA_API NzModel : public NzSceneNode
NzModel(const NzModel& model); NzModel(const NzModel& model);
~NzModel(); ~NzModel();
const NzAnimation* GetAnimation() const; NzAnimation* GetAnimation() const;
const NzAxisAlignedBox& GetAABB() const; const NzAxisAlignedBox& GetAABB() const;
const NzMaterial* GetMaterial(unsigned int matIndex) const; NzMaterial* GetMaterial(unsigned int matIndex) const;
const NzMaterial* GetMaterial(unsigned int skinIndex, unsigned int matIndex) const; NzMaterial* GetMaterial(unsigned int skinIndex, unsigned int matIndex) const;
unsigned int GetMaterialCount() const; unsigned int GetMaterialCount() const;
unsigned int GetSkinCount() const; unsigned int GetSkinCount() const;
const NzMesh* GetMesh() const; NzMesh* GetMesh() const;
nzSceneNodeType GetSceneNodeType() const override; nzSceneNodeType GetSceneNodeType() const override;
NzSkeleton* GetSkeleton(); NzSkeleton* GetSkeleton();
const NzSkeleton* GetSkeleton() const; const NzSkeleton* GetSkeleton() const;
@ -47,10 +47,10 @@ class NAZARA_API NzModel : public NzSceneNode
void Reset(); void Reset();
bool SetAnimation(const NzAnimation* animation); bool SetAnimation(NzAnimation* animation);
void SetMaterial(unsigned int matIndex, const NzMaterial* material); void SetMaterial(unsigned int matIndex, NzMaterial* material);
void SetMaterial(unsigned int skinIndex, unsigned int matIndex, const NzMaterial* material); void SetMaterial(unsigned int skinIndex, unsigned int matIndex, NzMaterial* material);
void SetMesh(const NzMesh* mesh, const NzModelParameters& parameters = NzModelParameters()); void SetMesh(NzMesh* mesh, const NzModelParameters& parameters = NzModelParameters());
void SetSkinCount(unsigned int skinCount); void SetSkinCount(unsigned int skinCount);
bool SetSequence(const NzString& sequenceName); bool SetSequence(const NzString& sequenceName);
void SetSequence(unsigned int sequenceIndex); void SetSequence(unsigned int sequenceIndex);
@ -58,10 +58,10 @@ class NAZARA_API NzModel : public NzSceneNode
void Update(float elapsedTime); void Update(float elapsedTime);
private: private:
std::vector<const NzMaterial*> m_materials; std::vector<NzMaterial*> m_materials;
NzSkeleton m_skeleton; // Uniquement pour les animations squelettiques NzSkeleton m_skeleton; // Uniquement pour les animations squelettiques
const NzAnimation* m_animation; NzAnimation* m_animation;
const NzMesh* m_mesh; NzMesh* m_mesh;
const NzSequence* m_currentSequence; const NzSequence* m_currentSequence;
float m_interpolation; float m_interpolation;
unsigned int m_currentFrame; unsigned int m_currentFrame;

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

@ -46,18 +46,18 @@ class NAZARA_API NzMaterial : public NzResource
NzColor GetAmbientColor() const; NzColor GetAmbientColor() const;
NzColor GetDiffuseColor() const; NzColor GetDiffuseColor() const;
const NzTexture* GetDiffuseMap() const; NzTexture* GetDiffuseMap() const;
NzTextureSampler& GetDiffuseSampler(); NzTextureSampler& GetDiffuseSampler();
const NzTextureSampler& GetDiffuseSampler() const; const NzTextureSampler& GetDiffuseSampler() const;
nzBlendFunc GetDstBlend() const; nzBlendFunc GetDstBlend() const;
nzFaceCulling GetFaceCulling() const; nzFaceCulling GetFaceCulling() const;
nzFaceFilling GetFaceFilling() const; nzFaceFilling GetFaceFilling() const;
const NzTexture* GetHeightMap() const; NzTexture* GetHeightMap() const;
const NzTexture* GetNormalMap() const; NzTexture* GetNormalMap() const;
const NzShader* GetShader() const; const NzShader* GetShader() const;
float GetShininess() const; float GetShininess() const;
NzColor GetSpecularColor() const; NzColor GetSpecularColor() const;
const NzTexture* GetSpecularMap() const; NzTexture* GetSpecularMap() const;
NzTextureSampler& GetSpecularSampler(); NzTextureSampler& GetSpecularSampler();
const NzTextureSampler& GetSpecularSampler() const; const NzTextureSampler& GetSpecularSampler() const;
nzBlendFunc GetSrcBlend() const; nzBlendFunc GetSrcBlend() const;
@ -76,17 +76,17 @@ class NAZARA_API NzMaterial : public NzResource
void SetAmbientColor(const NzColor& ambient); void SetAmbientColor(const NzColor& ambient);
void SetDiffuseColor(const NzColor& diffuse); void SetDiffuseColor(const NzColor& diffuse);
void SetDiffuseMap(const NzTexture* map); void SetDiffuseMap(NzTexture* map);
void SetDiffuseSampler(const NzTextureSampler& sampler); void SetDiffuseSampler(const NzTextureSampler& sampler);
void SetDstBlend(nzBlendFunc func); void SetDstBlend(nzBlendFunc func);
void SetFaceCulling(nzFaceCulling culling); void SetFaceCulling(nzFaceCulling culling);
void SetFaceFilling(nzFaceFilling filling); void SetFaceFilling(nzFaceFilling filling);
void SetHeightMap(const NzTexture* map); void SetHeightMap(NzTexture* map);
void SetNormalMap(const NzTexture* map); void SetNormalMap(NzTexture* map);
void SetShader(const NzShader* shader); void SetShader(const NzShader* shader);
void SetShininess(float shininess); void SetShininess(float shininess);
void SetSpecularColor(const NzColor& specular); void SetSpecularColor(const NzColor& specular);
void SetSpecularMap(const NzTexture* map); void SetSpecularMap(NzTexture* map);
void SetSpecularSampler(const NzTextureSampler& sampler); void SetSpecularSampler(const NzTextureSampler& sampler);
void SetSrcBlend(nzBlendFunc func); void SetSrcBlend(nzBlendFunc func);
void SetZTestCompare(nzRendererComparison compareFunc); void SetZTestCompare(nzRendererComparison compareFunc);
@ -94,7 +94,7 @@ class NAZARA_API NzMaterial : public NzResource
NzMaterial& operator=(const NzMaterial& material); NzMaterial& operator=(const NzMaterial& material);
NzMaterial& operator=(NzMaterial&& material); NzMaterial& operator=(NzMaterial&& material);
static const NzMaterial* GetDefault(); static NzMaterial* GetDefault();
private: private:
void UpdateShader() const; void UpdateShader() const;
@ -110,10 +110,10 @@ class NAZARA_API NzMaterial : public NzResource
NzTextureSampler m_diffuseSampler; NzTextureSampler m_diffuseSampler;
NzTextureSampler m_specularSampler; NzTextureSampler m_specularSampler;
mutable const NzShader* m_shader; mutable const NzShader* m_shader;
const NzTexture* m_diffuseMap; NzTexture* m_diffuseMap;
const NzTexture* m_heightMap; NzTexture* m_heightMap;
const NzTexture* m_normalMap; NzTexture* m_normalMap;
const NzTexture* m_specularMap; NzTexture* m_specularMap;
bool m_alphaBlendingEnabled; bool m_alphaBlendingEnabled;
bool m_autoShader; bool m_autoShader;
bool m_lightingEnabled; bool m_lightingEnabled;

16
src/Nazara/3D/Model.cpp
View File

@ -42,7 +42,7 @@ NzModel::~NzModel()
Reset(); Reset();
} }
const NzAnimation* NzModel::GetAnimation() const NzAnimation* NzModel::GetAnimation() const
{ {
return m_animation; return m_animation;
} }
@ -60,7 +60,7 @@ const NzAxisAlignedBox& NzModel::GetAABB() const
return m_mesh->GetAABB(); return m_mesh->GetAABB();
} }
const NzMaterial* NzModel::GetMaterial(unsigned int matIndex) const NzMaterial* NzModel::GetMaterial(unsigned int matIndex) const
{ {
#if NAZARA_3D_SAFE #if NAZARA_3D_SAFE
if (matIndex >= m_matCount) if (matIndex >= m_matCount)
@ -73,7 +73,7 @@ const NzMaterial* NzModel::GetMaterial(unsigned int matIndex) const
return m_materials[matIndex]; return m_materials[matIndex];
} }
const NzMaterial* NzModel::GetMaterial(unsigned int skinIndex, unsigned int matIndex) const NzMaterial* NzModel::GetMaterial(unsigned int skinIndex, unsigned int matIndex) const
{ {
#if NAZARA_3D_SAFE #if NAZARA_3D_SAFE
if (skinIndex >= m_skinCount) if (skinIndex >= m_skinCount)
@ -102,7 +102,7 @@ unsigned int NzModel::GetSkinCount() const
return m_skinCount; return m_skinCount;
} }
const NzMesh* NzModel::GetMesh() const NzMesh* NzModel::GetMesh() const
{ {
return m_mesh; return m_mesh;
} }
@ -199,7 +199,7 @@ void NzModel::Reset()
} }
} }
bool NzModel::SetAnimation(const NzAnimation* animation) bool NzModel::SetAnimation(NzAnimation* animation)
{ {
#if NAZARA_3D_SAFE #if NAZARA_3D_SAFE
if (!m_mesh) if (!m_mesh)
@ -243,7 +243,7 @@ bool NzModel::SetAnimation(const NzAnimation* animation)
return true; return true;
} }
void NzModel::SetMaterial(unsigned int matIndex, const NzMaterial* material) void NzModel::SetMaterial(unsigned int matIndex, NzMaterial* material)
{ {
#if NAZARA_3D_SAFE #if NAZARA_3D_SAFE
if (matIndex >= m_matCount) if (matIndex >= m_matCount)
@ -263,7 +263,7 @@ void NzModel::SetMaterial(unsigned int matIndex, const NzMaterial* material)
m_materials[matIndex]->AddResourceReference(); m_materials[matIndex]->AddResourceReference();
} }
void NzModel::SetMaterial(unsigned int skinIndex, unsigned int matIndex, const NzMaterial* material) void NzModel::SetMaterial(unsigned int skinIndex, unsigned int matIndex, NzMaterial* material)
{ {
#if NAZARA_3D_SAFE #if NAZARA_3D_SAFE
if (skinIndex >= m_skinCount) if (skinIndex >= m_skinCount)
@ -291,7 +291,7 @@ void NzModel::SetMaterial(unsigned int skinIndex, unsigned int matIndex, const N
m_materials[index]->AddResourceReference(); m_materials[index]->AddResourceReference();
} }
void NzModel::SetMesh(const NzMesh* mesh, const NzModelParameters& modelParameters) void NzModel::SetMesh(NzMesh* mesh, const NzModelParameters& modelParameters)
{ {
Reset(); Reset();

18
src/Nazara/Renderer/Material.cpp
View File

@ -217,7 +217,7 @@ const NzTextureSampler& NzMaterial::GetDiffuseSampler() const
return m_diffuseSampler; return m_diffuseSampler;
} }
const NzTexture* NzMaterial::GetDiffuseMap() const NzTexture* NzMaterial::GetDiffuseMap() const
{ {
return m_diffuseMap; return m_diffuseMap;
} }
@ -237,12 +237,12 @@ nzFaceFilling NzMaterial::GetFaceFilling() const
return m_faceFilling; return m_faceFilling;
} }
const NzTexture* NzMaterial::GetHeightMap() const NzTexture* NzMaterial::GetHeightMap() const
{ {
return m_diffuseMap; return m_diffuseMap;
} }
const NzTexture* NzMaterial::GetNormalMap() const NzTexture* NzMaterial::GetNormalMap() const
{ {
return m_diffuseMap; return m_diffuseMap;
} }
@ -265,7 +265,7 @@ NzColor NzMaterial::GetSpecularColor() const
return m_specularColor; return m_specularColor;
} }
const NzTexture* NzMaterial::GetSpecularMap() const NzTexture* NzMaterial::GetSpecularMap() const
{ {
return m_specularMap; return m_specularMap;
} }
@ -385,7 +385,7 @@ void NzMaterial::SetDiffuseColor(const NzColor& diffuse)
m_diffuseColor = diffuse; m_diffuseColor = diffuse;
} }
void NzMaterial::SetDiffuseMap(const NzTexture* map) void NzMaterial::SetDiffuseMap(NzTexture* map)
{ {
if (m_diffuseMap) if (m_diffuseMap)
m_diffuseMap->RemoveResourceReference(); m_diffuseMap->RemoveResourceReference();
@ -415,7 +415,7 @@ void NzMaterial::SetFaceFilling(nzFaceFilling filling)
m_faceFilling = filling; m_faceFilling = filling;
} }
void NzMaterial::SetHeightMap(const NzTexture* map) void NzMaterial::SetHeightMap(NzTexture* map)
{ {
if (m_heightMap) if (m_heightMap)
m_heightMap->RemoveResourceReference(); m_heightMap->RemoveResourceReference();
@ -425,7 +425,7 @@ void NzMaterial::SetHeightMap(const NzTexture* map)
m_heightMap->AddResourceReference(); m_heightMap->AddResourceReference();
} }
void NzMaterial::SetNormalMap(const NzTexture* map) void NzMaterial::SetNormalMap(NzTexture* map)
{ {
if (m_normalMap) if (m_normalMap)
m_normalMap->RemoveResourceReference(); m_normalMap->RemoveResourceReference();
@ -456,7 +456,7 @@ void NzMaterial::SetSpecularColor(const NzColor& specular)
m_specularColor = specular; m_specularColor = specular;
} }
void NzMaterial::SetSpecularMap(const NzTexture* map) void NzMaterial::SetSpecularMap(NzTexture* map)
{ {
if (m_specularMap) if (m_specularMap)
m_specularMap->RemoveResourceReference(); m_specularMap->RemoveResourceReference();
@ -545,7 +545,7 @@ NzMaterial& NzMaterial::operator=(NzMaterial&& material)
return *this; return *this;
} }
const NzMaterial* NzMaterial::GetDefault() NzMaterial* NzMaterial::GetDefault()
{ {
static NzMaterial defaultMaterial; static NzMaterial defaultMaterial;
static bool initialized = false; static bool initialized = false;