Skip to content

Commit a417182

Browse files
Updated ModelAnimation frameCount and framePoses to keyframeCount and keyframePoses. Removed redundant BoneInfo.
1 parent 1749440 commit a417182

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

include/ModelAnimation.hpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ class ModelAnimation : public ::ModelAnimation {
2222
set(other);
2323

2424
other.boneCount = 0;
25-
other.frameCount = 0;
26-
other.bones = nullptr;
27-
other.framePoses = nullptr;
25+
other.keyframeCount = 0;
26+
other.keyframePoses = nullptr;
2827
}
2928

3029
~ModelAnimation() { Unload(); }
@@ -43,9 +42,8 @@ class ModelAnimation : public ::ModelAnimation {
4342
}
4443

4544
GETTERSETTER(int, BoneCount, boneCount)
46-
GETTERSETTER(::BoneInfo*, Bones, bones)
47-
GETTERSETTER(int, FrameCount, frameCount)
48-
GETTERSETTER(::Transform**, FramePoses, framePoses)
45+
GETTERSETTER(int, KeyframeCount, keyframeCount)
46+
GETTERSETTER(::Transform**, KeyframePoses, keyframePoses)
4947

5048
ModelAnimation& operator=(const ::ModelAnimation& model) {
5149
set(model);
@@ -63,9 +61,8 @@ class ModelAnimation : public ::ModelAnimation {
6361
set(other);
6462

6563
other.boneCount = 0;
66-
other.frameCount = 0;
67-
other.bones = nullptr;
68-
other.framePoses = nullptr;
64+
other.keyframeCount = 0;
65+
other.keyframePoses = nullptr;
6966

7067
return *this;
7168
}
@@ -98,9 +95,8 @@ class ModelAnimation : public ::ModelAnimation {
9895
protected:
9996
void set(const ::ModelAnimation& model) {
10097
boneCount = model.boneCount;
101-
frameCount = model.frameCount;
102-
bones = model.bones;
103-
framePoses = model.framePoses;
98+
keyframeCount = model.keyframeCount;
99+
keyframePoses = model.keyframePoses;
104100

105101
// Duplicate the name. TextCopy() uses the null terminator, which we ignore here.
106102
for (int i = 0; i < 32; i++) {

0 commit comments

Comments
 (0)