AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

RuntimeCommon: Use override where applicable

Browse Source 
Continues the override modernization by applying it to the main
RuntimeCommon target. Resolves around 1100+ cases where override can be
used.
This commit is contained in:
Lioncash
2019-08-09 15:46:49 -04:00
parent 5eaa7a23e8
commit 9312eef905
86 changed files with 1173 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/Character/CTimeScaleFunctions.hpp
View File

@@ -25,11 +25,11 @@ private:
public:
CConstantAnimationTimeScale(float scale) : x4_scale(scale) {}
EVaryingAnimationTimeScaleType GetType() const { return EVaryingAnimationTimeScaleType::Constant; }
float VTimeScaleIntegral(float lowerLimit, float upperLimit) const;
float VFindUpperLimit(float lowerLimit, float root) const;
std::unique_ptr<IVaryingAnimationTimeScale> VClone() const;
std::unique_ptr<IVaryingAnimationTimeScale> VGetFunctionMirrored(float value) const;
EVaryingAnimationTimeScaleType GetType() const override { return EVaryingAnimationTimeScaleType::Constant; }
float VTimeScaleIntegral(float lowerLimit, float upperLimit) const override;
float VFindUpperLimit(float lowerLimit, float root) const override;
std::unique_ptr<IVaryingAnimationTimeScale> VClone() const override;
std::unique_ptr<IVaryingAnimationTimeScale> VGetFunctionMirrored(float value) const override;
};
class CLinearAnimationTimeScale : public IVaryingAnimationTimeScale {
@@ -46,11 +46,11 @@ class CLinearAnimationTimeScale : public IVaryingAnimationTimeScale {
public:
CLinearAnimationTimeScale(const CCharAnimTime& t1, float y1, const CCharAnimTime& t2, float y2);
EVaryingAnimationTimeScaleType GetType() const { return EVaryingAnimationTimeScaleType::Linear; }
float VTimeScaleIntegral(float lowerLimit, float upperLimit) const;
float VFindUpperLimit(float lowerLimit, float root) const;
std::unique_ptr<IVaryingAnimationTimeScale> VClone() const;
std::unique_ptr<IVaryingAnimationTimeScale> VGetFunctionMirrored(float value) const;
EVaryingAnimationTimeScaleType GetType() const override { return EVaryingAnimationTimeScaleType::Linear; }
float VTimeScaleIntegral(float lowerLimit, float upperLimit) const override;
float VFindUpperLimit(float lowerLimit, float root) const override;
std::unique_ptr<IVaryingAnimationTimeScale> VClone() const override;
std::unique_ptr<IVaryingAnimationTimeScale> VGetFunctionMirrored(float value) const override;
};
} // namespace urde