zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Store FTransform in visplane_t, not just a pointer 

- The transform values passed to R_CheckPlane might live on the stack, so
  it's not safe to only store a pointer to them.
This commit is contained in:
Randy Heit 2016-04-27 23:07:25 -05:00
parent 44adff459a
commit ae7d048057
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/r_plane.cpp
View File

@ -595,8 +595,12 @@ visplane_t *R_FindPlane (const secplane_t &height, FTextureID picnum, int lightl
if (picnum == skyflatnum) // killough 10/98 if (picnum == skyflatnum) // killough 10/98
{ // most skies map together { // most skies map together
FTransform nulltransform;
lightlevel = 0; lightlevel = 0;
xform = NULL; xform = &nulltransform;
nulltransform.xOffs = nulltransform.yOffs = nulltransform.baseyOffs = 0;
nulltransform.xScale = nulltransform.yScale = 1;
nulltransform.Angle = nulltransform.baseAngle = 0.0;
additive = false; additive = false;
// [RH] Map floor skies and ceiling skies to separate visplanes. This isn't // [RH] Map floor skies and ceiling skies to separate visplanes. This isn't
// always necessary, but it is needed if a floor and ceiling sky are in the // always necessary, but it is needed if a floor and ceiling sky are in the
@ -649,9 +653,7 @@ visplane_t *R_FindPlane (const secplane_t &height, FTextureID picnum, int lightl
picnum == check->picnum && picnum == check->picnum &&
lightlevel == check->lightlevel && lightlevel == check->lightlevel &&
basecolormap == check->colormap && // [RH] Add more checks basecolormap == check->colormap && // [RH] Add more checks
*xform == check->xform
(xform == check->xform ||
(xform != NULL && check->xform != NULL && *xform == *check->xform))
) )
) && ) &&
check->viewangle == stacked_angle check->viewangle == stacked_angle
@ -673,8 +675,7 @@ visplane_t *R_FindPlane (const secplane_t &height, FTextureID picnum, int lightl
picnum == check->picnum && picnum == check->picnum &&
lightlevel == check->lightlevel && lightlevel == check->lightlevel &&
basecolormap == check->colormap && // [RH] Add more checks basecolormap == check->colormap && // [RH] Add more checks
(xform == check->xform || *xform == check->xform &&
(xform != NULL && check->xform != NULL && *xform == *check->xform)) &&
sky == check->sky && sky == check->sky &&
CurrentPortalUniq == check->CurrentPortalUniq && CurrentPortalUniq == check->CurrentPortalUniq &&
MirrorFlags == check->MirrorFlags && MirrorFlags == check->MirrorFlags &&
@ -691,7 +692,7 @@ visplane_t *R_FindPlane (const secplane_t &height, FTextureID picnum, int lightl
check->height = plane; check->height = plane;
check->picnum = picnum; check->picnum = picnum;
check->lightlevel = lightlevel; check->lightlevel = lightlevel;
check->xform = xform; check->xform = *xform;
check->colormap = basecolormap; // [RH] Save colormap check->colormap = basecolormap; // [RH] Save colormap
check->sky = sky; check->sky = sky;
check->portal = portal; check->portal = portal;
@ -1095,8 +1096,8 @@ void R_DrawSinglePlane (visplane_t *pl, fixed_t alpha, bool additive, bool maske
masked = false; masked = false;
} }
R_SetupSpanBits(tex); R_SetupSpanBits(tex);
double xscale = pl->xform->xScale * tex->Scale.X; double xscale = pl->xform.xScale * tex->Scale.X;
double yscale = pl->xform->yScale * tex->Scale.Y; double yscale = pl->xform.yScale * tex->Scale.Y;
ds_source = tex->GetPixels (); ds_source = tex->GetPixels ();
basecolormap = pl->colormap; basecolormap = pl->colormap;
@ -1494,19 +1495,19 @@ void R_DrawNormalPlane (visplane_t *pl, double _xscale, double _yscale, fixed_t
return; return;
} }
DAngle planeang = pl->xform->Angle + pl->xform->baseAngle; DAngle planeang = pl->xform.Angle + pl->xform.baseAngle;
xscale = xs_ToFixed(32 - ds_xbits, _xscale); xscale = xs_ToFixed(32 - ds_xbits, _xscale);
yscale = xs_ToFixed(32 - ds_ybits, _yscale); yscale = xs_ToFixed(32 - ds_ybits, _yscale);
if (planeang != 0) if (planeang != 0)
{ {
double cosine = planeang.Cos(), sine = planeang.Sin(); double cosine = planeang.Cos(), sine = planeang.Sin();
pviewx = FLOAT2FIXED(pl->xform->xOffs + ViewPos.X * cosine - ViewPos.Y * sine); pviewx = FLOAT2FIXED(pl->xform.xOffs + ViewPos.X * cosine - ViewPos.Y * sine);
pviewy = FLOAT2FIXED(pl->xform->yOffs - ViewPos.X * sine - ViewPos.Y * cosine); pviewy = FLOAT2FIXED(pl->xform.yOffs - ViewPos.X * sine - ViewPos.Y * cosine);
} }
else else
{ {
pviewx = FLOAT2FIXED(pl->xform->xOffs + ViewPos.X); pviewx = FLOAT2FIXED(pl->xform.xOffs + ViewPos.X);
pviewy = FLOAT2FIXED(pl->xform->yOffs - ViewPos.Y); pviewy = FLOAT2FIXED(pl->xform.yOffs - ViewPos.Y);
} }
pviewx = FixedMul (xscale, pviewx); pviewx = FixedMul (xscale, pviewx);
@ -1624,8 +1625,8 @@ void R_DrawTiltedPlane (visplane_t *pl, double _xscale, double _yscale, fixed_t
yscale = 64.f / lyscale; yscale = 64.f / lyscale;
zeroheight = pl->height.ZatPoint(ViewPos); zeroheight = pl->height.ZatPoint(ViewPos);
pviewx = xs_ToFixed(32 - ds_xbits, pl->xform->xOffs * pl->xform->xScale); pviewx = xs_ToFixed(32 - ds_xbits, pl->xform.xOffs * pl->xform.xScale);
pviewy = xs_ToFixed(32 - ds_ybits, pl->xform->yOffs * pl->xform->yScale); pviewy = xs_ToFixed(32 - ds_ybits, pl->xform.yOffs * pl->xform.yScale);
// p is the texture origin in view space // p is the texture origin in view space
// Don't add in the offsets at this stage, because doing so can result in // Don't add in the offsets at this stage, because doing so can result in
@ -1652,7 +1653,7 @@ void R_DrawTiltedPlane (visplane_t *pl, double _xscale, double _yscale, fixed_t
// This code keeps the texture coordinates constant across the x,y plane no matter // This code keeps the texture coordinates constant across the x,y plane no matter
// how much you slope the surface. Use the commented-out code above instead to keep // how much you slope the surface. Use the commented-out code above instead to keep
// the textures a constant size across the surface's plane instead. // the textures a constant size across the surface's plane instead.
ang = pl->xform->Angle + pl->xform->baseAngle; ang = pl->xform.Angle + pl->xform.baseAngle;
m[1] = pl->height.ZatPoint(ViewPos.X + yscale * ang.Sin(), ViewPos.Y + yscale * ang.Cos()) - zeroheight; m[1] = pl->height.ZatPoint(ViewPos.X + yscale * ang.Sin(), ViewPos.Y + yscale * ang.Cos()) - zeroheight;
ang += 90; ang += 90;
n[1] = pl->height.ZatPoint(ViewPos.X + xscale * ang.Sin(), ViewPos.Y + xscale * ang.Cos()) - zeroheight; n[1] = pl->height.ZatPoint(ViewPos.X + xscale * ang.Sin(), ViewPos.Y + xscale * ang.Cos()) - zeroheight;

2
src/r_plane.h
View File

@ -34,10 +34,10 @@ struct visplane_s
{ {
struct visplane_s *next; // Next visplane in hash chain -- killough struct visplane_s *next; // Next visplane in hash chain -- killough
const FTransform *xform;
FDynamicColormap *colormap; // [RH] Support multiple colormaps FDynamicColormap *colormap; // [RH] Support multiple colormaps
FSectorPortal *portal; // [RH] Support sky boxes FSectorPortal *portal; // [RH] Support sky boxes
FTransform xform;
secplane_t height; secplane_t height;
FTextureID picnum; FTextureID picnum;
int lightlevel; int lightlevel;