2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 10:27:42 +00:00

Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Jack Andersen
2019-07-19 18:29:06 -10:00
73 changed files with 1178 additions and 377 deletions

View File

@@ -10,26 +10,26 @@ struct WorldTeleporter : IScriptObject {
AT_DECL_EXPLICIT_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<bool> unknown1;
Value<bool> active;
UniqueID32 mlvl;
UniqueID32 mrea;
AnimationParameters animationParameters;
Value<atVec3f> unknown2;
UniqueID32 model1;
Value<atVec3f> unknown3;
UniqueID32 model2;
Value<atVec3f> unknown4;
Value<bool> unknown5;
Value<atUint32> soundID; // needs verifcation
Value<atUint32> unknown6;
Value<atUint32> unknown7;
Value<bool> unknown8;
Value<atVec3f> playerScale;
UniqueID32 platformModel;
Value<atVec3f> platformScale;
UniqueID32 backgroundModel;
Value<atVec3f> backgroundScale;
Value<bool> upElevator;
Value<atUint32> elevatorSound; // needs verifcation
Value<atUint32> volume;
Value<atUint32> panning;
Value<bool> showText;
UniqueID32 font;
UniqueID32 strg;
Value<bool> unknown9;
Value<float> unknown10;
Value<float> unknown11;
Value<float> unknown12;
Value<bool> fadeWhite;
Value<float> charFadeInTime;
Value<float> charsPerSecond;
Value<float> showDelay;
/* Trilogy additions (property count 26) */
String<-1> audioStream;
@@ -39,12 +39,12 @@ struct WorldTeleporter : IScriptObject {
Value<float> unknown16;
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
if (model1.isValid()) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model1);
if (platformModel.isValid()) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(platformModel);
ent->name = name + "_model1";
}
if (model2.isValid()) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model2);
if (backgroundModel.isValid()) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(backgroundModel);
ent->name = name + "_model2";
}
if (strg.isValid()) {
@@ -54,8 +54,8 @@ struct WorldTeleporter : IScriptObject {
}
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut, std::vector<hecl::ProjectPath>& lazyOut) const {
g_curSpec->flattenDependencies(model1, pathsOut);
g_curSpec->flattenDependencies(model2, pathsOut);
g_curSpec->flattenDependencies(platformModel, pathsOut);
g_curSpec->flattenDependencies(backgroundModel, pathsOut);
g_curSpec->flattenDependencies(strg, pathsOut);
}
};