oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Refactor: Merge [IC]SkinnedMesh into SkinnedMesh (#15511)

Browse source
This commit is contained in:
Lars Müller 2024-12-06 18:03:44 +01:00 • committed by GitHub
parent 810f39767c
commit 3e10d9ccf5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 326 additions and 646 deletions
Download patch file Download diff file Expand all files Collapse all files

10
irr/src/CXMeshFileLoader.h
View file

@ -6,7 +6,7 @@
#include "IMeshLoader.h"
#include "irrString.h"
#include "CSkinnedMesh.h"
#include "SkinnedMesh.h"
namespace irr
{
@ -86,7 +86,7 @@ private:
bool parseDataObjectTemplate();
bool parseDataObjectFrame(CSkinnedMesh::SJoint *parent);
bool parseDataObjectFrame(SkinnedMesh::SJoint *parent);
bool parseDataObjectTransformationMatrix(core::matrix4 &mat);
@ -110,7 +110,7 @@ private:
bool parseDataObjectAnimation();
bool parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint);
bool parseDataObjectAnimationKey(SkinnedMesh::SJoint *joint);
bool parseDataObjectTextureFilename(core::stringc &texturename);
@ -155,7 +155,7 @@ private:
bool readRGB(video::SColor &color);
bool readRGBA(video::SColor &color);
CSkinnedMesh *AnimatedMesh;
SkinnedMesh *AnimatedMesh;
c8 *Buffer;
const c8 *P;
@ -167,7 +167,7 @@ private:
bool ErrorState;
CSkinnedMesh::SJoint *CurFrame;
SkinnedMesh::SJoint *CurFrame;
core::array<SXMesh *> Meshes;