mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-24 13:01:47 +00:00
Fixed skybox clipping: things in a skybox shouldn't be clipped against current portal. Fixed: portal inside of a skybox sets CurrentPortalInSkybox to false.
This commit is contained in:
ZZYZX
parent
4d518a220c
commit
605fce9008
3 changed files with 368 additions and 366 deletions
730
src/portal.cpp
730
src/portal.cpp
|
|
@ -1,368 +1,368 @@
|
||||||
#include "portal.h"
|
#include "portal.h"
|
||||||
#include "p_local.h"
|
#include "p_local.h"
|
||||||
#include "p_lnspec.h"
|
#include "p_lnspec.h"
|
||||||
#include "r_bsp.h"
|
#include "r_bsp.h"
|
||||||
#include "r_segs.h"
|
#include "r_segs.h"
|
||||||
#include "c_cvars.h"
|
#include "c_cvars.h"
|
||||||
#include "m_bbox.h"
|
#include "m_bbox.h"
|
||||||
#include "p_tags.h"
|
#include "p_tags.h"
|
||||||
|
|
||||||
// simulation recurions maximum
|
// simulation recurions maximum
|
||||||
CVAR(Int, sv_portal_recursions, 4, CVAR_ARCHIVE|CVAR_SERVERINFO)
|
CVAR(Int, sv_portal_recursions, 4, CVAR_ARCHIVE|CVAR_SERVERINFO)
|
||||||
|
|
||||||
PortalDrawseg* CurrentPortal = NULL;
|
PortalDrawseg* CurrentPortal = NULL;
|
||||||
int CurrentPortalUniq = 0;
|
int CurrentPortalUniq = 0;
|
||||||
bool CurrentPortalInSkybox = false;
|
bool CurrentPortalInSkybox = false;
|
||||||
|
|
||||||
// [ZZ] lots of floats here to avoid overflowing a lot
|
// [ZZ] lots of floats here to avoid overflowing a lot
|
||||||
bool R_IntersectLines(fixed_t o1x, fixed_t o1y, fixed_t p1x, fixed_t p1y,
|
bool R_IntersectLines(fixed_t o1x, fixed_t o1y, fixed_t p1x, fixed_t p1y,
|
||||||
fixed_t o2x, fixed_t o2y, fixed_t p2x, fixed_t p2y,
|
fixed_t o2x, fixed_t o2y, fixed_t p2x, fixed_t p2y,
|
||||||
fixed_t& rx, fixed_t& ry)
|
fixed_t& rx, fixed_t& ry)
|
||||||
{
|
{
|
||||||
float xx = FIXED2FLOAT(o2x) - FIXED2FLOAT(o1x);
|
float xx = FIXED2FLOAT(o2x) - FIXED2FLOAT(o1x);
|
||||||
float xy = FIXED2FLOAT(o2y) - FIXED2FLOAT(o1y);
|
float xy = FIXED2FLOAT(o2y) - FIXED2FLOAT(o1y);
|
||||||
|
|
||||||
float d1x = FIXED2FLOAT(p1x) - FIXED2FLOAT(o1x);
|
float d1x = FIXED2FLOAT(p1x) - FIXED2FLOAT(o1x);
|
||||||
float d1y = FIXED2FLOAT(p1y) - FIXED2FLOAT(o1y);
|
float d1y = FIXED2FLOAT(p1y) - FIXED2FLOAT(o1y);
|
||||||
|
|
||||||
if (d1x > d1y)
|
if (d1x > d1y)
|
||||||
{
|
{
|
||||||
d1y = d1y / d1x * 32767.0f;
|
d1y = d1y / d1x * 32767.0f;
|
||||||
d1x = 32767.0;
|
d1x = 32767.0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
d1x = d1x / d1y * 32767.0f;
|
d1x = d1x / d1y * 32767.0f;
|
||||||
d1y = 32767.0;
|
d1y = 32767.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
float d2x = FIXED2FLOAT(p2x) - FIXED2FLOAT(o2x);
|
float d2x = FIXED2FLOAT(p2x) - FIXED2FLOAT(o2x);
|
||||||
float d2y = FIXED2FLOAT(p2y) - FIXED2FLOAT(o2y);
|
float d2y = FIXED2FLOAT(p2y) - FIXED2FLOAT(o2y);
|
||||||
|
|
||||||
float cross = d1x*d2y - d1y*d2x;
|
float cross = d1x*d2y - d1y*d2x;
|
||||||
if (fabs(cross) < 1e-8)
|
if (fabs(cross) < 1e-8)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
float t1 = (xx * d2y - xy * d2x)/cross;
|
float t1 = (xx * d2y - xy * d2x)/cross;
|
||||||
rx = o1x + FLOAT2FIXED(d1x * t1);
|
rx = o1x + FLOAT2FIXED(d1x * t1);
|
||||||
ry = o1y + FLOAT2FIXED(d1y * t1);
|
ry = o1y + FLOAT2FIXED(d1y * t1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int P_PointOnLineSideExplicit (fixed_t x, fixed_t y, fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
|
inline int P_PointOnLineSideExplicit (fixed_t x, fixed_t y, fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
|
||||||
{
|
{
|
||||||
return DMulScale32 (y-y1, x2-x1, x1-x, y2-y1) > 0;
|
return DMulScale32 (y-y1, x2-x1, x1-x, y2-y1) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool P_ClipLineToPortal(line_t* line, line_t* portal, fixed_t viewx, fixed_t viewy, bool partial, bool samebehind)
|
bool P_ClipLineToPortal(line_t* line, line_t* portal, fixed_t viewx, fixed_t viewy, bool partial, bool samebehind)
|
||||||
{
|
{
|
||||||
// check if this line is between portal and the viewer. clip away if it is.
|
// check if this line is between portal and the viewer. clip away if it is.
|
||||||
bool behind1 = !!P_PointOnLineSide(line->v1->x, line->v1->y, portal);
|
bool behind1 = !!P_PointOnLineSide(line->v1->x, line->v1->y, portal);
|
||||||
bool behind2 = !!P_PointOnLineSide(line->v2->x, line->v2->y, portal);
|
bool behind2 = !!P_PointOnLineSide(line->v2->x, line->v2->y, portal);
|
||||||
|
|
||||||
// [ZZ] update 16.12.2014: if a vertex equals to one of portal's vertices, it's treated as being behind the portal.
|
// [ZZ] update 16.12.2014: if a vertex equals to one of portal's vertices, it's treated as being behind the portal.
|
||||||
// this is required in order to clip away diagonal lines around the portal (example: 1-sided triangle shape with a mirror on it's side)
|
// this is required in order to clip away diagonal lines around the portal (example: 1-sided triangle shape with a mirror on it's side)
|
||||||
if ((line->v1->x == portal->v1->x && line->v1->y == portal->v1->y) ||
|
if ((line->v1->x == portal->v1->x && line->v1->y == portal->v1->y) ||
|
||||||
(line->v1->x == portal->v2->x && line->v1->y == portal->v2->y))
|
(line->v1->x == portal->v2->x && line->v1->y == portal->v2->y))
|
||||||
behind1 = samebehind;
|
behind1 = samebehind;
|
||||||
if ((line->v2->x == portal->v1->x && line->v2->y == portal->v1->y) ||
|
if ((line->v2->x == portal->v1->x && line->v2->y == portal->v1->y) ||
|
||||||
(line->v2->x == portal->v2->x && line->v2->y == portal->v2->y))
|
(line->v2->x == portal->v2->x && line->v2->y == portal->v2->y))
|
||||||
behind2 = samebehind;
|
behind2 = samebehind;
|
||||||
|
|
||||||
if (behind1 && behind2)
|
if (behind1 && behind2)
|
||||||
{
|
{
|
||||||
// line is behind the portal plane. now check if it's in front of two view plane borders (i.e. if it will get in the way of rendering)
|
// line is behind the portal plane. now check if it's in front of two view plane borders (i.e. if it will get in the way of rendering)
|
||||||
fixed_t dummyx, dummyy;
|
fixed_t dummyx, dummyy;
|
||||||
bool infront1 = R_IntersectLines(line->v1->x, line->v1->y, line->v2->x, line->v2->y, viewx, viewy, portal->v1->x, portal->v1->y, dummyx, dummyy);
|
bool infront1 = R_IntersectLines(line->v1->x, line->v1->y, line->v2->x, line->v2->y, viewx, viewy, portal->v1->x, portal->v1->y, dummyx, dummyy);
|
||||||
bool infront2 = R_IntersectLines(line->v1->x, line->v1->y, line->v2->x, line->v2->y, viewx, viewy, portal->v2->x, portal->v2->y, dummyx, dummyy);
|
bool infront2 = R_IntersectLines(line->v1->x, line->v1->y, line->v2->x, line->v2->y, viewx, viewy, portal->v2->x, portal->v2->y, dummyx, dummyy);
|
||||||
if (infront1 && infront2)
|
if (infront1 && infront2)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool P_CheckPortal(line_t* line)
|
bool P_CheckPortal(line_t* line)
|
||||||
{
|
{
|
||||||
if (line->special == Line_Mirror)
|
if (line->special == Line_Mirror)
|
||||||
{
|
{
|
||||||
line->portal = true;
|
line->portal = true;
|
||||||
line->portal_mirror = true;
|
line->portal_mirror = true;
|
||||||
line->portal_passive = true;
|
line->portal_passive = true;
|
||||||
line->portal_dst = line;
|
line->portal_dst = line;
|
||||||
}
|
}
|
||||||
else if (line->special == Line_SetPortal ||
|
else if (line->special == Line_SetPortal ||
|
||||||
line->special == Line_SetVisualPortal)
|
line->special == Line_SetVisualPortal)
|
||||||
{
|
{
|
||||||
// portal destination is special argument #0
|
// portal destination is special argument #0
|
||||||
line_t* dst = NULL;
|
line_t* dst = NULL;
|
||||||
|
|
||||||
if (line->args[0] > 0)
|
if (line->args[0] > 0)
|
||||||
{
|
{
|
||||||
int linenum = -1;
|
int linenum = -1;
|
||||||
|
|
||||||
for (int i = 0; i < numlines; i++)
|
for (int i = 0; i < numlines; i++)
|
||||||
{
|
{
|
||||||
if (&lines[i] == line)
|
if (&lines[i] == line)
|
||||||
continue;
|
continue;
|
||||||
if (tagManager.LineHasID(&lines[i], line->args[0]))
|
if (tagManager.LineHasID(&lines[i], line->args[0]))
|
||||||
{
|
{
|
||||||
dst = &lines[i];
|
dst = &lines[i];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dst)
|
if (dst)
|
||||||
{
|
{
|
||||||
line->portal = true;
|
line->portal = true;
|
||||||
line->portal_mirror = false;
|
line->portal_mirror = false;
|
||||||
line->portal_passive = (line->special == Line_SetVisualPortal);
|
line->portal_passive = (line->special == Line_SetVisualPortal);
|
||||||
line->portal_dst = dst;
|
line->portal_dst = dst;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
line->portal = false;
|
line->portal = false;
|
||||||
line->portal_mirror = false;
|
line->portal_mirror = false;
|
||||||
line->portal_passive = false;
|
line->portal_passive = false;
|
||||||
line->portal_dst = NULL;
|
line->portal_dst = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
line->portal = false;
|
line->portal = false;
|
||||||
line->portal_mirror = false;
|
line->portal_mirror = false;
|
||||||
line->portal_passive = false;
|
line->portal_passive = false;
|
||||||
line->portal_dst = NULL;
|
line->portal_dst = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (line->portal);
|
return (line->portal);
|
||||||
}
|
}
|
||||||
|
|
||||||
void P_TranslatePortalXY(line_t* src, line_t* dst, fixed_t& x, fixed_t& y)
|
void P_TranslatePortalXY(line_t* src, line_t* dst, fixed_t& x, fixed_t& y)
|
||||||
{
|
{
|
||||||
if (!src || !dst)
|
if (!src || !dst)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
fixed_t nposx, nposy; // offsets from line
|
fixed_t nposx, nposy; // offsets from line
|
||||||
|
|
||||||
// Get the angle between the two linedefs, for rotating
|
// Get the angle between the two linedefs, for rotating
|
||||||
// orientation and velocity. Rotate 180 degrees, and flip
|
// orientation and velocity. Rotate 180 degrees, and flip
|
||||||
// the position across the exit linedef, if reversed.
|
// the position across the exit linedef, if reversed.
|
||||||
angle_t angle =
|
angle_t angle =
|
||||||
R_PointToAngle2(0, 0, dst->dx, dst->dy) -
|
R_PointToAngle2(0, 0, dst->dx, dst->dy) -
|
||||||
R_PointToAngle2(0, 0, src->dx, src->dy);
|
R_PointToAngle2(0, 0, src->dx, src->dy);
|
||||||
|
|
||||||
angle += ANGLE_180;
|
angle += ANGLE_180;
|
||||||
|
|
||||||
// Sine, cosine of angle adjustment
|
// Sine, cosine of angle adjustment
|
||||||
fixed_t s = finesine[angle>>ANGLETOFINESHIFT];
|
fixed_t s = finesine[angle>>ANGLETOFINESHIFT];
|
||||||
fixed_t c = finecosine[angle>>ANGLETOFINESHIFT];
|
fixed_t c = finecosine[angle>>ANGLETOFINESHIFT];
|
||||||
|
|
||||||
fixed_t tx, ty;
|
fixed_t tx, ty;
|
||||||
|
|
||||||
nposx = x - src->v1->x;
|
nposx = x - src->v1->x;
|
||||||
nposy = y - src->v1->y;
|
nposy = y - src->v1->y;
|
||||||
|
|
||||||
// Rotate position along normal to match exit linedef
|
// Rotate position along normal to match exit linedef
|
||||||
tx = FixedMul(nposx, c) - FixedMul(nposy, s);
|
tx = FixedMul(nposx, c) - FixedMul(nposy, s);
|
||||||
ty = FixedMul(nposy, c) + FixedMul(nposx, s);
|
ty = FixedMul(nposy, c) + FixedMul(nposx, s);
|
||||||
|
|
||||||
tx += dst->v2->x;
|
tx += dst->v2->x;
|
||||||
ty += dst->v2->y;
|
ty += dst->v2->y;
|
||||||
|
|
||||||
x = tx;
|
x = tx;
|
||||||
y = ty;
|
y = ty;
|
||||||
}
|
}
|
||||||
|
|
||||||
void P_TranslatePortalVXVY(line_t* src, line_t* dst, fixed_t& vx, fixed_t& vy)
|
void P_TranslatePortalVXVY(line_t* src, line_t* dst, fixed_t& vx, fixed_t& vy)
|
||||||
{
|
{
|
||||||
angle_t angle =
|
angle_t angle =
|
||||||
R_PointToAngle2(0, 0, dst->dx, dst->dy) -
|
R_PointToAngle2(0, 0, dst->dx, dst->dy) -
|
||||||
R_PointToAngle2(0, 0, src->dx, src->dy);
|
R_PointToAngle2(0, 0, src->dx, src->dy);
|
||||||
|
|
||||||
angle += ANGLE_180;
|
angle += ANGLE_180;
|
||||||
|
|
||||||
// Sine, cosine of angle adjustment
|
// Sine, cosine of angle adjustment
|
||||||
fixed_t s = finesine[angle>>ANGLETOFINESHIFT];
|
fixed_t s = finesine[angle>>ANGLETOFINESHIFT];
|
||||||
fixed_t c = finecosine[angle>>ANGLETOFINESHIFT];
|
fixed_t c = finecosine[angle>>ANGLETOFINESHIFT];
|
||||||
|
|
||||||
fixed_t orig_velx = vx;
|
fixed_t orig_velx = vx;
|
||||||
fixed_t orig_vely = vy;
|
fixed_t orig_vely = vy;
|
||||||
vx = FixedMul(orig_velx, c) - FixedMul(orig_vely, s);
|
vx = FixedMul(orig_velx, c) - FixedMul(orig_vely, s);
|
||||||
vy = FixedMul(orig_vely, c) + FixedMul(orig_velx, s);
|
vy = FixedMul(orig_vely, c) + FixedMul(orig_velx, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
void P_TranslatePortalAngle(line_t* src, line_t* dst, angle_t& angle)
|
void P_TranslatePortalAngle(line_t* src, line_t* dst, angle_t& angle)
|
||||||
{
|
{
|
||||||
if (!src || !dst)
|
if (!src || !dst)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Get the angle between the two linedefs, for rotating
|
// Get the angle between the two linedefs, for rotating
|
||||||
// orientation and velocity. Rotate 180 degrees, and flip
|
// orientation and velocity. Rotate 180 degrees, and flip
|
||||||
// the position across the exit linedef, if reversed.
|
// the position across the exit linedef, if reversed.
|
||||||
angle_t xangle =
|
angle_t xangle =
|
||||||
R_PointToAngle2(0, 0, dst->dx, dst->dy) -
|
R_PointToAngle2(0, 0, dst->dx, dst->dy) -
|
||||||
R_PointToAngle2(0, 0, src->dx, src->dy);
|
R_PointToAngle2(0, 0, src->dx, src->dy);
|
||||||
|
|
||||||
xangle += ANGLE_180;
|
xangle += ANGLE_180;
|
||||||
angle += xangle;
|
angle += xangle;
|
||||||
}
|
}
|
||||||
|
|
||||||
void P_TranslatePortalZ(line_t* src, line_t* dst, fixed_t& z)
|
void P_TranslatePortalZ(line_t* src, line_t* dst, fixed_t& z)
|
||||||
{
|
{
|
||||||
// args[2] = 0 - no teleport
|
// args[2] = 0 - no teleport
|
||||||
// args[2] = 1 - adjust by floor difference
|
// args[2] = 1 - adjust by floor difference
|
||||||
// args[2] = 2 - adjust by ceiling difference
|
// args[2] = 2 - adjust by ceiling difference
|
||||||
|
|
||||||
if (src->args[2] == 1)
|
if (src->args[2] == 1)
|
||||||
{
|
{
|
||||||
z = z - src->frontsector->floorplane.ZatPoint(src->v1->x, src->v1->y) + dst->frontsector->floorplane.ZatPoint(dst->v2->x, dst->v2->y);
|
z = z - src->frontsector->floorplane.ZatPoint(src->v1->x, src->v1->y) + dst->frontsector->floorplane.ZatPoint(dst->v2->x, dst->v2->y);
|
||||||
}
|
}
|
||||||
else if (src->args[2] == 2)
|
else if (src->args[2] == 2)
|
||||||
{
|
{
|
||||||
z = z - src->frontsector->ceilingplane.ZatPoint(src->v1->x, src->v1->y) + dst->frontsector->ceilingplane.ZatPoint(dst->v2->x, dst->v2->y);
|
z = z - src->frontsector->ceilingplane.ZatPoint(src->v1->x, src->v1->y) + dst->frontsector->ceilingplane.ZatPoint(dst->v2->x, dst->v2->y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// calculate shortest distance from a point (x,y) to a linedef
|
// calculate shortest distance from a point (x,y) to a linedef
|
||||||
fixed_t P_PointLineDistance(line_t* line, fixed_t x, fixed_t y)
|
fixed_t P_PointLineDistance(line_t* line, fixed_t x, fixed_t y)
|
||||||
{
|
{
|
||||||
angle_t angle = R_PointToAngle2(0, 0, line->dx, line->dy);
|
angle_t angle = R_PointToAngle2(0, 0, line->dx, line->dy);
|
||||||
angle += ANGLE_180;
|
angle += ANGLE_180;
|
||||||
|
|
||||||
fixed_t dx = line->v1->x - x;
|
fixed_t dx = line->v1->x - x;
|
||||||
fixed_t dy = line->v1->y - y;
|
fixed_t dy = line->v1->y - y;
|
||||||
|
|
||||||
fixed_t s = finesine[angle>>ANGLETOFINESHIFT];
|
fixed_t s = finesine[angle>>ANGLETOFINESHIFT];
|
||||||
fixed_t c = finecosine[angle>>ANGLETOFINESHIFT];
|
fixed_t c = finecosine[angle>>ANGLETOFINESHIFT];
|
||||||
|
|
||||||
fixed_t d2x = FixedMul(dx, c) - FixedMul(dy, s);
|
fixed_t d2x = FixedMul(dx, c) - FixedMul(dy, s);
|
||||||
|
|
||||||
return abs(d2x);
|
return abs(d2x);
|
||||||
}
|
}
|
||||||
|
|
||||||
void P_NormalizeVXVY(fixed_t& vx, fixed_t& vy)
|
void P_NormalizeVXVY(fixed_t& vx, fixed_t& vy)
|
||||||
{
|
{
|
||||||
float _vx = FIXED2FLOAT(vx);
|
float _vx = FIXED2FLOAT(vx);
|
||||||
float _vy = FIXED2FLOAT(vy);
|
float _vy = FIXED2FLOAT(vy);
|
||||||
float len = sqrt(_vx*_vx+_vy*_vy);
|
float len = sqrt(_vx*_vx+_vy*_vy);
|
||||||
vx = FLOAT2FIXED(_vx/len);
|
vx = FLOAT2FIXED(_vx/len);
|
||||||
vy = FLOAT2FIXED(_vy/len);
|
vy = FLOAT2FIXED(_vy/len);
|
||||||
}
|
}
|
||||||
|
|
||||||
// portal tracer code
|
// portal tracer code
|
||||||
PortalTracer::PortalTracer(fixed_t startx, fixed_t starty, fixed_t endx, fixed_t endy)
|
PortalTracer::PortalTracer(fixed_t startx, fixed_t starty, fixed_t endx, fixed_t endy)
|
||||||
{
|
{
|
||||||
this->startx = startx;
|
this->startx = startx;
|
||||||
this->starty = starty;
|
this->starty = starty;
|
||||||
this->endx = endx;
|
this->endx = endx;
|
||||||
this->endy = endy;
|
this->endy = endy;
|
||||||
intx = endx;
|
intx = endx;
|
||||||
inty = endy;
|
inty = endy;
|
||||||
intxIn = intx;
|
intxIn = intx;
|
||||||
intyIn = inty;
|
intyIn = inty;
|
||||||
z = 0;
|
z = 0;
|
||||||
angle = 0;
|
angle = 0;
|
||||||
depth = 0;
|
depth = 0;
|
||||||
frac = 0;
|
frac = 0;
|
||||||
in = NULL;
|
in = NULL;
|
||||||
out = NULL;
|
out = NULL;
|
||||||
vx = 0;
|
vx = 0;
|
||||||
vy = 0;
|
vy = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PortalTracer::TraceStep()
|
bool PortalTracer::TraceStep()
|
||||||
{
|
{
|
||||||
if (depth > sv_portal_recursions)
|
if (depth > sv_portal_recursions)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
this->in = NULL;
|
this->in = NULL;
|
||||||
this->out = NULL;
|
this->out = NULL;
|
||||||
this->vx = 0;
|
this->vx = 0;
|
||||||
this->vy = 0;
|
this->vy = 0;
|
||||||
|
|
||||||
int oDepth = depth;
|
int oDepth = depth;
|
||||||
|
|
||||||
fixed_t dirx = endx-startx;
|
fixed_t dirx = endx-startx;
|
||||||
fixed_t diry = endy-starty;
|
fixed_t diry = endy-starty;
|
||||||
P_NormalizeVXVY(dirx, diry);
|
P_NormalizeVXVY(dirx, diry);
|
||||||
|
|
||||||
dirx = 0;
|
dirx = 0;
|
||||||
diry = 0;
|
diry = 0;
|
||||||
|
|
||||||
FPathTraverse it(startx-dirx, starty-diry, endx+dirx, endy+diry, PT_ADDLINES | PT_COMPATIBLE);
|
FPathTraverse it(startx-dirx, starty-diry, endx+dirx, endy+diry, PT_ADDLINES | PT_COMPATIBLE);
|
||||||
|
|
||||||
intercept_t *in;
|
intercept_t *in;
|
||||||
while ((in = it.Next()))
|
while ((in = it.Next()))
|
||||||
{
|
{
|
||||||
line_t* li;
|
line_t* li;
|
||||||
|
|
||||||
if (in->isaline)
|
if (in->isaline)
|
||||||
{
|
{
|
||||||
li = in->d.line;
|
li = in->d.line;
|
||||||
|
|
||||||
if (li->portal && !li->portal_passive)
|
if (li->portal && !li->portal_passive)
|
||||||
{
|
{
|
||||||
if (P_PointOnLineSide(startx-dirx, starty-diry, li))
|
if (P_PointOnLineSide(startx-dirx, starty-diry, li))
|
||||||
continue; // we're at the back side of this line
|
continue; // we're at the back side of this line
|
||||||
|
|
||||||
line_t* out = li->portal_dst;
|
line_t* out = li->portal_dst;
|
||||||
|
|
||||||
this->in = li;
|
this->in = li;
|
||||||
this->out = out;
|
this->out = out;
|
||||||
|
|
||||||
// we only know that we crossed it, but we also need to know WHERE we crossed it
|
// we only know that we crossed it, but we also need to know WHERE we crossed it
|
||||||
fixed_t vx = it.Trace().dx;
|
fixed_t vx = it.Trace().dx;
|
||||||
fixed_t vy = it.Trace().dy;
|
fixed_t vy = it.Trace().dy;
|
||||||
|
|
||||||
fixed_t x = it.Trace().x + FixedMul(vx, in->frac);
|
fixed_t x = it.Trace().x + FixedMul(vx, in->frac);
|
||||||
fixed_t y = it.Trace().y + FixedMul(vy, in->frac);
|
fixed_t y = it.Trace().y + FixedMul(vy, in->frac);
|
||||||
|
|
||||||
P_NormalizeVXVY(vx, vy);
|
P_NormalizeVXVY(vx, vy);
|
||||||
|
|
||||||
this->vx = vx;
|
this->vx = vx;
|
||||||
this->vy = vy;
|
this->vy = vy;
|
||||||
|
|
||||||
// teleport our trace
|
// teleport our trace
|
||||||
|
|
||||||
if (!out->backsector)
|
if (!out->backsector)
|
||||||
{
|
{
|
||||||
intx = x + vx;
|
intx = x + vx;
|
||||||
inty = y + vy;
|
inty = y + vy;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
intx = x - vx;
|
intx = x - vx;
|
||||||
inty = y - vy;
|
inty = y - vy;
|
||||||
}
|
}
|
||||||
|
|
||||||
//P_TranslateCoordinatesAndAngle(li, out, startx, starty, noangle);
|
//P_TranslateCoordinatesAndAngle(li, out, startx, starty, noangle);
|
||||||
//P_TranslateCoordinatesAndAngle(li, out, endx, endy, angle);
|
//P_TranslateCoordinatesAndAngle(li, out, endx, endy, angle);
|
||||||
//if (hdeltaZ)
|
//if (hdeltaZ)
|
||||||
// P_TranslateZ(li, out, deltaZ);
|
// P_TranslateZ(li, out, deltaZ);
|
||||||
//P_TranslateCoordinatesAndAngle(li, out, vx, vy, noangle);
|
//P_TranslateCoordinatesAndAngle(li, out, vx, vy, noangle);
|
||||||
|
|
||||||
P_TranslatePortalXY(li, out, startx, starty);
|
P_TranslatePortalXY(li, out, startx, starty);
|
||||||
P_TranslatePortalVXVY(li, out, this->vx, this->vy);
|
P_TranslatePortalVXVY(li, out, this->vx, this->vy);
|
||||||
intxIn = intx;
|
intxIn = intx;
|
||||||
intyIn = inty;
|
intyIn = inty;
|
||||||
P_TranslatePortalXY(li, out, intx, inty);
|
P_TranslatePortalXY(li, out, intx, inty);
|
||||||
P_TranslatePortalXY(li, out, endx, endy);
|
P_TranslatePortalXY(li, out, endx, endy);
|
||||||
P_TranslatePortalAngle(li, out, angle);
|
P_TranslatePortalAngle(li, out, angle);
|
||||||
P_TranslatePortalZ(li, out, z);
|
P_TranslatePortalZ(li, out, z);
|
||||||
frac += in->frac;
|
frac += in->frac;
|
||||||
depth++;
|
depth++;
|
||||||
break; // breaks to outer loop
|
break; // breaks to outer loop
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(li->flags & ML_TWOSIDED) || (li->flags & ML_BLOCKEVERYTHING))
|
if (!(li->flags & ML_TWOSIDED) || (li->flags & ML_BLOCKEVERYTHING))
|
||||||
return false; // stop tracing, 2D blocking line
|
return false; // stop tracing, 2D blocking line
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Printf("returning %d; vx = %.2f; vy = %.2f\n", (oDepth != depth), FIXED2FLOAT(this->vx), FIXED2FLOAT(this->vy));
|
//Printf("returning %d; vx = %.2f; vy = %.2f\n", (oDepth != depth), FIXED2FLOAT(this->vx), FIXED2FLOAT(this->vy));
|
||||||
|
|
||||||
return (oDepth != depth); // if a portal has been found, return false
|
return (oDepth != depth); // if a portal has been found, return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -766,6 +766,7 @@ void R_EnterPortal (PortalDrawseg* pds, int depth)
|
||||||
|
|
||||||
// some portals have height differences, account for this here
|
// some portals have height differences, account for this here
|
||||||
R_3D_EnterSkybox(); // push 3D floor height map
|
R_3D_EnterSkybox(); // push 3D floor height map
|
||||||
|
CurrentPortalInSkybox = false; // first portal in a skybox should set this variable to false for proper clipping in skyboxes.
|
||||||
|
|
||||||
// first pass, set clipping
|
// first pass, set clipping
|
||||||
memcpy (ceilingclip + pds->x1, &pds->ceilingclip[0], pds->len*sizeof(*ceilingclip));
|
memcpy (ceilingclip + pds->x1, &pds->ceilingclip[0], pds->len*sizeof(*ceilingclip));
|
||||||
|
|
|
||||||
|
|
@ -716,7 +716,8 @@ void R_ProjectSprite (AActor *thing, int fakeside, F3DFloor *fakefloor, F3DFloor
|
||||||
}
|
}
|
||||||
|
|
||||||
// [ZZ] Or less definitely not visible (hue)
|
// [ZZ] Or less definitely not visible (hue)
|
||||||
if (CurrentPortal && !!P_PointOnLineSide(thing->x, thing->y, CurrentPortal->dst))
|
// [ZZ] 10.01.2016: don't try to clip stuff inside a skybox against the current portal.
|
||||||
|
if (!CurrentPortalInSkybox && CurrentPortal && !!P_PointOnLineSide(thing->x, thing->y, CurrentPortal->dst))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// [RH] Interpolate the sprite's position to make it look smooth
|
// [RH] Interpolate the sprite's position to make it look smooth
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue