mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-05-02 18:43:56 +00:00
7b114bbe59
* 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.
127 lines
4.1 KiB
C++
127 lines
4.1 KiB
C++
#pragma once
|
|
|
|
#include "extensions/common/characteranimator.h"
|
|
#include "extensions/common/customizestate.h"
|
|
#include "extensions/multiplayer/animation/catalog.h"
|
|
#include "extensions/multiplayer/emoteanimhandler.h"
|
|
#include "extensions/multiplayer/protocol.h"
|
|
#include "mxgeometry/mxmatrix.h"
|
|
#include "mxtypes.h"
|
|
|
|
#include <cstdint>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
class LegoROI;
|
|
class LegoWorld;
|
|
|
|
namespace Multiplayer
|
|
{
|
|
|
|
class NameBubbleRenderer;
|
|
|
|
class RemotePlayer {
|
|
public:
|
|
RemotePlayer(uint32_t p_peerId, uint8_t p_actorId, uint8_t p_displayActorIndex);
|
|
~RemotePlayer();
|
|
|
|
void Spawn(LegoWorld* p_isleWorld);
|
|
void Despawn();
|
|
void UpdateFromNetwork(const PlayerStateMsg& p_msg);
|
|
void Tick(float p_deltaTime);
|
|
void ReAddToScene();
|
|
|
|
uint32_t GetPeerId() const { return m_peerId; }
|
|
const char* GetUniqueName() const { return m_uniqueName; }
|
|
uint8_t GetActorId() const { return m_actorId; }
|
|
uint8_t GetDisplayActorIndex() const { return m_displayActorIndex; }
|
|
void SetActorId(uint8_t p_actorId) { m_actorId = p_actorId; }
|
|
LegoROI* GetROI() const { return m_roi; }
|
|
bool IsSpawned() const { return m_spawned; }
|
|
bool IsVisible() const { return m_visible; }
|
|
int8_t GetWorldId() const { return m_targetWorldId; }
|
|
const std::vector<int16_t>& GetLocations() const { return m_locations; }
|
|
void SetLocations(std::vector<int16_t> p_locations) { m_locations = std::move(p_locations); }
|
|
bool IsAtLocation(int16_t p_location) const;
|
|
bool HasReceivedUpdate() const { return m_hasReceivedUpdate; }
|
|
void GetTargetPosition(float& p_x, float& p_z) const
|
|
{
|
|
p_x = m_targetPosition[0];
|
|
p_z = m_targetPosition[2];
|
|
}
|
|
uint32_t GetLastUpdateTime() const { return m_lastUpdateTime; }
|
|
void SetVisible(bool p_visible);
|
|
void TriggerExtraAnim(uint8_t p_emoteId);
|
|
void SetNameBubbleVisible(bool p_visible);
|
|
void CreateNameBubble();
|
|
void DestroyNameBubble();
|
|
|
|
const Extensions::Common::CustomizeState& GetCustomizeState() const { return m_customizeState; }
|
|
bool GetAllowRemoteCustomize() const { return m_allowRemoteCustomize; }
|
|
void SetClickAnimObjectId(MxU32 p_clickAnimObjectId) { m_animator.SetClickAnimObjectId(p_clickAnimObjectId); }
|
|
void StopClickAnimation();
|
|
bool IsInVehicle() const { return m_animator.IsInVehicle(); }
|
|
LegoROI* GetRideVehicleROI() const { return m_animator.GetRideVehicleROI(); }
|
|
bool IsMoving() const { return m_animator.IsInVehicle() || m_targetSpeed > 0.01f; }
|
|
bool IsExtraAnimBlocking() const { return m_animator.IsExtraAnimBlocking(); }
|
|
|
|
const char* GetDisplayName() const { return m_displayName; }
|
|
|
|
void LockForAnimation(uint16_t p_lockedForAnimIndex) { m_lockedForAnimIndex = p_lockedForAnimIndex; }
|
|
void UnlockFromAnimation(uint16_t p_lockedForAnimIndex)
|
|
{
|
|
if (m_lockedForAnimIndex == p_lockedForAnimIndex) {
|
|
m_lockedForAnimIndex = Animation::ANIM_INDEX_NONE;
|
|
}
|
|
}
|
|
void ForceUnlockAnimation() { m_lockedForAnimIndex = Animation::ANIM_INDEX_NONE; }
|
|
bool IsAnimationLocked() const { return m_lockedForAnimIndex != Animation::ANIM_INDEX_NONE; }
|
|
|
|
private:
|
|
bool IsEffectivelyMoving() const;
|
|
const char* GetDisplayActorName() const;
|
|
void UpdateTransform(float p_deltaTime);
|
|
void UpdateVehicleState();
|
|
void EnterVehicle(int8_t p_vehicleType);
|
|
void ExitVehicle();
|
|
|
|
uint32_t m_peerId;
|
|
uint8_t m_actorId;
|
|
uint8_t m_displayActorIndex;
|
|
char m_uniqueName[32];
|
|
char m_displayName[USERNAME_BUFFER_SIZE];
|
|
|
|
LegoROI* m_roi;
|
|
bool m_spawned;
|
|
bool m_visible;
|
|
|
|
float m_targetPosition[3];
|
|
float m_targetDirection[3];
|
|
float m_targetUp[3];
|
|
float m_targetSpeed;
|
|
int8_t m_targetVehicleType;
|
|
int8_t m_targetWorldId;
|
|
uint32_t m_lastUpdateTime;
|
|
bool m_hasReceivedUpdate;
|
|
std::vector<int16_t> m_locations;
|
|
|
|
float m_currentPosition[3];
|
|
float m_currentDirection[3];
|
|
float m_currentUp[3];
|
|
|
|
Multiplayer::EmoteAnimHandler m_emoteHandler;
|
|
Extensions::Common::CharacterAnimator m_animator;
|
|
|
|
LegoROI* m_vehicleROI;
|
|
bool m_vehicleROICloned;
|
|
std::vector<MxMatrix> m_vehicleChildOffsets; // child-to-parent local offsets for cloned hierarchical ROIs
|
|
|
|
NameBubbleRenderer* m_nameBubble;
|
|
|
|
Extensions::Common::CustomizeState m_customizeState;
|
|
bool m_allowRemoteCustomize;
|
|
uint16_t m_lockedForAnimIndex;
|
|
};
|
|
|
|
} // namespace Multiplayer
|