OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Let FSkyboxTexture map to the last defined regular texture of the same name instead of its first face

Browse source 
This is normally a better fallback for the software renderer.
This commit is contained in:
Christoph Oelckers 2018-12-10 02:56:49 +01:00
commit 91bb7c0641
3 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/textures/skyboxtexture.cpp
View file

@ -36,8 +36,14 @@
FSkyBox::FSkyBox(const char *name)
: FTexture(name)
{
faces[0]=faces[1]=faces[2]=faces[3]=faces[4]=faces[5]=NULL;
{
FTextureID texid = TexMan.CheckForTexture(name, ETextureType::Wall);
if (texid.isValid())
{
previous = TexMan.GetTexture(texid);
CopySize(previous);
}
faces[0]=faces[1]=faces[2]=faces[3]=faces[4]=faces[5] = nullptr;
UseType = ETextureType::Override;
bSkybox = true;
fliptop = false;
@ -51,8 +57,7 @@ FSkyBox::FSkyBox(const char *name)
TArray<uint8_t> FSkyBox::Get8BitPixels(bool alphatex)
{
if (faces[0]) return faces[0]->Get8BitPixels(alphatex);
return FTexture::Get8BitPixels(alphatex);
return previous->Get8BitPixels(alphatex);
}
//-----------------------------------------------------------------------------
@ -63,7 +68,16 @@ TArray<uint8_t> FSkyBox::Get8BitPixels(bool alphatex)
FBitmap FSkyBox::GetBgraBitmap(PalEntry *p, int *trans)
{
if (faces[0]) return faces[0]->GetBgraBitmap(p, trans);
return FTexture::GetBgraBitmap(p, trans);
return previous->GetBgraBitmap(p, trans);
}
//-----------------------------------------------------------------------------
//
//
//
//-----------------------------------------------------------------------------
FImageSource *FSkyBox::GetImage() const
{
return previous->GetImage();
}