AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:47:43 +00:00
Code Issues Projects Releases Wiki Activity

New code style refactor

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

153
DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp
View File

@@ -4,91 +4,78 @@
#include "IScriptObject.hpp"
#include "Parameters.hpp"
namespace DataSpec::DNAMP1
{
struct DebrisExtended : IScriptObject
{
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<atVec3f> scale;
Value<float> linConeAngle;
Value<float> linMinMag;
Value<float> linMaxMag;
Value<float> angMinMag;
Value<float> angMaxMag;
Value<float> minDuration;
Value<float> maxDuration;
Value<float> colorInT;
Value<float> colorOutT;
DNAColor color;
DNAColor endsColor;
Value<float> scaleOutT;
Value<atVec3f> endScale;
Value<float> restitution;
Value<float> downwardSpeed;
Value<atVec3f> localOffset;
UniqueID32 model;
ActorParameters actorParameters;
UniqueID32 particle1;
Value<atVec3f> particle1Scale;
Value<bool> particle1GlobalTranslation;
Value<bool> deferDeleteTillParticle1Done;
Value<atUint32> particle1Or;
UniqueID32 particle2;
Value<atVec3f> particle2Scale;
Value<bool> particle2GlobalTranslation;
Value<bool> deferDeleteTillParticle2Done;
Value<atUint32> particle2Or;
UniqueID32 particle3;
Value<atVec3f> particle3Scale;
Value<atUint32> particle3Or;
Value<bool> solid;
Value<bool> dieOnProjectile;
Value<bool> noBounce;
Value<bool> active;
namespace DataSpec::DNAMP1 {
struct DebrisExtended : IScriptObject {
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<atVec3f> scale;
Value<float> linConeAngle;
Value<float> linMinMag;
Value<float> linMaxMag;
Value<float> angMinMag;
Value<float> angMaxMag;
Value<float> minDuration;
Value<float> maxDuration;
Value<float> colorInT;
Value<float> colorOutT;
DNAColor color;
DNAColor endsColor;
Value<float> scaleOutT;
Value<atVec3f> endScale;
Value<float> restitution;
Value<float> downwardSpeed;
Value<atVec3f> localOffset;
UniqueID32 model;
ActorParameters actorParameters;
UniqueID32 particle1;
Value<atVec3f> particle1Scale;
Value<bool> particle1GlobalTranslation;
Value<bool> deferDeleteTillParticle1Done;
Value<atUint32> particle1Or;
UniqueID32 particle2;
Value<atVec3f> particle2Scale;
Value<bool> particle2GlobalTranslation;
Value<bool> deferDeleteTillParticle2Done;
Value<atUint32> particle2Or;
UniqueID32 particle3;
Value<atVec3f> particle3Scale;
Value<atUint32> particle3Or;
Value<bool> solid;
Value<bool> dieOnProjectile;
Value<bool> noBounce;
Value<bool> active;
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
{
if (model)
{
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
ent->name = name + "_model";
}
if (particle1)
{
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
ent->name = name + "_part1";
}
if (particle2)
{
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
ent->name = name + "_part2";
}
if (particle3)
{
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
ent->name = name + "_part3";
}
actorParameters.nameIDs(pakRouter, name + "_actp");
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
if (model) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
ent->name = name + "_model";
}
if (particle1) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
ent->name = name + "_part1";
}
if (particle2) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
ent->name = name + "_part2";
}
if (particle3) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
ent->name = name + "_part3";
}
actorParameters.nameIDs(pakRouter, name + "_actp");
}
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
std::vector<hecl::ProjectPath>& lazyOut) const
{
g_curSpec->flattenDependencies(model, pathsOut);
g_curSpec->flattenDependencies(particle1, pathsOut);
g_curSpec->flattenDependencies(particle2, pathsOut);
g_curSpec->flattenDependencies(particle3, pathsOut);
actorParameters.depIDs(pathsOut, lazyOut);
}
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut, std::vector<hecl::ProjectPath>& lazyOut) const {
g_curSpec->flattenDependencies(model, pathsOut);
g_curSpec->flattenDependencies(particle1, pathsOut);
g_curSpec->flattenDependencies(particle2, pathsOut);
g_curSpec->flattenDependencies(particle3, 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