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

Merge pull request #233 from lioncash/pos 

CPoseAsTransforms: Make use of std::array where applicable
This commit is contained in:
Luke Street 2020-03-16 16:14:40 -04:00 committed by GitHub
parent 4a64d92433 f45e2362c5
commit 7039232a95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/Character/CPoseAsTransforms.cpp
View File

@ -12,8 +12,7 @@ bool CPoseAsTransforms::ContainsDataFor(const CSegId& id) const {
} }
void CPoseAsTransforms::Clear() { void CPoseAsTransforms::Clear() {
for (u32 i = 0; i < 100; ++i) x8_links.fill({});
x8_links[i] = std::make_pair(CSegId(), CSegId());
xd4_lastInserted = 0; xd4_lastInserted = 0;
x0_nextId = 0; x0_nextId = 0;
} }

5
Runtime/Character/CPoseAsTransforms.hpp
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <array>
#include <memory> #include <memory>
#include <utility> #include <utility>
@ -24,12 +25,12 @@ public:
private: private:
CSegId x0_nextId = 0; CSegId x0_nextId = 0;
CSegId x1_count; CSegId x1_count;
std::pair<CSegId, CSegId> x8_links[100]; std::array<std::pair<CSegId, CSegId>, 100> x8_links;
std::unique_ptr<Transform[]> xd0_transformArr; std::unique_ptr<Transform[]> xd0_transformArr;
CSegId xd4_lastInserted = 0; CSegId xd4_lastInserted = 0;
public: public:
CPoseAsTransforms(u8 boneCount); explicit CPoseAsTransforms(u8 boneCount);
bool ContainsDataFor(const CSegId& id) const; bool ContainsDataFor(const CSegId& id) const;
void Clear(); void Clear();
void AccumulateScaledTransform(const CSegId& id, zeus::CMatrix3f& rotation, float scale) const; void AccumulateScaledTransform(const CSegId& id, zeus::CMatrix3f& rotation, float scale) const;