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

Match

Browse Source
This commit is contained in:
Christian Semmler 2024-04-14 14:11:43 -04:00
parent 113cdaa34e
commit 6188c7e94c
2 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,7 +468,7 @@ inline void LegoAnimNodeData::GetTranslation(
n = FindKeys( n = FindKeys(
p_time, p_time,
p_numTranslationKeys & USHRT_MAX, p_numTranslationKeys & USHRT_MAX,
(LegoU8*) p_translationKeys, p_translationKeys,
sizeof(*p_translationKeys), sizeof(*p_translationKeys),
i, i,
p_old_index p_old_index
@ -528,14 +528,7 @@ inline void LegoAnimNodeData::GetTranslation(
) )
{ {
LegoU32 i, n; LegoU32 i, n;
n = FindKeys( n = FindKeys(p_time, p_numRotationKeys & USHRT_MAX, p_rotationKeys, sizeof(*p_rotationKeys), i, p_old_index);
p_time,
p_numRotationKeys & USHRT_MAX,
(LegoU8*) p_rotationKeys,
sizeof(*p_rotationKeys),
i,
p_old_index
);
switch (n) { switch (n) {
case 0: case 0:
@ -599,7 +592,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, (LegoU8*) p_scaleKeys, sizeof(*p_scaleKeys), i, p_old_index); n = FindKeys(p_time, p_numScaleKeys & USHRT_MAX, p_scaleKeys, sizeof(*p_scaleKeys), i, p_old_index);
switch (n) { switch (n) {
case 0: case 0:
@ -626,7 +619,7 @@ LegoBool LegoAnimNodeData::FUN_100a0990(LegoFloat p_time)
LegoU32 index = GetMorphIndex(); LegoU32 index = GetMorphIndex();
LegoBool result; LegoBool result;
n = FindKeys(p_time, m_numMorphKeys, (LegoU8*) m_morphKeys, sizeof(*m_morphKeys), i, index); n = FindKeys(p_time, m_numMorphKeys, m_morphKeys, sizeof(*m_morphKeys), i, index);
SetMorphIndex(index); SetMorphIndex(index);
switch (n) { switch (n) {
@ -646,52 +639,50 @@ LegoBool LegoAnimNodeData::FUN_100a0990(LegoFloat p_time)
LegoU32 LegoAnimNodeData::FindKeys( LegoU32 LegoAnimNodeData::FindKeys(
LegoFloat p_time, LegoFloat p_time,
LegoU32 p_numKeys, LegoU32 p_numKeys,
LegoU8* p_keys, LegoAnimKey* p_keys,
LegoU32 p_size, LegoU32 p_size,
LegoU32& p_new_index, LegoU32& p_new_index,
LegoU32& p_old_index LegoU32& p_old_index
) )
{ {
LegoU32 numKeys;
if (p_numKeys == 0) { if (p_numKeys == 0) {
return 0; numKeys = 0;
} }
else if (p_time < GetKey(0, p_keys, p_size).GetTime()) {
if (((LegoAnimKey*) p_keys)->GetTime() > p_time) { numKeys = 0;
return 0;
} }
else if (p_time > GetKey(p_numKeys - 1, p_keys, p_size).GetTime()) {
LegoS32 index = p_numKeys - 1; p_new_index = p_numKeys - 1;
if (((LegoAnimKey*) (p_keys + (p_size * index)))->GetTime() < p_time) { numKeys = 1;
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 = p_old_index; p_new_index < index; p_new_index++) {
if (p_time < ((LegoAnimKey*) ptr)->GetTime()) {
break;
}
ptr = ptr + p_size;
}
} }
else { else {
LegoU8* ptr = p_keys; if (!(GetKey(p_old_index, p_keys, p_size).GetTime() > p_time)) {
for (p_new_index = 0; p_new_index < index; p_new_index++) { for (p_new_index = p_old_index;
ptr = ptr + p_size; p_new_index < p_numKeys - 1 && p_time >= GetKey(p_new_index + 1, p_keys, p_size).GetTime();
if (p_time < ((LegoAnimKey*) ptr)->GetTime()) { p_new_index++)
break; ;
} }
else {
for (p_new_index = 0;
p_new_index < p_numKeys - 1 && p_time >= GetKey(p_new_index + 1, p_keys, p_size).GetTime();
p_new_index++)
;
}
p_old_index = p_new_index;
if (p_time == GetKey(p_new_index, p_keys, p_size).GetTime()) {
numKeys = 1;
}
else if (p_new_index < p_numKeys - 1) {
numKeys = 2;
}
else {
numKeys = 0;
} }
} }
p_old_index = p_new_index; return numKeys;
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
@ -706,6 +697,11 @@ inline LegoFloat LegoAnimNodeData::Interpolate(
return p_value1 + (p_value2 - p_value1) * (p_time - p_key1.GetTime()) / (p_key2.GetTime() - p_key1.GetTime()); return p_value1 + (p_value2 - p_value1) * (p_time - p_key1.GetTime()) / (p_key2.GetTime() - p_key1.GetTime());
} }
inline LegoAnimKey& LegoAnimNodeData::GetKey(LegoU32 p_i, LegoAnimKey* p_keys, LegoU32 p_size)
{
return *((LegoAnimKey*) (((LegoU8*) p_keys) + (p_i * p_size)));
}
// FUNCTION: LEGO1 0x100a0b30 // FUNCTION: LEGO1 0x100a0b30
LegoAnim::LegoAnim() LegoAnim::LegoAnim()
{ {

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

@ -165,11 +165,12 @@ class LegoAnimNodeData : public LegoTreeNodeData {
LegoAnimKey& p_key2, LegoAnimKey& p_key2,
LegoFloat p_value2 LegoFloat p_value2
); );
inline static LegoAnimKey& GetKey(LegoU32 p_i, LegoAnimKey* p_keys, LegoU32 p_size);
static LegoU32 FindKeys( static LegoU32 FindKeys(
LegoFloat p_time, LegoFloat p_time,
LegoU32 p_numKeys, LegoU32 p_numKeys,
LegoU8* p_keys, LegoAnimKey* p_keys,
LegoU32 p_size, LegoU32 p_size,
LegoU32& p_new_index, LegoU32& p_new_index,
LegoU32& p_old_index LegoU32& p_old_index