zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-10 03:02:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

expose WallMask and ignore actor, allow disabling Actor Tracing for LineTracer::Trace

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2023-01-11 14:53:36 -03:00 committed by Rachael Alexanderson
parent 458142eb8b
commit 5e464d3e93
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/playsim/p_trace.cpp
View file

@ -1068,10 +1068,14 @@ DEFINE_ACTION_FUNCTION(DLineTracer, Trace)
PARAM_FLOAT(direction_y); PARAM_FLOAT(direction_y);
PARAM_FLOAT(direction_z); PARAM_FLOAT(direction_z);
PARAM_FLOAT(maxDist); PARAM_FLOAT(maxDist);
// actor flags and wall flags are not supported due to how flags are implemented on the ZScript side. // actor flags are not supported due to how flags are implemented on the ZScript side.
// say thanks to oversimplifying the user API. // say thanks to oversimplifying the user API.
PARAM_INT(traceFlags); PARAM_INT(traceFlags);
PARAM_UINT(wallMask);
PARAM_BOOL(ignoreAllActors);
PARAM_OBJECT(ignore, AActor);
// these are internal hacks. // these are internal hacks.
traceFlags &= ~(TRACE_PCross | TRACE_Impact); traceFlags &= ~(TRACE_PCross | TRACE_Impact);
// this too // this too
@ -1079,7 +1083,7 @@ DEFINE_ACTION_FUNCTION(DLineTracer, Trace)
// Trace(vector3 start, Sector sector, vector3 direction, double maxDist, ETraceFlags traceFlags) // Trace(vector3 start, Sector sector, vector3 direction, double maxDist, ETraceFlags traceFlags)
bool res = Trace(DVector3(start_x, start_y, start_z), sector, DVector3(direction_x, direction_y, direction_z), maxDist, bool res = Trace(DVector3(start_x, start_y, start_z), sector, DVector3(direction_x, direction_y, direction_z), maxDist,
(ActorFlag)0xFFFFFFFF, 0xFFFFFFFF, nullptr, self->Results, traceFlags, &DLineTracer::TraceCallback, self); (ActorFlag)(ignoreAllActors ? 0x0 : 0xFFFFFFFF), wallMask, ignore, self->Results, traceFlags, &DLineTracer::TraceCallback, self);
ACTION_RETURN_BOOL(res); ACTION_RETURN_BOOL(res);
} }

2
wadsrc/static/zscript/doombase.zs
View file

@ -299,7 +299,7 @@ struct TraceResults native
class LineTracer : Object native class LineTracer : Object native
{ {
native @TraceResults Results; native @TraceResults Results;
native bool Trace(vector3 start, Sector sec, vector3 direction, double maxDist, ETraceFlags traceFlags); native bool Trace(vector3 start, Sector sec, vector3 direction, double maxDist, ETraceFlags traceFlags, /* Line::ELineFlags */ uint wallMask = 0xFFFFFFFF, bool ignoreAllActors = false, Actor ignore = null);
virtual ETraceStatus TraceCallback() virtual ETraceStatus TraceCallback()
{ {