Skip to content

Hitbox group pen #2002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdamTadeusz wants to merge 2 commits into
base: master
Choose a base branch
from
+105 −1
Open

Hitbox group pen #2002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c747442
init
AdamTadeusz Jun 30, 2026
248df2d
little check here
AdamTadeusz Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/game/client/neo/c_neo_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class C_NEO_Player : public C_HL2MP_Player
virtual float GetFOV( void );
virtual CStudioHdr *OnNewModel( void );
virtual void TraceAttack( const CTakeDamageInfo &info, const Vector &vecDir, trace_t *ptr, CDmgAccumulator *pAccumulator );
virtual bool TestHitboxes(const Ray_t &ray, unsigned int fContentsMask, trace_t &tr) override;
virtual void ItemPreFrame( void );
virtual void ItemPostFrame( void );
virtual float GetMinFOV() const;
Expand Down
1 change: 1 addition & 0 deletions src/game/server/neo/neo_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class CNEO_Player : public CHL2MP_Player
virtual CBaseEntity* FindUseEntity() override;

virtual void InitVCollision(const Vector& vecAbsOrigin, const Vector& vecAbsVelocity) OVERRIDE;
virtual bool TestHitboxes(const Ray_t &ray, unsigned int fContentsMask, trace_t &tr) override;

virtual void ModifyFireBulletsDamage(CTakeDamageInfo* dmgInfo) OVERRIDE;

Expand Down
89 changes: 89 additions & 0 deletions src/game/shared/neo/neo_player_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "c_neo_player.h"
#include "c_playerresource.h"
#include "ui/neo_hud_context_hint.h"
#include "vprof.h"
#define CNEO_Player C_NEO_Player
#else
#include "neo_player.h"
Expand All @@ -42,6 +43,8 @@
#include "c_te_effect_dispatch.h"
#endif // GAME_DLL

#include "bone_setup.h"

// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"

Expand Down Expand Up @@ -707,4 +710,90 @@ CBaseEntity *CNEO_Player::FindUseEntity()
}

return pNearest;
}

bool CNEO_Player::TestHitboxes(const Ray_t& ray, unsigned int fContentsMask, trace_t& tr)
{
#ifdef CLIENT_DLL
VPROF( "C_BaseAnimating::TestHitboxes" );

MDLCACHE_CRITICAL_SECTION();
#endif // CLIENT_DLL

CStudioHdr *pStudioHdr = GetModelPtr();
if (!pStudioHdr)
return false;

mstudiohitboxset_t *set = pStudioHdr->pHitboxSet( m_nHitboxSet );
if ( !set || !set->numhitboxes )
return false;

// Use vcollide for box traces.
if ( !ray.m_IsRay )
return false;

// This *has* to be true for the existing code to function correctly.
Assert( ray.m_StartOffset == vec3_origin );

#ifdef GAME_DLL
CBoneCache *pCache = GetBoneCache( );
#else
CBoneCache *pCache = GetBoneCache( pStudioHdr );
#endif // GAME_DLL
matrix3x4_t *hitboxbones[MAXSTUDIOBONES];
pCache->ReadCachedBonePointers( hitboxbones, pStudioHdr->numbones() );

#ifdef GAME_DLL
if ( TraceToStudio( physprops, ray, pStudioHdr, set, hitboxbones, fContentsMask, GetAbsOrigin(), GetModelScale(), tr ) )
#else
if ( TraceToStudio( physprops, ray, pStudioHdr, set, hitboxbones, fContentsMask, GetRenderOrigin(), GetModelScale(), tr ) )
#endif // GAME_DLL
{
mstudiobbox_t *pbox = set->pHitbox( tr.hitbox );
mstudiobone_t *pBone = pStudioHdr->pBone(pbox->bone);
tr.surface.name = "**studio**";
tr.surface.flags = SURF_HITBOX;
tr.surface.surfaceProps = physprops->GetSurfaceIndex( pBone->pszSurfaceProp() );

if (fContentsMask & CONTENTS_HITBOX)

@AdamTadeusz AdamTadeusz Jul 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the only changes from the CBaseAnimating baseclass implementation should be in this if loop, I've skipped the ismultiplayer checks in the other player classes that otherwise scale the player's hitbox down in singleplayer

{
switch (tr.hitgroup)
{
case HITGROUP_LEFTARM:
case HITGROUP_RIGHTARM:
case HITGROUP_LEFTLEG:
case HITGROUP_RIGHTLEG:
case HITGROUP_GEAR:
trace_t secondTrace;
unsigned int fHitboxGroupMask = UINT_MAX;
fHitboxGroupMask = fHitboxGroupMask & ~(1 << HITGROUP_LEFTARM);
fHitboxGroupMask = fHitboxGroupMask & ~(1 << HITGROUP_RIGHTARM);
fHitboxGroupMask = fHitboxGroupMask & ~(1 << HITGROUP_LEFTLEG);
fHitboxGroupMask = fHitboxGroupMask & ~(1 << HITGROUP_RIGHTLEG);
fHitboxGroupMask = fHitboxGroupMask & ~(1 << HITGROUP_GEAR);
#ifdef GAME_DLL
if (TraceToStudio(physprops, ray, pStudioHdr, set, hitboxbones, fContentsMask, GetAbsOrigin(), GetModelScale(), secondTrace, fHitboxGroupMask))
#else
if (TraceToStudio(physprops, ray, pStudioHdr, set, hitboxbones, fContentsMask, GetRenderOrigin(), GetModelScale(), secondTrace, fHitboxGroupMask))
#endif // GAME_DLL
{
tr.hitgroup = secondTrace.hitgroup;
}
}
}

#ifdef CLIENT_DLL
if ( IsRagdoll() )
{
IPhysicsObject *pReplace = m_pRagdoll->GetElement( tr.physicsbone );
if ( pReplace )
{
VPhysicsSetObject( NULL );
VPhysicsSetObject( pReplace );
}
}
#endif // CLIENT_DLL
}

return true;
}
11 changes: 10 additions & 1 deletion src/public/bone_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5380,8 +5380,12 @@ bool SweepBoxToStudio( IPhysicsSurfaceProps *pProps, const Ray_t& ray, CStudioHd
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
bool TraceToStudio( IPhysicsSurfaceProps *pProps, const Ray_t& ray, CStudioHdr *pStudioHdr, mstudiohitboxset_t *set,
bool TraceToStudio( IPhysicsSurfaceProps *pProps, const Ray_t& ray, CStudioHdr *pStudioHdr, mstudiohitboxset_t *set,
#ifdef NEO
matrix3x4_t **hitboxbones, int fContentsMask, const Vector &vecOrigin, float flScale, trace_t &tr, unsigned int fHitboxGroupMask )
#else
matrix3x4_t **hitboxbones, int fContentsMask, const Vector &vecOrigin, float flScale, trace_t &tr )
#endif // NEO
{
if ( !ray.m_IsRay )
{
Expand All @@ -5400,6 +5404,11 @@ bool TraceToStudio( IPhysicsSurfaceProps *pProps, const Ray_t& ray, CStudioHdr *
{
mstudiobbox_t *pbox = set->pHitbox(i);

#ifdef NEO
if ((fHitboxGroupMask & (1 << pbox->group)) == 0)
continue;
#endif // NEO

// Filter based on contents mask
int fBoneContents = pStudioHdr->pBone( pbox->bone )->contents;
if ( ( fBoneContents & fContentsMask ) == 0 )
Expand Down
4 changes: 4 additions & 0 deletions src/public/bone_setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,11 @@ void Studio_DestroyBoneCache( memhandle_t cacheHandle );
void Studio_InvalidateBoneCache( memhandle_t cacheHandle );

// Given a ray, trace for an intersection with this studiomodel. Get the array of bones from StudioSetupHitboxBones
#ifdef NEO
bool TraceToStudio( class IPhysicsSurfaceProps *pProps, const Ray_t& ray, CStudioHdr *pStudioHdr, mstudiohitboxset_t *set, matrix3x4_t **hitboxbones, int fContentsMask, const Vector &vecOrigin, float flScale, trace_t &trace, unsigned int fHitboxGroupMask = UINT_MAX );
#else
bool TraceToStudio( class IPhysicsSurfaceProps *pProps, const Ray_t& ray, CStudioHdr *pStudioHdr, mstudiohitboxset_t *set, matrix3x4_t **hitboxbones, int fContentsMask, const Vector &vecOrigin, float flScale, trace_t &trace );
#endif // NEO

void QuaternionSM( float s, const Quaternion &p, const Quaternion &q, Quaternion &qt );
void QuaternionMA( const Quaternion &p, float s, const Quaternion &q, Quaternion &qt );
Expand Down