OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- changed all texture access in the play code to use FGameTexture and redid Hexen's front sky layer by adding a new texture instead of hacking the existing one.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-14 18:01:51 +02:00
commit b9b6a354c7
20 changed files with 91 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/rendering/r_sky.cpp
View file

@ -64,8 +64,7 @@ CVAR(Float, skyoffset, 0, 0) // for testing
void InitSkyMap(FLevelLocals *Level)
{
int skyheight;
FTexture *skytex1, *skytex2;
FGameTexture *skytex1, *skytex2;
// Do not allow the null texture which has no bitmap and will crash.
if (Level->skytexture1.isNull())
@ -77,12 +76,17 @@ void InitSkyMap(FLevelLocals *Level)
Level->skytexture2 = TexMan.CheckForTexture("-noflat-", ETextureType::Any);
}
skytex1 = TexMan.GetTexture(Level->skytexture1, false);
skytex2 = TexMan.GetTexture(Level->skytexture2, false);
skytex1 = TexMan.GetGameTexture(Level->skytexture1, false);
skytex2 = TexMan.GetGameTexture(Level->skytexture2, false);
if (skytex1 == nullptr)
return;
if (Level->flags & LEVEL_DOUBLESKY)
{
skytex1 = skytex1->GetFrontSkyLayer();
}
if ((Level->flags & LEVEL_DOUBLESKY) && skytex1->GetDisplayHeight() != skytex2->GetDisplayHeight())
{
Printf(TEXTCOLOR_BOLD "Both sky textures must be the same height." TEXTCOLOR_NORMAL "\n");
@ -103,7 +107,7 @@ void InitSkyMap(FLevelLocals *Level)
// the screen when looking fully up.
// 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.
skyheight = skytex1->GetDisplayHeight();
auto skyheight = skytex1->GetDisplayHeight();
Level->skystretch = (r_skymode == 1
&& skyheight >= 128 && skyheight <= 256