2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-14 08:46:09 +00:00

Reimplement CSkinRules/CSkinnedModel; skinning kinda works!

This commit is contained in:
2022-03-10 01:33:17 -05:00
parent 8714fbf844
commit cd963c4a5c
35 changed files with 346 additions and 284 deletions

View File

@@ -4,9 +4,9 @@
#include <memory>
#include <utility>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Character/CCharLayoutInfo.hpp"
#include "Runtime/Character/CSegId.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CMatrix3f.hpp>
#include <zeus/CTransform.hpp>
@@ -16,31 +16,26 @@ namespace metaforce {
class CPoseAsTransforms {
friend class CAnimData;
public:
struct Transform {
zeus::CTransform m_originToAccum;
zeus::CTransform m_restPoseToAccum;
};
private:
CSegId x0_nextId = 0;
CSegId x1_count;
std::array<std::pair<CSegId, CSegId>, 100> x8_links;
std::unique_ptr<Transform[]> xd0_transformArr;
std::unique_ptr<zeus::CTransform[]> xd0_transformArr;
CSegId xd4_lastInserted = 0;
public:
explicit CPoseAsTransforms(u8 boneCount);
bool ContainsDataFor(const CSegId& id) const;
void Clear();
void AccumulateScaledTransform(const CSegId& id, zeus::CMatrix3f& rotation, float scale) const;
const zeus::CTransform& GetTransform(const CSegId& id) const;
const zeus::CTransform& GetRestToAccumTransform(const CSegId& id) const;
const zeus::CVector3f& GetOffset(const CSegId& id) const;
const zeus::CMatrix3f& GetRotation(const CSegId& id) const;
const zeus::CMatrix3f& GetTransformMinusOffset(const CSegId& id) const { return GetRotation(id); }
void Insert(const CSegId& id, const zeus::CMatrix3f& rotation, const zeus::CVector3f& offset,
const zeus::CVector3f& restOffset);
void Insert(const CSegId& id, const zeus::CMatrix3f& rotation, const zeus::CVector3f& offset);
[[nodiscard]] bool ContainsDataFor(const CSegId& id) const;
[[nodiscard]] const zeus::CTransform& GetTransform(const CSegId& id) const;
[[nodiscard]] const zeus::CVector3f& GetOffset(const CSegId& id) const;
[[nodiscard]] const zeus::CMatrix3f& GetRotation(const CSegId& id) const;
[[nodiscard]] CSegId GetLastInserted() const { return xd4_lastInserted; }
[[nodiscard]] CSegId GetParent(const CSegId& id) const;
};
} // namespace metaforce