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

Implement/match LegoExtraActor::VTable0x6c (#956)

Browse source
This commit is contained in:
Christian Semmler 2024-05-25 19:16:20 -04:00 committed by GitHub
parent 535f1b973a
commit 3cfb918559
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 116 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
LEGO1/lego/legoomni/include/legoanimpresenter.h
View file

@ -54,21 +54,21 @@ class LegoAnimPresenter : public MxVideoPresenter {
return !strcmp(p_name, LegoAnimPresenter::ClassName()) || MxVideoPresenter::IsA(p_name); return !strcmp(p_name, LegoAnimPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
} }
void ReadyTickle() override; // vtable+0x18 void ReadyTickle() override; // vtable+0x18
void StartingTickle() override; // vtable+0x1c void StartingTickle() override; // vtable+0x1c
void StreamingTickle() override; // vtable+0x20 void StreamingTickle() override; // vtable+0x20
void DoneTickle() override; // vtable+0x2c void DoneTickle() override; // vtable+0x2c
void ParseExtra() override; // vtable+0x30 void ParseExtra() override; // vtable+0x30
MxResult AddToManager() override; // vtable+0x34 MxResult AddToManager() override; // vtable+0x34
void Destroy() override; // vtable+0x38 void Destroy() override; // vtable+0x38
MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
void EndAction() override; // vtable+0x40 void EndAction() override; // vtable+0x40
void PutFrame() override; // vtable+0x6c void PutFrame() override; // vtable+0x6c
virtual MxResult CreateAnim(MxStreamChunk* p_chunk); // vtable+0x88 virtual MxResult CreateAnim(MxStreamChunk* p_chunk); // vtable+0x88
virtual void VTable0x8c(); // vtable+0x8c virtual void VTable0x8c(); // vtable+0x8c
virtual void VTable0x90(); // vtable+0x90 virtual void VTable0x90(); // vtable+0x90
virtual MxU32 VTable0x94(Vector3& p_vec1, Vector3& p_vec2, float p_f1, float p_f2, Vector3& p_vec3); // vtable+0x94 virtual MxU32 VTable0x94(Vector3& p_v1, Vector3& p_v2, float p_f1, float p_f2, Vector3& p_v3); // vtable+0x94
virtual MxResult VTable0x98(LegoPathBoundary* p_boundary); // vtable+0x98 virtual MxResult VTable0x98(LegoPathBoundary* p_boundary); // vtable+0x98
// FUNCTION: LEGO1 0x1000c990 // FUNCTION: LEGO1 0x1000c990
virtual LegoROI** GetROIMap(MxU32& p_roiMapSize) virtual LegoROI** GetROIMap(MxU32& p_roiMapSize)

1
LEGO1/lego/legoomni/include/legopathactor.h
View file

@ -126,6 +126,7 @@ class LegoPathActor : public LegoActor {
inline LegoPathBoundary* GetBoundary() { return m_boundary; } inline LegoPathBoundary* GetBoundary() { return m_boundary; }
inline MxU32 GetState() { return m_state; } inline MxU32 GetState() { return m_state; }
inline LegoPathController* GetController() { return m_controller; } inline LegoPathController* GetController() { return m_controller; }
inline MxBool GetCollideBox() { return m_collideBox; }
inline void SetBoundary(LegoPathBoundary* p_boundary) { m_boundary = p_boundary; } inline void SetBoundary(LegoPathBoundary* p_boundary) { m_boundary = p_boundary; }
inline void SetState(MxU32 p_state) { m_state = p_state; } inline void SetState(MxU32 p_state) { m_state = p_state; }

99
LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
View file

@ -287,9 +287,9 @@ MxResult LegoExtraActor::VTable0x9c()
if (m_boundary != oldBoundary) { if (m_boundary != oldBoundary) {
MxU32 b = FALSE; MxU32 b = FALSE;
LegoAnimPresenterSet& set = m_boundary->GetPresenters(); LegoAnimPresenterSet& presenters = m_boundary->GetPresenters();
for (LegoAnimPresenterSet::iterator it = set.begin(); it != set.end(); it++) { for (LegoAnimPresenterSet::iterator it = presenters.begin(); it != presenters.end(); it++) {
MxU32 roiMapSize; MxU32 roiMapSize;
if ((*it)->GetROIMap(roiMapSize)) { if ((*it)->GetROIMap(roiMapSize)) {
b = TRUE; b = TRUE;
@ -312,9 +312,9 @@ void LegoExtraActor::Restart()
{ {
if (m_unk0x0e != 0) { if (m_unk0x0e != 0) {
MxU32 b = FALSE; MxU32 b = FALSE;
LegoAnimPresenterSet& set = m_boundary->GetPresenters(); LegoAnimPresenterSet& presenters = m_boundary->GetPresenters();
for (LegoAnimPresenterSet::iterator it = set.begin(); it != set.end(); it++) { for (LegoAnimPresenterSet::iterator it = presenters.begin(); it != presenters.end(); it++) {
MxU32 roiMapSize; MxU32 roiMapSize;
if ((*it)->GetROIMap(roiMapSize)) { if ((*it)->GetROIMap(roiMapSize)) {
b = TRUE; b = TRUE;
@ -429,7 +429,7 @@ MxS32 LegoExtraActor::VTable0x68(Vector3& p_point1, Vector3& p_point2, Vector3&
return LegoPathActor::VTable0x68(p_point1, p_point2, p_point3); return LegoPathActor::VTable0x68(p_point1, p_point2, p_point3);
} }
// STUB: LEGO1 0x1002b980 // FUNCTION: LEGO1 0x1002b980
MxU32 LegoExtraActor::VTable0x6c( MxU32 LegoExtraActor::VTable0x6c(
LegoPathBoundary* p_boundary, LegoPathBoundary* p_boundary,
Vector3& p_v1, Vector3& p_v1,
@ -439,5 +439,94 @@ MxU32 LegoExtraActor::VTable0x6c(
Vector3& p_v3 Vector3& p_v3
) )
{ {
LegoAnimPresenterSet& presenters = p_boundary->GetPresenters();
for (LegoAnimPresenterSet::iterator itap = presenters.begin(); itap != presenters.end(); itap++) {
if ((*itap)->VTable0x94(p_v1, p_v2, p_f1, p_f2, p_v3)) {
return 1;
}
}
LegoPathActorSet& plpas = p_boundary->GetActors();
LegoPathActorSet lpas(plpas);
for (LegoPathActorSet::iterator itpa = lpas.begin(); itpa != lpas.end(); itpa++) {
if (plpas.find(*itpa) != plpas.end()) {
LegoPathActor* actor = *itpa;
if (this != actor && !(actor->GetState() & 0x100)) {
LegoROI* roi = actor->GetROI();
if ((roi != NULL && roi->GetVisibility()) || actor->GetCameraFlag()) {
if (actor->GetUserNavFlag()) {
MxMatrix local2world = roi->GetLocal2World();
Vector3 local60(local2world[3]);
Mx3DPointFloat local54(p_v1);
((Vector3&) local54).Sub(&local60);
float local1c = p_v2.Dot(&p_v2, &p_v2);
float local24 = p_v2.Dot(&p_v2, &local54) * 2.0f;
float local20 = local54.Dot(&local54, &local54);
if (m_unk0x15 != 0 && local20 < 10.0f) {
return 0;
}
local20 -= 1.0f;
if (local1c >= 0.001 || local1c <= -0.001) {
float local40 = (local24 * local24) + (local20 * local1c * -4.0f);
if (local40 >= -0.001) {
local1c *= 2.0f;
local24 = -local24;
if (local40 < 0.0f) {
local40 = 0.0f;
}
local40 = sqrt(local40);
float local20X = (local24 + local40) / local1c;
float local1cX = (local24 - local40) / local1c;
if (local1cX < local20X) {
local40 = local20X;
local20X = local1cX;
local1cX = local40;
}
if ((local20X >= 0.0f && local20X <= p_f1) || (local1cX >= 0.0f && local1cX <= p_f1) ||
(local20X <= -0.01 && p_f1 + 0.01 <= local1cX)) {
p_v3 = p_v1;
if (VTable0x94(actor, TRUE) < 0) {
return 0;
}
actor->VTable0x94(this, FALSE);
return 2;
}
}
}
}
else {
if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
if (VTable0x94(actor, TRUE) < 0) {
return 0;
}
actor->VTable0x94(this, FALSE);
return 2;
}
}
}
}
}
}
if (m_unk0x15 != 0) {
m_unk0x15--;
}
return 0; return 0;
} }

4
LEGO1/lego/legoomni/src/paths/legopathactor.cpp
View file

@ -437,9 +437,9 @@ MxU32 LegoPathActor::VTable0x6c(
Vector3& p_v3 Vector3& p_v3
) )
{ {
LegoAnimPresenterSet& laps = p_boundary->GetPresenters(); LegoAnimPresenterSet& presenters = p_boundary->GetPresenters();
for (LegoAnimPresenterSet::iterator itap = laps.begin(); itap != laps.end(); itap++) { for (LegoAnimPresenterSet::iterator itap = presenters.begin(); itap != presenters.end(); itap++) {
if ((*itap)->VTable0x94(p_v1, p_v2, p_f1, p_f2, p_v3)) { if ((*itap)->VTable0x94(p_v1, p_v2, p_f1, p_f2, p_v3)) {
return 1; return 1;
} }

9
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View file

@ -1113,13 +1113,13 @@ void LegoAnimPresenter::FUN_1006c8a0(MxBool p_bool)
// FUNCTION: LEGO1 0x1006c8f0 // FUNCTION: LEGO1 0x1006c8f0
// FUNCTION: BETA10 0x1005206c // FUNCTION: BETA10 0x1005206c
MxU32 LegoAnimPresenter::VTable0x94(Vector3& p_vec1, Vector3& p_vec2, float p_f1, float p_f2, Vector3& p_vec3) MxU32 LegoAnimPresenter::VTable0x94(Vector3& p_v1, Vector3& p_v2, float p_f1, float p_f2, Vector3& p_v3)
{ {
Mx3DPointFloat a, b; Mx3DPointFloat a, b;
b = p_vec2; b = p_v2;
((Vector3&) b).Mul(p_f1); ((Vector3&) b).Mul(p_f1);
((Vector3&) b).Add(&p_vec1); ((Vector3&) b).Add(&p_v1);
a = b; a = b;
((Vector3&) a).Sub(&m_unk0xa8); ((Vector3&) a).Sub(&m_unk0xa8);
@ -1132,8 +1132,7 @@ MxU32 LegoAnimPresenter::VTable0x94(Vector3& p_vec1, Vector3& p_vec2, float p_f1
len = sqrt(len); len = sqrt(len);
if (len <= m_unk0xa4 + p_f2 && m_roiMapSize != 0 && m_roiMap != NULL) { if (len <= m_unk0xa4 + p_f2 && m_roiMapSize != 0 && m_roiMap != NULL) {
for (MxU32 i = 1; i <= m_roiMapSize; i++) { for (MxU32 i = 1; i <= m_roiMapSize; i++) {
if (m_roiMap[i]->GetLODCount() != 0 && if (m_roiMap[i]->GetLODCount() != 0 && m_roiMap[i]->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, FALSE)) {
m_roiMap[i]->FUN_100a9410(p_vec1, p_vec2, p_f1, p_f2, p_vec3, FALSE)) {
return TRUE; return TRUE;
} }
} }