AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 15:44:56 +00:00
Code Issues Projects Releases Wiki Activity

Finish CPauseScreenBlur; work on CPlayerVisor

Browse Source
This commit is contained in:
Jack Andersen
2017-05-29 09:55:44 -10:00
parent 5f5c1ce2f1
commit d14dc8f7a8
14 changed files with 544 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DataSpec/DNACommon/Tweaks/ITweakGui.hpp
View File

@@ -28,6 +28,7 @@ struct ITweakGui : ITweak
};
virtual float GetMapAlphaInterpolant() const=0;
virtual float GetPauseBlurFactor() const=0;
virtual float GetRadarXYRadius() const=0;
virtual float GetRadarZRadius() const=0;
virtual float GetRadarZCloseRadius() const=0;
@@ -101,6 +102,11 @@ struct ITweakGui : ITweak
virtual float GetScanPaneFadeInTime() const=0;
virtual float GetScanPaneFadeOutTime() const=0;
virtual float GetBallViewportYReduction() const=0;
virtual float GetScanWindowIdleWidth() const=0;
virtual float GetScanWindowIdleHeight() const=0;
virtual float GetScanWindowActiveWidth() const=0;
virtual float GetScanWindowActiveHeight() const=0;
virtual float GetScanWindowMagnification() const=0;
virtual float GetScanSpeed(int idx) const=0;
virtual float GetXrayBlurScaleLinear() const=0;
virtual float GetXrayBlurScaleQuadratic() const=0;

3
DataSpec/DNACommon/Tweaks/ITweakGuiColors.hpp
View File

@@ -22,7 +22,7 @@ struct ITweakGuiColors : BigYAML
const zeus::CColor& shadow;
};
virtual const zeus::CColor& GetInvPhazonSuitFilterMod() const=0;
virtual const zeus::CColor& GetPauseBlurFilterColor() const=0;
virtual const zeus::CColor& GetRadarStuffColor() const=0;
virtual const zeus::CColor& GetRadarPlayerPaintColor() const=0;
virtual const zeus::CColor& GetRadarEnemyPaintColor() const=0;
@@ -63,6 +63,7 @@ struct ITweakGuiColors : BigYAML
virtual const zeus::CColor& GetMissileWarningOutline() const=0;
virtual const zeus::CColor& GetDamageAmbientColor() const=0;
virtual const zeus::CColor& GetScanVisorHudLightMultiply() const=0;
virtual const zeus::CColor& GetScanVisorScreenDimColor() const=0;
virtual const zeus::CColor& GetThermalVisorHudLightMultiply() const=0;
virtual const zeus::CColor& GetEnergyDrainFilterColor() const=0;
virtual const zeus::CColor& GetDamageAmbientPulseColor() const=0;

18
DataSpec/DNAMP1/Tweaks/CTweakGui.hpp
View File

@@ -12,7 +12,7 @@ struct CTweakGui : ITweakGui
DECL_YAML
Value<bool> x4_;
Value<float> x8_mapAlphaInterp;
Value<float> xc_;
Value<float> xc_pauseBlurFactor;
Value<float> x10_radarXYRadius;
Value<float> x14_;
Value<float> x18_;
@@ -141,11 +141,11 @@ struct CTweakGui : ITweakGui
Value<float> x24c_scanPaneFadeInTime;
Value<float> x250_scanPaneFadeOutTime;
Value<float> x254_ballViewportYReduction;
Value<float> x258_;
Value<float> x25c_;
Value<float> x260_;
Value<float> x264_;
Value<float> x268_;
Value<float> x258_scanWindowIdleW;
Value<float> x25c_scanWindowIdleH;
Value<float> x260_scanWindowActiveW;
Value<float> x264_scanWindowActiveH;
Value<float> x268_scanWindowMagnification;
Value<float> x26c_;
Value<float> x270_scanSidesPositionStart;
Value<bool> x274_showAutomapperInMorphball;
@@ -190,6 +190,7 @@ struct CTweakGui : ITweakGui
CTweakGui(athena::io::IStreamReader& r) { this->read(r); }
float GetMapAlphaInterpolant() const { return x8_mapAlphaInterp; }
float GetPauseBlurFactor() const { return xc_pauseBlurFactor; }
float GetRadarXYRadius() const { return x10_radarXYRadius; }
float GetRadarZRadius() const { return x24_radarZRadius; }
float GetRadarZCloseRadius() const { return x28_radarZCloseRadius; }
@@ -277,6 +278,11 @@ struct CTweakGui : ITweakGui
float GetScanPaneFadeInTime() const { return x24c_scanPaneFadeInTime; }
float GetScanPaneFadeOutTime() const { return x250_scanPaneFadeOutTime; }
float GetBallViewportYReduction() const { return x254_ballViewportYReduction; }
float GetScanWindowIdleWidth() const { return x258_scanWindowIdleW; }
float GetScanWindowIdleHeight() const { return x25c_scanWindowIdleH; }
float GetScanWindowActiveWidth() const { return x260_scanWindowActiveW; }
float GetScanWindowActiveHeight() const { return x264_scanWindowActiveH; }
float GetScanWindowMagnification() const { return x268_scanWindowMagnification; }
float GetScanSidesPositionStart() const { return x270_scanSidesPositionStart; }
bool GetShowAutomapperInMorphball() const { return x274_showAutomapperInMorphball; }
bool GetLatchArticleText() const { return x275_latchArticleText; }

7
DataSpec/DNAMP1/Tweaks/CTweakGuiColors.hpp
View File

@@ -10,7 +10,7 @@ namespace DNAMP1
struct CTweakGuiColors : public ITweakGuiColors
{
DECL_YAML
DNAColor x4_invPhazonSuitFilterMod;
DNAColor x4_pauseBlurFilterColor;
DNAColor x8_radarStuffColor;
DNAColor xc_radarPlayerPaintColor;
DNAColor x10_radarEnemyPaintColor;
@@ -63,7 +63,7 @@ struct CTweakGuiColors : public ITweakGuiColors
DNAColor xcc_;
DNAColor xd0_;
DNAColor xd4_scanVisorHudLightMultiply;
DNAColor xd8_;
DNAColor xd8_scanVisorScreenDimColor;
DNAColor xdc_thermalVisorHudLightMultiply;
DNAColor xe0_energyDrainFilterColor;
DNAColor xe4_damageAmbientPulseColor;
@@ -140,7 +140,7 @@ struct CTweakGuiColors : public ITweakGuiColors
CTweakGuiColors() = default;
CTweakGuiColors(athena::io::IStreamReader& r) { this->read(r); }
const zeus::CColor& GetInvPhazonSuitFilterMod() const { return x4_invPhazonSuitFilterMod; }
const zeus::CColor& GetPauseBlurFilterColor() const { return x4_pauseBlurFilterColor; }
const zeus::CColor& GetRadarStuffColor() const { return x8_radarStuffColor; }
const zeus::CColor& GetRadarPlayerPaintColor() const { return xc_radarPlayerPaintColor; }
const zeus::CColor& GetRadarEnemyPaintColor() const { return x10_radarEnemyPaintColor; }
@@ -181,6 +181,7 @@ struct CTweakGuiColors : public ITweakGuiColors
const zeus::CColor& GetMissileWarningOutline() const { return xbc_missileWarningOutline; }
const zeus::CColor& GetDamageAmbientColor() const { return xc4_damageAmbientColor; }
const zeus::CColor& GetScanVisorHudLightMultiply() const { return xd4_scanVisorHudLightMultiply; }
const zeus::CColor& GetScanVisorScreenDimColor() const { return xd8_scanVisorScreenDimColor; }
const zeus::CColor& GetThermalVisorHudLightMultiply() const { return xdc_thermalVisorHudLightMultiply; }
const zeus::CColor& GetEnergyDrainFilterColor() const { return xe0_energyDrainFilterColor; }
const zeus::CColor& GetDamageAmbientPulseColor() const { return xe4_damageAmbientPulseColor; }

2
DataSpec/SpecMP2.cpp
View File

@@ -231,7 +231,7 @@ struct SpecMP2 : SpecBase
int prog = 0;
ctx.progressCB = [&](const std::string& name, float) {
hecl::SystemStringView nameView(name);
progress(_S("MP2 Root"), nameView.c_str(), 3, prog / (float)m_nonPaks.size());
progress(_S("MP2 Root"), nameView.c_str(), 3, prog);
};
for (const nod::Node* node : m_nonPaks)
{