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

Relaxed constant access

Browse Source 
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
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 NzAnimation* GetAnimation() const;
NzAnimation* GetAnimation() const;
const NzAxisAlignedBox& GetAABB() const;
const NzMaterial* GetMaterial(unsigned int matIndex) const;
const NzMaterial* GetMaterial(unsigned int skinIndex, unsigned int matIndex) const;
NzMaterial* GetMaterial(unsigned int matIndex) const;
NzMaterial* GetMaterial(unsigned int skinIndex, unsigned int matIndex) const;
unsigned int GetMaterialCount() const;
unsigned int GetSkinCount() const;
const NzMesh* GetMesh() const;
NzMesh* GetMesh() const;
nzSceneNodeType GetSceneNodeType() const override;
NzSkeleton* GetSkeleton();
const NzSkeleton* GetSkeleton() const;
@@ -47,10 +47,10 @@ class NAZARA_API NzModel : public NzSceneNode
void Reset();
bool SetAnimation(const NzAnimation* animation);
void SetMaterial(unsigned int matIndex, const NzMaterial* material);
void SetMaterial(unsigned int skinIndex, unsigned int matIndex, const NzMaterial* material);
void SetMesh(const NzMesh* mesh, const NzModelParameters& parameters = NzModelParameters());
bool SetAnimation(NzAnimation* animation);
void SetMaterial(unsigned int matIndex, NzMaterial* material);
void SetMaterial(unsigned int skinIndex, unsigned int matIndex, NzMaterial* material);
void SetMesh(NzMesh* mesh, const NzModelParameters& parameters = NzModelParameters());
void SetSkinCount(unsigned int skinCount);
bool SetSequence(const NzString& sequenceName);
void SetSequence(unsigned int sequenceIndex);
@@ -58,10 +58,10 @@ class NAZARA_API NzModel : public NzSceneNode
void Update(float elapsedTime);
private:
std::vector<const NzMaterial*> m_materials;
std::vector<NzMaterial*> m_materials;
NzSkeleton m_skeleton; // Uniquement pour les animations squelettiques
const NzAnimation* m_animation;
const NzMesh* m_mesh;
NzAnimation* m_animation;
NzMesh* m_mesh;
const NzSequence* m_currentSequence;
float m_interpolation;
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 GetDiffuseColor() const;
const NzTexture* GetDiffuseMap() const;
NzTexture* GetDiffuseMap() const;
NzTextureSampler& GetDiffuseSampler();
const NzTextureSampler& GetDiffuseSampler() const;
nzBlendFunc GetDstBlend() const;
nzFaceCulling GetFaceCulling() const;
nzFaceFilling GetFaceFilling() const;
const NzTexture* GetHeightMap() const;
const NzTexture* GetNormalMap() const;
NzTexture* GetHeightMap() const;
NzTexture* GetNormalMap() const;
const NzShader* GetShader() const;
float GetShininess() const;
NzColor GetSpecularColor() const;
const NzTexture* GetSpecularMap() const;
NzTexture* GetSpecularMap() const;
NzTextureSampler& GetSpecularSampler();
const NzTextureSampler& GetSpecularSampler() const;
nzBlendFunc GetSrcBlend() const;
@@ -76,17 +76,17 @@ class NAZARA_API NzMaterial : public NzResource
void SetAmbientColor(const NzColor& ambient);
void SetDiffuseColor(const NzColor& diffuse);
void SetDiffuseMap(const NzTexture* map);
void SetDiffuseMap(NzTexture* map);
void SetDiffuseSampler(const NzTextureSampler& sampler);
void SetDstBlend(nzBlendFunc func);
void SetFaceCulling(nzFaceCulling culling);
void SetFaceFilling(nzFaceFilling filling);
void SetHeightMap(const NzTexture* map);
void SetNormalMap(const NzTexture* map);
void SetHeightMap(NzTexture* map);
void SetNormalMap(NzTexture* map);
void SetShader(const NzShader* shader);
void SetShininess(float shininess);
void SetSpecularColor(const NzColor& specular);
void SetSpecularMap(const NzTexture* map);
void SetSpecularMap(NzTexture* map);
void SetSpecularSampler(const NzTextureSampler& sampler);
void SetSrcBlend(nzBlendFunc func);
void SetZTestCompare(nzRendererComparison compareFunc);
@@ -94,7 +94,7 @@ class NAZARA_API NzMaterial : public NzResource
NzMaterial& operator=(const NzMaterial& material);
NzMaterial& operator=(NzMaterial&& material);
static const NzMaterial* GetDefault();
static NzMaterial* GetDefault();
private:
void UpdateShader() const;
@@ -110,10 +110,10 @@ class NAZARA_API NzMaterial : public NzResource
NzTextureSampler m_diffuseSampler;
NzTextureSampler m_specularSampler;
mutable const NzShader* m_shader;
const NzTexture* m_diffuseMap;
const NzTexture* m_heightMap;
const NzTexture* m_normalMap;
const NzTexture* m_specularMap;
NzTexture* m_diffuseMap;
NzTexture* m_heightMap;
NzTexture* m_normalMap;
NzTexture* m_specularMap;
bool m_alphaBlendingEnabled;
bool m_autoShader;
bool m_lightingEnabled;