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

Lots of HUD-related implementations

This commit is contained in:
Jack Andersen
2017-04-01 17:03:37 -10:00
parent 1731cae418
commit b3c94f1d2b
64 changed files with 2066 additions and 106 deletions

View File

@@ -123,13 +123,13 @@ struct CTweakGui : ITweakGui
float x204_xrayBlurScaleLinear = 0.0014f;
float x208_xrayBlurScaleQuadratic = 0.0000525f;
Value<float> x20c_;
Value<float> x210_;
Value<float> x214_;
Value<float> x218_;
Value<float> x210_scanSidesAngle;
Value<float> x214_scanSidesXScale;
Value<float> x218_scanSidesPositionEnd;
Value<float> x21c_;
Value<float> x220_;
Value<float> x224_;
float x228_;
Value<float> x220_scanSidesDuration;
Value<float> x224_scanSidesStartTime;
float x228_scanSidesEndTime;
Value<float> x22c_;
Value<float> x230_;
Value<float> x234_;
@@ -147,7 +147,7 @@ struct CTweakGui : ITweakGui
Value<float> x264_;
Value<float> x268_;
Value<float> x26c_;
Value<float> x270_;
Value<float> x270_scanSidesPositionStart;
Value<bool> x274_;
bool x275_ = true;
Value<float> x278_wtMgrCharsPerSfx;
@@ -204,6 +204,13 @@ struct CTweakGui : ITweakGui
float GetScanAppearanceOffset() const { return x244_scanAppearanceOffset; }
float GetXrayBlurScaleLinear() const { return x204_xrayBlurScaleLinear; }
float GetXrayBlurScaleQuadratic() const { return x208_xrayBlurScaleQuadratic; }
float GetScanSidesAngle() const { return x210_scanSidesAngle; }
float GetScanSidesXScale() const { return x214_scanSidesXScale; }
float GetScanSidesPositionEnd() const { return x218_scanSidesPositionEnd; }
float GetScanSidesDuration() const { return x220_scanSidesDuration; }
float GetScanSidesStartTime() const { return x224_scanSidesStartTime; }
float GetScanSidesEndTime() const { return x228_scanSidesEndTime; }
float GetScanSidesPositionStart() const { return x270_scanSidesPositionStart; }
float GetWorldTransManagerCharsPerSfx() const { return x278_wtMgrCharsPerSfx; }
atUint32 GetXRayFogMode() const { return x27c_xrayFogMode; }
float GetXRayFogNearZ() const { return x280_xrayFogNearZ; }
@@ -228,8 +235,8 @@ struct CTweakGui : ITweakGui
x204_xrayBlurScaleLinear = x1f8_ * 0.25f;
x208_xrayBlurScaleQuadratic = x1fc_ * 0.25f;
x210_ = zeus::degToRad(x210_);
x228_ = x220_ + x224_;
x210_scanSidesAngle = zeus::degToRad(x210_scanSidesAngle);
x228_scanSidesEndTime = x220_scanSidesDuration + x224_scanSidesStartTime;
if (x27c_xrayFogMode == 1)
x27c_xrayFogMode = 2;

View File

@@ -14,9 +14,9 @@ struct CTweakGuiColors : public ITweakGuiColors
DNAColor x8_;
DNAColor xc_;
DNAColor x10_;
DNAColor x14_;
DNAColor x18_;
DNAColor x1c_;
DNAColor x14_hudMessageFill;
DNAColor x18_hudMessageOutline;
DNAColor x1c_hudFrameColor;
DNAColor x20_;
DNAColor x24_;
DNAColor x28_;
@@ -43,7 +43,7 @@ struct CTweakGuiColors : public ITweakGuiColors
DNAColor x7c_;
DNAColor x80_;
DNAColor x84_;
DNAColor x88_;
DNAColor x88_tickDecoColor;
DNAColor x8c_;
DNAColor x90_;
DNAColor x94_;
@@ -105,8 +105,8 @@ struct CTweakGuiColors : public ITweakGuiColors
DNAColor x174_;
DNAColor x178_;
DNAColor x17c_;
DNAColor x180_;
DNAColor x184_;
DNAColor x180_hudCounterFill;
DNAColor x184_hudCounterOutline;
DNAColor x188_;
DNAColor x18c_;
DNAColor x190_;
@@ -138,6 +138,13 @@ struct CTweakGuiColors : public ITweakGuiColors
CTweakGuiColors() = default;
CTweakGuiColors(athena::io::IStreamReader& r) { this->read(r); }
zeus::CColor GetHudMessageFill() const { return x14_hudMessageFill; }
zeus::CColor GetHudMessageOutline() const { return x18_hudMessageOutline; }
zeus::CColor GetHudFrameColor() const { return x1c_hudFrameColor; }
zeus::CColor GetTickDecoColor() const { return x88_tickDecoColor; }
zeus::CColor GetHudCounterFill() const { return x180_hudCounterFill; }
zeus::CColor GetHudCounterOutline() const { return x184_hudCounterOutline; }
};
}
}

View File

@@ -350,7 +350,7 @@ void CTweakPlayer::read(athena::io::IStreamReader& __dna_reader)
/* x214_ */
x214_ = __dna_reader.readFloatBig();
/* x218_ */
x218_ = __dna_reader.readFloatBig();
x218_scanningRange = __dna_reader.readFloatBig();
/* x21c_24_ */
x21c_24_ = __dna_reader.readBool();
/* x21c_25_ */
@@ -790,7 +790,7 @@ void CTweakPlayer::write(athena::io::IStreamWriter& __dna_writer) const
/* x214_ */
__dna_writer.writeFloatBig(x214_);
/* x218_ */
__dna_writer.writeFloatBig(x218_);
__dna_writer.writeFloatBig(x218_scanningRange);
/* x21c_24_ */
__dna_writer.writeBool(x21c_24_);
/* x21c_25_ */
@@ -1304,8 +1304,8 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x210_ = __dna_docin.readFloat("x210_");
/* x214_ */
x214_ = __dna_docin.readFloat("x214_");
/* x218_ */
x218_ = __dna_docin.readFloat("x218_");
/* x218_scanningRange */
x218_scanningRange = __dna_docin.readFloat("x218_scanningRange");
/* x21c_24_ */
x21c_24_ = __dna_docin.readBool("x21c_24_");
/* x21c_25_ */
@@ -1392,12 +1392,12 @@ void CTweakPlayer::read(athena::io::YAMLDocReader& __dna_docin)
x2f8_ = __dna_docin.readFloat("x2f8_");
/* x2fc_ */
x2fc_ = __dna_docin.readUint32("x2fc_");
/* x300_ */
x300_variaDamageReduction = __dna_docin.readFloat("x300_");
/* x304_ */
x304_gravityDamageReduction = __dna_docin.readFloat("x304_");
/* x308_ */
x308_phazonDamageReduction = __dna_docin.readFloat("x308_");
/* x300_variaDamageReduction */
x300_variaDamageReduction = __dna_docin.readFloat("x300_variaDamageReduction");
/* x304_gravityDamageReduction */
x304_gravityDamageReduction = __dna_docin.readFloat("x304_gravityDamageReduction");
/* x308_phazonDamageReduction */
x308_phazonDamageReduction = __dna_docin.readFloat("x308_phazonDamageReduction");
}
void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout) const
@@ -1804,8 +1804,8 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
__dna_docout.writeFloat("x210_", x210_);
/* x214_ */
__dna_docout.writeFloat("x214_", x214_);
/* x218_ */
__dna_docout.writeFloat("x218_", x218_);
/* x218_scanningRange */
__dna_docout.writeFloat("x218_scanningRange", x218_scanningRange);
/* x21c_24_ */
__dna_docout.writeBool("x21c_24_", x21c_24_);
/* x21c_25_ */
@@ -1892,12 +1892,12 @@ void CTweakPlayer::CTweakPlayer::write(athena::io::YAMLDocWriter& __dna_docout)
__dna_docout.writeFloat("x2f8_", x2f8_);
/* x2fc_ */
__dna_docout.writeUint32("x2fc_", x2fc_);
/* x300_ */
__dna_docout.writeFloat("x300_", x300_variaDamageReduction);
/* x304_ */
__dna_docout.writeFloat("x304_", x304_gravityDamageReduction);
/* x308_ */
__dna_docout.writeFloat("x308_", x308_phazonDamageReduction);
/* x300_variaDamageReduction */
__dna_docout.writeFloat("x300_variaDamageReduction", x300_variaDamageReduction);
/* x304_gravityDamageReduction */
__dna_docout.writeFloat("x304_gravityDamageReduction", x304_gravityDamageReduction);
/* x308_phazonDamageReduction */
__dna_docout.writeFloat("x308_phazonDamageReduction", x308_phazonDamageReduction);
}
void CTweakPlayer::FixupValues()

View File

@@ -91,7 +91,7 @@ struct CTweakPlayer : ITweakPlayer
Value<float> x20c_;
Value<float> x210_;
Value<float> x214_;
Value<float> x218_;
Value<float> x218_scanningRange;
Value<bool> x21c_24_ : 1;
Value<bool> x21c_25_ : 1;
Value<bool> x21c_26_ : 1;
@@ -179,6 +179,7 @@ struct CTweakPlayer : ITweakPlayer
float GetX54() const { return x44_[4]; }
float GetX58() const { return x44_[5]; }
float GetX5C() const { return x44_[6]; }
float GetScanningRange() const { return x218_scanningRange; }
float GetPlayerHeight() const { return x26c_playerHeight; }
float GetPlayerXYHalfExtent() const { return x270_playerXYHalfExtent; }
float GetX274() const { return x274_; }