stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 23:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sloped planes now respect flat offsets

Browse source
This commit is contained in:
RedEnchilada 2015-05-23 02:18:32 -05:00
parent a5d7356fd2
commit 485f671f23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/r_plane.c
View file

@ -437,6 +437,9 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
visplane_t *check; visplane_t *check;
unsigned hash; unsigned hash;
#ifdef ESLOPE
if (slope); else // Don't mess with this right now if a slope is involved
#endif
if (plangle != 0) if (plangle != 0)
{ {
// Add the view offset, rotated by the plane angle. // Add the view offset, rotated by the plane angle.
@ -946,8 +949,8 @@ void R_DrawSinglePlane(visplane_t *pl)
//double zeroheight; //double zeroheight;
float fudge; float fudge;
float vx = FIXED_TO_FLOAT(viewx); float vx = FIXED_TO_FLOAT(viewx+xoffs);
float vy = FIXED_TO_FLOAT(viewy); float vy = FIXED_TO_FLOAT(viewy-yoffs);
float vz = FIXED_TO_FLOAT(viewz); float vz = FIXED_TO_FLOAT(viewz);
zeroheight = FIXED_TO_FLOAT(P_GetZAt(pl->slope, viewx, viewy)); zeroheight = FIXED_TO_FLOAT(P_GetZAt(pl->slope, viewx, viewy));
@ -960,7 +963,7 @@ void R_DrawSinglePlane(visplane_t *pl)
ang = ANG2RAD(ANGLE_270 - viewangle); ang = ANG2RAD(ANGLE_270 - viewangle);
p.x = vx * cos(ang) - vy * sin(ang); p.x = vx * cos(ang) - vy * sin(ang);
p.z = vx * sin(ang) + vy * cos(ang); p.z = vx * sin(ang) + vy * cos(ang);
p.y = FIXED_TO_FLOAT(P_GetZAt(pl->slope, 0, 0)) - vz; p.y = FIXED_TO_FLOAT(P_GetZAt(pl->slope, -xoffs, yoffs)) - vz;
// m is the v direction vector in view space // m is the v direction vector in view space
ang = ANG2RAD(ANGLE_180 - viewangle - pl->plangle); ang = ANG2RAD(ANGLE_180 - viewangle - pl->plangle);