mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-22 16:04:17 +00:00
Implement/match LegoNavController::CalculateNewPosDir (#675)
* Implement/match LegoNavController::CalculateNewPosDir * Fix naming * Fix naming
This commit is contained in:

committed by
GitHub

parent
5e0e7ab908
commit
0e146f08d6
@@ -1,45 +1,22 @@
|
||||
#ifndef LEGONAVCONTROLLER_H
|
||||
#define LEGONAVCONTROLLER_H
|
||||
#ifndef __LEGONAVCONTROLLER_H
|
||||
#define __LEGONAVCONTROLLER_H
|
||||
|
||||
#include "decomp.h"
|
||||
#include "mxcore.h"
|
||||
#include "mxtimer.h"
|
||||
#include "mxtypes.h"
|
||||
#include "realtime/vector.h"
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// LegoMouseController
|
||||
|
||||
// VTABLE: LEGO1 0x100d85b8
|
||||
// SIZE 0x70
|
||||
class LegoNavController : public MxCore {
|
||||
public:
|
||||
static void GetDefaults(
|
||||
int* p_mouseDeadzone,
|
||||
float* p_movementMaxSpeed,
|
||||
float* p_turnMaxSpeed,
|
||||
float* p_movementMaxAccel,
|
||||
float* p_turnMaxAccel,
|
||||
float* p_movementDecel,
|
||||
float* p_turnDecel,
|
||||
float* p_movementMinAccel,
|
||||
float* p_turnMinAccel,
|
||||
float* p_rotationSensitivity,
|
||||
MxBool* p_turnUseVelocity
|
||||
);
|
||||
static void SetDefaults(
|
||||
int p_mouseDeadzone,
|
||||
float p_movementMaxSpeed,
|
||||
float p_turnMaxSpeed,
|
||||
float p_movementMaxAccel,
|
||||
float p_turnMaxAccel,
|
||||
float p_movementDecel,
|
||||
float p_turnDecel,
|
||||
float p_movementMinAccel,
|
||||
float p_turnMinAccel,
|
||||
float p_rotationSensitivity,
|
||||
MxBool p_turnUseVelocity
|
||||
);
|
||||
|
||||
LegoNavController();
|
||||
~LegoNavController() override; // vtable+0x00
|
||||
~LegoNavController() override;
|
||||
|
||||
MxLong Notify(MxParam& p_param) override; // vtable+0x04
|
||||
|
||||
// FUNCTION: LEGO1 0x10054b80
|
||||
@@ -55,55 +32,98 @@ public:
|
||||
return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
|
||||
}
|
||||
|
||||
void SetControlMax(int p_hMax, int p_vMax);
|
||||
void ResetToDefault();
|
||||
void SetTargets(int p_hPos, int p_vPos, MxBool p_accel);
|
||||
static void SetLocation(MxU32 p_location);
|
||||
float CalculateNewTargetSpeed(int p_pos, int p_center, float p_maxSpeed);
|
||||
float CalculateNewAccel(int p_pos, int p_center, float p_maxAccel, int p_minAccel);
|
||||
float CalculateNewVel(float p_targetVel, float p_currentVel, float p_accel, float p_time);
|
||||
void SetControlMax(int p_hMax, int p_vMax);
|
||||
void SetTrackDefaultParams(MxBool p_state) { m_trackDefault = p_state; }
|
||||
void SetToDefaultParams();
|
||||
MxBool CalculateNewPosDir(
|
||||
const Vector3& p_curPos,
|
||||
const Vector3& p_curDir,
|
||||
Vector3& p_newPos,
|
||||
Vector3& p_newDir,
|
||||
undefined* p_und
|
||||
const Vector3* p_und
|
||||
);
|
||||
|
||||
inline void SetTrackDefaultParams(MxBool p_trackDefault) { m_trackDefault = p_trackDefault; }
|
||||
static void GetDefaults(
|
||||
int* p_dz,
|
||||
float* p_lv,
|
||||
float* p_rv,
|
||||
float* p_la,
|
||||
float* p_ra,
|
||||
float* p_ld,
|
||||
float* p_rd,
|
||||
float* p_lmina,
|
||||
float* p_rmina,
|
||||
float* p_rs,
|
||||
MxBool* p_urs
|
||||
);
|
||||
static void SetDefaults(
|
||||
int p_dz,
|
||||
float p_lv,
|
||||
float p_rv,
|
||||
float p_la,
|
||||
float p_ra,
|
||||
float p_ld,
|
||||
float p_rd,
|
||||
float p_lmina,
|
||||
float p_rmina,
|
||||
float p_rs,
|
||||
MxBool p_urs
|
||||
);
|
||||
static void SetLocation(MxU32 p_location);
|
||||
|
||||
// SYNTHETIC: LEGO1 0x10054c10
|
||||
// LegoNavController::`scalar deleting destructor'
|
||||
|
||||
private:
|
||||
int m_hMax;
|
||||
int m_vMax;
|
||||
int m_mouseDeadzone;
|
||||
float m_zeroThreshold;
|
||||
float m_unk0x18;
|
||||
float m_unk0x1c;
|
||||
float m_targetMovementSpeed;
|
||||
float m_targetTurnSpeed;
|
||||
float m_movementMaxSpeed;
|
||||
float m_turnMaxSpeed;
|
||||
float m_movementAccel;
|
||||
float m_turnAccel;
|
||||
float m_movementMaxAccel;
|
||||
float m_turnMaxAccel;
|
||||
float m_movementMinAccel;
|
||||
float m_turnMinAccel;
|
||||
float m_movementDecel;
|
||||
float m_turnDecel;
|
||||
float m_turnSensitivity;
|
||||
MxBool m_turnUseVelocity;
|
||||
int m_time;
|
||||
MxBool m_trackDefault;
|
||||
MxBool m_unk0x5d;
|
||||
char m_unk0x5e[2];
|
||||
int m_unk0x60;
|
||||
int m_unk0x64;
|
||||
int m_unk0x68;
|
||||
MxBool m_unk0x6c;
|
||||
protected:
|
||||
float CalculateNewVel(float p_targetVel, float p_currentVel, float p_accel, float p_time);
|
||||
float CalculateNewTargetVel(int p_pos, int p_center, float p_max);
|
||||
float CalculateNewAccel(int p_pos, int p_center, float p_max, int p_min);
|
||||
|
||||
int FUN_10055750(MxBool& p_und);
|
||||
int FUN_100558b0();
|
||||
|
||||
int m_hMax; // 0x08
|
||||
int m_vMax; // 0x0c
|
||||
int m_deadZone; // 0x10
|
||||
float m_zeroThreshold; // 0x14
|
||||
float m_linearVel; // 0x18
|
||||
float m_rotationalVel; // 0x1c
|
||||
float m_targetLinearVel; // 0x20
|
||||
float m_targetRotationalVel; // 0x24
|
||||
float m_maxLinearVel; // 0x28
|
||||
float m_maxRotationalVel; // 0x2c
|
||||
float m_linearAccel; // 0x30
|
||||
float m_rotationalAccel; // 0x34
|
||||
float m_maxLinearAccel; // 0x38
|
||||
float m_maxRotationalAccel; // 0x3c
|
||||
float m_minLinearAccel; // 0x40
|
||||
float m_minRotationalAccel; // 0x44
|
||||
float m_maxLinearDeccel; // 0x48
|
||||
float m_maxRotationalDeccel; // 0x4c
|
||||
float m_rotSensitivity; // 0x50
|
||||
MxBool m_useRotationalVel; // 0x54
|
||||
MxTime m_lastTime; // 0x58
|
||||
MxBool m_trackDefault; // 0x5c
|
||||
MxBool m_unk0x5d; // 0x5d
|
||||
float m_unk0x60; // 0x60
|
||||
float m_unk0x64; // 0x64
|
||||
float m_unk0x68; // 0x68
|
||||
MxBool m_unk0x6c; // 0x6c
|
||||
|
||||
// one copy of defaults (these can be set by App.)
|
||||
static int g_defdeadZone;
|
||||
static float g_defzeroThreshold;
|
||||
static float g_defmaxLinearVel;
|
||||
static float g_defmaxRotationalVel;
|
||||
static float g_defmaxLinearAccel;
|
||||
static float g_defmaxRotationalAccel;
|
||||
static float g_defminLinearAccel;
|
||||
static float g_defminRotationalAccel;
|
||||
static float g_defmaxLinearDeccel;
|
||||
static float g_defmaxRotationalDeccel;
|
||||
static float g_defrotSensitivity;
|
||||
static MxBool g_defuseRotationalVel;
|
||||
};
|
||||
|
||||
#endif // LEGONAVCONTROLLER_H
|
||||
#endif // __LEGOPOVCONTROLLER_H
|
||||
|
Reference in New Issue
Block a user