primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from ShulkMaster/CAnimData

Browse Source 
replace direct addressing of pointers for `x434_additiveAnims`, use b…
This commit is contained in:
Henrique Gemignani Passos Lima
2026-05-30 21:54:08 +03:00
committed by GitHub
parent bbc96bd3e9 aea9330281
commit 1a1d315b60
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MetroidPrime/CAnimData.cpp
+10 -15
View File
@@ -960,9 +960,8 @@ const rstl::ncrc_ptr< CAnimTreeNode >& CAnimData::GetRootAnimationTree() const {
const rstl::rc_ptr< CAnimTreeNode >& CAnimData::GetAdditiveAnimationTree(uint idx) const {
const uint animIdx = xc_charInfo.GetAnimationIndexList()[idx];
const rstl::pair< uint, CAdditiveAnimPlayback >* end =
x434_additiveAnims.data() + x434_additiveAnims.size();
const rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.data();
const rstl::pair< uint, CAdditiveAnimPlayback >* end = x434_additiveAnims.end();
const rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.begin();
while (search != end) {
if (animIdx == search->first) {
@@ -976,9 +975,8 @@ const rstl::rc_ptr< CAnimTreeNode >& CAnimData::GetAdditiveAnimationTree(uint id
bool CAnimData::IsAdditiveAnimationAdded(uint idx) const {
const uint animIdx = xc_charInfo.GetAnimationIndexList()[idx];
const rstl::pair< uint, CAdditiveAnimPlayback >* end =
x434_additiveAnims.data() + x434_additiveAnims.size();
const rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.data();
const rstl::pair< uint, CAdditiveAnimPlayback >* end = x434_additiveAnims.end();
const rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.begin();
while (search != end) {
if (animIdx == search->first) {
@@ -992,9 +990,8 @@ bool CAnimData::IsAdditiveAnimationAdded(uint idx) const {
float CAnimData::GetAdditiveAnimationWeight(uint idx) {
const uint animIdx = xc_charInfo.GetAnimationIndexList()[idx];
rstl::pair< uint, CAdditiveAnimPlayback >* end =
x434_additiveAnims.data() + x434_additiveAnims.size();
rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.data();
rstl::pair< uint, CAdditiveAnimPlayback >* end = x434_additiveAnims.end();
rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.begin();
while (search != end) {
if (animIdx == search->first) {
@@ -1008,9 +1005,8 @@ float CAnimData::GetAdditiveAnimationWeight(uint idx) {
void CAnimData::DelAdditiveAnimation(uint idx) {
const uint animIdx = xc_charInfo.GetAnimationIndexList()[idx];
rstl::pair< uint, CAdditiveAnimPlayback >* end =
x434_additiveAnims.data() + x434_additiveAnims.size();
rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.data();
rstl::pair< uint, CAdditiveAnimPlayback >* end = x434_additiveAnims.end();
rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.begin();
while (search != end) {
if (animIdx == search->first) {
@@ -1031,9 +1027,8 @@ void CAnimData::DelAdditiveAnimation(uint idx) {
void CAnimData::AddAdditiveAnimation(uint idx, float weight, bool active, bool fadeOut) {
const uint animIdx = xc_charInfo.GetAnimationIndexList()[idx];
rstl::pair< uint, CAdditiveAnimPlayback >* end =
x434_additiveAnims.data() + x434_additiveAnims.size();
rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.data();
rstl::pair< uint, CAdditiveAnimPlayback >* end = x434_additiveAnims.end();
rstl::pair< uint, CAdditiveAnimPlayback >* search = x434_additiveAnims.begin();
while (search != end) {
if (animIdx == search->first) {