2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:04:56 +00:00

Numerous uninitialized memory fixes

This commit is contained in:
Jack Andersen
2019-04-06 19:14:48 -10:00
parent b72cc490e8
commit 3a0d2930fa
48 changed files with 112 additions and 79 deletions

View File

@@ -4,6 +4,7 @@
#include "zeus/CMatrix3f.hpp"
#include "zeus/CQuaternion.hpp"
#include "hecl/hecl.hpp"
#include <unordered_map>
namespace DataSpec::DNAANIM {

View File

@@ -777,8 +777,8 @@ void ANCS::AnimationSet::Enumerate<BigDNA::Read>(athena::io::IStreamReader& read
if (sectionCount > 1) {
atUint32 additiveAnimCount = reader.readUint32Big();
reader.enumerate(additiveAnims, additiveAnimCount);
floatA = reader.readFloatBig();
floatB = reader.readFloatBig();
additiveDefaultFadeInDur = reader.readFloatBig();
additiveDefaultFadeOutDur = reader.readFloatBig();
}
halfTransitions.clear();
@@ -818,8 +818,8 @@ void ANCS::AnimationSet::Enumerate<BigDNA::Write>(athena::io::IStreamWriter& wri
if (sectionCount > 1) {
writer.writeUint32Big(additiveAnims.size());
writer.enumerate(additiveAnims);
writer.writeFloatBig(floatA);
writer.writeFloatBig(floatB);
writer.writeFloatBig(additiveDefaultFadeInDur);
writer.writeFloatBig(additiveDefaultFadeOutDur);
}
if (sectionCount > 2) {
@@ -886,8 +886,8 @@ void ANCS::AnimationSet::Enumerate<BigDNA::ReadYaml>(athena::io::YAMLDocReader&
additiveAnims.clear();
if (sectionCount > 1) {
reader.enumerate("additiveAnims", additiveAnims);
floatA = reader.readFloat("floatA");
floatB = reader.readFloat("floatB");
additiveDefaultFadeInDur = reader.readFloat("additiveDefaultFadeInDur");
additiveDefaultFadeOutDur = reader.readFloat("additiveDefaultFadeOutDur");
}
halfTransitions.clear();
@@ -922,8 +922,8 @@ void ANCS::AnimationSet::Enumerate<BigDNA::WriteYaml>(athena::io::YAMLDocWriter&
if (sectionCount > 1) {
writer.enumerate("additiveAnims", additiveAnims);
writer.writeFloat("floatA", floatA);
writer.writeFloat("floatB", floatB);
writer.writeFloat("additiveDefaultFadeInDur", additiveDefaultFadeInDur);
writer.writeFloat("additiveDefaultFadeOutDur", additiveDefaultFadeOutDur);
}
if (sectionCount > 2) {

View File

@@ -327,13 +327,13 @@ struct ANCS : BigDNA {
struct AdditiveAnimationInfo : BigDNA {
AT_DECL_DNA_YAML
Value<atUint32> animIdx;
Value<float> unk1;
Value<float> unk2;
Value<float> fadeInDur;
Value<float> fadeOutDur;
};
std::vector<AdditiveAnimationInfo> additiveAnims;
float floatA = 0.0;
float floatB = 0.0;
float additiveDefaultFadeInDur = 0.0;
float additiveDefaultFadeOutDur = 0.0;
struct HalfTransition : BigDNA {
AT_DECL_DNA_YAML

View File

@@ -363,8 +363,8 @@ void ANCS::AnimationSet::Enumerate<BigDNA::Read>(typename Read::StreamT& reader)
if (sectionCount > 1) {
atUint32 additiveAnimCount = reader.readUint32Big();
reader.enumerate(additiveAnims, additiveAnimCount);
floatA = reader.readFloatBig();
floatB = reader.readFloatBig();
additiveDefaultFadeInDur = reader.readFloatBig();
additiveDefaultFadeOutDur = reader.readFloatBig();
}
halfTransitions.clear();
@@ -404,8 +404,8 @@ void ANCS::AnimationSet::Enumerate<BigDNA::Write>(typename Write::StreamT& write
if (sectionCount > 1) {
writer.writeUint32Big(additiveAnims.size());
writer.enumerate(additiveAnims);
writer.writeFloatBig(floatA);
writer.writeFloatBig(floatB);
writer.writeFloatBig(additiveDefaultFadeInDur);
writer.writeFloatBig(additiveDefaultFadeOutDur);
}
if (sectionCount > 2) {
@@ -472,8 +472,8 @@ void ANCS::AnimationSet::Enumerate<BigDNA::ReadYaml>(typename ReadYaml::StreamT&
additiveAnims.clear();
if (sectionCount > 1) {
reader.enumerate("additiveAnims", additiveAnims);
floatA = reader.readFloat("floatA");
floatB = reader.readFloat("floatB");
additiveDefaultFadeInDur = reader.readFloat("additiveDefaultFadeInDur");
additiveDefaultFadeOutDur = reader.readFloat("additiveDefaultFadeOutDur");
}
halfTransitions.clear();
@@ -508,8 +508,8 @@ void ANCS::AnimationSet::Enumerate<BigDNA::WriteYaml>(typename WriteYaml::Stream
if (sectionCount > 1) {
writer.enumerate("additiveAnims", additiveAnims);
writer.writeFloat("floatA", floatA);
writer.writeFloat("floatB", floatB);
writer.writeFloat("additiveDefaultFadeInDur", additiveDefaultFadeInDur);
writer.writeFloat("additiveDefaultFadeOutDur", additiveDefaultFadeOutDur);
}
if (sectionCount > 2) {

View File

@@ -103,8 +103,8 @@ struct ANCS : BigDNA {
std::vector<MP1AnimationSet::AdditiveAnimationInfo> additiveAnims;
float floatA = 0.0;
float floatB = 0.0;
float additiveDefaultFadeInDur = 0.0;
float additiveDefaultFadeOutDur = 0.0;
std::vector<MP1AnimationSet::HalfTransition> halfTransitions;