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

Merge remote-tracking branch 'origin/capsky' into qzdoom

Browse source 
# Conflicts:
#	src/r_plane.cpp
#	src/r_sky.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
This commit is contained in:
Magnus Norddahl 2016-10-20 01:05:05 +02:00
commit aa199a91c5
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_plane.cpp
View file

@ -65,7 +65,7 @@
#pragma warning(disable:4244)
#endif
CVAR(Bool, r_capsky, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
EXTERN_CVAR(Int, r_skymode)
CVAR(Bool, r_cubesky, false, 0)
//EXTERN_CVAR (Int, tx)
@ -1268,7 +1268,7 @@ static void R_DrawSky (visplane_t *pl)
R_DrawCubeSky(pl);
return;
}
else if (r_capsky)
else if (r_skymode == 2)
{
R_DrawCapSky(pl);
return;

5
src/r_sky.cpp
View file

@ -49,7 +49,8 @@ fixed_t sky1cyl, sky2cyl;
double sky1pos, sky2pos;
// [RH] Stretch sky texture if not taller than 128 pixels?
CUSTOM_CVAR (Bool, r_stretchsky, false, CVAR_ARCHIVE)
// Also now controls capped skies. 0 = normal, 1 = stretched, 2 = capped
CUSTOM_CVAR (Int, r_skymode, 2, CVAR_ARCHIVE)
{
R_InitSkyMap ();
}
@ -99,7 +100,7 @@ void R_InitSkyMap ()
skytexturemid = 0;
if (skyheight >= 128 && skyheight < 200)
{
skystretch = (r_stretchsky
skystretch = (r_skymode == 1
&& skyheight >= 128
&& level.IsFreelookAllowed()
&& !(level.flags & LEVEL_FORCENOSKYSTRETCH)) ? 1 : 0;

6
wadsrc/static/language.enu
View file

@ -1786,8 +1786,7 @@ DSPLYMNU_BLOODFADE = "Blood Flash Intensity";
DSPLYMNU_PICKUPFADE = "Pickup Flash Intensity";
DSPLYMNU_PALLETEHACK = "DirectDraw palette hack"; // Not used
DSPLYMNU_ATTACHEDSURFACES = "Use attached surfaces"; // Not used
DSPLYMNU_CAPSKY = "Cap skies with solid color";
DSPLYMNU_STRETCHSKY = "Stretch short skies";
DSPLYMNU_SKYMODE = "Sky render mode";
DSPLYMNU_LINEARSKY = "Linear skies";
DSPLYMNU_GZDFULLBRIGHT = "Emulate GZDoom FullBright";
DSPLYMNU_DRAWFUZZ = "Use fuzz effect";
@ -2197,6 +2196,9 @@ OPTVAL_INVERTED = "Inverted";
OPTVAL_NOTINVERTED = "Not Inverted";
OPTVAL_ORIGINAL = "Original";
OPTVAL_OPTIMIZED = "Optimized";
OPTVAL_NORMAL = "Normal";
OPTVAL_STRETCH = "Stretch";
OPTVAL_CAPPED = "Capped";
OPTVAL_PARTICLES = "Particles";
OPTVAL_SPRITES = "Sprites";
OPTVAL_SPRITESPARTICLES = "Sprites & Particles";

10
wadsrc/static/menudef.txt
View file

@ -600,6 +600,13 @@ OptionValue ColumnMethods
1.0, "$OPTVAL_OPTIMIZED"
}
OptionValue SkyModes
{
0.0, "$OPTVAL_NORMAL"
1.0, "$OPTVAL_STRETCH"
2.0, "$OPTVAL_CAPPED"
}
OptionValue RocketTrailTypes
{
0.0, "$OPTVAL_OFF"
@ -700,8 +707,7 @@ OptionMenu "VideoOptions"
//Option "$DSPLYMNU_ATTACHEDSURFACES", "vid_attachedsurfaces", "OnOff"
}
Option "$DSPLYMNU_CAPSKY", "r_capsky", "OnOff"
Option "$DSPLYMNU_STRETCHSKY", "r_stretchsky", "OnOff"
Option "$DSPLYMNU_SKYMODE", "r_skymode", "SkyModes"
Option "$DSPLYMNU_LINEARSKY", "r_linearsky", "OnOff"
Option "$DSPLYMNU_GZDFULLBRIGHT", "r_fullbrightignoresectorcolor", "OnOff"
Option "$DSPLYMNU_DRAWFUZZ", "r_drawfuzz", "Fuzziness"