zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 13:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Do not squash skies taller than 200 into square pixels.

Browse source 
SVN r1981 (trunk)
This commit is contained in:
Randy Heit 2009-11-15 01:04:58 +00:00
parent d01c402755
commit 6310f32843
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,3 +1,6 @@
November 14, 2009
- Do not squash skies taller than 200 into square pixels.
November 14, 2009 (Changes by Graf Zahl) November 14, 2009 (Changes by Graf Zahl)
- Added skillinfo fix by Gez. - Added skillinfo fix by Gez.
- added a r_scaletallskies CVAR so that sky positioning can be checked - added a r_scaletallskies CVAR so that sky positioning can be checked

25
src/r_sky.cpp
View file

@ -64,10 +64,6 @@ extern fixed_t freelookviewheight;
// Called whenever the view size changes. // Called whenever the view size changes.
// //
//========================================================================== //==========================================================================
CUSTOM_CVAR(Bool, r_scaletallskies, true, CVAR_ARCHIVE)
{
R_InitSkyMap();
}
void R_InitSkyMap () void R_InitSkyMap ()
{ {
@ -97,11 +93,8 @@ void R_InitSkyMap ()
// fully up. // fully up.
// h == 200: Unstretched, baseline is on horizon, and top is at the top of // h == 200: Unstretched, baseline is on horizon, and top is at the top of
// the screen when looking fully up. // the screen when looking fully up.
// 200 < h <= 240: Squashed to consume the same height as a 200-pixel tall sky // h > 200: Unstretched, but the baseline is shifted down so that the top
// and aligned on the horizon. // of the texture is at the top of the screen when looking fully up.
// h > 240: Same scale as a 240-tall sky, but the baseline is shifted down
// so that the top of the texture is at the top of the screen
// when looking fully up.
skyheight = skytex1->GetScaledHeight(); skyheight = skytex1->GetScaledHeight();
skystretch = false; skystretch = false;
skytexturemid = 0; skytexturemid = 0;
@ -113,11 +106,7 @@ void R_InitSkyMap ()
&& !(level.flags & LEVEL_FORCENOSKYSTRETCH)) ? 1 : 0; && !(level.flags & LEVEL_FORCENOSKYSTRETCH)) ? 1 : 0;
skytexturemid = -28*FRACUNIT; skytexturemid = -28*FRACUNIT;
} }
else if (r_scaletallskies && skyheight > 240) else if (skyheight > 200)
{
skytexturemid = (240 - skyheight) << FRACBITS;
}
else if (!r_scaletallskies && skyheight > 200)
{ {
skytexturemid = (200 - skyheight) << FRACBITS; skytexturemid = (200 - skyheight) << FRACBITS;
} }
@ -132,13 +121,7 @@ void R_InitSkyMap ()
skyscale = Scale (skyscale, 2048, FieldOfView); skyscale = Scale (skyscale, 2048, FieldOfView);
} }
if (r_scaletallskies && skyheight > 200) if (skystretch)
{
int sheight = MIN(skyheight, 240);
skyscale = Scale(skyscale, 200, sheight);
skyiscale = Scale(skyiscale, sheight, 200);
}
else if (skyheight < 200 && skystretch)
{ {
skyscale = Scale(skyscale, SKYSTRETCH_HEIGHT, skyheight); skyscale = Scale(skyscale, SKYSTRETCH_HEIGHT, skyheight);
skyiscale = Scale(skyiscale, skyheight, SKYSTRETCH_HEIGHT); skyiscale = Scale(skyiscale, skyheight, SKYSTRETCH_HEIGHT);