Skip to content
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

Jump to bottom

LineTracer interface 3D floors fix #467

Merged
merged 3 commits into from Apr 25, 2018
Merged

LineTracer interface 3D floors fix #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f6634a
Implemented workaround for ZScript LineTrace with 3D floors
Apr 25, 2018
9411831
Added missing commented enum entry for ETraceFlags on ZScript side
Apr 25, 2018
d0e876a
Only call additional LineCheck if there are 3D floors
Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 34 additions & 18 deletions src/p_trace.cpp
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ struct FTraceInfo
int sectorsel;

void Setup3DFloors();
bool LineCheck(intercept_t *in, double dist, DVector3 hit);
bool LineCheck(intercept_t *in, double dist, DVector3 hit, bool special3dpass);
bool ThingCheck(intercept_t *in, double dist, DVector3 hit);
bool TraceTraverse (int ptflags);
bool CheckPlane(const secplane_t &plane);
Expand Down Expand Up @@ -380,7 +380,7 @@ void FTraceInfo::Setup3DFloors()
//
//==========================================================================

bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit)
bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit, bool special3dpass)
{
int lineside;
sector_t *entersector;
Expand Down Expand Up @@ -419,7 +419,7 @@ bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit)

// For backwards compatibility: Ignore lines with the same sector on both sides.
// This is the way Doom.exe did it and some WADs (e.g. Alien Vendetta MAP15) need it.
if (i_compatflags & COMPATF_TRACE && in->d.line->backsector == in->d.line->frontsector)
if (i_compatflags & COMPATF_TRACE && in->d.line->backsector == in->d.line->frontsector && !special3dpass)
{
// We must check special activation here because the code below is never reached.
if (TraceFlags & TRACE_PCross)
Expand Down Expand Up @@ -472,15 +472,15 @@ bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit)
}
else if (entersector == NULL ||
hit.Z < bf || hit.Z > bc ||
in->d.line->flags & WallMask)
((in->d.line->flags & WallMask) && !special3dpass))
{
// hit the wall
Results->HitType = TRACE_HitWall;
Results->Tier =
entersector == NULL ? TIER_Middle :
hit.Z <= bf ? TIER_Lower :
hit.Z >= bc ? TIER_Upper : TIER_Middle;
if (TraceFlags & TRACE_Impact)
if ((TraceFlags & TRACE_Impact) && !special3dpass)
{
P_ActivateLine(in->d.line, IgnoreThis, lineside, SPAC_Impact);
}
Expand Down Expand Up @@ -565,14 +565,17 @@ bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit)
}

Results->HitType = TRACE_HitNone;
if (TraceFlags & TRACE_PCross)
if (!special3dpass)
{
P_ActivateLine(in->d.line, IgnoreThis, lineside, SPAC_PCross);
}
if (TraceFlags & TRACE_Impact)
{ // This is incorrect for "impact", but Hexen did this, so
// we need to as well, for compatibility
P_ActivateLine(in->d.line, IgnoreThis, lineside, SPAC_Impact);
if (TraceFlags & TRACE_PCross)
{
P_ActivateLine(in->d.line, IgnoreThis, lineside, SPAC_PCross);
}
if (TraceFlags & TRACE_Impact)
{ // This is incorrect for "impact", but Hexen did this, so
// we need to as well, for compatibility
P_ActivateLine(in->d.line, IgnoreThis, lineside, SPAC_Impact);
}
}
}
cont:
Expand Down Expand Up @@ -604,7 +607,7 @@ bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit)
Results->HitType = TRACE_HitNone;
}
}
if (Results->HitType == TRACE_HitWall && TraceFlags & TRACE_Impact)
if (Results->HitType == TRACE_HitWall && TraceFlags & TRACE_Impact && (!special3dpass || Results->Tier != TIER_FFloor))
{
P_ActivateLine(in->d.line, IgnoreThis, lineside, SPAC_Impact);
}
Expand All @@ -625,10 +628,21 @@ bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit)
{
switch (TraceCallback(*Results, TraceCallbackData))
{
case TRACE_Stop: return false;
case TRACE_Abort: Results->HitType = TRACE_HitNone; return false;
case TRACE_Skip: Results->HitType = TRACE_HitNone; break;
default: break;
case TRACE_Stop:
return false;

case TRACE_Abort:
Results->HitType = TRACE_HitNone;
return false;

case TRACE_Skip:
Results->HitType = TRACE_HitNone;
if (!special3dpass && (TraceFlags & TRACE_3DCallback) && entersector->e->XFloor.ffloors.Size())
return LineCheck(in, dist, hit, true);
break;

default:
break;
}
}

Expand Down Expand Up @@ -835,7 +849,7 @@ bool FTraceInfo::TraceTraverse (int ptflags)
}
}
}
if (!LineCheck(in, dist, hit)) break;
if (!LineCheck(in, dist, hit, false)) break;
}
else if ((in->d.thing->flags & ActorMask) && in->d.thing != IgnoreThis)
{
Expand Down Expand Up @@ -996,6 +1010,8 @@ DEFINE_ACTION_FUNCTION(DLineTracer, Trace)

// these are internal hacks.
traceFlags &= ~(TRACE_PCross | TRACE_Impact);
// this too
traceFlags |= TRACE_3DCallback;

// 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,
Expand Down
11 changes: 6 additions & 5 deletions src/p_trace.h
View file
Open in desktop
Expand Up @@ -92,11 +92,12 @@ struct FTraceResults

enum
{
TRACE_NoSky = 1, // Hitting the sky returns TRACE_HitNone
TRACE_PCross = 2, // Trigger SPAC_PCROSS lines
TRACE_Impact = 4, // Trigger SPAC_IMPACT lines
TRACE_PortalRestrict= 8, // Cannot go through portals without a static link offset.
TRACE_ReportPortals = 16, // Report any portal crossing to the TraceCallback
TRACE_NoSky = 0x0001, // Hitting the sky returns TRACE_HitNone
TRACE_PCross = 0x0002, // Trigger SPAC_PCROSS lines
TRACE_Impact = 0x0004, // Trigger SPAC_IMPACT lines
TRACE_PortalRestrict= 0x0008, // Cannot go through portals without a static link offset.
TRACE_ReportPortals = 0x0010, // Report any portal crossing to the TraceCallback
TRACE_3DCallback = 0x0020, // [ZZ] use TraceCallback to determine whether we need to go through a line to do 3D floor check, or not. without this, only line flag mask is used
};

// return values from callback
Expand Down
11 changes: 6 additions & 5 deletions wadsrc/static/zscript/base.txt
View file
Open in desktop
Expand Up @@ -478,11 +478,12 @@ enum ETraceStatus

enum ETraceFlags
{
TRACE_NoSky = 1, // Hitting the sky returns TRACE_HitNone
//TRACE_PCross = 2, // Trigger SPAC_PCROSS lines
//TRACE_Impact = 4, // Trigger SPAC_IMPACT lines
TRACE_PortalRestrict = 8, // Cannot go through portals without a static link offset.
TRACE_ReportPortals = 16 // Report any portal crossing to the TraceCallback
TRACE_NoSky = 0x0001, // Hitting the sky returns TRACE_HitNone
//TRACE_PCross = 0x0002, // Trigger SPAC_PCROSS lines
//TRACE_Impact = 0x0004, // Trigger SPAC_IMPACT lines
TRACE_PortalRestrict = 0x0008, // Cannot go through portals without a static link offset.
TRACE_ReportPortals = 0x0010, // Report any portal crossing to the TraceCallback
//TRACE_3DCallback = 0x0020, // [ZZ] use TraceCallback to determine whether we need to go through a line to do 3D floor check, or not. without this, only line flag mask is used
}


Expand Down