2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 11:07:44 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -2,66 +2,56 @@
#include "RetroTypes.hpp"
namespace urde
{
namespace urde {
class CAnimTreeNode;
class CAdditiveAnimationInfo;
class CSegIdList;
class CCharLayoutInfo;
class CSegStatementSet;
class CAdditiveAnimationInfo
{
float x0_fadeInDur = 0.f;
float x4_fadeOutDur = 0.f;
class CAdditiveAnimationInfo {
float x0_fadeInDur = 0.f;
float x4_fadeOutDur = 0.f;
public:
void read(CInputStream& in)
{
x0_fadeInDur = in.readFloatBig();
x4_fadeOutDur = in.readFloatBig();
}
CAdditiveAnimationInfo() = default;
CAdditiveAnimationInfo(CInputStream& in) {read(in);}
float GetFadeInDuration() const {return x0_fadeInDur;}
float GetFadeOutDuration() const {return x4_fadeOutDur;}
void read(CInputStream& in) {
x0_fadeInDur = in.readFloatBig();
x4_fadeOutDur = in.readFloatBig();
}
CAdditiveAnimationInfo() = default;
CAdditiveAnimationInfo(CInputStream& in) { read(in); }
float GetFadeInDuration() const { return x0_fadeInDur; }
float GetFadeOutDuration() const { return x4_fadeOutDur; }
};
enum class EAdditivePlaybackPhase
{
None,
FadingIn,
FadingOut,
FadedIn,
FadedOut
};
enum class EAdditivePlaybackPhase { None, FadingIn, FadingOut, FadedIn, FadedOut };
class CAdditiveAnimPlayback {
CAdditiveAnimationInfo x0_info;
std::shared_ptr<CAnimTreeNode> x8_anim;
float xc_targetWeight;
float x10_curWeight = 0.f;
bool x14_active;
float x18_weightTimer = 0.f;
EAdditivePlaybackPhase x1c_phase = EAdditivePlaybackPhase::FadingIn;
bool x20_needsFadeOut = false;
class CAdditiveAnimPlayback
{
CAdditiveAnimationInfo x0_info;
std::shared_ptr<CAnimTreeNode> x8_anim;
float xc_targetWeight;
float x10_curWeight = 0.f;
bool x14_active;
float x18_weightTimer = 0.f;
EAdditivePlaybackPhase x1c_phase = EAdditivePlaybackPhase::FadingIn;
bool x20_needsFadeOut = false;
public:
CAdditiveAnimPlayback(const std::weak_ptr<CAnimTreeNode>& anim, float weight, bool active,
const CAdditiveAnimationInfo& info, bool fadeOut);
CAdditiveAnimPlayback(const std::weak_ptr<CAnimTreeNode>& anim, float weight, bool active,
const CAdditiveAnimationInfo& info, bool fadeOut);
void AddToSegStatementSet(const CSegIdList& list, const CCharLayoutInfo&, CSegStatementSet&) const;
void Update(float dt);
void FadeOut();
void SetWeight(float w);
float GetTargetWeight() const {return xc_targetWeight;}
bool IsActive() const {return x14_active;}
void SetActive(bool active) {x14_active = active;}
const std::shared_ptr<CAnimTreeNode>& GetAnim() const {return x8_anim;}
std::shared_ptr<CAnimTreeNode>& GetAnim() {return x8_anim;}
EAdditivePlaybackPhase GetPhase() const {return x1c_phase;}
void SetNeedsFadeOut(bool b) {x20_needsFadeOut = b;}
bool NeedsFadeOut() const {return x20_needsFadeOut;}
void AddToSegStatementSet(const CSegIdList& list, const CCharLayoutInfo&, CSegStatementSet&) const;
void Update(float dt);
void FadeOut();
void SetWeight(float w);
float GetTargetWeight() const { return xc_targetWeight; }
bool IsActive() const { return x14_active; }
void SetActive(bool active) { x14_active = active; }
const std::shared_ptr<CAnimTreeNode>& GetAnim() const { return x8_anim; }
std::shared_ptr<CAnimTreeNode>& GetAnim() { return x8_anim; }
EAdditivePlaybackPhase GetPhase() const { return x1c_phase; }
void SetNeedsFadeOut(bool b) { x20_needsFadeOut = b; }
bool NeedsFadeOut() const { return x20_needsFadeOut; }
};
}
} // namespace urde