OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- let FSkybox inherit from FImageTexture to simplify the redirection of the base image for the software renderer.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-13 14:23:57 +02:00
commit e92be97f33
5 changed files with 30 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/common/textures/skyboxtexture.cpp
View file

@ -35,15 +35,14 @@
//-----------------------------------------------------------------------------
FSkyBox::FSkyBox(const char *name)
: FTexture(name)
: FImageTexture(name)
{
FTextureID texid = TexMan.CheckForTexture(name, ETextureType::Wall);
previous = nullptr;
if (texid.isValid())
{
previous = TexMan.GetTexture(texid);
CopySize(previous);
}
else previous = nullptr;
faces[0]=faces[1]=faces[2]=faces[3]=faces[4]=faces[5] = nullptr;
UseType = ETextureType::Override;
bSkybox = true;
@ -56,29 +55,12 @@ FSkyBox::FSkyBox(const char *name)
//
//-----------------------------------------------------------------------------
TArray<uint8_t> FSkyBox::Get8BitPixels(bool alphatex)
void FSkyBox::SetSize()
{
return previous->Get8BitPixels(alphatex);
}
//-----------------------------------------------------------------------------
//
//
//
//-----------------------------------------------------------------------------
FBitmap FSkyBox::GetBgraBitmap(const PalEntry *p, int *trans)
{
return previous->GetBgraBitmap(p, trans);
}
//-----------------------------------------------------------------------------
//
//
//
//-----------------------------------------------------------------------------
FImageSource *FSkyBox::GetImage() const
{
return previous->GetImage();
if (!previous && faces[0]) previous = faces[0];
if (previous && previous->GetImage())
{
SetImage(previous->GetImage());
SetFromImage();
}
}