isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 10:41:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

implement LegoAnimNodeData::FindKeys

Browse Source
This commit is contained in:
Misha 2024-04-14 13:12:03 -04:00
parent dcc42c33d8
commit 81bd0b4449
No known key found for this signature in database
GPG Key ID: 8441D12AEF33FED8
2 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
LEGO1/lego/sources/anim/legoanim.cpp
View File

@ -3,6 +3,7 @@
#include "mxgeometry/mxmatrix.h" #include "mxgeometry/mxmatrix.h"
#include <limits.h> #include <limits.h>
#include <windows.h>
DECOMP_SIZE_ASSERT(LegoAnimKey, 0x08) DECOMP_SIZE_ASSERT(LegoAnimKey, 0x08)
DECOMP_SIZE_ASSERT(LegoTranslationKey, 0x14) DECOMP_SIZE_ASSERT(LegoTranslationKey, 0x14)
@ -468,7 +469,7 @@ inline void LegoAnimNodeData::GetTranslation(
n = FindKeys( n = FindKeys(
p_time, p_time,
p_numTranslationKeys & USHRT_MAX, p_numTranslationKeys & USHRT_MAX,
p_translationKeys, (LegoU8*) p_translationKeys,
sizeof(*p_translationKeys), sizeof(*p_translationKeys),
i, i,
p_old_index p_old_index
@ -528,7 +529,14 @@ inline void LegoAnimNodeData::GetTranslation(
) )
{ {
LegoU32 i, n; LegoU32 i, n;
n = FindKeys(p_time, p_numRotationKeys & USHRT_MAX, p_rotationKeys, sizeof(*p_rotationKeys), i, p_old_index); n = FindKeys(
p_time,
p_numRotationKeys & USHRT_MAX,
(LegoU8*) p_rotationKeys,
sizeof(*p_rotationKeys),
i,
p_old_index
);
switch (n) { switch (n) {
case 0: case 0:
@ -592,7 +600,7 @@ inline void LegoAnimNodeData::GetScale(
{ {
LegoU32 i, n; LegoU32 i, n;
LegoFloat x, y, z; LegoFloat x, y, z;
n = FindKeys(p_time, p_numScaleKeys & USHRT_MAX, p_scaleKeys, sizeof(*p_scaleKeys), i, p_old_index); n = FindKeys(p_time, p_numScaleKeys & USHRT_MAX, (LegoU8*) p_scaleKeys, sizeof(*p_scaleKeys), i, p_old_index);
switch (n) { switch (n) {
case 0: case 0:
@ -619,7 +627,7 @@ LegoBool LegoAnimNodeData::FUN_100a0990(LegoFloat p_time)
LegoU32 index = GetMorphIndex(); LegoU32 index = GetMorphIndex();
LegoBool result; LegoBool result;
n = FindKeys(p_time, m_numMorphKeys, m_morphKeys, sizeof(*m_morphKeys), i, index); n = FindKeys(p_time, m_numMorphKeys, (LegoU8*) m_morphKeys, sizeof(*m_morphKeys), i, index);
SetMorphIndex(index); SetMorphIndex(index);
switch (n) { switch (n) {
@ -635,18 +643,56 @@ LegoBool LegoAnimNodeData::FUN_100a0990(LegoFloat p_time)
return result; return result;
} }
// STUB: LEGO1 0x100a0a00 // FUNCTION: LEGO1 0x100a0a00
LegoU32 LegoAnimNodeData::FindKeys( LegoU32 LegoAnimNodeData::FindKeys(
LegoFloat p_time, LegoFloat p_time,
LegoU32 p_numKeys, LegoU32 p_numKeys,
LegoAnimKey* p_keys, LegoU8* p_keys,
LegoU32 p_size, LegoU32 p_size,
LegoU32& p_new_index, LegoU32& p_new_index,
LegoU32& p_old_index LegoU32& p_old_index
) )
{ {
// TODO if (p_numKeys == 0) {
return 0; return 0;
}
if (((LegoAnimKey*) p_keys)->GetTime() > p_time) {
return 0;
}
LegoS32 index = p_numKeys - 1;
if (((LegoAnimKey*) (p_keys + (p_size * index)))->GetTime() < p_time) {
p_new_index = index;
return 1;
}
if (p_time > ((LegoAnimKey*) (p_keys + (p_size * p_old_index)))->GetTime()) {
LegoU8* ptr = (LegoU8*) (p_keys + (p_old_index + 1) * p_size);
for (p_new_index = index; p_new_index < index; p_new_index++) {
if (p_time < ((LegoAnimKey*) ptr)->GetTime()) {
break;
}
ptr = ptr + p_size;
}
}
else {
LegoU8* ptr = p_keys;
for (p_new_index = 0; p_new_index < index; p_new_index++) {
ptr = ptr + p_size;
if (p_time < ((LegoAnimKey*) ptr)->GetTime()) {
break;
}
}
}
p_old_index = p_new_index;
if (((LegoAnimKey*) (p_keys + (p_new_index * p_size)))->GetTime() == p_time) {
return 1;
}
else {
return (p_new_index < index) ? 2 : 0;
}
} }
// FUNCTION: LEGO1 0x100a0b00 // FUNCTION: LEGO1 0x100a0b00

2
LEGO1/lego/sources/anim/legoanim.h
View File

@ -169,7 +169,7 @@ class LegoAnimNodeData : public LegoTreeNodeData {
static LegoU32 FindKeys( static LegoU32 FindKeys(
LegoFloat p_time, LegoFloat p_time,
LegoU32 p_numKeys, LegoU32 p_numKeys,
LegoAnimKey* p_keys, LegoU8* p_keys,
LegoU32 p_size, LegoU32 p_size,
LegoU32& p_new_index, LegoU32& p_new_index,
LegoU32& p_old_index LegoU32& p_old_index