zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved SkyOffset and Rotations.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-18 13:32:23 +02:00
parent f7dd16ba16
commit 389892a079
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/common/textures/textures.h
View file

@ -260,8 +260,6 @@ protected:
int8_t bTranslucent : 2; int8_t bTranslucent : 2;
uint16_t Rotations;
int16_t SkyOffset;
FloatRect* areas = nullptr; FloatRect* areas = nullptr;
int areacount = 0; int areacount = 0;
@ -278,15 +276,10 @@ public:
bool isHardwareCanvas() const { return bHasCanvas; } // There's two here so that this can deal with software canvases in the hardware renderer later. bool isHardwareCanvas() const { return bHasCanvas; } // There's two here so that this can deal with software canvases in the hardware renderer later.
bool isCanvas() const { return bHasCanvas; } bool isCanvas() const { return bHasCanvas; }
int GetRotations() const { return Rotations; }
void SetRotations(int rot) { Rotations = int16_t(rot); }
bool isMasked() const { return bMasked; } bool isMasked() const { return bMasked; }
void SetSkyOffset(int offs) { SkyOffset = offs; } int GetSourceLump() { return SourceLump; } // needed by the scripted GetName method.
int GetSkyOffset() const { return SkyOffset; }
virtual int GetSourceLump() { return SourceLump; } // needed by the scripted GetName method.
bool FindHoles(const unsigned char * buffer, int w, int h); bool FindHoles(const unsigned char * buffer, int w, int h);
int GetSourceLump() const { return SourceLump; }
void CopySize(FTexture* BaseTexture) void CopySize(FTexture* BaseTexture)
@ -501,6 +494,10 @@ class FGameTexture
uint16_t GlowHeight; uint16_t GlowHeight;
PalEntry GlowColor = 0; PalEntry GlowColor = 0;
int16_t SkyOffset;
uint16_t Rotations;
public: public:
FGameTexture(FTexture* wrap, const char *name); FGameTexture(FTexture* wrap, const char *name);
~FGameTexture(); ~FGameTexture();
@ -554,10 +551,10 @@ public:
void SetTranslucent(bool on) { Base->bTranslucent = on; } void SetTranslucent(bool on) { Base->bTranslucent = on; }
void SetUseType(ETextureType type) { UseType = type; } void SetUseType(ETextureType type) { UseType = type; }
uint16_t GetRotations() const { return Base->GetRotations(); } int GetRotations() const { return Rotations; }
void SetRotations(int index) { Base->SetRotations(index); } void SetRotations(int rot) { Rotations = int16_t(rot); }
void SetSkyOffset(int ofs) { Base->SetSkyOffset(ofs); } void SetSkyOffset(int offs) { SkyOffset = offs; }
int GetSkyOffset() const { return Base->GetSkyOffset(); } int GetSkyOffset() const { return SkyOffset; }
ISoftwareTexture* GetSoftwareTexture() ISoftwareTexture* GetSoftwareTexture()
{ {