isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 23:48:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement LegoAnimNodeData::FindKeys (#802)

Browse source 
* implement LegoAnimNodeData::FindKeys

* Update legoanim.cpp

* fix flickering

* Match

* Fix cond

* clang

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Misha 2024-04-14 14:25:39 -04:00 committed by GitHub
parent dcc42c33d8
commit e251ddb17d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
LEGO1/lego/sources/anim/legoanim.cpp
View file

@ -635,7 +635,7 @@ 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,
@ -645,8 +645,44 @@ LegoU32 LegoAnimNodeData::FindKeys(
LegoU32& p_old_index LegoU32& p_old_index
) )
{ {
// TODO LegoU32 numKeys;
return 0; if (p_numKeys == 0) {
numKeys = 0;
}
else if (p_time < GetKey(0, p_keys, p_size).GetTime()) {
numKeys = 0;
}
else if (p_time > GetKey(p_numKeys - 1, p_keys, p_size).GetTime()) {
p_new_index = p_numKeys - 1;
numKeys = 1;
}
else {
if (GetKey(p_old_index, p_keys, p_size).GetTime() <= p_time) {
for (p_new_index = p_old_index;
p_new_index < p_numKeys - 1 && p_time >= GetKey(p_new_index + 1, p_keys, p_size).GetTime();
p_new_index++) {
}
}
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;
}
}
return numKeys;
} }
// FUNCTION: LEGO1 0x100a0b00 // FUNCTION: LEGO1 0x100a0b00
@ -661,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()
{ {

1
LEGO1/lego/sources/anim/legoanim.h
View file

@ -165,6 +165,7 @@ 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,