xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed last issues with bullet tracing

Browse source
This commit is contained in:
Kamay Xutax 2024-07-15 21:53:44 +02:00
parent 94060e8c19
commit 466b0ea280
9 changed files with 80 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
game/client/c_baseplayer.cpp
View file

@ -247,7 +247,9 @@ END_RECV_TABLE()
RecvPropInt ( RECVINFO( m_nWaterLevel ) ),
RecvPropFloat ( RECVINFO( m_flLaggedMovementValue )),
END_RECV_TABLE()
RecvPropArray3 ( RECVINFO_ARRAY(m_vecBulletServerPositions), RecvPropVector( RECVINFO(m_vecBulletServerPositions[0])) ),
RecvPropInt(RECVINFO(m_iBulletServerPositionCount)),
END_RECV_TABLE()
// -------------------------------------------------------------------------------- //
@ -443,6 +445,7 @@ C_BasePlayer::C_BasePlayer() : m_iv_vecViewOffset( "C_BasePlayer::m_iv_vecViewOf
ListenForGameEvent( "base_player_teleported" );
m_nTickBaseFireBullet = -1;
m_iBulletServerPositionCount = 0;
}
//-----------------------------------------------------------------------------

2
game/client/c_baseplayer.h
View file

@ -640,6 +640,8 @@ public:
void SetOldPlayerZ( float flOld ) { m_flOldPlayerZ = flOld; }
int m_nTickBaseFireBullet;
Vector m_vecBulletServerPositions[MAX_PLAYER_BULLET_SERVER_POSITIONS];
int m_iBulletServerPositionCount;
};
EXTERN_RECV_TABLE(DT_BasePlayer);

33
game/client/cstrike/c_cs_player.cpp
View file

@ -52,6 +52,7 @@
#include "steam/steam_api.h"
#include "cs_blackmarket.h" // for vest/helmet prices
#include "weapon_csbase.h"
#if defined( CCSPlayer )
#undef CCSPlayer
@ -2226,6 +2227,38 @@ void C_CSPlayer::Simulate( void )
}
BaseClass::Simulate();
static ConVarRef cl_showimpacts("cl_showimpacts");
if ((cl_showimpacts.GetInt() == 1 || cl_showimpacts.GetInt() == 3) && m_lastBulletDiameter != -1.0f && m_iBulletServerPositionCount > 0)
{
auto weaponInfo = GetActiveWeapon();
if (!weaponInfo)
{
return;
}
for (int i = 0; i < m_iBulletServerPositionCount; i++)
{
debugoverlay->AddBoxOverlay(
m_vecBulletServerPositions[i],
Vector(-m_lastBulletDiameter,
-m_lastBulletDiameter,
-m_lastBulletDiameter)
/ 2,
Vector(m_lastBulletDiameter, m_lastBulletDiameter, m_lastBulletDiameter)
/ 2,
QAngle(0, 0, 0),
0,
0,
255,
127,
60);
}
m_lastBulletDiameter = -1.0f;
}
}
void C_CSPlayer::PostThink()

1
game/client/cstrike/c_cs_player.h
View file

@ -168,6 +168,7 @@ public:
public:
virtual float GetPlayerMaxSpeed();
float m_lastBulletDiameter;
float GetBulletDiameter(int iBulletType);
void GetBulletTypeParameters(
int iBulletType,

31
game/server/cstrike/cs_eventlog.cpp
View file

@ -299,36 +299,7 @@ protected:
pPlayer->GetNetworkIDString()
);
return true;
}
else if ( !Q_strncmp( eventName, "bullet_impact", Q_strlen("bullet_impact") ) )
{
static ConVarRef cl_showimpacts("cl_showimpacts");
if (cl_showimpacts.GetInt() == 1
|| cl_showimpacts.GetInt() == 3)
{
auto x = event->GetFloat("x");
auto y = event->GetFloat("y");
auto z = event->GetFloat("z");
auto flBulletDiameter = event->GetFloat("diameter");
debugoverlay->AddBoxOverlay(Vector(x, y, z),
Vector(-flBulletDiameter,
-flBulletDiameter,
-flBulletDiameter),
Vector(flBulletDiameter,
flBulletDiameter,
flBulletDiameter),
QAngle(0, 0, 0),
0,
0,
255,
127,
60.0f);
}
return true;
}
}
// unused events:
//hostage_hurt
//bomb_exploded

3
game/server/player.cpp
View file

@ -635,6 +635,7 @@ CBasePlayer::CBasePlayer( )
m_flLastUserCommandTime = 0.f;
m_flMovementTimeForUserCmdProcessingRemaining = 0.0f;
m_iBulletServerPositionCount.Set(0);
}
CBasePlayer::~CBasePlayer( )
@ -7970,6 +7971,8 @@ void CMovementSpeedMod::InputSpeedMod(inputdata_t &data)
SendPropInt ( SENDINFO( m_nWaterLevel ), 2, SPROP_UNSIGNED ),
SendPropFloat ( SENDINFO( m_flLaggedMovementValue ), 0, SPROP_NOSCALE ),
SendPropArray3( SENDINFO_ARRAY3(m_vecBulletServerPositions), SendPropVector(SENDINFO_ARRAY(m_vecBulletServerPositions))),
SendPropInt(SENDINFO(m_iBulletServerPositionCount)),
END_SEND_TABLE()

2
game/server/player.h
View file

@ -1210,6 +1210,8 @@ private:
public:
virtual unsigned int PlayerSolidMask( bool brushOnly = false ) const; // returns the solid mask for the given player, so bots can have a more-restrictive set
CNetworkArray(Vector, m_vecBulletServerPositions, MAX_PLAYER_BULLET_SERVER_POSITIONS);
CNetworkVar(int, m_iBulletServerPositionCount);
};
typedef CHandle<CBasePlayer> CBasePlayerHandle;

53
game/shared/cstrike/cs_player_shared.cpp
View file

@ -190,7 +190,12 @@ void UTIL_ClipTraceToPlayersHull( float flBulletDiameter, const Vector& vecAbsSt
float smallestFraction = tr->fraction;
const float maxRange = 60.0f;
ray.Init( vecAbsStart, vecAbsEnd , Vector(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter), Vector(flBulletDiameter, flBulletDiameter, flBulletDiameter) );
Vector vecBulletDiameterMaxs(flBulletDiameter, flBulletDiameter, flBulletDiameter);
vecBulletDiameterMaxs /= 2.0f;
Vector vecBulletDiameterMins(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter);
vecBulletDiameterMins /= 2.0f;
ray.Init( vecAbsStart, vecAbsEnd , vecBulletDiameterMins, vecBulletDiameterMaxs );
for ( int k = 1; k <= gpGlobals->maxClients; ++k )
{
@ -407,13 +412,18 @@ static bool TraceToExit(Vector &start, Vector &dir, Vector &end, float flStepSiz
inline void UTIL_TraceLineIgnoreTwoEntities(float flBulletDiameter, const Vector& vecAbsStart, const Vector& vecAbsEnd, unsigned int mask,
const IHandleEntity *ignore, const IHandleEntity *ignore2, int collisionGroup, trace_t *ptr )
{
Vector vecBulletDiameterMaxs(flBulletDiameter, flBulletDiameter, flBulletDiameter);
vecBulletDiameterMaxs /= 2.0f;
Vector vecBulletDiameterMins(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter);
vecBulletDiameterMins /= 2.0f;
Ray_t ray;
ray.Init( vecAbsStart, vecAbsEnd, Vector(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter), Vector(flBulletDiameter, flBulletDiameter, flBulletDiameter) );
ray.Init( vecAbsStart, vecAbsEnd, vecBulletDiameterMins, vecBulletDiameterMaxs );
CTraceFilterSkipTwoEntities traceFilter( ignore, ignore2, collisionGroup );
enginetrace->TraceRay( ray, mask, &traceFilter, ptr );
if( r_visualizetraces.GetBool() )
{
NDebugOverlay::SweptBox( ptr->startpos, ptr->endpos, Vector(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter), Vector(flBulletDiameter, flBulletDiameter, flBulletDiameter), QAngle(), 255, 0, 0, true, 100.0f );
NDebugOverlay::SweptBox( ptr->startpos, ptr->endpos, vecBulletDiameterMins, vecBulletDiameterMaxs, QAngle(), 255, 0, 0, true, 100.0f );
}
}
@ -442,9 +452,19 @@ void CCSPlayer::FireBullet(
float flDamageModifier = 0.5; // default modification of bullets power after they go through a wall.
float flPenetrationModifier = 1.f;
float flBulletDiameter = 0.0f;
int iPenetrationCount = 0;
GetBulletTypeParameters( iBulletType, flPenetrationPower, flPenetrationDistance, flBulletDiameter );
#ifdef CLIENT_DLL
m_lastBulletDiameter = flBulletDiameter;
#endif
Vector vecBulletDiameterMaxs(flBulletDiameter, flBulletDiameter, flBulletDiameter);
vecBulletDiameterMaxs /= 2.0f;
Vector vecBulletDiameterMins(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter);
vecBulletDiameterMins /= 2.0f;
if ( !pevAttacker )
pevAttacker = this; // the default attacker is ourselves
@ -572,7 +592,7 @@ void CCSPlayer::FireBullet(
{
#ifdef CLIENT_DLL
// draw red client impact markers
debugoverlay->AddBoxOverlay( tr.endpos, Vector(-flBulletDiameter,-flBulletDiameter,-flBulletDiameter), Vector(flBulletDiameter,flBulletDiameter,flBulletDiameter), QAngle( 0, 0, 0), 255,0,0,127, 60 );
debugoverlay->AddBoxOverlay( tr.endpos, vecBulletDiameterMins, vecBulletDiameterMaxs, QAngle( 0, 0, 0), 255,0,0,127, 60 );
if ( tr.m_pEnt && tr.m_pEnt->IsPlayer() )
{
@ -588,18 +608,11 @@ void CCSPlayer::FireBullet(
player->RecordServerHitboxes( this );
}
//
// Propogate a bullet impact event
// @todo Add this for shotgun pellets (which dont go thru here)
//
IGameEvent * event = gameeventmanager->CreateEvent( "bullet_impact" );
if ( event )
{
event->SetFloat( "x", tr.endpos.x );
event->SetFloat( "y", tr.endpos.y );
event->SetFloat("z", tr.endpos.z);
event->SetFloat( "diameter", flBulletDiameter );
gameeventmanager->FireEvent( event );
if (iPenetrationCount < MAX_PLAYER_BULLET_SERVER_POSITIONS)
{
m_vecBulletServerPositions.Set(iPenetrationCount, tr.endpos);
iPenetrationCount++;
m_iBulletServerPositionCount.Set(iPenetrationCount);
}
#endif
}
@ -625,7 +638,7 @@ void CCSPlayer::FireBullet(
if ( enginetrace->GetPointContents( tr.endpos ) & (CONTENTS_WATER|CONTENTS_SLIME) )
{
trace_t waterTrace;
UTIL_TraceHull( vecSrc, tr.endpos, Vector(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter), Vector(flBulletDiameter, flBulletDiameter, flBulletDiameter), (MASK_SHOT|CONTENTS_WATER|CONTENTS_SLIME), this, COLLISION_GROUP_NONE, &waterTrace );
UTIL_TraceHull( vecSrc, tr.endpos, vecBulletDiameterMins, vecBulletDiameterMaxs, (MASK_SHOT|CONTENTS_WATER|CONTENTS_SLIME), this, COLLISION_GROUP_NONE, &waterTrace );
if( waterTrace.allsolid != 1 )
{
@ -708,12 +721,12 @@ void CCSPlayer::FireBullet(
// find exact penetration exit
trace_t exitTr;
UTIL_TraceHull( penetrationEnd, tr.endpos, Vector(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter), Vector(flBulletDiameter, flBulletDiameter, flBulletDiameter), CS_MASK_SHOOT|CONTENTS_HITBOX, NULL, &exitTr );
UTIL_TraceHull( penetrationEnd, tr.endpos, vecBulletDiameterMins, vecBulletDiameterMaxs, CS_MASK_SHOOT|CONTENTS_HITBOX, NULL, &exitTr );
if( exitTr.m_pEnt != tr.m_pEnt && exitTr.m_pEnt != NULL )
{
// something was blocking, trace again
UTIL_TraceHull( penetrationEnd, tr.endpos, Vector(-flBulletDiameter, -flBulletDiameter, -flBulletDiameter), Vector(flBulletDiameter, flBulletDiameter, flBulletDiameter), CS_MASK_SHOOT|CONTENTS_HITBOX, exitTr.m_pEnt, COLLISION_GROUP_NONE, &exitTr );
UTIL_TraceHull( penetrationEnd, tr.endpos, vecBulletDiameterMins, vecBulletDiameterMaxs, CS_MASK_SHOOT|CONTENTS_HITBOX, exitTr.m_pEnt, COLLISION_GROUP_NONE, &exitTr );
}
// get material at exit point

2
game/shared/util_shared.h
View file

@ -26,7 +26,7 @@
#include "portal_util_shared.h"
#endif
#define MAX_PLAYER_BULLET_POSITIONS 128
#define MAX_PLAYER_BULLET_SERVER_POSITIONS 128
//-----------------------------------------------------------------------------
// Forward declarations