From 79ac41c5b3a1911bed8c90fed64ba057c95d89b9 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 27 Sep 2020 10:48:38 +0200 Subject: [PATCH] - more 'override's. --- src/common/models/model_kvx.h | 10 +++++----- src/common/models/model_ue1.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/models/model_kvx.h b/src/common/models/model_kvx.h index bea2fdfd2..36db774c7 100644 --- a/src/common/models/model_kvx.h +++ b/src/common/models/model_kvx.h @@ -56,13 +56,13 @@ protected: public: FVoxelModel(FVoxel *voxel, bool owned); ~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(); - virtual int FindFrame(const char * name); - virtual void RenderFrame(FModelRenderer *renderer, FGameTexture * skin, int frame, int frame2, double inter, int translation=0); - virtual void AddSkins(uint8_t *hitlist); + virtual int FindFrame(const char * name) override; + virtual void RenderFrame(FModelRenderer *renderer, FGameTexture * skin, int frame, int frame2, double inter, int translation=0) override; + virtual void AddSkins(uint8_t *hitlist) override; FTextureID GetPaletteTexture() const { return mPalette; } - void BuildVertexBuffer(FModelRenderer *renderer); + void BuildVertexBuffer(FModelRenderer *renderer) override; float getAspectFactor(float vscale) override; }; diff --git a/src/common/models/model_ue1.h b/src/common/models/model_ue1.h index b92713da4..967488355 100644 --- a/src/common/models/model_ue1.h +++ b/src/common/models/model_ue1.h @@ -13,7 +13,7 @@ public: PT_TwoSided = 1, // like normal, but don't cull backfaces PT_Translucent = 2, // additive blending 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 PT_Type = 7, // flags