mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-05-01 18:13:57 +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.
103 lines
2.9 KiB
C++
103 lines
2.9 KiB
C++
#ifndef LEGOUTILS_H
|
|
#define LEGOUTILS_H
|
|
|
|
#include "actionsfwd.h"
|
|
#include "decomp.h"
|
|
#include "extra.h"
|
|
#include "mxtypes.h"
|
|
|
|
#ifdef MINIWIN
|
|
#include "miniwin/windows.h"
|
|
#else
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#define WM_ISLE_SETCURSOR 0x5400
|
|
|
|
// name verified by BETA10 0x100d4054
|
|
#define DS_NOT_A_STREAM -1
|
|
|
|
enum Cursor {
|
|
e_cursorArrow = 0,
|
|
e_cursorBusy,
|
|
e_cursorNo,
|
|
e_cursorUnused3,
|
|
e_cursorUnused4,
|
|
e_cursorUnused5,
|
|
e_cursorUnused6,
|
|
e_cursorUnused7,
|
|
e_cursorUnused8,
|
|
e_cursorUnused9,
|
|
e_cursorUnused10,
|
|
e_cursorNone
|
|
};
|
|
|
|
enum GameEvent {
|
|
e_hitActor,
|
|
e_skeletonKick,
|
|
e_raceFinished,
|
|
e_badEnding,
|
|
e_goodEnding,
|
|
e_saveSlotWritten,
|
|
e_saveStateChanged
|
|
};
|
|
|
|
class BoundingSphere;
|
|
class MxAtomId;
|
|
class LegoEntity;
|
|
class LegoAnimPresenter;
|
|
class LegoNamedTexture;
|
|
class LegoPathActor;
|
|
class LegoROI;
|
|
class LegoStorage;
|
|
class LegoTreeNode;
|
|
|
|
extern MxAtomId* g_isleScript;
|
|
|
|
LegoEntity* PickEntity(MxLong p_x, MxLong p_y);
|
|
LegoROI* PickROI(MxLong p_x, MxLong p_y);
|
|
LegoROI* PickRootROI(MxLong p_x, MxLong p_y);
|
|
void RotateY(LegoROI* p_roi, MxFloat p_angle);
|
|
MxBool SpheresIntersect(const BoundingSphere& p_sphere1, const BoundingSphere& p_sphere2);
|
|
MxBool CalculateRayOriginDirection(MxFloat p_coordinates[2], MxFloat p_direction[3], MxFloat p_origin[3]);
|
|
MxBool TransformWorldToScreen(const MxFloat p_world[3], MxFloat p_screen[4]);
|
|
MxS16 CountTotalTreeNodes(LegoTreeNode* p_node);
|
|
LegoTreeNode* GetTreeNode(LegoTreeNode* p_node, MxU32 p_index);
|
|
void CalculateViewFromAnimation(LegoAnimPresenter* p_presenter);
|
|
Extra::ActionType MatchActionString(const char*);
|
|
void InvokeAction(Extra::ActionType p_actionId, const MxAtomId& p_pAtom, MxS32 p_streamId, LegoEntity* p_sender);
|
|
void SetCameraControllerFromIsle();
|
|
void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_gOut, float* p_bOut);
|
|
void PlayCamAnim(LegoPathActor* p_actor, MxBool p_unused, MxU32 p_location, MxBool p_bool);
|
|
void ResetViewVelocity();
|
|
MxBool RemoveFromCurrentWorld(const MxAtomId& p_atomId, MxS32 p_id);
|
|
void EnableAnimations(MxBool p_enable);
|
|
void SetAppCursor(Cursor p_cursor);
|
|
MxBool CanExit();
|
|
MxBool RemoveFromWorld(
|
|
const MxAtomId& p_entityAtom,
|
|
MxS32 p_entityId,
|
|
const MxAtomId& p_worldAtom,
|
|
MxS32 p_worldEntityId
|
|
);
|
|
MxS32 UpdateLightPosition(MxS32 p_increase);
|
|
void SetLightPosition(MxS32 p_index);
|
|
LegoNamedTexture* ReadNamedTexture(LegoStorage* p_storage);
|
|
void WriteDefaultTexture(LegoStorage* p_storage, const char* p_name);
|
|
void WriteNamedTexture(LegoStorage* p_storage, LegoNamedTexture* p_namedTexture);
|
|
void LoadFromNamedTexture(LegoNamedTexture* p_namedTexture);
|
|
void EmitGameEvent(GameEvent p_event, void* p_data = NULL);
|
|
|
|
// FUNCTION: BETA10 0x100260a0
|
|
inline void StartIsleAction(IsleScript::Script p_objectId)
|
|
{
|
|
if (p_objectId != (IsleScript::Script) -1) {
|
|
InvokeAction(Extra::e_start, *g_isleScript, p_objectId, NULL);
|
|
}
|
|
}
|
|
|
|
// SYNTHETIC: LEGO1 0x10034b40
|
|
// LegoTexture::`scalar deleting destructor'
|
|
|
|
#endif // LEGOUTILS_H
|