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

Meshes no longer retains an animation pointer

Browse Source 
Former-commit-id: da4d93b815c46284a8977d7fb142201dc23fff61
This commit is contained in:
Lynix
2012-11-27 23:33:11 +01:00
parent c019d02b91
commit 2e26d52248
4 changed files with 165 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Utility/Mesh.hpp
View File

@@ -13,7 +13,6 @@
#include <Nazara/Core/ResourceListener.hpp>
#include <Nazara/Core/ResourceLoader.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Utility/Animation.hpp>
#include <Nazara/Utility/AxisAlignedBox.hpp>
#include <Nazara/Utility/Skeleton.hpp>
#include <Nazara/Utility/SubMesh.hpp>
@@ -23,13 +22,13 @@ struct NAZARA_API NzMeshParams
{
NzMeshParams(); // Vérifie que le storage indiqué un peu plus bas est supporté
NzAnimationParams animation;
nzBufferStorage storage = nzBufferStorage_Hardware;
bool animated = true;
bool IsValid() const;
};
class NzAnimation;
class NzMesh;
typedef NzVertexStruct_XYZ_Normal_UV_Tangent NzMeshVertex;
@@ -57,6 +56,7 @@ class NAZARA_API NzMesh : public NzResource, NzResourceListener
void Destroy();
const NzAxisAlignedBox& GetAABB() const;
NzString GetAnimation() const;
nzAnimationType GetAnimationType() const;
unsigned int GetJointCount() const;
NzString GetMaterial(unsigned int index) const;
@@ -86,6 +86,7 @@ class NAZARA_API NzMesh : public NzResource, NzResourceListener
void RemoveSubMesh(const NzString& identifier);
void RemoveSubMesh(unsigned int index);
void SetAnimation(const NzString& animationPath);
void SetMaterial(unsigned int matIndex, const NzString& materialPath);
void SetMaterialCount(unsigned int matCount);