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

Implement/match Act3Cop::ParseAction (#1230)

Browse source 
* Implement/match `Act3Cop::ParseAction`

* Fix formatting

* Address review comment

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz 2024-12-15 18:09:29 +01:00 committed by GitHub
parent 661c76c6e0
commit 2e7f2edbf1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 68 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
LEGO1/lego/legoomni/include/act3actors.h
View file

@ -76,9 +76,13 @@ class Act3Cop : public Act3Actor {
// Act3Cop::`scalar deleting destructor' // Act3Cop::`scalar deleting destructor'
private: private:
MxFloat m_unk0x20; // 0x20 MxFloat m_unk0x20; // 0x20
LegoWorld* m_world; // 0x24 LegoWorld* m_world; // 0x24
undefined4 m_unk0x28[2]; // 0x28
// name verified by BETA10 0x10018aa1
LegoAnimActorStruct* m_eatAnim; // 0x28
undefined4 m_unk0x2c; // 0x2c
}; };
// VTABLE: LEGO1 0x100d7838 LegoPathActor // VTABLE: LEGO1 0x100d7838 LegoPathActor

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

@ -13,6 +13,7 @@ struct LegoAnimActorStruct {
float GetDuration(); float GetDuration();
// FUNCTION: BETA10 0x1000fb10
float GetUnknown0x00() { return m_unk0x00; } float GetUnknown0x00() { return m_unk0x00; }
// FUNCTION: BETA10 0x10012210 // FUNCTION: BETA10 0x10012210

63
LEGO1/lego/legoomni/src/actors/act3actors.cpp
View file

@ -9,6 +9,7 @@
#include "legopathedgecontainer.h" #include "legopathedgecontainer.h"
#include "legosoundmanager.h" #include "legosoundmanager.h"
#include "misc.h" #include "misc.h"
#include "mxdebug.h"
#include "mxmisc.h" #include "mxmisc.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxutilities.h" #include "mxutilities.h"
@ -211,11 +212,67 @@ MxResult Act3Cop::HitActor(LegoPathActor* p_actor, MxBool p_bool)
return SUCCESS; return SUCCESS;
} }
// STUB: LEGO1 0x10040060 // FUNCTION: LEGO1 0x10040060
// STUB: BETA10 0x100186fa // FUNCTION: BETA10 0x100186fa
void Act3Cop::ParseAction(char* p_extra) void Act3Cop::ParseAction(char* p_extra)
{ {
// TODO m_world = CurrentWorld();
LegoAnimActor::ParseAction(p_extra);
((Act3*) m_world)->AddCop(this);
Act3* world = (Act3*) m_world;
MxS32 i;
// The typecast is necessary for correct signedness
for (i = 0; i < (MxS32) sizeOfArray(g_copDest); i++) {
assert(g_copDest[i].m_bName);
g_copDest[i].m_boundary = world->FindPathBoundary(g_copDest[i].m_bName);
assert(g_copDest[i].m_boundary);
if (g_copDest[i].m_boundary) {
Mx3DPointFloat point(g_copDest[i].m_unk0x08[0], g_copDest[i].m_unk0x08[1], g_copDest[i].m_unk0x08[2]);
LegoPathBoundary* boundary = g_copDest[i].m_boundary;
for (MxS32 j = 0; j < boundary->GetNumEdges(); j++) {
Mx4DPointFloat* edgeNormal = boundary->GetEdgeNormal(j);
if (point.Dot(edgeNormal, &point) + edgeNormal->index_operator(3) < -0.001) {
MxTrace("Bad Act3 cop destination %d\n", i);
break;
}
}
Mx4DPointFloat* boundary0x14 = boundary->GetUnknown0x14();
if (point.Dot(&point, boundary0x14) + boundary0x14->index_operator(3) <= 0.001 &&
point.Dot(&point, boundary0x14) + boundary0x14->index_operator(3) >= -0.001) {
continue;
}
g_copDest[i].m_unk0x08[1] = -(boundary0x14->index_operator(3) + boundary0x14->index_operator(0) * point[0] +
boundary0x14->index_operator(2) * point[2]) /
boundary0x14->index_operator(1);
MxTrace(
"Act3 cop destination %d (%g, %g, %g) is not on plane of boundary %s...adjusting to (%g, %g, %g)\n",
i,
point[0],
point[1],
point[2],
boundary->GetName(),
point[0],
g_copDest[i].m_unk0x08[1],
point[2]
);
}
}
for (i = 0; i < m_animMaps.size(); i++) {
if (m_animMaps[i]->GetUnknown0x00() == -1.0f) {
m_eatAnim = m_animMaps[i];
}
}
assert(m_eatAnim);
} }
// STUB: LEGO1 0x100401f0 // STUB: LEGO1 0x100401f0