mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-09 03:07:41 +00:00
New code style refactor
This commit is contained in:
Jack Andersen
@@ -1,190 +1,156 @@
|
||||
#include "CAnimTreeDoubleChild.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
namespace urde {
|
||||
|
||||
CAnimTreeDoubleChild::CAnimTreeDoubleChild(const std::weak_ptr<CAnimTreeNode>& a,
|
||||
const std::weak_ptr<CAnimTreeNode>& b,
|
||||
CAnimTreeDoubleChild::CAnimTreeDoubleChild(const std::weak_ptr<CAnimTreeNode>& a, const std::weak_ptr<CAnimTreeNode>& b,
|
||||
std::string_view name)
|
||||
: CAnimTreeNode(name), x14_a(a.lock()), x18_b(b.lock())
|
||||
{
|
||||
}
|
||||
: CAnimTreeNode(name), x14_a(a.lock()), x18_b(b.lock()) {}
|
||||
|
||||
CAnimTreeDoubleChild::CDoubleChildAdvancementResult
|
||||
CAnimTreeDoubleChild::AdvanceViewBothChildren(const CCharAnimTime& time, bool runLeft, bool loopLeft)
|
||||
{
|
||||
CCharAnimTime lRemTime = time;
|
||||
CCharAnimTime totalTime;
|
||||
if (!runLeft)
|
||||
totalTime = CCharAnimTime();
|
||||
else if (loopLeft)
|
||||
totalTime = CCharAnimTime::Infinity();
|
||||
else
|
||||
CAnimTreeDoubleChild::AdvanceViewBothChildren(const CCharAnimTime& time, bool runLeft, bool loopLeft) {
|
||||
CCharAnimTime lRemTime = time;
|
||||
CCharAnimTime totalTime;
|
||||
if (!runLeft)
|
||||
totalTime = CCharAnimTime();
|
||||
else if (loopLeft)
|
||||
totalTime = CCharAnimTime::Infinity();
|
||||
else
|
||||
totalTime = x14_a->VGetTimeRemaining();
|
||||
|
||||
SAdvancementDeltas leftDeltas, rightDeltas;
|
||||
CCharAnimTime rRemTime = time;
|
||||
if (time.GreaterThanZero()) {
|
||||
while (lRemTime.GreaterThanZero() && !lRemTime.EpsilonZero() && totalTime.GreaterThanZero() &&
|
||||
(loopLeft || !totalTime.EpsilonZero())) {
|
||||
SAdvancementResults res = x14_a->VAdvanceView(lRemTime);
|
||||
auto simp = x14_a->Simplified();
|
||||
if (simp)
|
||||
x14_a = CAnimTreeNode::Cast(std::move(*simp));
|
||||
leftDeltas.x0_posDelta += res.x8_deltas.x0_posDelta;
|
||||
leftDeltas.xc_rotDelta = leftDeltas.xc_rotDelta * res.x8_deltas.xc_rotDelta;
|
||||
if (!loopLeft)
|
||||
totalTime = x14_a->VGetTimeRemaining();
|
||||
|
||||
SAdvancementDeltas leftDeltas, rightDeltas;
|
||||
CCharAnimTime rRemTime = time;
|
||||
if (time.GreaterThanZero())
|
||||
{
|
||||
while (lRemTime.GreaterThanZero() && !lRemTime.EpsilonZero() &&
|
||||
totalTime.GreaterThanZero() && (loopLeft || !totalTime.EpsilonZero()))
|
||||
{
|
||||
SAdvancementResults res = x14_a->VAdvanceView(lRemTime);
|
||||
auto simp = x14_a->Simplified();
|
||||
if (simp)
|
||||
x14_a = CAnimTreeNode::Cast(std::move(*simp));
|
||||
leftDeltas.x0_posDelta += res.x8_deltas.x0_posDelta;
|
||||
leftDeltas.xc_rotDelta = leftDeltas.xc_rotDelta * res.x8_deltas.xc_rotDelta;
|
||||
if (!loopLeft)
|
||||
totalTime = x14_a->VGetTimeRemaining();
|
||||
lRemTime = res.x0_remTime;
|
||||
}
|
||||
|
||||
while (rRemTime.GreaterThanZero() && !rRemTime.EpsilonZero())
|
||||
{
|
||||
SAdvancementResults res = x18_b->VAdvanceView(rRemTime);
|
||||
auto simp = x18_b->Simplified();
|
||||
if (simp)
|
||||
x18_b = CAnimTreeNode::Cast(std::move(*simp));
|
||||
rightDeltas.x0_posDelta += res.x8_deltas.x0_posDelta;
|
||||
rightDeltas.xc_rotDelta = rightDeltas.xc_rotDelta * res.x8_deltas.xc_rotDelta;
|
||||
rRemTime = res.x0_remTime;
|
||||
}
|
||||
lRemTime = res.x0_remTime;
|
||||
}
|
||||
|
||||
return {time, leftDeltas, rightDeltas};
|
||||
}
|
||||
|
||||
SAdvancementResults CAnimTreeDoubleChild::VAdvanceView(const CCharAnimTime& a)
|
||||
{
|
||||
SAdvancementResults resA = x14_a->VAdvanceView(a);
|
||||
SAdvancementResults resB = x14_a->VAdvanceView(a);
|
||||
return (resA.x0_remTime > resB.x0_remTime) ? resA : resB;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetBoolPOIList(const CCharAnimTime& time, CBoolPOINode* listOut,
|
||||
u32 capacity, u32 iterator, u32 unk) const
|
||||
{
|
||||
u32 newCapacity = x14_a->GetBoolPOIList(time, listOut, capacity, iterator, unk);
|
||||
newCapacity += x18_b->GetBoolPOIList(time, listOut, capacity, newCapacity + iterator, unk);
|
||||
if (newCapacity > capacity)
|
||||
newCapacity = capacity;
|
||||
|
||||
std::sort(listOut, listOut + newCapacity);
|
||||
|
||||
return newCapacity;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetInt32POIList(const CCharAnimTime& time, CInt32POINode* listOut,
|
||||
u32 capacity, u32 iterator, u32 unk) const
|
||||
{
|
||||
u32 newCapacity = x14_a->GetInt32POIList(time, listOut, capacity, iterator, unk);
|
||||
newCapacity += x18_b->GetInt32POIList(time, listOut, capacity, newCapacity + iterator, unk);
|
||||
if (newCapacity > capacity)
|
||||
newCapacity = capacity;
|
||||
|
||||
std::sort(listOut, listOut + newCapacity);
|
||||
|
||||
return newCapacity;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetParticlePOIList(const CCharAnimTime& time, CParticlePOINode* listOut,
|
||||
u32 capacity, u32 iterator, u32 unk) const
|
||||
{
|
||||
u32 newCapacity = x14_a->GetParticlePOIList(time, listOut, capacity, iterator, unk);
|
||||
newCapacity += x18_b->GetParticlePOIList(time, listOut, capacity, newCapacity + iterator, unk);
|
||||
if (newCapacity > capacity)
|
||||
newCapacity = capacity;
|
||||
|
||||
std::sort(listOut, listOut + newCapacity);
|
||||
|
||||
return newCapacity;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetSoundPOIList(const CCharAnimTime& time, CSoundPOINode* listOut,
|
||||
u32 capacity, u32 iterator, u32 unk) const
|
||||
{
|
||||
u32 newCapacity = x14_a->GetSoundPOIList(time, listOut, capacity, iterator, unk);
|
||||
newCapacity += x18_b->GetSoundPOIList(time, listOut, capacity, newCapacity + iterator, unk);
|
||||
if (newCapacity > capacity)
|
||||
newCapacity = capacity;
|
||||
|
||||
std::sort(listOut, listOut + newCapacity);
|
||||
|
||||
return newCapacity;
|
||||
}
|
||||
|
||||
bool CAnimTreeDoubleChild::VGetBoolPOIState(const char* name) const
|
||||
{
|
||||
return x18_b->VGetBoolPOIState(name);
|
||||
}
|
||||
|
||||
s32 CAnimTreeDoubleChild::VGetInt32POIState(const char* name) const
|
||||
{
|
||||
return x18_b->VGetBoolPOIState(name);
|
||||
}
|
||||
|
||||
CParticleData::EParentedMode CAnimTreeDoubleChild::VGetParticlePOIState(const char* name) const
|
||||
{
|
||||
return x18_b->VGetParticlePOIState(name);
|
||||
}
|
||||
|
||||
void CAnimTreeDoubleChild::VSetPhase(float phase)
|
||||
{
|
||||
x14_a->VSetPhase(phase);
|
||||
x18_b->VSetPhase(phase);
|
||||
}
|
||||
|
||||
SAdvancementResults CAnimTreeDoubleChild::VGetAdvancementResults(const CCharAnimTime& a, const CCharAnimTime& b) const
|
||||
{
|
||||
SAdvancementResults resA = x14_a->VGetAdvancementResults(a, b);
|
||||
SAdvancementResults resB = x18_b->VGetAdvancementResults(a, b);
|
||||
return (resA.x0_remTime > resB.x0_remTime) ? resA : resB;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::Depth() const
|
||||
{
|
||||
return std::max(x14_a->Depth(), x18_b->Depth()) + 1;
|
||||
}
|
||||
|
||||
CAnimTreeEffectiveContribution CAnimTreeDoubleChild::VGetContributionOfHighestInfluence() const
|
||||
{
|
||||
CAnimTreeEffectiveContribution cA = x14_a->GetContributionOfHighestInfluence();
|
||||
CAnimTreeEffectiveContribution cB = x18_b->GetContributionOfHighestInfluence();
|
||||
|
||||
float leftWeight = (1.f - VGetRightChildWeight()) * cA.GetContributionWeight();
|
||||
float rightWeight = VGetRightChildWeight() * cB.GetContributionWeight();
|
||||
|
||||
if (leftWeight > rightWeight)
|
||||
{
|
||||
return {leftWeight, cA.GetPrimitiveName(), cA.GetSteadyStateAnimInfo(),
|
||||
cA.GetTimeRemaining(), cA.GetAnimDatabaseIndex()};
|
||||
}
|
||||
else
|
||||
{
|
||||
return {rightWeight, cB.GetPrimitiveName(), cB.GetSteadyStateAnimInfo(),
|
||||
cB.GetTimeRemaining(), cB.GetAnimDatabaseIndex()};
|
||||
while (rRemTime.GreaterThanZero() && !rRemTime.EpsilonZero()) {
|
||||
SAdvancementResults res = x18_b->VAdvanceView(rRemTime);
|
||||
auto simp = x18_b->Simplified();
|
||||
if (simp)
|
||||
x18_b = CAnimTreeNode::Cast(std::move(*simp));
|
||||
rightDeltas.x0_posDelta += res.x8_deltas.x0_posDelta;
|
||||
rightDeltas.xc_rotDelta = rightDeltas.xc_rotDelta * res.x8_deltas.xc_rotDelta;
|
||||
rRemTime = res.x0_remTime;
|
||||
}
|
||||
}
|
||||
|
||||
return {time, leftDeltas, rightDeltas};
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetNumChildren() const
|
||||
{
|
||||
return x14_a->VGetNumChildren() + x18_b->VGetNumChildren() + 2;
|
||||
SAdvancementResults CAnimTreeDoubleChild::VAdvanceView(const CCharAnimTime& a) {
|
||||
SAdvancementResults resA = x14_a->VAdvanceView(a);
|
||||
SAdvancementResults resB = x14_a->VAdvanceView(a);
|
||||
return (resA.x0_remTime > resB.x0_remTime) ? resA : resB;
|
||||
}
|
||||
|
||||
std::shared_ptr<IAnimReader> CAnimTreeDoubleChild::VGetBestUnblendedChild() const
|
||||
{
|
||||
std::shared_ptr<CAnimTreeNode> bestChild = (VGetRightChildWeight() > 0.5f) ? x18_b : x14_a;
|
||||
if (!bestChild)
|
||||
return {};
|
||||
return bestChild->GetBestUnblendedChild();
|
||||
u32 CAnimTreeDoubleChild::VGetBoolPOIList(const CCharAnimTime& time, CBoolPOINode* listOut, u32 capacity, u32 iterator,
|
||||
u32 unk) const {
|
||||
u32 newCapacity = x14_a->GetBoolPOIList(time, listOut, capacity, iterator, unk);
|
||||
newCapacity += x18_b->GetBoolPOIList(time, listOut, capacity, newCapacity + iterator, unk);
|
||||
if (newCapacity > capacity)
|
||||
newCapacity = capacity;
|
||||
|
||||
std::sort(listOut, listOut + newCapacity);
|
||||
|
||||
return newCapacity;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetInt32POIList(const CCharAnimTime& time, CInt32POINode* listOut, u32 capacity,
|
||||
u32 iterator, u32 unk) const {
|
||||
u32 newCapacity = x14_a->GetInt32POIList(time, listOut, capacity, iterator, unk);
|
||||
newCapacity += x18_b->GetInt32POIList(time, listOut, capacity, newCapacity + iterator, unk);
|
||||
if (newCapacity > capacity)
|
||||
newCapacity = capacity;
|
||||
|
||||
std::sort(listOut, listOut + newCapacity);
|
||||
|
||||
return newCapacity;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetParticlePOIList(const CCharAnimTime& time, CParticlePOINode* listOut, u32 capacity,
|
||||
u32 iterator, u32 unk) const {
|
||||
u32 newCapacity = x14_a->GetParticlePOIList(time, listOut, capacity, iterator, unk);
|
||||
newCapacity += x18_b->GetParticlePOIList(time, listOut, capacity, newCapacity + iterator, unk);
|
||||
if (newCapacity > capacity)
|
||||
newCapacity = capacity;
|
||||
|
||||
std::sort(listOut, listOut + newCapacity);
|
||||
|
||||
return newCapacity;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetSoundPOIList(const CCharAnimTime& time, CSoundPOINode* listOut, u32 capacity,
|
||||
u32 iterator, u32 unk) const {
|
||||
u32 newCapacity = x14_a->GetSoundPOIList(time, listOut, capacity, iterator, unk);
|
||||
newCapacity += x18_b->GetSoundPOIList(time, listOut, capacity, newCapacity + iterator, unk);
|
||||
if (newCapacity > capacity)
|
||||
newCapacity = capacity;
|
||||
|
||||
std::sort(listOut, listOut + newCapacity);
|
||||
|
||||
return newCapacity;
|
||||
}
|
||||
|
||||
bool CAnimTreeDoubleChild::VGetBoolPOIState(const char* name) const { return x18_b->VGetBoolPOIState(name); }
|
||||
|
||||
s32 CAnimTreeDoubleChild::VGetInt32POIState(const char* name) const { return x18_b->VGetBoolPOIState(name); }
|
||||
|
||||
CParticleData::EParentedMode CAnimTreeDoubleChild::VGetParticlePOIState(const char* name) const {
|
||||
return x18_b->VGetParticlePOIState(name);
|
||||
}
|
||||
|
||||
void CAnimTreeDoubleChild::VSetPhase(float phase) {
|
||||
x14_a->VSetPhase(phase);
|
||||
x18_b->VSetPhase(phase);
|
||||
}
|
||||
|
||||
SAdvancementResults CAnimTreeDoubleChild::VGetAdvancementResults(const CCharAnimTime& a, const CCharAnimTime& b) const {
|
||||
SAdvancementResults resA = x14_a->VGetAdvancementResults(a, b);
|
||||
SAdvancementResults resB = x18_b->VGetAdvancementResults(a, b);
|
||||
return (resA.x0_remTime > resB.x0_remTime) ? resA : resB;
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::Depth() const { return std::max(x14_a->Depth(), x18_b->Depth()) + 1; }
|
||||
|
||||
CAnimTreeEffectiveContribution CAnimTreeDoubleChild::VGetContributionOfHighestInfluence() const {
|
||||
CAnimTreeEffectiveContribution cA = x14_a->GetContributionOfHighestInfluence();
|
||||
CAnimTreeEffectiveContribution cB = x18_b->GetContributionOfHighestInfluence();
|
||||
|
||||
float leftWeight = (1.f - VGetRightChildWeight()) * cA.GetContributionWeight();
|
||||
float rightWeight = VGetRightChildWeight() * cB.GetContributionWeight();
|
||||
|
||||
if (leftWeight > rightWeight) {
|
||||
return {leftWeight, cA.GetPrimitiveName(), cA.GetSteadyStateAnimInfo(), cA.GetTimeRemaining(),
|
||||
cA.GetAnimDatabaseIndex()};
|
||||
} else {
|
||||
return {rightWeight, cB.GetPrimitiveName(), cB.GetSteadyStateAnimInfo(), cB.GetTimeRemaining(),
|
||||
cB.GetAnimDatabaseIndex()};
|
||||
}
|
||||
}
|
||||
|
||||
u32 CAnimTreeDoubleChild::VGetNumChildren() const { return x14_a->VGetNumChildren() + x18_b->VGetNumChildren() + 2; }
|
||||
|
||||
std::shared_ptr<IAnimReader> CAnimTreeDoubleChild::VGetBestUnblendedChild() const {
|
||||
std::shared_ptr<CAnimTreeNode> bestChild = (VGetRightChildWeight() > 0.5f) ? x18_b : x14_a;
|
||||
if (!bestChild)
|
||||
return {};
|
||||
return bestChild->GetBestUnblendedChild();
|
||||
}
|
||||
|
||||
void CAnimTreeDoubleChild::VGetWeightedReaders(
|
||||
rstl::reserved_vector<std::pair<float, std::weak_ptr<IAnimReader>>, 16>& out, float w) const
|
||||
{
|
||||
x14_a->VGetWeightedReaders(out, w);
|
||||
x18_b->VGetWeightedReaders(out, w);
|
||||
rstl::reserved_vector<std::pair<float, std::weak_ptr<IAnimReader>>, 16>& out, float w) const {
|
||||
x14_a->VGetWeightedReaders(out, w);
|
||||
x18_b->VGetWeightedReaders(out, w);
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace urde
|
||||
|
||||
Reference in New Issue
Block a user