From 21390e91b8a28c71ba44bf62ee3c7545508a74e2 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 6 Aug 2016 21:04:45 +0200 Subject: [PATCH] Remove linear sky again --- src/r_plane.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/r_plane.cpp b/src/r_plane.cpp index e25812fbd4..c751fc5dcb 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -880,30 +880,16 @@ static DWORD lastskycol_bgra[4]; static int skycolplace; 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. 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; - tx = (UMulScale16(column, frontcyl) + frontpos) >> FRACBITS; - } + angle_t column = (skyangle + xtoviewangle[x]) ^ skyflip; + int tx = (UMulScale16(column, frontcyl) + frontpos) >> FRACBITS; if (!r_swtruecolor) return fronttex->GetColumn(tx, NULL); else - { return (const BYTE *)fronttex->GetColumnBgra(tx, NULL); - } } // Get a column of sky when there are two overlapping sky textures