Skip to content

fix TraceLineTable function degrading performance over time #893

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

Merged
BenLubar merged 2 commits into from
Apr 30, 2025
Merged

fix TraceLineTable function degrading performance over time #893

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
0d91bb7
TraceLineParams vscript function
jhh8 Apr 15, 2025
7ae2d84
fix TraceLineTable function degrading performance over time
jhh8 Apr 16, 2025
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
36 changes: 16 additions & 20 deletions src/game/server/vscript_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ static float ScriptTraceLine( const Vector &vecStart, const Vector &vecEnd, HSCR
}
}

static void ScriptTraceLineTable( HSCRIPT hTable )
static void ScriptTraceLineTable( HSCRIPT hTable, const Vector &vecStart, const Vector &vecEnd, const Vector &vecMins, const Vector &vecMaxs )
{
if ( !hTable )
return;
Expand All @@ -1152,26 +1152,22 @@ static void ScriptTraceLineTable( HSCRIPT hTable )
return;

trace_t tr;
ScriptVariant_t start, end, mask, ignore, collisiongroup, mins, maxs;
mask = MASK_VISIBLE_AND_NPCS;
collisiongroup = COLLISION_GROUP_NONE;
mins = vec3_origin;
maxs = vec3_origin;
g_pScriptVM->GetValue( hTable, "start", &start );
g_pScriptVM->GetValue( hTable, "end", &end );
g_pScriptVM->GetValue( hTable, "mask", &mask );
g_pScriptVM->GetValue( hTable, "ignore", &ignore );
g_pScriptVM->GetValue( hTable, "collisiongroup", &collisiongroup );
g_pScriptVM->GetValue( hTable, "mins", &mins );
g_pScriptVM->GetValue( hTable, "maxs", &maxs );
const Vector vecStart = start;
const Vector vecEnd = end;
const Vector vecMins = mins;
const Vector vecMaxs = maxs;
ScriptVariant_t rval;
int nMask = MASK_VISIBLE_AND_NPCS;
int nCollisionGroup = COLLISION_GROUP_NONE;
CBaseEntity *pIgnore = NULL;

if ( g_pScriptVM->GetValue( hTable, "mask", &rval ) )
nMask = ( int )rval;
if ( g_pScriptVM->GetValue( hTable, "ignore", &rval ) )
pIgnore = ToEnt( ( HSCRIPT )rval );
if ( g_pScriptVM->GetValue( hTable, "collisiongroup", &rval ) )
nCollisionGroup = ( int )rval;

if ( vecMins == vecMaxs )
UTIL_TraceLine( vecStart, vecEnd, ( int )mask, ToEnt( ignore ), ( int )collisiongroup, &tr );
UTIL_TraceLine( vecStart, vecEnd, ( unsigned int )nMask, pIgnore, nCollisionGroup, &tr );
else
UTIL_TraceHull( vecStart, vecEnd, vecMins, vecMaxs, ( int )mask, ToEnt( ignore ), ( int )collisiongroup, &tr );
UTIL_TraceHull( vecStart, vecEnd, vecMins, vecMaxs, ( unsigned int )nMask, pIgnore, nCollisionGroup, &tr );

g_pScriptVM->SetValue( hTable, "pos", tr.endpos );
g_pScriptVM->SetValue( hTable, "fraction", tr.fraction );
Expand Down Expand Up @@ -1720,7 +1716,7 @@ bool VScriptServerInit()
ScriptRegisterFunction( g_pScriptVM, SendToServerConsole, "Send a string to the server console as a command" );
ScriptRegisterFunction( g_pScriptVM, GetMapName, "Get the name of the map.");
ScriptRegisterFunctionNamed( g_pScriptVM, ScriptTraceLine, "TraceLine", "given 2 points & ent to ignore, return fraction along line that hits world or models" );
ScriptRegisterFunctionNamed( g_pScriptVM, ScriptTraceLineTable, "TraceLineTable", "Uses a configuration table to do a raytrace, puts return information into the table for return usage." );
ScriptRegisterFunction( g_pScriptVM, ScriptTraceLineTable, "Uses a configuration table to do a raytrace, puts return information into the table for return usage." );

ScriptRegisterFunction( g_pScriptVM, Time, "Get the current server time" );
ScriptRegisterFunction( g_pScriptVM, FrameTime, "Get the time spent on the server in the last frame" );
Expand Down
19 changes: 19 additions & 0 deletions src/game/server/vscript_server.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,3 +272,22 @@ function ClientPrint( player, target, message, param1 = "", param2 = "", param3
{
DoClientPrint( player, target, message, param1.tostring(), param2.tostring(), param3.tostring(), param4.tostring() );
}

function TraceLineTable( table )
{
local vecStart = Vector( 0.0, 0.0, 0.0 );
local vecEnd = Vector( 0.0, 0.0, 0.0 );
local vecMins = Vector( 0.0, 0.0, 0.0 );
local vecMaxs = Vector( 0.0, 0.0, 0.0 );

if ( "start" in table )
vecStart = table[ "start" ];
if ( "end" in table )
vecEnd = table[ "end" ];
if ( "mins" in table )
vecMins = table[ "mins" ];
if ( "maxs" in table )
vecMaxs = table[ "maxs" ];

ScriptTraceLineTable( table, vecStart, vecEnd, vecMins, vecMaxs );
}
Loading