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

- more 'override's.

Browse source
This commit is contained in:
Christoph Oelckers 2020-09-27 10:48:38 +02:00
parent 31628a70c8
commit 79ac41c5b3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/models/model_kvx.h
View file

@ -56,13 +56,13 @@ protected:
public: public:
FVoxelModel(FVoxel *voxel, bool owned); FVoxelModel(FVoxel *voxel, bool owned);
~FVoxelModel(); ~FVoxelModel();
bool Load(const char * fn, int lumpnum, const char * buffer, int length); bool Load(const char * fn, int lumpnum, const char * buffer, int length) override;
void Initialize(); void Initialize();
virtual int FindFrame(const char * name); virtual int FindFrame(const char * name) override;
virtual void RenderFrame(FModelRenderer *renderer, FGameTexture * skin, int frame, int frame2, double inter, int translation=0); virtual void RenderFrame(FModelRenderer *renderer, FGameTexture * skin, int frame, int frame2, double inter, int translation=0) override;
virtual void AddSkins(uint8_t *hitlist); virtual void AddSkins(uint8_t *hitlist) override;
FTextureID GetPaletteTexture() const { return mPalette; } FTextureID GetPaletteTexture() const { return mPalette; }
void BuildVertexBuffer(FModelRenderer *renderer); void BuildVertexBuffer(FModelRenderer *renderer) override;
float getAspectFactor(float vscale) override; float getAspectFactor(float vscale) override;
}; };

2
src/common/models/model_ue1.h
View file

@ -13,7 +13,7 @@ public:
PT_TwoSided = 1, // like normal, but don't cull backfaces PT_TwoSided = 1, // like normal, but don't cull backfaces
PT_Translucent = 2, // additive blending PT_Translucent = 2, // additive blending
PT_Masked = 3, // draw with alpha testing PT_Masked = 3, // draw with alpha testing
PT_Modulated = 4, // modulated blending (src*dest*2) PT_Modulated = 4, // overlay-like blending (rgb values below 128 darken, 128 is unchanged, and above 128 lighten)
// types mask // types mask
PT_Type = 7, PT_Type = 7,
// flags // flags