zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove linear sky again

This commit is contained in:
Magnus Norddahl 2016-08-06 21:04:45 +02:00
parent 9953d70eaa
commit 21390e91b8
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/r_plane.cpp
View File

@ -880,31 +880,17 @@ static DWORD lastskycol_bgra[4];
static int skycolplace; static int skycolplace;
static int skycolplace_bgra; static int skycolplace_bgra;
CVAR(Bool, r_linearsky, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
// 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)
{
int tx;
if (r_linearsky)
{
angle_t xangle = (angle_t)((0.5 - x / (double)viewwidth) * FocalTangent * ANGLE_90);
angle_t column = (skyangle + xangle) ^ skyflip;
tx = (UMulScale16(column, frontcyl) + frontpos) >> FRACBITS;
}
else
{ {
angle_t column = (skyangle + xtoviewangle[x]) ^ skyflip; angle_t column = (skyangle + xtoviewangle[x]) ^ skyflip;
tx = (UMulScale16(column, frontcyl) + frontpos) >> FRACBITS; int tx = (UMulScale16(column, frontcyl) + frontpos) >> FRACBITS;
}
if (!r_swtruecolor) if (!r_swtruecolor)
return fronttex->GetColumn(tx, NULL); return fronttex->GetColumn(tx, NULL);
else else
{
return (const BYTE *)fronttex->GetColumnBgra(tx, NULL); return (const BYTE *)fronttex->GetColumnBgra(tx, 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)