mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-10 09:07:42 +00:00
Merge branch 'shader-refactor'
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
#ifndef _DNAMP1_BLOODFLOWER_HPP_
|
||||
#define _DNAMP1_BLOODFLOWER_HPP_
|
||||
#pragma once
|
||||
|
||||
#include "../../DNACommon/DNACommon.hpp"
|
||||
#include "IScriptObject.hpp"
|
||||
@@ -30,10 +29,9 @@ struct BloodFlower : IScriptObject
|
||||
UniqueID32 particle5;
|
||||
Value<atUint32> unknown2;
|
||||
|
||||
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
|
||||
std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
|
||||
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
|
||||
{
|
||||
actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
|
||||
actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
|
||||
}
|
||||
|
||||
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
|
||||
@@ -98,4 +96,3 @@ struct BloodFlower : IScriptObject
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user