AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #228 from lioncash/time 

CCharAnimTime: Make constructors constexpr where applicable
This commit is contained in:
Luke Street 2020-03-15 19:46:39 -04:00 committed by GitHub
parent 76f12c5c38 1926966d21
commit 79f6dbac73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Character/CCharAnimTime.cpp
View File

@ -5,10 +5,6 @@
namespace urde { namespace urde {
CCharAnimTime CCharAnimTime::Infinity() {
return {EType::Infinity, 1.f};
}
bool CCharAnimTime::EqualsZero() const { bool CCharAnimTime::EqualsZero() const {
if (x4_type == EType::ZeroIncreasing || x4_type == EType::ZeroSteady || x4_type == EType::ZeroDecreasing) if (x4_type == EType::ZeroIncreasing || x4_type == EType::ZeroSteady || x4_type == EType::ZeroDecreasing)
return true; return true;

11
Runtime/Character/CCharAnimTime.hpp
View File

@ -16,13 +16,12 @@ private:
EType x4_type = EType::ZeroSteady; EType x4_type = EType::ZeroSteady;
public: public:
CCharAnimTime() = default; constexpr CCharAnimTime() = default;
CCharAnimTime(CInputStream& in) : x0_time(in.readFloatBig()), x4_type(EType(in.readUint32Big())) {} constexpr CCharAnimTime(float time) : x0_time(time), x4_type(x0_time != 0.f ? EType::NonZero : EType::ZeroSteady) {}
CCharAnimTime(float time) : x0_time(time), x4_type(x0_time != 0.f ? EType::NonZero : EType::ZeroSteady) {} constexpr CCharAnimTime(EType type, float t) : x0_time(t), x4_type(type) {}
explicit CCharAnimTime(CInputStream& in) : x0_time(in.readFloatBig()), x4_type(EType(in.readUint32Big())) {}
CCharAnimTime(EType type, const float& t) : x0_time(t), x4_type(type) {} static constexpr CCharAnimTime Infinity() { return {EType::Infinity, 1.0f}; }
static CCharAnimTime Infinity();
float GetSeconds() const { return x0_time; } float GetSeconds() const { return x0_time; }
bool EqualsZero() const; bool EqualsZero() const;