R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
r5sdk/r5dev/game/shared/animation.h

104 lines
2.8 KiB
C
Raw Normal View History

Fix rare crash Rare crash when the sqvm tries to look for an animation sequence on a missing prop_dynamic model (mdl/error.rmdl doesn't support animations), its purely to indicate there is a problem).
2022-04-30 18:59:55 +02:00
#ifndef ANIMATION_H
#define ANIMATION_H
Add more entity structures to the SDK Stuff will be separated properly very soon.
2023-01-18 01:34:40 +01:00
#include "mathlib/vector.h"
Add modelinfo vftable pointers
2023-01-22 16:48:16 +01:00
#include "public/studio.h"
Fix crash in hitbox drawing code and light restructure * Fix null pointer dereference crash in server hitbox drawing code; implemented a proper getter for CStudioHdr. * Moved 'baseentity.h/cpp' to 'game/server/' instead. * Overall light cleanup.
2023-01-23 23:21:29 +01:00
#include "public/ihandleentity.h"
Add more entity structures to the SDK Stuff will be separated properly very soon.
2023-01-18 01:34:40 +01:00
class CAnimationLayer
{
bool m_bSequenceFinished;
char gap_1[3];
int m_fFlags;
int m_layerIndex;
int m_modelIndex;
float m_flKillRate;
float m_flKillDelay;
char m_nActivity[4];
int m_nPriority;
float m_flLastEventCheck;
char gap_24[4];
Fix crash in hitbox drawing code and light restructure * Fix null pointer dereference crash in server hitbox drawing code; implemented a proper getter for CStudioHdr. * Moved 'baseentity.h/cpp' to 'game/server/' instead. * Overall light cleanup.
2023-01-23 23:21:29 +01:00
IHandleEntity* m_animationLayerOwner; // !TODO: CBaseEntity/C_BaseEntity?
Add more entity structures to the SDK Stuff will be separated properly very soon.
2023-01-18 01:34:40 +01:00
};
/W4: Properly pack server animation structures Manually add fields to align structure properly. This suppresses many pesky compiler warnings.
2023-04-02 17:19:13 +02:00
struct PredictedAnimEventData
Finished CPlayer inheritance
2023-01-18 12:39:18 +01:00
{
char gap_0[8];
float m_predictedAnimEventTimes[8];
int m_predictedAnimEventIndices[8];
int m_predictedAnimEventCount;
int m_predictedAnimEventTarget;
int m_predictedAnimEventSequence;
int m_predictedAnimEventModel;
float m_predictedAnimEventsReadyToFireTime;
/W4: Properly pack server animation structures Manually add fields to align structure properly. This suppresses many pesky compiler warnings.
2023-04-02 17:19:13 +02:00
char gap_5C[4]; // <-- 64-BIT ALIGNMENT
Finished CPlayer inheritance
2023-01-18 12:39:18 +01:00
};
/W4: Properly pack server animation structures Manually add fields to align structure properly. This suppresses many pesky compiler warnings.
2023-04-02 17:19:13 +02:00
struct AnimRelativeData
Add more entity structures to the SDK Stuff will be separated properly very soon.
2023-01-18 01:34:40 +01:00
{
char gap_0[8];
Vector3D m_animInitialPos;
Vector3D m_animInitialVel;
Quaternion m_animInitialRot;
Vector3D m_animInitialCorrectPos;
Quaternion m_animInitialCorrectRot;
Vector3D m_animEntityToRefOffset;
Quaternion m_animEntityToRefRotation;
float m_animBlendBeginTime;
float m_animBlendEndTime;
int m_animScriptSequence;
int m_animScriptModel;
bool m_animIgnoreParentRot;
char gap_79[3];
int m_animMotionMode;
bool m_safePushMode;
/W4: Properly pack server animation structures Manually add fields to align structure properly. This suppresses many pesky compiler warnings.
2023-04-02 17:19:13 +02:00
char gap_81[7]; // <-- 64-BIT ALIGNMENT
Add more entity structures to the SDK Stuff will be separated properly very soon.
2023-01-18 01:34:40 +01:00
};
struct Player_AnimViewEntityData
{
char gap_0[8];
int animViewEntityHandle;
float animViewEntityAngleLerpInDuration;
float animViewEntityOriginLerpInDuration;
float animViewEntityLerpOutDuration;
bool animViewEntityStabilizePlayerEyeAngles;
char gap_19[3];
int animViewEntityThirdPersonCameraParity;
int animViewEntityThirdPersonCameraAttachment[6];
int animViewEntityNumThirdPersonCameraAttachments;
bool animViewEntityThirdPersonCameraVisibilityChecks;
bool animViewEntityDrawPlayer;
char gap_3e[2];
float fovTarget;
float fovSmoothTime;
int animViewEntityParity;
int lastAnimViewEntityParity;
int lastAnimViewEntityParityTick;
Vector3D animViewEntityCameraPosition;
Vector3D animViewEntityCameraAngles;
float animViewEntityBlendStartTime;
Vector3D animViewEntityBlendStartEyePosition;
Vector3D animViewEntityBlendStartEyeAngles;
};
IDetour: remove extraneous pointer assignments Originally, we store the search results in a CMemory instance which we then assign to the actual function pointer. CMemory is just a pointer class; we can assign the results directly to the actual function pointer. This commit reduces a lot of code verbosity, and also reduced roughly 2KiB worth of static pointers in the resulting executable. This commit also officially deprecates the support for any GameDLL's below S3 (Season 3), since it makes more sense to port the assets from earlier/later games back to the version this SDK supports.
2024-01-02 15:21:36 +01:00
inline int(*CStudioHdr__LookupSequence)(CStudioHdr* pStudio, const char* pszName);
Fix rare crash Rare crash when the sqvm tries to look for an animation sequence on a missing prop_dynamic model (mdl/error.rmdl doesn't support animations), its purely to indicate there is a problem).
2022-04-30 18:59:55 +02:00
///////////////////////////////////////////////////////////////////////////////
Update GetAdr implementations to feature spdlog Fixed all alignments and reduced code verbosity
2022-05-13 14:53:25 +02:00
class VAnimation : public IDetour
Fix rare crash Rare crash when the sqvm tries to look for an animation sequence on a missing prop_dynamic model (mdl/error.rmdl doesn't support animations), its purely to indicate there is a problem).
2022-04-30 18:59:55 +02:00
{
virtual void GetAdr(void) const
{
IDetour: remove extraneous pointer assignments Originally, we store the search results in a CMemory instance which we then assign to the actual function pointer. CMemory is just a pointer class; we can assign the results directly to the actual function pointer. This commit reduces a lot of code verbosity, and also reduced roughly 2KiB worth of static pointers in the resulting executable. This commit also officially deprecates the support for any GameDLL's below S3 (Season 3), since it makes more sense to port the assets from earlier/later games back to the version this SDK supports.
2024-01-02 15:21:36 +01:00
LogFunAdr("CStudioHdr::LookupSequence", CStudioHdr__LookupSequence);
Fix rare crash Rare crash when the sqvm tries to look for an animation sequence on a missing prop_dynamic model (mdl/error.rmdl doesn't support animations), its purely to indicate there is a problem).
2022-04-30 18:59:55 +02:00
}
virtual void GetFun(void) const
{
IDetour: remove extraneous pointer assignments Originally, we store the search results in a CMemory instance which we then assign to the actual function pointer. CMemory is just a pointer class; we can assign the results directly to the actual function pointer. This commit reduces a lot of code verbosity, and also reduced roughly 2KiB worth of static pointers in the resulting executable. This commit also officially deprecates the support for any GameDLL's below S3 (Season 3), since it makes more sense to port the assets from earlier/later games back to the version this SDK supports.
2024-01-02 15:21:36 +01:00
g_GameDll.FindPatternSIMD("40 53 48 83 EC 20 48 8B D9 4C 8B C2 48 8B 89 ?? ?? ?? ??").GetPtr(CStudioHdr__LookupSequence);
Fix rare crash Rare crash when the sqvm tries to look for an animation sequence on a missing prop_dynamic model (mdl/error.rmdl doesn't support animations), its purely to indicate there is a problem).
2022-04-30 18:59:55 +02:00
}
virtual void GetVar(void) const { }
virtual void GetCon(void) const { }
IDetour: code refactor Utilize the new IDetour::DetourSetup() code, IDetour::Attach and IDetour::Detach have been removed in favor of this (significantly reduces chance of user error). Since the template check happens in the idetour header, it is much more aggressive on type mismatches, such as a difference in parameter types, between the function and detour, will now raise a compile time error. As a result, some type mismatches have been fixed in this commit as well.
2023-11-26 13:21:20 +01:00
virtual void Detour(const bool bAttach) const;
Fix rare crash Rare crash when the sqvm tries to look for an animation sequence on a missing prop_dynamic model (mdl/error.rmdl doesn't support animations), its purely to indicate there is a problem).
2022-04-30 18:59:55 +02:00
};
///////////////////////////////////////////////////////////////////////////////
#endif // ANIMATION_H
Reference in New Issue Copy Permalink