mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-05-01 18:13:57 +00:00
* Add multiplayer extension * Fix animation system to work when host is outside ISLE world - Move TickHostSessions outside m_inIsleWorld gate so the host can coordinate animations from any world - Load animation catalog early in HandleCreate so the host can coordinate before entering the ISLE world - Use network-reported positions for remote player location detection instead of requiring spawned ROIs - Always erase sessions at launch — the host's job ends when the animation starts; clients play and complete independently - Replace BroadcastAnimComplete with locally-driven completion callbacks: host generates eventId at launch, clients cache completion JSON at start time, fire it when ScenePlayer finishes - Make StopAnimation only do local cleanup (stop playback, cancel own interest, reset coordinator) without destroying the session host, so other players' sessions survive world transitions - Broadcast state=0 in ResetAnimationState for full teardown paths (shutdown, reconnect, host migration) so clients aren't left with stale session state * Fix use-after-free crash in ScenePlayer when remote player disconnects mid-animation When a remote player's ROI is destroyed (disconnect, timeout, or respawn), notify all active ScenePlayer instances to null out dangling references before the ROI is freed. The animation engine already handles null ROI map entries gracefully, so playback continues for remaining participants. * Fix crash when performer's child ROIs are left dangling in ScenePlayer NotifyROIDestroyed now walks the parent chain to also invalidate child ROIs of the destroyed performer (head, limbs, etc.) that were placed into the roiMap by BuildROIMap. The ancestor walk happens once; all other fields are cleaned with simple pointer equality. * Allow spectator to play click animation during scene playback * Make PTATCAM track spectator ROI instead of camera in ScenePlayer * Only regenerate emscripten version files when git state changes Replace add_custom_target(ALL) with add_custom_command(OUTPUT) so the version script only runs when .git/HEAD or the current branch ref file changes, instead of on every build. * Fix ROI name collision causing dangling pointers in NPC locomotion roiMaps When ScenePlayer created cloned NPC ROIs for cooperative animations, it renamed them to match the original character name and added them to the ViewManager. This created a name collision: two ROIs with the same name. The original game's AppendROIToScene searches by name and stops at the first match, so if a locomotion BuildROIMap ran while the clone existed, it could capture pointers to the clone's child ROIs. When the clone was later destroyed (CleanupProps), those roiMap entries became dangling pointers, crashing in AnimateWithTransform at roi.h:151 (SetVisibility). Fix: use the alias mechanism (already supported by AnimUtils::BuildROIMap) instead of renaming clones. Also unify all ROI name generation behind a shared counter to prevent character manager key collisions.
299 lines
8.5 KiB
C++
299 lines
8.5 KiB
C++
#ifndef LEGOINPUTMANAGER_H
|
|
#define LEGOINPUTMANAGER_H
|
|
|
|
#include "decomp.h"
|
|
#include "extensions/fwd.h"
|
|
#include "lego1_export.h"
|
|
#include "legoeventnotificationparam.h"
|
|
#include "mxlist.h"
|
|
#include "mxpresenter.h"
|
|
#include "mxqueue.h"
|
|
|
|
#include <SDL3/SDL_haptic.h>
|
|
#include <SDL3/SDL_joystick.h>
|
|
#include <SDL3/SDL_keyboard.h>
|
|
#include <SDL3/SDL_keycode.h>
|
|
#include <SDL3/SDL_timer.h>
|
|
#ifdef MINIWIN
|
|
#include "miniwin/windows.h"
|
|
#else
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#include <map>
|
|
#include <variant>
|
|
|
|
class LegoCameraController;
|
|
class LegoControlManager;
|
|
class LegoWorld;
|
|
|
|
extern MxS32 g_clickedObjectId;
|
|
extern const char* g_clickedAtom;
|
|
|
|
// VTABLE: LEGO1 0x100d87b8
|
|
// class MxCollection<LegoEventNotificationParam>
|
|
|
|
// VTABLE: LEGO1 0x100d87d0
|
|
// class MxList<LegoEventNotificationParam>
|
|
|
|
// VTABLE: LEGO1 0x100d87e8
|
|
// class MxQueue<LegoEventNotificationParam>
|
|
|
|
// VTABLE: LEGO1 0x100d8800
|
|
// SIZE 0x18
|
|
class LegoEventQueue : public MxQueue<LegoEventNotificationParam> {};
|
|
|
|
// VTABLE: LEGO1 0x100d6a20
|
|
// class MxCollection<MxCore*>
|
|
|
|
// VTABLE: LEGO1 0x100d6a38
|
|
// class MxList<MxCore*>
|
|
|
|
// VTABLE: LEGO1 0x100d6a50
|
|
// class MxPtrList<MxCore>
|
|
|
|
// VTABLE: LEGO1 0x100d6a68
|
|
// SIZE 0x18
|
|
class LegoNotifyList : public MxPtrList<MxCore> {
|
|
protected:
|
|
// FUNCTION: LEGO1 0x10028830
|
|
MxS8 Compare(MxCore* p_element1, MxCore* p_element2) override
|
|
{
|
|
return p_element1 == p_element2 ? 0 : p_element1 < p_element2 ? -1 : 1;
|
|
} // vtable+0x14
|
|
|
|
public:
|
|
LegoNotifyList(MxBool p_ownership = FALSE) : MxPtrList<MxCore>(p_ownership) {}
|
|
};
|
|
|
|
// VTABLE: LEGO1 0x100d6ac0
|
|
// class MxListCursor<MxCore *>
|
|
|
|
// VTABLE: LEGO1 0x100d6ad8
|
|
// class MxPtrListCursor<MxCore>
|
|
|
|
// VTABLE: LEGO1 0x100d6aa8
|
|
// SIZE 0x10
|
|
class LegoNotifyListCursor : public MxPtrListCursor<MxCore> {
|
|
public:
|
|
LegoNotifyListCursor(LegoNotifyList* p_list) : MxPtrListCursor<MxCore>(p_list) {}
|
|
};
|
|
|
|
// VTABLE: LEGO1 0x100d8760
|
|
// SIZE 0x338
|
|
class LegoInputManager : public MxPresenter {
|
|
public:
|
|
enum Keys {
|
|
c_left = 0x01,
|
|
c_right = 0x02,
|
|
c_up = 0x04,
|
|
c_down = 0x08,
|
|
c_ctrl = 0x10,
|
|
|
|
c_leftOrRight = c_left | c_right,
|
|
c_upOrDown = c_up | c_down
|
|
};
|
|
|
|
enum TouchScheme {
|
|
e_none = -1,
|
|
e_mouse = 0,
|
|
e_arrowKeys,
|
|
e_gamepad,
|
|
};
|
|
|
|
LegoInputManager();
|
|
~LegoInputManager() override;
|
|
|
|
LEGO1_EXPORT void QueueEvent(NotificationId p_id, MxU8 p_modifier, MxLong p_x, MxLong p_y, SDL_Keycode p_key);
|
|
void Register(MxCore*);
|
|
void UnRegister(MxCore*);
|
|
|
|
// FUNCTION: LEGO1 0x1005b8b0
|
|
MxResult Tickle() override
|
|
{
|
|
ProcessEvents();
|
|
return SUCCESS;
|
|
} // vtable+0x08
|
|
|
|
// FUNCTION: LEGO1 0x1005b8c0
|
|
MxResult PutData() override { return SUCCESS; } // vtable+0x4c
|
|
|
|
MxResult Create(HWND p_hwnd);
|
|
void Destroy() override;
|
|
LEGO1_EXPORT MxResult GetJoystick();
|
|
MxResult GetJoystickState(MxU32* p_joystickX, MxU32* p_joystickY, MxU32* p_povPosition);
|
|
void StartAutoDragTimer();
|
|
void StopAutoDragTimer();
|
|
void EnableInputProcessing();
|
|
void SetCamera(LegoCameraController* p_camera);
|
|
void ClearCamera();
|
|
void SetWorld(LegoWorld* p_world);
|
|
void ClearWorld();
|
|
|
|
void SetUnknown335(MxBool p_unk0x335) { m_unk0x335 = p_unk0x335; }
|
|
void SetUnknown336(MxBool p_unk0x336) { m_unk0x336 = p_unk0x336; }
|
|
|
|
MxBool GetWasd() { return m_wasd; }
|
|
void SetWasd(MxBool p_wasd) { m_wasd = p_wasd; }
|
|
|
|
// FUNCTION: BETA10 0x1002e390
|
|
void DisableInputProcessing()
|
|
{
|
|
m_inputProcessingDisabled = TRUE;
|
|
m_unk0x336 = FALSE;
|
|
}
|
|
|
|
// FUNCTION: BETA10 0x10031ba0
|
|
LegoControlManager* GetControlManager() { return m_controlManager; }
|
|
|
|
// FUNCTION: BETA10 0x10017870
|
|
LegoWorld* GetWorld() { return m_world; }
|
|
|
|
LegoCameraController* GetCamera() { return m_camera; }
|
|
|
|
void ProcessEvents();
|
|
MxBool ProcessOneEvent(LegoEventNotificationParam& p_param);
|
|
MxBool FUN_1005cdf0(LegoEventNotificationParam& p_param);
|
|
void GetKeyboardState();
|
|
MxResult GetNavigationKeyStates(MxU32& p_keyFlags);
|
|
MxResult GetNavigationTouchStates(MxU32& p_keyFlags);
|
|
LEGO1_EXPORT void AddKeyboard(SDL_KeyboardID p_keyboardID);
|
|
LEGO1_EXPORT void RemoveKeyboard(SDL_KeyboardID p_keyboardID);
|
|
LEGO1_EXPORT void AddMouse(SDL_MouseID p_mouseID);
|
|
LEGO1_EXPORT void RemoveMouse(SDL_MouseID p_mouseID);
|
|
LEGO1_EXPORT void AddJoystick(SDL_JoystickID p_joystickID);
|
|
LEGO1_EXPORT void RemoveJoystick(SDL_JoystickID p_joystickID);
|
|
LEGO1_EXPORT MxBool HandleTouchEvent(SDL_Event* p_event, TouchScheme p_touchScheme);
|
|
LEGO1_EXPORT MxBool
|
|
HandleRumbleEvent(float p_strength, float p_lowFrequencyRumble, float p_highFrequencyRumble, MxU32 p_milliseconds);
|
|
LEGO1_EXPORT void UpdateLastInputMethod(SDL_Event* p_event);
|
|
const auto& GetLastInputMethod() { return m_lastInputMethod; }
|
|
|
|
// clang-format off
|
|
enum class SDL_KeyboardID_v : SDL_KeyboardID {};
|
|
enum class SDL_MouseID_v : SDL_MouseID {};
|
|
enum class SDL_JoystickID_v : SDL_JoystickID {};
|
|
enum class SDL_TouchID_v : SDL_TouchID {};
|
|
// clang-format on
|
|
|
|
// SYNTHETIC: LEGO1 0x1005b8d0
|
|
// LegoInputManager::`scalar deleting destructor'
|
|
|
|
private:
|
|
friend class Extensions::MultiplayerExt;
|
|
friend class Extensions::ThirdPersonCameraExt;
|
|
|
|
void InitializeHaptics();
|
|
|
|
MxCriticalSection m_criticalSection; // 0x58
|
|
LegoNotifyList* m_keyboardNotifyList; // 0x5c
|
|
LegoCameraController* m_camera; // 0x60
|
|
LegoWorld* m_world; // 0x64
|
|
LegoEventQueue* m_eventQueue; // 0x68
|
|
MxS32 m_x; // 0x6c
|
|
MxS32 m_y; // 0x70
|
|
MxS32 m_unk0x74; // 0x74
|
|
SDL_TimerID m_autoDragTimerID; // 0x78
|
|
UINT m_autoDragTime; // 0x7c
|
|
MxBool m_unk0x80; // 0x80
|
|
MxBool m_unk0x81; // 0x81
|
|
LegoControlManager* m_controlManager; // 0x84
|
|
MxBool m_inputProcessingDisabled; // 0x88
|
|
const bool* m_keyboardState;
|
|
MxBool m_unk0x195; // 0x195
|
|
MxBool m_unk0x335; // 0x335
|
|
MxBool m_unk0x336; // 0x336
|
|
|
|
MxBool m_wasd;
|
|
TouchScheme m_touchScheme = e_none;
|
|
SDL_Point m_touchVirtualThumb = {0, 0};
|
|
SDL_FPoint m_touchVirtualThumbOrigin;
|
|
SDL_FingerID m_touchFinger = 0;
|
|
std::map<SDL_FingerID, MxU32> m_touchFlags;
|
|
std::map<SDL_KeyboardID, std::pair<void*, void*>> m_keyboards;
|
|
std::map<SDL_MouseID, std::pair<void*, SDL_Haptic*>> m_mice;
|
|
std::map<SDL_JoystickID, std::pair<SDL_Gamepad*, SDL_Haptic*>> m_joysticks;
|
|
std::map<SDL_HapticID, SDL_Haptic*> m_otherHaptics;
|
|
std::variant<SDL_KeyboardID_v, SDL_MouseID_v, SDL_JoystickID_v, SDL_TouchID_v> m_lastInputMethod;
|
|
};
|
|
|
|
// TEMPLATE: LEGO1 0x10028850
|
|
// MxCollection<MxCore *>::Compare
|
|
|
|
// TEMPLATE: LEGO1 0x10028860
|
|
// MxCollection<MxCore *>::~MxCollection<MxCore *>
|
|
|
|
// TEMPLATE: LEGO1 0x100288b0
|
|
// MxCollection<MxCore *>::Destroy
|
|
|
|
// TEMPLATE: LEGO1 0x100288c0
|
|
// MxList<MxCore *>::~MxList<MxCore *>
|
|
|
|
// SYNTHETIC: LEGO1 0x10028950
|
|
// LegoNotifyList::`scalar deleting destructor'
|
|
|
|
// TEMPLATE: LEGO1 0x100289c0
|
|
// MxPtrList<MxCore>::~MxPtrList<MxCore>
|
|
|
|
// SYNTHETIC: LEGO1 0x10028a10
|
|
// MxCollection<MxCore *>::`scalar deleting destructor'
|
|
|
|
// SYNTHETIC: LEGO1 0x10028a80
|
|
// MxList<MxCore *>::`scalar deleting destructor'
|
|
|
|
// SYNTHETIC: LEGO1 0x10028b30
|
|
// MxPtrList<MxCore>::`scalar deleting destructor'
|
|
|
|
// FUNCTION: LEGO1 0x10028ba0
|
|
// LegoNotifyList::~LegoNotifyList
|
|
|
|
// SYNTHETIC: LEGO1 0x10028fd0
|
|
// LegoNotifyListCursor::`scalar deleting destructor'
|
|
|
|
// TEMPLATE: LEGO1 0x10029040
|
|
// MxPtrListCursor<MxCore>::~MxPtrListCursor<MxCore>
|
|
|
|
// SYNTHETIC: LEGO1 0x10029090
|
|
// MxListCursor<MxCore *>::`scalar deleting destructor'
|
|
|
|
// SYNTHETIC: LEGO1 0x10029100
|
|
// MxPtrListCursor<MxCore>::`scalar deleting destructor'
|
|
|
|
// TEMPLATE: LEGO1 0x10029170
|
|
// MxListCursor<MxCore *>::~MxListCursor<MxCore *>
|
|
|
|
// TEMPLATE: LEGO1 0x100291c0
|
|
// LegoNotifyListCursor::~LegoNotifyListCursor
|
|
|
|
// TEMPLATE: LEGO1 0x1005bb80
|
|
// MxCollection<LegoEventNotificationParam>::Compare
|
|
|
|
// TEMPLATE: LEGO1 0x1005bbe0
|
|
// MxCollection<LegoEventNotificationParam>::~MxCollection<LegoEventNotificationParam>
|
|
|
|
// TEMPLATE: LEGO1 0x1005bc30
|
|
// MxCollection<LegoEventNotificationParam>::Destroy
|
|
|
|
// TEMPLATE: LEGO1 0x1005bc80
|
|
// MxList<LegoEventNotificationParam>::~MxList<LegoEventNotificationParam>
|
|
|
|
// SYNTHETIC: LEGO1 0x1005bd50
|
|
// MxCollection<LegoEventNotificationParam>::`scalar deleting destructor'
|
|
|
|
// SYNTHETIC: LEGO1 0x1005bdc0
|
|
// MxList<LegoEventNotificationParam>::`scalar deleting destructor'
|
|
|
|
// SYNTHETIC: LEGO1 0x1005beb0
|
|
// LegoEventQueue::`scalar deleting destructor'
|
|
|
|
// TEMPLATE: LEGO1 0x1005bf20
|
|
// MxQueue<LegoEventNotificationParam>::~MxQueue<LegoEventNotificationParam>
|
|
|
|
// SYNTHETIC: LEGO1 0x1005bf70
|
|
// MxQueue<LegoEventNotificationParam>::`scalar deleting destructor'
|
|
|
|
// TEMPLATE: LEGO1 0x1005d010
|
|
// MxListEntry<LegoEventNotificationParam>::GetValue
|
|
|
|
#endif // LEGOINPUTMANAGER_H
|