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

Merge remote-tracking branch 'isle/master'

Browse Source
This commit is contained in:
Christian Semmler 2025-07-18 14:44:18 -07:00
commit 10d4142c39
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
11 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legophonemepresenter.h
View File

@ -42,9 +42,9 @@ class LegoPhonemePresenter : public MxFlcPresenter {
MxS32 m_rectCount; // 0x68
LegoTextureInfo* m_textureInfo; // 0x6c
MxBool m_unk0x70; // 0x70
MxBool m_reusedPhoneme; // 0x70
MxString m_roiName; // 0x74
MxBool m_unk0x84; // 0x84
MxBool m_isPartOfAnimMM; // 0x84
};
// TEMPLATE: LEGO1 0x1004eb20

2
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View File

@ -631,7 +631,7 @@ MxU32 Act2Actor::FUN_10019700(MxFloat p_param)
MxFloat time = p_param - (m_unk0x2c - m_shootAnim->GetDuration());
for (MxS32 i = 0; i < root->GetNumChildren(); i++) {
LegoROI::FUN_100a8e80(root->GetChild(i), matrix, time, m_shootAnim->GetROIMap());
LegoROI::ApplyAnimationTransformation(root->GetChild(i), matrix, time, m_shootAnim->GetROIMap());
}
return FALSE;

6
LEGO1/lego/legoomni/src/actors/act3actors.cpp
View File

@ -639,7 +639,7 @@ void Act3Brickster::Animate(float p_time)
float time = p_time - (m_unk0x50 - m_shootAnim->GetDuration());
for (MxS32 i = 0; i < root->GetNumChildren(); i++) {
LegoROI::FUN_100a8e80(root->GetChild(i), local70, time, m_shootAnim->GetROIMap());
LegoROI::ApplyAnimationTransformation(root->GetChild(i), local70, time, m_shootAnim->GetROIMap());
}
}
@ -686,7 +686,7 @@ void Act3Brickster::Animate(float p_time)
float time = p_time - (m_unk0x50 - m_shootAnim->GetDuration());
for (MxS32 i = 0; i < root->GetNumChildren(); i++) {
LegoROI::FUN_100a8e80(root->GetChild(i), locale4, time, m_shootAnim->GetROIMap());
LegoROI::ApplyAnimationTransformation(root->GetChild(i), locale4, time, m_shootAnim->GetROIMap());
}
}
@ -1187,7 +1187,7 @@ void Act3Shark::Animate(float p_time)
vec = m_unk0x3c;
LegoTreeNode* node = m_unk0x34->GetAnimTreePtr()->GetRoot();
LegoROI::FUN_100a8e80(node, mat, duration, m_unk0x34->GetROIMap());
LegoROI::ApplyAnimationTransformation(node, mat, duration, m_unk0x34->GetROIMap());
}
else {
roiMap[1] = m_unk0x38;

2
LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
View File

@ -175,7 +175,7 @@ void LegoCameraController::FUN_100123e0(const Matrix4& p_transform, MxU32 p_und)
mat = p_transform;
}
((TimeROI*) pov)->FUN_100a9b40(mat, Timer()->GetTime());
((TimeROI*) pov)->CalculateWorldVelocity(mat, Timer()->GetTime());
pov->WrappedSetLocal2WorldWithWorldDataUpdate(mat);
m_lego3DView->Moved(*pov);

2
LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
View File

@ -153,7 +153,7 @@ MxResult LegoPointOfViewController::Tickle()
MxMatrix mat;
CalcLocalTransform(newPos, newDir, pov->GetWorldUp(), mat);
((TimeROI*) pov)->FUN_100a9b40(mat, Timer()->GetTime());
((TimeROI*) pov)->CalculateWorldVelocity(mat, Timer()->GetTime());
pov->WrappedSetLocal2WorldWithWorldDataUpdate(mat);
m_lego3DView->Moved(*pov);

2
LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
View File

@ -133,7 +133,7 @@ MxResult LegoAnimActor::FUN_1001c360(float p_und, Matrix4& p_transform)
}
for (MxS32 j = 0; j < n->GetNumChildren(); j++) {
LegoROI::FUN_100a8e80(n->GetChild(j), p_transform, p_und, roiMap);
LegoROI::ApplyAnimationTransformation(n->GetChild(j), p_transform, p_und, roiMap);
}
if (m_cameraFlag) {

2
LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
View File

@ -375,7 +375,7 @@ void LegoExtraActor::Animate(float p_time)
MxS32 count = root->GetNumChildren();
for (MxS32 i = 0; i < count; i++) {
LegoROI::FUN_100a8e80(root->GetChild(i), matrix, duration2, laas->m_roiMap);
LegoROI::ApplyAnimationTransformation(root->GetChild(i), matrix, duration2, laas->m_roiMap);
}
}
}

4
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View File

@ -909,7 +909,7 @@ void LegoAnimPresenter::FUN_1006b900(LegoAnim* p_anim, MxLong p_time, Matrix4* p
}
}
LegoROI::FUN_100a8fd0(root, mat, p_time, m_roiMap);
LegoROI::ApplyTransform(root, mat, p_time, m_roiMap);
}
// FUNCTION: LEGO1 0x1006b9a0
@ -943,7 +943,7 @@ void LegoAnimPresenter::FUN_1006b9a0(LegoAnim* p_anim, MxLong p_time, Matrix4* p
}
}
LegoROI::FUN_100a8e80(root, mat, p_time, m_roiMap);
LegoROI::ApplyAnimationTransformation(root, mat, p_time, m_roiMap);
}
// FUNCTION: LEGO1 0x1006bac0

14
LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
View File

@ -25,8 +25,8 @@ void LegoPhonemePresenter::Init()
{
m_rectCount = 0;
m_textureInfo = NULL;
m_unk0x70 = FALSE;
m_unk0x84 = FALSE;
m_reusedPhoneme = FALSE;
m_isPartOfAnimMM = FALSE;
}
// FUNCTION: LEGO1 0x1004e3d0
@ -49,7 +49,7 @@ void LegoPhonemePresenter::StartingTickle()
if (m_compositePresenter != NULL && m_compositePresenter->IsA("LegoAnimMMPresenter")) {
entityROI = FindROI(m_roiName.GetData());
m_unk0x84 = TRUE;
m_isPartOfAnimMM = TRUE;
}
else {
entityROI = CharacterManager()->GetActorROI(m_roiName.GetData(), TRUE);
@ -81,7 +81,7 @@ void LegoPhonemePresenter::StartingTickle()
phoneme->SetCount(phoneme->GetCount() + 1);
cursor.SetValue(phoneme);
m_unk0x70 = TRUE;
m_reusedPhoneme = TRUE;
}
}
}
@ -139,7 +139,7 @@ void LegoPhonemePresenter::EndAction()
if (phoneme->GetCount() == 1) {
LegoROI* roi;
if (m_unk0x84) {
if (m_isPartOfAnimMM) {
roi = FindROI(m_roiName.GetData());
}
else {
@ -150,7 +150,7 @@ void LegoPhonemePresenter::EndAction()
CharacterManager()->SetHeadTexture(roi, NULL);
}
if (!m_unk0x84) {
if (!m_isPartOfAnimMM) {
CharacterManager()->ReleaseActor(m_roiName.GetData());
}
@ -163,7 +163,7 @@ void LegoPhonemePresenter::EndAction()
cursor.SetValue(phoneme);
}
if (!m_unk0x84) {
if (!m_isPartOfAnimMM) {
CharacterManager()->ReleaseActor(m_roiName.GetData());
}
}

36
LEGO1/lego/sources/roi/legoroi.cpp
View File

@ -115,7 +115,7 @@ LegoROI::~LegoROI()
// FUNCTION: LEGO1 0x100a84a0
// FUNCTION: BETA10 0x10189b99
LegoResult LegoROI::Read(
OrientableROI* p_unk0xd4,
OrientableROI* p_parentROI,
Tgl::Renderer* p_renderer,
ViewLODListManager* p_viewLODListManager,
LegoTextureContainer* p_textureContainer,
@ -135,7 +135,7 @@ LegoResult LegoROI::Read(
LegoSphere sphere;
LegoBox box;
m_parentROI = p_unk0xd4;
m_parentROI = p_parentROI;
if (p_storage->Read(&length, sizeof(LegoU32)) != SUCCESS) {
goto done;
@ -178,11 +178,11 @@ LegoResult LegoROI::Read(
textureName = NULL;
}
if (p_storage->Read(&m_unk0x100, sizeof(undefined)) != SUCCESS) {
if (p_storage->Read(&m_sharedLodList, sizeof(LegoBool)) != SUCCESS) {
goto done;
}
if (m_unk0x100) {
if (m_sharedLodList) {
for (roiLength = strlen(m_name); roiLength; roiLength--) {
if (m_name[roiLength - 1] < '0' || m_name[roiLength - 1] > '9') {
break;
@ -390,7 +390,7 @@ LegoROI* LegoROI::FindChildROI(const LegoChar* p_name, LegoROI* p_roi)
// FUNCTION: LEGO1 0x100a8da0
// FUNCTION: BETA10 0x1018a9fb
LegoResult LegoROI::ApplyAnimationTransformation(
LegoResult LegoROI::ApplyChildAnimationTransformation(
LegoTreeNode* p_node,
const Matrix4& p_matrix,
LegoTime p_time,
@ -411,11 +411,11 @@ LegoResult LegoROI::ApplyAnimationTransformation(
roi->m_local2world.Product(mat, p_matrix);
roi->UpdateWorldData();
LegoBool und = data->GetVisibility(p_time);
roi->SetVisibility(und);
LegoBool visibility = data->GetVisibility(p_time);
roi->SetVisibility(visibility);
for (LegoU32 i = 0; i < p_node->GetNumChildren(); i++) {
ApplyAnimationTransformation(p_node->GetChild(i), roi->m_local2world, p_time, roi);
ApplyChildAnimationTransformation(p_node->GetChild(i), roi->m_local2world, p_time, roi);
}
}
else {
@ -427,7 +427,7 @@ LegoResult LegoROI::ApplyAnimationTransformation(
// FUNCTION: LEGO1 0x100a8e80
// FUNCTION: BETA10 0x1018ab3a
void LegoROI::FUN_100a8e80(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_time, LegoROI** p_roiMap)
void LegoROI::ApplyAnimationTransformation(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_time, LegoROI** p_roiMap)
{
MxMatrix mat;
@ -439,11 +439,11 @@ void LegoROI::FUN_100a8e80(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_t
roi->m_local2world.Product(mat, p_matrix);
roi->UpdateWorldData();
LegoBool und = data->GetVisibility(p_time);
roi->SetVisibility(und);
LegoBool visiblity = data->GetVisibility(p_time);
roi->SetVisibility(visiblity);
for (LegoU32 i = 0; i < p_node->GetNumChildren(); i++) {
FUN_100a8e80(p_node->GetChild(i), roi->m_local2world, p_time, p_roiMap);
ApplyAnimationTransformation(p_node->GetChild(i), roi->m_local2world, p_time, p_roiMap);
}
}
else {
@ -451,14 +451,14 @@ void LegoROI::FUN_100a8e80(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_t
local2world.Product(mat, p_matrix);
for (LegoU32 i = 0; i < p_node->GetNumChildren(); i++) {
FUN_100a8e80(p_node->GetChild(i), local2world, p_time, p_roiMap);
ApplyAnimationTransformation(p_node->GetChild(i), local2world, p_time, p_roiMap);
}
}
}
// FUNCTION: LEGO1 0x100a8fd0
// FUNCTION: BETA10 0x1018ac81
void LegoROI::FUN_100a8fd0(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_time, LegoROI** p_roiMap)
void LegoROI::ApplyTransform(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_time, LegoROI** p_roiMap)
{
MxMatrix mat;
@ -470,7 +470,7 @@ void LegoROI::FUN_100a8fd0(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_t
roi->m_local2world.Product(mat, p_matrix);
for (LegoU32 i = 0; i < p_node->GetNumChildren(); i++) {
FUN_100a8fd0(p_node->GetChild(i), roi->m_local2world, p_time, p_roiMap);
ApplyTransform(p_node->GetChild(i), roi->m_local2world, p_time, p_roiMap);
}
}
else {
@ -478,7 +478,7 @@ void LegoROI::FUN_100a8fd0(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_t
local2world.Product(mat, p_matrix);
for (LegoU32 i = 0; i < p_node->GetNumChildren(); i++) {
FUN_100a8fd0(p_node->GetChild(i), local2world, p_time, p_roiMap);
ApplyTransform(p_node->GetChild(i), local2world, p_time, p_roiMap);
}
}
}
@ -493,7 +493,7 @@ LegoResult LegoROI::SetFrame(LegoAnim* p_anim, LegoTime p_time)
mat = m_local2world;
mat.SetIdentity(); // this clears the matrix, assignment above is redundant
return ApplyAnimationTransformation(root, mat, p_time, this);
return ApplyChildAnimationTransformation(root, mat, p_time, this);
}
// FUNCTION: LEGO1 0x100a9170
@ -756,7 +756,7 @@ TimeROI::TimeROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, LegoTime p_t
// FUNCTION: LEGO1 0x100a9b40
// FUNCTION: BETA10 0x1018bbf0
void TimeROI::FUN_100a9b40(Matrix4& p_matrix, LegoTime p_time)
void TimeROI::CalculateWorldVelocity(Matrix4& p_matrix, LegoTime p_time)
{
LegoTime time = p_time - m_time;

23
LEGO1/lego/sources/roi/legoroi.h
View File

@ -27,21 +27,26 @@ class LegoROI : public ViewROI {
~LegoROI() override;
LegoResult Read(
OrientableROI* p_unk0xd4,
OrientableROI* p_parentROI,
Tgl::Renderer* p_renderer,
ViewLODListManager* p_viewLODListManager,
LegoTextureContainer* p_textureContainer,
LegoStorage* p_storage
);
LegoROI* FindChildROI(const LegoChar* p_name, LegoROI* p_roi);
LegoResult ApplyAnimationTransformation(
LegoResult ApplyChildAnimationTransformation(
LegoTreeNode* p_node,
const Matrix4& p_matrix,
LegoTime p_time,
LegoROI* p_roi
);
static void FUN_100a8e80(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_time, LegoROI** p_roiMap);
static void FUN_100a8fd0(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_time, LegoROI** p_roiMap);
static void ApplyAnimationTransformation(
LegoTreeNode* p_node,
Matrix4& p_matrix,
LegoTime p_time,
LegoROI** p_roiMap
);
static void ApplyTransform(LegoTreeNode* p_node, Matrix4& p_matrix, LegoTime p_time, LegoROI** p_roiMap);
LegoResult SetFrame(LegoAnim* p_anim, LegoTime p_time);
LegoResult SetLodColor(LegoFloat p_red, LegoFloat p_green, LegoFloat p_blue, LegoFloat p_alpha);
LegoResult SetTextureInfo(LegoTextureInfo* p_textureInfo);
@ -92,10 +97,10 @@ class LegoROI : public ViewROI {
// LegoROI::`scalar deleting destructor'
private:
LegoChar* m_name; // 0xe4
BoundingSphere m_sphere; // 0xe8
undefined m_unk0x100; // 0x100
LegoEntity* m_entity; // 0x104
LegoChar* m_name; // 0xe4
BoundingSphere m_sphere; // 0xe8
LegoBool m_sharedLodList; // 0x100
LegoEntity* m_entity; // 0x104
friend class DebugViewer;
};
@ -107,7 +112,7 @@ class TimeROI : public LegoROI {
public:
TimeROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, LegoTime p_time);
void FUN_100a9b40(Matrix4& p_matrix, LegoTime p_time);
void CalculateWorldVelocity(Matrix4& p_matrix, LegoTime p_time);
// SYNTHETIC: LEGO1 0x100a9ad0
// SYNTHETIC: BETA10 0x1018c540