zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: MBF sky Y offsets were ignored. X offsets should also be applied to

Browse source 
the sky cylinder, not the screen like Hexen scrolling skies.


SVN r1970 (trunk)
This commit is contained in:
Randy Heit 2009-11-12 01:05:55 +00:00
parent 653e2dd1f0
commit 281b2f5637
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -1,3 +1,7 @@
November 11, 2009
- Fixed: MBF sky Y offsets were ignored. X offsets should also be applied to
the sky cylinder, not the screen like Hexen scrolling skies.
November 9, 2009 November 9, 2009
- Maps inside zips can now satisfy the map checks for IWAD detection. - Maps inside zips can now satisfy the map checks for IWAD detection.
- Fixed: F7ZFile did not delete its Archive when destroyed. - Fixed: F7ZFile did not delete its Archive when destroyed.

16
src/r_plane.cpp
View file

@ -747,6 +747,8 @@ static angle_t skyflip;
static int frontpos, backpos; static int frontpos, backpos;
static fixed_t frontyScale; static fixed_t frontyScale;
static fixed_t frontcyl, backcyl; static fixed_t frontcyl, backcyl;
static fixed_t skymid;
static angle_t skyangle;
int frontiScale; int frontiScale;
extern fixed_t swall[MAXWIDTH]; extern fixed_t swall[MAXWIDTH];
@ -764,14 +766,14 @@ static int skycolplace;
// Get a column of sky when there is only one sky texture. // Get a column of sky when there is only one sky texture.
static const BYTE *R_GetOneSkyColumn (FTexture *fronttex, int x) static const BYTE *R_GetOneSkyColumn (FTexture *fronttex, int x)
{ {
angle_t column = (viewangle + xtoviewangle[x]) ^ skyflip; angle_t column = (skyangle + xtoviewangle[x]) ^ skyflip;
return fronttex->GetColumn((UMulScale16(column, frontcyl) + frontpos) >> FRACBITS, NULL); return fronttex->GetColumn((UMulScale16(column, frontcyl) + frontpos) >> FRACBITS, NULL);
} }
// Get a column of sky when there are two overlapping sky textures // Get a column of sky when there are two overlapping sky textures
static const BYTE *R_GetTwoSkyColumns (FTexture *fronttex, int x) static const BYTE *R_GetTwoSkyColumns (FTexture *fronttex, int x)
{ {
DWORD ang = (viewangle + xtoviewangle[x]) ^ skyflip; DWORD ang = (skyangle + xtoviewangle[x]) ^ skyflip;
DWORD angle1 = (DWORD)((UMulScale16(ang, frontcyl) + frontpos) >> FRACBITS); DWORD angle1 = (DWORD)((UMulScale16(ang, frontcyl) + frontpos) >> FRACBITS);
DWORD angle2 = (DWORD)((UMulScale16(ang, backcyl) + backpos) >> FRACBITS); DWORD angle2 = (DWORD)((UMulScale16(ang, backcyl) + backpos) >> FRACBITS);
@ -849,7 +851,7 @@ static void R_DrawSky (visplane_t *pl)
rw_offset = 0; rw_offset = 0;
frontyScale = rw_pic->yScale; frontyScale = rw_pic->yScale;
dc_texturemid = MulScale16 (skytexturemid/*-viewz*/, frontyScale); dc_texturemid = MulScale16 (skymid, frontyScale);
if (1 << frontskytex->HeightBits == frontskytex->GetHeight()) if (1 << frontskytex->HeightBits == frontskytex->GetHeight())
{ // The texture tiles nicely { // The texture tiles nicely
@ -881,7 +883,7 @@ static void R_DrawSkyStriped (visplane_t *pl)
// So that I don't have to worry about fractional precision, chop off the // So that I don't have to worry about fractional precision, chop off the
// fractional part of centeryfrac. // fractional part of centeryfrac.
centeryfrac = centery << FRACBITS; centeryfrac = centery << FRACBITS;
topfrac = (skytexturemid + iscale * (1-centery)) % (frontskytex->GetHeight() << FRACBITS); topfrac = (skymid + iscale * (1-centery)) % (frontskytex->GetHeight() << FRACBITS);
if (topfrac < 0) topfrac += frontskytex->GetHeight() << FRACBITS; if (topfrac < 0) topfrac += frontskytex->GetHeight() << FRACBITS;
yl = 0; yl = 0;
yh = (short)MulScale32 ((frontskytex->GetHeight() << FRACBITS) - topfrac, frontyScale); yh = (short)MulScale32 ((frontskytex->GetHeight() << FRACBITS) - topfrac, frontyScale);
@ -1255,6 +1257,8 @@ void R_DrawSkyPlane (visplane_t *pl)
sky1tex = sky1texture; sky1tex = sky1texture;
} }
sky2tex = sky2texture; sky2tex = sky2texture;
skymid = skytexturemid;
skyangle = viewangle;
if (pl->picnum == skyflatnum) if (pl->picnum == skyflatnum)
{ {
@ -1311,10 +1315,10 @@ void R_DrawSkyPlane (visplane_t *pl)
// to allow sky rotation as well as careful positioning. // to allow sky rotation as well as careful positioning.
// However, the offset is scaled very small, so that it // However, the offset is scaled very small, so that it
// allows a long-period of sky rotation. // allows a long-period of sky rotation.
frontdpos = (-s->GetTextureXOffset(pos)) >> 6; skyangle += s->GetTextureXOffset(pos);
// Vertical offset allows careful sky positioning. // Vertical offset allows careful sky positioning.
dc_texturemid = s->GetTextureYOffset(pos) - 28*FRACUNIT; skymid = s->GetTextureYOffset(pos) - 28*FRACUNIT;
// We sometimes flip the picture horizontally. // We sometimes flip the picture horizontally.
// //