zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: When R_DrawTiltedPlane() calculates the p vector, it can overflow

Browse source 
if the view is near the bounds of the fixed point coordinate system. This
  happens because it rotates the view position around (0,0) according to
  the current viewangle, so the resultant coordinate may be outside the
  bounds of fixed point. All important math in this function is now done
  entirely in floating point.
- Fixed: Slopes didn't draw right on 64-bit platforms.


SVN r986 (trunk)
This commit is contained in:
Randy Heit 2008-05-22 05:17:21 +00:00
parent befdd0b41f
commit 7160e09b04
7 changed files with 85 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docs/rh-log.txt
View file

@ -1,3 +1,12 @@
May 21, 2008
- Fixed: When R_DrawTiltedPlane() calculates the p vector, it can overflow
if the view is near the bounds of the fixed point coordinate system. This
happens because it rotates the view position around (0,0) according to
the current viewangle, so the resultant coordinate may be outside the
bounds of fixed point. All important math in this function is now done
entirely in floating point.
- Fixed: Slopes didn't draw right on 64-bit platforms.
May 20, 2008 May 20, 2008
- Fixed: With hardware 2D, the console and menu need not reimplement palette - Fixed: With hardware 2D, the console and menu need not reimplement palette
flashes to ensure their visibility. flashes to ensure their visibility.

4
src/mscinlines.h
View file

@ -343,7 +343,7 @@ __forceinline SDWORD ksgn (SDWORD a)
__forceinline int toint (float v) __forceinline int toint (float v)
{ {
QWORD res; SQWORD res;
__asm fld v; __asm fld v;
__asm fistp res; __asm fistp res;
return (int)res; return (int)res;
@ -351,7 +351,7 @@ __forceinline int toint (float v)
__forceinline int quickertoint (float v) __forceinline int quickertoint (float v)
{ {
DWORD res; SDWORD res;
__asm fld v; __asm fld v;
__asm fistp res; __asm fistp res;
return (int)res; return (int)res;

1
src/p_mobj.cpp
View file

@ -2552,7 +2552,6 @@ void AActor::Tick ()
} }
else else
{ {
AInventory * item = Inventory; AInventory * item = Inventory;
// Handle powerup effects here so that the order is controlled // Handle powerup effects here so that the order is controlled

6
src/r_defs.h
View file

@ -140,6 +140,12 @@ struct secplane_t
return FixedMul (ic, -d - DMulScale16 (a, x, b, y)); return FixedMul (ic, -d - DMulScale16 (a, x, b, y));
} }
// Returns the value of z at (x,y) as a double
double ZatPoint (double x, double y) const
{
return (d + a*x + b*y) * ic / (-65536.0 * 65536.0);
}
// Returns the value of z at vertex v // Returns the value of z at vertex v
fixed_t ZatPoint (const vertex_t *v) const fixed_t ZatPoint (const vertex_t *v) const
{ {

113
src/r_plane.cpp
View file

@ -315,7 +315,7 @@ void R_MapTiltedPlane (int y, int x1)
{ {
int x2 = spanend[y]; int x2 = spanend[y];
int width = x2 - x1; int width = x2 - x1;
float iz, uz, vz; double iz, uz, vz;
BYTE *fb; BYTE *fb;
DWORD u, v; DWORD u, v;
int i; int i;
@ -344,10 +344,10 @@ void R_MapTiltedPlane (int y, int x1)
i = 0; i = 0;
do do
{ {
float z = 1.f/iz; double z = 1.f/iz;
u = toint (uz*z) + pviewx; u = SQWORD(uz*z) + pviewx;
v = toint (vz*z) + pviewy; v = SQWORD(vz*z) + pviewy;
ds_colormap = tiltlighting[i]; ds_colormap = tiltlighting[i];
fb[i++] = ds_colormap[ds_source[(v >> vshift) | ((u >> ushift) & umask)]]; fb[i++] = ds_colormap[ds_source[(v >> vshift) | ((u >> ushift) & umask)]];
iz += plane_sz[0]; iz += plane_sz[0];
@ -362,10 +362,10 @@ void R_MapTiltedPlane (int y, int x1)
#define SPANSIZE 16 #define SPANSIZE 16
#define INVSPAN 0.0625f #define INVSPAN 0.0625f
float startz = 1.f/iz; double startz = 1.f/iz;
float startu = uz*startz; double startu = uz*startz;
float startv = vz*startz; double startv = vz*startz;
float izstep, uzstep, vzstep; double izstep, uzstep, vzstep;
izstep = plane_sz[0] * SPANSIZE; izstep = plane_sz[0] * SPANSIZE;
uzstep = plane_su[0] * SPANSIZE; uzstep = plane_su[0] * SPANSIZE;
@ -379,13 +379,13 @@ void R_MapTiltedPlane (int y, int x1)
uz += uzstep; uz += uzstep;
vz += vzstep; vz += vzstep;
float endz = 1.f/iz; double endz = 1.f/iz;
float endu = uz*endz; double endu = uz*endz;
float endv = vz*endz; double endv = vz*endz;
DWORD stepu = toint ((endu - startu) * INVSPAN); DWORD stepu = SQWORD((endu - startu) * INVSPAN);
DWORD stepv = toint ((endv - startv) * INVSPAN); DWORD stepv = SQWORD((endv - startv) * INVSPAN);
u = toint (startu) + pviewx; u = SQWORD(startu) + pviewx;
v = toint (startv) + pviewy; v = SQWORD(startv) + pviewy;
for (i = SPANSIZE-1; i >= 0; i--) for (i = SPANSIZE-1; i >= 0; i--)
{ {
@ -403,25 +403,25 @@ void R_MapTiltedPlane (int y, int x1)
{ {
if (width == 1) if (width == 1)
{ {
u = toint (startu); u = SQWORD(startu);
v = toint (startv); v = SQWORD(startv);
fb[x1] = *(tiltlighting[x1] + ds_source[(v >> vshift) | ((u >> ushift) & umask)]); fb[x1] = *(tiltlighting[x1] + ds_source[(v >> vshift) | ((u >> ushift) & umask)]);
} }
else else
{ {
float left = (float)width; double left = width;
iz += plane_sz[0] * left; iz += plane_sz[0] * left;
uz += plane_su[0] * left; uz += plane_su[0] * left;
vz += plane_sv[0] * left; vz += plane_sv[0] * left;
float endz = 1.f/iz; double endz = 1.f/iz;
float endu = uz*endz; double endu = uz*endz;
float endv = vz*endz; double endv = vz*endz;
left = 1.f/left; left = 1.f/left;
DWORD stepu = toint ((endu - startu) * left); DWORD stepu = SQWORD((endu - startu) * left);
DWORD stepv = toint ((endv - startv) * left); DWORD stepv = SQWORD((endv - startv) * left);
u = toint (startu) + pviewx; u = SQWORD(startu) + pviewx;
v = toint (startv) + pviewy; v = SQWORD(startv) + pviewy;
for (; width != 0; width--) for (; width != 0; width--)
{ {
@ -1447,66 +1447,59 @@ void R_DrawTiltedPlane (visplane_t *pl, fixed_t alpha, bool masked)
/*, 0.0009765625f, 0.00048828125f, 0.000244140625f, /*, 0.0009765625f, 0.00048828125f, 0.000244140625f,
1.220703125e-4f, 6.103515625e-5, 3.0517578125e-5*/ 1.220703125e-4f, 6.103515625e-5, 3.0517578125e-5*/
}; };
float lxscale, lyscale; double lxscale, lyscale;
float xscale, yscale; double xscale, yscale;
fixed_t ixscale, iyscale;
angle_t ang;
FVector3 p, m, n; FVector3 p, m, n;
fixed_t zeroheight; double ang;
double zeroheight;
if (alpha <= 0) if (alpha <= 0)
{ {
return; return;
} }
// p is the texture origin in view space double vx = FIXED2FLOAT(viewx);
// Don't add in the offsets at this stage, because doing so can result in double vy = FIXED2FLOAT(viewy);
// errors if the flat is rotated. double vz = FIXED2FLOAT(viewz);
lxscale = FIXED2FLOAT(pl->xscale) * ifloatpow2[ds_xbits]; lxscale = FIXED2FLOAT(pl->xscale) * ifloatpow2[ds_xbits];
lyscale = FIXED2FLOAT(pl->yscale) * ifloatpow2[ds_ybits]; lyscale = FIXED2FLOAT(pl->yscale) * ifloatpow2[ds_ybits];
xscale = 64.f / lxscale; xscale = 64.f / lxscale;
yscale = 64.f / lyscale; yscale = 64.f / lyscale;
ixscale = quickertoint(xscale*65536.f); zeroheight = pl->height.ZatPoint(vx, vy);
iyscale = quickertoint(yscale*65536.f);
zeroheight = pl->height.ZatPoint (viewx, viewy);
pviewx = MulScale (pl->xoffs, pl->xscale, ds_xbits); pviewx = MulScale (pl->xoffs, pl->xscale, ds_xbits);
pviewy = MulScale (pl->yoffs, pl->yscale, ds_ybits); pviewy = MulScale (pl->yoffs, pl->yscale, ds_ybits);
ang = (ANG270 - viewangle) >> ANGLETOFINESHIFT; // p is the texture origin in view space
// Printf ("%u %d %d\n", ang, finecosine[ang], finesine[ang]); // Don't add in the offsets at this stage, because doing so can result in
p[0] = FIXED2FLOAT(DMulScale16 (viewx, finecosine[ang], -viewy, finesine[ang])); // errors if the flat is rotated.
p[2] = FIXED2FLOAT(DMulScale16 (viewx, finesine[ang], viewy, finecosine[ang])); ang = bam2rad(ANG270 - viewangle);
// double dang = 1.5*M_PI - double(viewangle)*M_PI/2147483648.0; p[0] = vx * cos(ang) - vy * sin(ang);
// double vx = viewx/65536.0, vy = viewy/65536.0; p[2] = vx * sin(ang) + vy * cos(ang);
// double dcos = cos(dang), dsin = sin(dang); p[1] = pl->height.ZatPoint(0.0, 0.0) - vz;
// p[0] = vx * dcos - vy * dsin;
// p[2] = vx * dsin + vy * dcos;
p[1] = FIXED2FLOAT(pl->height.ZatPoint (0, 0) - viewz);
// m is the v direction vector in view space // m is the v direction vector in view space
ang = (ANG180 - viewangle - pl->angle) >> ANGLETOFINESHIFT; ang = bam2rad(ANG180 - viewangle - pl->angle);
m[0] = yscale * FIXED2FLOAT(finecosine[ang]); m[0] = yscale * cos(ang);
m[2] = yscale * FIXED2FLOAT(finesine[ang]); m[2] = yscale * sin(ang);
// m[1] = FIXED2FLOAT(pl->height.ZatPoint (0, iyscale) - pl->height.ZatPoint (0,0)); // m[1] = FIXED2FLOAT(pl->height.ZatPoint (0, iyscale) - pl->height.ZatPoint (0,0));
// VectorScale2 (m, 64.f/VectorLength(m)); // VectorScale2 (m, 64.f/VectorLength(m));
// n is the u direction vector in view space // n is the u direction vector in view space
ang = (ang + (ANG90>>ANGLETOFINESHIFT)) & FINEMASK; ang += PI/2;
n[0] = -xscale * FIXED2FLOAT(finecosine[ang]); n[0] = -xscale * cos(ang);
n[2] = -xscale * FIXED2FLOAT(finesine[ang]); n[2] = -xscale * sin(ang);
// n[1] = FIXED2FLOAT(pl->height.ZatPoint (ixscale, 0) - pl->height.ZatPoint (0,0)); // n[1] = FIXED2FLOAT(pl->height.ZatPoint (ixscale, 0) - pl->height.ZatPoint (0,0));
// VectorScale2 (n, 64.f/VectorLength(n)); // VectorScale2 (n, 64.f/VectorLength(n));
ang = pl->angle >> ANGLETOFINESHIFT; // This code keeps the texture coordinates constant across the x,y plane no matter
m[1] = FIXED2FLOAT(pl->height.ZatPoint ( // how much you slope the surface. Use the commented-out code above instead to keep
viewx + MulScale16 (iyscale, finesine[ang]), // the textures a constant size across the surface's plane instead.
viewy + MulScale16 (iyscale, finecosine[ang])) - zeroheight); ang = bam2rad(pl->angle);
ang = (pl->angle + ANGLE_90) >> ANGLETOFINESHIFT; m[1] = pl->height.ZatPoint(vx + yscale * sin(ang), vy + yscale * cos(ang)) - zeroheight;
n[1] = FIXED2FLOAT(pl->height.ZatPoint ( ang += PI/2;
viewx + MulScale16 (ixscale, finesine[ang]), n[1] = pl->height.ZatPoint(vx + xscale * sin(ang), vy + xscale * cos(ang)) - zeroheight;
viewy + MulScale16 (ixscale, finecosine[ang])) - zeroheight);
plane_su = p ^ m; plane_su = p ^ m;
plane_sv = p ^ n; plane_sv = p ^ n;

5
src/tables.h
View file

@ -120,4 +120,9 @@ inline int SlopeDiv (unsigned int num, unsigned den)
return ans <= SLOPERANGE ? ans : SLOPERANGE; return ans <= SLOPERANGE ? ans : SLOPERANGE;
} }
inline double bam2rad(angle_t ang)
{
return double(ang >> 1) * (PI / ANGLE_90);
}
#endif // __TABLES_H__ #endif // __TABLES_H__

25
zdoom.sln
View file

@ -57,16 +57,16 @@ Global
{8049475B-5C87-46F9-9358-635218A4EF18}.Debug|x64.Build.0 = Debug|x64 {8049475B-5C87-46F9-9358-635218A4EF18}.Debug|x64.Build.0 = Debug|x64
{8049475B-5C87-46F9-9358-635218A4EF18}.Release|Win32.ActiveCfg = Release|Win32 {8049475B-5C87-46F9-9358-635218A4EF18}.Release|Win32.ActiveCfg = Release|Win32
{8049475B-5C87-46F9-9358-635218A4EF18}.Release|Win32.Build.0 = Release|Win32 {8049475B-5C87-46F9-9358-635218A4EF18}.Release|Win32.Build.0 = Release|Win32
{8049475B-5C87-46F9-9358-635218A4EF18}.Release|x64.ActiveCfg = Release|x64 {8049475B-5C87-46F9-9358-635218A4EF18}.Release|x64.ActiveCfg = Debug|x64
{8049475B-5C87-46F9-9358-635218A4EF18}.Release|x64.Build.0 = Release|x64 {8049475B-5C87-46F9-9358-635218A4EF18}.Release|x64.Build.0 = Debug|x64
{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Debug|Win32.ActiveCfg = Debug|Win32 {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Debug|Win32.ActiveCfg = Debug|Win32
{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Debug|Win32.Build.0 = Debug|Win32 {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Debug|Win32.Build.0 = Debug|Win32
{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Debug|x64.ActiveCfg = Debug|x64 {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Debug|x64.ActiveCfg = Debug|x64
{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Debug|x64.Build.0 = Debug|x64 {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Debug|x64.Build.0 = Debug|x64
{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Release|Win32.ActiveCfg = Release|Win32 {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Release|Win32.ActiveCfg = Release|Win32
{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Release|Win32.Build.0 = Release|Win32 {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Release|Win32.Build.0 = Release|Win32
{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Release|x64.ActiveCfg = Release|x64 {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Release|x64.ActiveCfg = Debug|x64
{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Release|x64.Build.0 = Release|x64 {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}.Release|x64.Build.0 = Debug|x64
{0F80ACBF-460E-44F0-B28E-B3272D1774A7}.Debug|Win32.ActiveCfg = Debug|Win32 {0F80ACBF-460E-44F0-B28E-B3272D1774A7}.Debug|Win32.ActiveCfg = Debug|Win32
{0F80ACBF-460E-44F0-B28E-B3272D1774A7}.Debug|Win32.Build.0 = Debug|Win32 {0F80ACBF-460E-44F0-B28E-B3272D1774A7}.Debug|Win32.Build.0 = Debug|Win32
{0F80ACBF-460E-44F0-B28E-B3272D1774A7}.Debug|x64.ActiveCfg = Release|Win32 {0F80ACBF-460E-44F0-B28E-B3272D1774A7}.Debug|x64.ActiveCfg = Release|Win32
@ -113,32 +113,27 @@ Global
{6077B7D6-349F-4077-B552-3BC302EF5859}.Debug|x64.Build.0 = Debug|x64 {6077B7D6-349F-4077-B552-3BC302EF5859}.Debug|x64.Build.0 = Debug|x64
{6077B7D6-349F-4077-B552-3BC302EF5859}.Release|Win32.ActiveCfg = Release|Win32 {6077B7D6-349F-4077-B552-3BC302EF5859}.Release|Win32.ActiveCfg = Release|Win32
{6077B7D6-349F-4077-B552-3BC302EF5859}.Release|Win32.Build.0 = Release|Win32 {6077B7D6-349F-4077-B552-3BC302EF5859}.Release|Win32.Build.0 = Release|Win32
{6077B7D6-349F-4077-B552-3BC302EF5859}.Release|x64.ActiveCfg = Release|x64 {6077B7D6-349F-4077-B552-3BC302EF5859}.Release|x64.ActiveCfg = Debug|x64
{6077B7D6-349F-4077-B552-3BC302EF5859}.Release|x64.Build.0 = Release|x64 {6077B7D6-349F-4077-B552-3BC302EF5859}.Release|x64.Build.0 = Debug|x64
{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Debug|Win32.ActiveCfg = Debug|Win32 {AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Debug|Win32.ActiveCfg = Debug|Win32
{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Debug|Win32.Build.0 = Debug|Win32 {AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Debug|Win32.Build.0 = Debug|Win32
{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Debug|x64.ActiveCfg = Debug|x64 {AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Debug|x64.ActiveCfg = Debug|x64
{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Debug|x64.Build.0 = Debug|x64
{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Release|Win32.ActiveCfg = Release|Win32 {AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Release|Win32.ActiveCfg = Release|Win32
{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Release|Win32.Build.0 = Release|Win32 {AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Release|Win32.Build.0 = Release|Win32
{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Release|x64.ActiveCfg = Release|x64 {AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Release|x64.ActiveCfg = Debug|x64
{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}.Release|x64.Build.0 = Release|x64
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Debug|Win32.ActiveCfg = Debug|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Debug|Win32.ActiveCfg = Debug|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Debug|Win32.Build.0 = Debug|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Debug|Win32.Build.0 = Debug|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Debug|x64.ActiveCfg = Debug|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Debug|x64.ActiveCfg = Debug|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Debug|x64.Build.0 = Debug|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|Win32.ActiveCfg = Release|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|Win32.ActiveCfg = Release|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|Win32.Build.0 = Release|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|Win32.Build.0 = Release|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|x64.ActiveCfg = Release|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|x64.ActiveCfg = Release|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|x64.Build.0 = Release|Win32
{E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Debug|Win32.ActiveCfg = Release|Win32 {E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Debug|Win32.ActiveCfg = Release|Win32
{E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Debug|Win32.Build.0 = Release|Win32 {E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Debug|Win32.Build.0 = Release|Win32
{E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Debug|x64.ActiveCfg = Release|x64 {E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Debug|x64.ActiveCfg = Debug|x64
{E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Debug|x64.Build.0 = Release|x64 {E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Debug|x64.Build.0 = Debug|x64
{E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Release|Win32.ActiveCfg = Release|Win32 {E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Release|Win32.ActiveCfg = Release|Win32
{E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Release|Win32.Build.0 = Release|Win32 {E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Release|Win32.Build.0 = Release|Win32
{E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Release|x64.ActiveCfg = Release|x64 {E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Release|x64.ActiveCfg = Release|Win32
{E83FD370-2E72-4D4C-9427-FF9D9DED1E88}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE