mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-07 21:41:07 +00:00
1b55520a8b
- Fixed: At resolutions taller than 600 pixels or so, tall sky textures were drawn a row too low. This was quite visible on Hexen MAP06. - Fixed: P_CheckSlopeWalk() must return false if floorsector != sector, or the actor will be yanked down to the floorsector by P_TryMove(). - Fixed: ClearActorInventory, GiveActorInventory, and TakeActorInventory only affected the first actor with the given TID. - Fixed: The color boxes for the colorpicker menu items were drawn a little too low. SVN r603 (trunk)
126 lines
3.3 KiB
C++
126 lines
3.3 KiB
C++
// Emacs style mode select -*- C++ -*-
|
|
//-----------------------------------------------------------------------------
|
|
//
|
|
// $Id:$
|
|
//
|
|
// Copyright (C) 1993-1996 by id Software, Inc.
|
|
//
|
|
// This source is available for distribution and/or modification
|
|
// only under the terms of the DOOM Source Code License as
|
|
// published by id Software. All rights reserved.
|
|
//
|
|
// The source is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
|
|
// for more details.
|
|
//
|
|
// $Log:$
|
|
//
|
|
// DESCRIPTION:
|
|
// Sky rendering. The DOOM sky is a texture map like any
|
|
// wall, wrapping around. 1024 columns equal 360 degrees.
|
|
// The default sky map is 256 columns and repeats 4 times
|
|
// on a 320 screen.
|
|
//
|
|
//
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
|
// Needed for FRACUNIT.
|
|
#include "m_fixed.h"
|
|
#include "r_data.h"
|
|
#include "c_cvars.h"
|
|
#include "g_level.h"
|
|
#include "r_sky.h"
|
|
#include "r_main.h"
|
|
#include "v_text.h"
|
|
#include "gi.h"
|
|
|
|
//
|
|
// sky mapping
|
|
//
|
|
int skyflatnum;
|
|
int sky1texture, sky2texture;
|
|
fixed_t skytexturemid;
|
|
fixed_t skyscale;
|
|
int skystretch;
|
|
fixed_t skyheight;
|
|
fixed_t skyiscale;
|
|
|
|
int sky1shift, sky2shift;
|
|
fixed_t sky1pos=0, sky1speed=0;
|
|
fixed_t sky2pos=0, sky2speed=0;
|
|
|
|
// [RH] Stretch sky texture if not taller than 128 pixels?
|
|
CUSTOM_CVAR (Bool, r_stretchsky, true, CVAR_ARCHIVE)
|
|
{
|
|
R_InitSkyMap ();
|
|
}
|
|
|
|
extern "C" int detailxshift, detailyshift;
|
|
extern fixed_t freelookviewheight;
|
|
|
|
//==========================================================================
|
|
//
|
|
// R_InitSkyMap
|
|
//
|
|
// Called whenever the view size changes.
|
|
//
|
|
//==========================================================================
|
|
|
|
void R_InitSkyMap ()
|
|
{
|
|
fixed_t fskyheight;
|
|
FTexture *skytex1, *skytex2;
|
|
|
|
skytex1 = TexMan[sky1texture];
|
|
skytex2 = TexMan[sky2texture];
|
|
|
|
if (skytex1 == NULL)
|
|
return;
|
|
|
|
if ((level.flags & LEVEL_DOUBLESKY) && skytex1->GetHeight() != skytex2->GetHeight())
|
|
{
|
|
Printf (TEXTCOLOR_BOLD "Both sky textures must be the same height." TEXTCOLOR_NORMAL "\n");
|
|
sky2texture = sky1texture;
|
|
}
|
|
|
|
fskyheight = skytex1->GetHeight() << FRACBITS;
|
|
if (skytex1->GetScaledHeight() <= 128)
|
|
{
|
|
skytexturemid = r_Yaspect/2*FRACUNIT;
|
|
skystretch = (r_stretchsky
|
|
&& level.IsFreelookAllowed()
|
|
&& !(level.flags & LEVEL_FORCENOSKYSTRETCH)) ? 1 : 0;
|
|
}
|
|
else
|
|
{
|
|
skytexturemid = 199 * skytex1->yScale;
|
|
skystretch = 0;
|
|
// At heights above 600 pixels, the sky is drawn slightly too low.
|
|
if (SCREENHEIGHT > 600)
|
|
{
|
|
skytexturemid += FRACUNIT;
|
|
}
|
|
}
|
|
skyheight = fskyheight << skystretch;
|
|
|
|
if (viewwidth && viewheight)
|
|
{
|
|
skyiscale = (r_Yaspect*FRACUNIT) / (((freelookviewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift));
|
|
skyscale = ((((freelookviewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift)) << FRACBITS) /
|
|
(r_Yaspect);
|
|
|
|
skyiscale = Scale (skyiscale, FieldOfView, 2048);
|
|
skyscale = Scale (skyscale, 2048, FieldOfView);
|
|
}
|
|
|
|
// The (standard Doom) sky map is 256*128*4 maps.
|
|
sky1shift = 22+skystretch-16;
|
|
sky2shift = 22+skystretch-16;
|
|
if (skytex1->WidthBits >= 9)
|
|
sky1shift -= skystretch;
|
|
if (skytex2->WidthBits >= 9)
|
|
sky2shift -= skystretch;
|
|
}
|
|
|