OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- separated the image converters from the texture offsets.

Browse source 
Mostly done, except for FMultiPatchTexture and FFontChar1 + 2.
Note that this commit leaks those image objects!
This commit is contained in:
Christoph Oelckers 2018-12-09 07:39:05 +01:00
commit 583a740441
21 changed files with 90 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/textures/formats/flattexture.cpp
View file

@ -38,6 +38,7 @@
#include "w_wad.h"
#include "textures/textures.h"
#include "imagehelpers.h"
#include "image.h"
//==========================================================================
//
@ -45,7 +46,7 @@
//
//==========================================================================
class FFlatTexture : public FWorldTexture
class FFlatTexture : public FImageSource
{
public:
FFlatTexture (int lumpnum);
@ -63,7 +64,7 @@ public:
FTexture *FlatTexture_TryCreate(FileReader & file, int lumpnum)
{
return new FFlatTexture(lumpnum);
return new FImageTexture(new FFlatTexture(lumpnum));
}
//==========================================================================
@ -73,7 +74,7 @@ FTexture *FlatTexture_TryCreate(FileReader & file, int lumpnum)
//==========================================================================
FFlatTexture::FFlatTexture (int lumpnum)
: FWorldTexture(NULL, lumpnum)
: FImageSource(lumpnum)
{
int area;
int bits;
@ -91,6 +92,7 @@ FFlatTexture::FFlatTexture (int lumpnum)
case 256*256: bits = 8; break;
}
bUseGamePalette = true;
bMasked = false;
bTranslucent = false;
Width = Height = 1 << bits;