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

- Fixed sky stretching for the new freelook limit.

Browse source
This commit is contained in:
drfrag 2019-10-09 00:33:23 +02:00
parent d48a886f8b
commit 302b9a768a
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/r_sky.cpp
View file

@ -53,6 +53,8 @@ bool skystretch;
fixed_t sky1cyl, sky2cyl; fixed_t sky1cyl, sky2cyl;
double sky1pos, sky2pos; double sky1pos, sky2pos;
EXTERN_CVAR(Bool, cl_oldfreelooklimit)
CUSTOM_CVAR(Int, testskyoffset, 0, 0) CUSTOM_CVAR(Int, testskyoffset, 0, 0)
{ {
R_InitSkyMap(); R_InitSkyMap();
@ -67,6 +69,7 @@ CUSTOM_CVAR (Int, r_skymode, 2, CVAR_ARCHIVE)
int freelookviewheight; int freelookviewheight;
int skyoffset;
//========================================================================== //==========================================================================
// //
@ -117,17 +120,17 @@ void R_InitSkyMap ()
// h > 200: Unstretched, but the baseline is shifted down so that the top // h > 200: Unstretched, but the baseline is shifted down so that the top
// of the texture is at the top of the screen when looking fully up. // of the texture is at the top of the screen when looking fully up.
skyheight = skytex1->GetScaledHeight(); skyheight = skytex1->GetScaledHeight();
skystretch = false; skystretch = (r_skymode == 1
&& skyheight >= 128 && skyheight < 310
&& level.IsFreelookAllowed()
&& !(level.flags & LEVEL_FORCETILEDSKY)) ? 1 : 0;
skyoffset = cl_oldfreelooklimit? 0 : skyheight >= 200? 110 : 138;
skytexturemid = 0; skytexturemid = 0;
if (skyheight >= 128 && skyheight < 200) if (skyheight >= 128 && skyheight < 200)
{ {
skystretch = (r_skymode == 1
&& skyheight >= 128
&& level.IsFreelookAllowed()
&& !(level.flags & LEVEL_FORCETILEDSKY)) ? 1 : 0;
skytexturemid = -28; skytexturemid = -28;
} }
else if (skyheight > 200) else if (skyheight >= 200)
{ {
skytexturemid = (200 - skyheight) * skytex1->Scale.Y +((r_skymode == 2 && !(level.flags & LEVEL_FORCETILEDSKY)) ? skytex1->SkyOffset + testskyoffset : 0); skytexturemid = (200 - skyheight) * skytex1->Scale.Y +((r_skymode == 2 && !(level.flags & LEVEL_FORCETILEDSKY)) ? skytex1->SkyOffset + testskyoffset : 0);
} }
@ -143,9 +146,9 @@ void R_InitSkyMap ()
if (skystretch) if (skystretch)
{ {
skyscale *= (double)SKYSTRETCH_HEIGHT / skyheight; skyscale *= (double)(SKYSTRETCH_HEIGHT + skyoffset) / skyheight;
skyiscale *= skyheight / (float)SKYSTRETCH_HEIGHT; skyiscale *= skyheight / (float)(SKYSTRETCH_HEIGHT + skyoffset);
skytexturemid *= skyheight / (double)SKYSTRETCH_HEIGHT; skytexturemid *= skyheight / (double)(SKYSTRETCH_HEIGHT + skyoffset);
} }
// The standard Doom sky texture is 256 pixels wide, repeated 4 times over 360 degrees, // The standard Doom sky texture is 256 pixels wide, repeated 4 times over 360 degrees,

4
src/swrenderer/plane/r_skyplane.cpp
View file

@ -54,6 +54,8 @@
#include "swrenderer/r_renderthread.h" #include "swrenderer/r_renderthread.h"
#include "g_levellocals.h" #include "g_levellocals.h"
extern int skyoffset;
CVAR(Bool, r_linearsky, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); CVAR(Bool, r_linearsky, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
EXTERN_CVAR(Int, r_skymode) EXTERN_CVAR(Int, r_skymode)
@ -152,7 +154,7 @@ namespace swrenderer
frontcyl = MAX(frontskytex->GetWidth(), frontxscale); frontcyl = MAX(frontskytex->GetWidth(), frontxscale);
if (skystretch) if (skystretch)
{ {
skymid = skymid * frontskytex->GetScaledHeightDouble() / SKYSTRETCH_HEIGHT; skymid = skymid * frontskytex->GetScaledHeightDouble() / (SKYSTRETCH_HEIGHT + skyoffset);
} }
} }
} }