2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 13:47:43 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -4,60 +4,50 @@
#include "IScriptObject.hpp"
#include "Parameters.hpp"
namespace DataSpec::DNAMP1
{
struct Parasite : IScriptObject
{
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<atUint32> flavor;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<atVec3f> scale;
PatternedInfo patternedInfo;
ActorParameters actorParameters;
Value<float> maxTelegraphReactDist;
Value<float> advanceWpRadius;
Value<float> unknown4;
Value<float> alignAngVel;
Value<float> unknown6;
Value<float> stuckTimeThreshold;
Value<float> collisionCloseMargin;
Value<float> parasiteSearchRadius;
Value<float> parasiteSeparationDist;
Value<float> parasiteSeparationWeight;
Value<float> parasiteAlignmentWeight;
Value<float> parasiteCohesionWeight;
Value<float> destinationSeekWeight;
Value<float> forwardMoveWeight;
Value<float> playerSeparationDist;
Value<float> playerSeparationWeight;
Value<float> playerObstructionMinDist;
Value<bool> disableMove;
namespace DataSpec::DNAMP1 {
struct Parasite : IScriptObject {
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<atUint32> flavor;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<atVec3f> scale;
PatternedInfo patternedInfo;
ActorParameters actorParameters;
Value<float> maxTelegraphReactDist;
Value<float> advanceWpRadius;
Value<float> unknown4;
Value<float> alignAngVel;
Value<float> unknown6;
Value<float> stuckTimeThreshold;
Value<float> collisionCloseMargin;
Value<float> parasiteSearchRadius;
Value<float> parasiteSeparationDist;
Value<float> parasiteSeparationWeight;
Value<float> parasiteAlignmentWeight;
Value<float> parasiteCohesionWeight;
Value<float> destinationSeekWeight;
Value<float> forwardMoveWeight;
Value<float> playerSeparationDist;
Value<float> playerSeparationWeight;
Value<float> playerObstructionMinDist;
Value<bool> disableMove;
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
{
actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
}
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const {
actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
}
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
{
patternedInfo.nameIDs(pakRouter, name + "_patterned");
actorParameters.nameIDs(pakRouter, name + "_actp");
}
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
patternedInfo.nameIDs(pakRouter, name + "_patterned");
actorParameters.nameIDs(pakRouter, name + "_actp");
}
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
std::vector<hecl::ProjectPath>& lazyOut) const
{
patternedInfo.depIDs(pathsOut);
actorParameters.depIDs(pathsOut, lazyOut);
}
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut, std::vector<hecl::ProjectPath>& lazyOut) const {
patternedInfo.depIDs(pathsOut);
actorParameters.depIDs(pathsOut, lazyOut);
}
void gatherScans(std::vector<Scan>& scansOut) const
{
actorParameters.scanIDs(scansOut);
}
void gatherScans(std::vector<Scan>& scansOut) const { actorParameters.scanIDs(scansOut); }
};
}
} // namespace DataSpec::DNAMP1