mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 08:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match LegoPointOfViewController::Tickle (#667)

Browse Source
This commit is contained in:
Christian Semmler
2024-03-13 13:46:20 -04:00
committed by GitHub
parent beb30e80ea
commit 0623e6a766
8 changed files with 99 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
View File

@@ -93,3 +93,9 @@ MxResult LegoSoundManager::Tickle()
AUTOLOCK(m_criticalSection);
return m_unk0x40->Tickle();
}
// STUB: LEGO1 0x1002a410
void LegoSoundManager::FUN_1002a410(const float* p_pos, const float* p_dir, const float* p_up, const float* p_vel)
{
// TODO
}

13
LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
View File

@@ -242,6 +242,19 @@ float LegoNavController::CalculateNewVel(float p_targetVel, float p_currentVel,
return newVel;
}
// STUB: LEGO1 0x10055080
MxBool LegoNavController::CalculateNewPosDir(
const Vector3& p_curPos,
const Vector3& p_curDir,
Vector3& p_newPos,
Vector3& p_newDir,
undefined* p_und
)
{
// TODO
return TRUE;
}
// STUB: LEGO1 0x10055620
void LegoNavController::SetLocation(MxU32 p_location)
{

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

@@ -1,12 +1,20 @@
#include "3dmanager/lego3dview.h"
#include "legonavcontroller.h"
#include "legoomni.h"
#include "legopointofviewcontroller.h"
#include "legosoundmanager.h"
#include "misc.h"
#include "mxmisc.h"
#include "mxticklemanager.h"
#include "realtime/realtime.h"
#include "roi/legoroi.h"
DECOMP_SIZE_ASSERT(LegoMouseController, 0x20);
DECOMP_SIZE_ASSERT(LegoPointOfViewController, 0x38);
// GLOBAL: LEGO1 0x100f75ac
MxBool g_unk0x100f75ac = FALSE;
//////////////////////////////////////////////////////////////////////
// FUNCTION: LEGO1 0x10065550
@@ -121,16 +129,59 @@ void LegoPointOfViewController::LeftDrag(int p_x, int p_y)
AffectPointOfView();
}
// STUB: LEGO1 0x10065900
// FUNCTION: LEGO1 0x10065900
void LegoPointOfViewController::AffectPointOfView()
{
// TODO
m_nav->SetTargets(GetButtonX(), GetButtonY(), GetIsButtonDown());
}
// STUB: LEGO1 0x10065930
// FUNCTION: LEGO1 0x10065930
MxResult LegoPointOfViewController::Tickle()
{
// TODO
ViewROI* pov = m_lego3DView->GetPointOfView();
if (pov != NULL && m_nav != NULL && m_entity == NULL) {
Mx3DPointFloat newDir, newPos;
Vector3 pos(pov->GetWorldPosition());
Vector3 dir(pov->GetWorldDirection());
if (m_nav->CalculateNewPosDir(pos, dir, newDir, newPos, NULL)) {
MxMatrix mat;
CalcLocalTransform(newPos, newDir, pov->GetWorldUp(), mat);
((TimeROI*) pov)->FUN_100a9b40(mat, Timer()->GetTime());
pov->WrappedSetLocalTransform(mat);
m_lego3DView->Moved(*pov);
SoundManager()->FUN_1002a410(
pov->GetWorldPosition(),
pov->GetWorldDirection(),
pov->GetWorldUp(),
pov->GetWorldVelocity()
);
g_unk0x100f75ac = FALSE;
}
else {
if (g_unk0x100f75ac == FALSE) {
Mx3DPointFloat vel;
vel.Clear();
pov->FUN_100a5a30(vel);
SoundManager()->FUN_1002a410(
pov->GetWorldPosition(),
pov->GetWorldDirection(),
pov->GetWorldUp(),
pov->GetWorldVelocity()
);
g_unk0x100f75ac = TRUE;
}
}
}
return SUCCESS;
}