OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- started separating the texture class from the image format handlers.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-08 23:28:35 +01:00
commit 5eab944157
16 changed files with 297 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/textures/formats/ddstexture.cpp
View file

@ -163,7 +163,6 @@ class FDDSTexture : public FWorldTexture
public:
FDDSTexture (FileReader &lump, int lumpnum, void *surfdesc);
FTextureFormat GetFormat () override;
TArray<uint8_t> Get8BitPixels(bool alphatex) override;
protected:
@ -375,30 +374,6 @@ void FDDSTexture::CalcBitShift (uint32_t mask, uint8_t *lshiftp, uint8_t *rshift
//
//==========================================================================
FTextureFormat FDDSTexture::GetFormat()
{
#if 0
switch (Format)
{
case ID_DXT1: return TEX_DXT1;
case ID_DXT2: return TEX_DXT2;
case ID_DXT3: return TEX_DXT3;
case ID_DXT4: return TEX_DXT4;
case ID_DXT5: return TEX_DXT5;
default: return TEX_RGB;
}
#else
// For now, create a true color texture to preserve all colors.
return TEX_RGB;
#endif
}
//==========================================================================
//
//
//
//==========================================================================
TArray<uint8_t> FDDSTexture::Get8BitPixels(bool alphatex)
{
auto lump = Wads.OpenLumpReader (SourceLump);