From b32bc296adb8dc4574e0713c95e7b8639f085c11 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 24 Apr 2020 00:58:44 -0400 Subject: [PATCH] CUVElement/CVectorElement: Make use of [[maybe_unused]] where applicable --- Runtime/Particle/CUVElement.hpp | 10 +++++++--- Runtime/Particle/CVectorElement.cpp | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Runtime/Particle/CUVElement.hpp b/Runtime/Particle/CUVElement.hpp index 8aa6fc566..2ac1fefe5 100644 --- a/Runtime/Particle/CUVElement.hpp +++ b/Runtime/Particle/CUVElement.hpp @@ -30,8 +30,10 @@ struct CUVEConstant : public CUVElement { public: explicit CUVEConstant(TToken&& tex) : x4_tex(std::move(tex)) {} - TLockedToken GetValueTexture(int frame) const override { return TLockedToken(x4_tex); } - void GetValueUV(int frame, SUVElementSet& valOut) const override { valOut = {0.f, 0.f, 1.f, 1.f}; } + TLockedToken GetValueTexture([[maybe_unused]] int frame) const override { + return TLockedToken(x4_tex); + } + void GetValueUV([[maybe_unused]] int frame, SUVElementSet& valOut) const override { valOut = {0.f, 0.f, 1.f, 1.f}; } bool HasConstantTexture() const override { return true; } bool HasConstantUV() const override { return true; } }; @@ -48,7 +50,9 @@ public: CUVEAnimTexture(TToken&& tex, std::unique_ptr&& tileW, std::unique_ptr&& tileH, std::unique_ptr&& strideW, std::unique_ptr&& strideH, std::unique_ptr&& cycleFrames, bool loop); - TLockedToken GetValueTexture(int frame) const override { return TLockedToken(x4_tex); } + TLockedToken GetValueTexture([[maybe_unused]] int frame) const override { + return TLockedToken(x4_tex); + } void GetValueUV(int frame, SUVElementSet& valOut) const override; bool HasConstantTexture() const override { return true; } bool HasConstantUV() const override { return false; } diff --git a/Runtime/Particle/CVectorElement.cpp b/Runtime/Particle/CVectorElement.cpp index 0b395b68b..3e910bd84 100644 --- a/Runtime/Particle/CVectorElement.cpp +++ b/Runtime/Particle/CVectorElement.cpp @@ -26,7 +26,7 @@ CVEKeyframeEmitter::CVEKeyframeEmitter(CInputStream& in) { } } -bool CVEKeyframeEmitter::GetValue(int frame, zeus::CVector3f& valOut) const { +bool CVEKeyframeEmitter::GetValue([[maybe_unused]] int frame, zeus::CVector3f& valOut) const { if (!x4_percent) { int emitterTime = CParticleGlobals::instance()->m_EmitterTime; int calcKey = emitterTime; @@ -171,7 +171,7 @@ bool CVEConstant::GetValue(int frame, zeus::CVector3f& valOut) const { return false; } -bool CVEFastConstant::GetValue(int frame, zeus::CVector3f& valOut) const { +bool CVEFastConstant::GetValue([[maybe_unused]] int frame, zeus::CVector3f& valOut) const { valOut = x4_val; return false; }