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

RetroDataSpec: Use override where applicable

Browse Source 
Continues the override modernizations, applying the keyword where
applicable to the RetroDataSpec target.
This commit is contained in:
Lioncash
2019-08-09 22:32:48 -04:00
parent 1e625e0995
commit a5a2516138
101 changed files with 1230 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
DataSpec/DNAMP1/Tweaks/CTweakBall.hpp
View File

@@ -127,66 +127,70 @@ struct CTweakBall final : public ITweakBall {
x1ec_maxLeanAngle = zeus::degToRad(x1ec_maxLeanAngle);
}
float GetMaxBallTranslationAcceleration(int s) const { return x4_maxTranslationAcceleration[s]; }
float GetBallTranslationFriction(int s) const { return x24_translationFriction[s]; }
float GetBallTranslationMaxSpeed(int s) const { return x44_translationMaxSpeed[s]; }
float GetBallCameraElevation() const { return 2.736f; }
float GetBallCameraAnglePerSecond() const { return x74_ballCameraAnglePerSecond; }
const zeus::CVector3f& GetBallCameraOffset() const { return x78_ballCameraOffset; }
float GetBallCameraMinSpeedDistance() const { return x84_ballCameraMinSpeedDistance; }
float GetBallCameraMaxSpeedDistance() const { return x88_ballCameraMaxSpeedDistance; }
float GetBallCameraBackwardsDistance() const { return x8c_ballCameraBackwardsDistance; }
float GetBallCameraSpringConstant() const { return x94_ballCameraSpringConstant; }
float GetBallCameraSpringMax() const { return x98_ballCameraSpringMax; }
float GetBallCameraSpringTardis() const { return x9c_ballCameraSpringTardis; }
float GetBallCameraCentroidSpringConstant() const { return xa0_ballCameraCentroidSpringConstant; }
float GetBallCameraCentroidSpringMax() const { return xa4_ballCameraCentroidSpringMax; }
float GetBallCameraCentroidSpringTardis() const { return xa8_ballCameraCentroidSpringTardis; }
float GetBallCameraCentroidDistanceSpringConstant() const { return xac_ballCameraCentroidDistanceSpringConstant; }
float GetBallCameraCentroidDistanceSpringMax() const { return xb0_ballCameraCentroidDistanceSpringMax; }
float GetBallCameraCentroidDistanceSpringTardis() const { return xb4_ballCameraCentroidDistanceSpringTardis; }
float GetBallCameraLookAtSpringConstant() const { return xb8_ballCameraLookAtSpringConstant; }
float GetBallCameraLookAtSpringMax() const { return xbc_ballCameraLookAtSpringMax; }
float GetBallCameraLookAtSpringTardis() const { return xc0_ballCameraLookAtSpringTardis; }
float GetBallForwardBrakingAcceleration(int s) const { return xc4_ballForwardBrakingAcceleration[s]; }
float GetBallGravity() const { return xe4_ballGravity; }
float GetBallWaterGravity() const { return xe8_ballWaterGravity; }
float GetBallSlipFactor(int s) const { return x12c_ballSlipFactor[s]; }
float GetConservativeDoorCameraDistance() const { return x170_conservativeDoorCamDistance; }
float GetBallCameraChaseElevation() const { return x178_ballCameraChaseElevation; }
float GetBallCameraChaseDampenAngle() const { return x17c_ballCameraChaseDampenAngle; }
float GetBallCameraChaseDistance() const { return x180_ballCameraChaseDistance; }
float GetBallCameraChaseYawSpeed() const { return x184_ballCameraChaseYawSpeed; }
float GetBallCameraChaseAnglePerSecond() const { return x188_ballCameraChaseAnglePerSecond; }
const zeus::CVector3f& GetBallCameraChaseLookAtOffset() const { return x18c_ballCameraChaseLookAtOffset; }
float GetBallCameraChaseSpringConstant() const { return x198_ballCameraChaseSpringConstant; }
float GetBallCameraChaseSpringMax() const { return x19c_ballCameraChaseSpringMax; }
float GetBallCameraChaseSpringTardis() const { return x1a0_ballCameraChaseSpringTardis; }
float GetBallCameraBoostElevation() const { return x1a4_ballCameraBoostElevation; }
float GetBallCameraBoostDampenAngle() const { return x1a8_ballCameraBoostDampenAngle; }
float GetBallCameraBoostDistance() const { return x1ac_ballCameraBoostDistance; }
float GetBallCameraBoostYawSpeed() const { return x1b0_ballCameraBoostYawSpeed; }
float GetBallCameraBoostAnglePerSecond() const { return x1b4_ballCameraBoostAnglePerSecond; }
const zeus::CVector3f& GetBallCameraBoostLookAtOffset() const { return x1b8_ballCameraBoostLookAtOffset; }
float GetBallCameraBoostSpringConstant() const { return x1c4_ballCameraBoostSpringConstant; }
float GetBallCameraBoostSpringMax() const { return x1c8_ballCameraBoostSpringMax; }
float GetBallCameraBoostSpringTardis() const { return x1cc_ballCameraBoostSpringTardis; }
float GetBallCameraControlDistance() const { return x1d0_ballCameraControlDistance; }
float GetMinimumAlignmentSpeed() const { return x1dc_minimumAlignmentSpeed; }
float GetTireness() const { return x1e0_tireness; }
float GetMaxLeanAngle() const { return x1ec_maxLeanAngle; }
float GetTireToMarbleThresholdSpeed() const { return x1f0_tireToMarbleThresholdSpeed; }
float GetMarbleToTireThresholdSpeed() const { return x1f4_marbleToTireThresholdSpeed; }
float GetForceToLeanGain() const { return x1f8_forceToLeanGain; }
float GetLeanTrackingGain() const { return x1fc_leanTrackingGain; }
float GetLeftStickDivisor() const { return x1e4_leftStickDivisor; }
float GetRightStickDivisor() const { return x1e8_rightStickDivisor; }
float GetBallTouchRadius() const { return x204_ballTouchRadius; }
float GetBoostBallDrainTime() const { return x20c_boostBallDrainTime; }
float GetBoostBallMaxChargeTime() const { return x210_boostBallMaxChargeTime; }
float GetBoostBallMinChargeTime() const { return x218_boostBallMinChargeTime; }
float GetBoostBallMinRelativeSpeedForDamage() const { return x21c_boostBallMinRelativeSpeedForDamage; }
float GetBoostBallChargeTimeTable(int i) const {
float GetMaxBallTranslationAcceleration(int s) const override { return x4_maxTranslationAcceleration[s]; }
float GetBallTranslationFriction(int s) const override { return x24_translationFriction[s]; }
float GetBallTranslationMaxSpeed(int s) const override { return x44_translationMaxSpeed[s]; }
float GetBallCameraElevation() const override { return 2.736f; }
float GetBallCameraAnglePerSecond() const override { return x74_ballCameraAnglePerSecond; }
const zeus::CVector3f& GetBallCameraOffset() const override { return x78_ballCameraOffset; }
float GetBallCameraMinSpeedDistance() const override { return x84_ballCameraMinSpeedDistance; }
float GetBallCameraMaxSpeedDistance() const override { return x88_ballCameraMaxSpeedDistance; }
float GetBallCameraBackwardsDistance() const override { return x8c_ballCameraBackwardsDistance; }
float GetBallCameraSpringConstant() const override { return x94_ballCameraSpringConstant; }
float GetBallCameraSpringMax() const override { return x98_ballCameraSpringMax; }
float GetBallCameraSpringTardis() const override { return x9c_ballCameraSpringTardis; }
float GetBallCameraCentroidSpringConstant() const override { return xa0_ballCameraCentroidSpringConstant; }
float GetBallCameraCentroidSpringMax() const override { return xa4_ballCameraCentroidSpringMax; }
float GetBallCameraCentroidSpringTardis() const override { return xa8_ballCameraCentroidSpringTardis; }
float GetBallCameraCentroidDistanceSpringConstant() const override {
return xac_ballCameraCentroidDistanceSpringConstant;
}
float GetBallCameraCentroidDistanceSpringMax() const override { return xb0_ballCameraCentroidDistanceSpringMax; }
float GetBallCameraCentroidDistanceSpringTardis() const override {
return xb4_ballCameraCentroidDistanceSpringTardis;
}
float GetBallCameraLookAtSpringConstant() const override { return xb8_ballCameraLookAtSpringConstant; }
float GetBallCameraLookAtSpringMax() const override { return xbc_ballCameraLookAtSpringMax; }
float GetBallCameraLookAtSpringTardis() const override { return xc0_ballCameraLookAtSpringTardis; }
float GetBallForwardBrakingAcceleration(int s) const override { return xc4_ballForwardBrakingAcceleration[s]; }
float GetBallGravity() const override { return xe4_ballGravity; }
float GetBallWaterGravity() const override { return xe8_ballWaterGravity; }
float GetBallSlipFactor(int s) const override { return x12c_ballSlipFactor[s]; }
float GetConservativeDoorCameraDistance() const override { return x170_conservativeDoorCamDistance; }
float GetBallCameraChaseElevation() const override { return x178_ballCameraChaseElevation; }
float GetBallCameraChaseDampenAngle() const override { return x17c_ballCameraChaseDampenAngle; }
float GetBallCameraChaseDistance() const override { return x180_ballCameraChaseDistance; }
float GetBallCameraChaseYawSpeed() const override { return x184_ballCameraChaseYawSpeed; }
float GetBallCameraChaseAnglePerSecond() const override { return x188_ballCameraChaseAnglePerSecond; }
const zeus::CVector3f& GetBallCameraChaseLookAtOffset() const override { return x18c_ballCameraChaseLookAtOffset; }
float GetBallCameraChaseSpringConstant() const override { return x198_ballCameraChaseSpringConstant; }
float GetBallCameraChaseSpringMax() const override { return x19c_ballCameraChaseSpringMax; }
float GetBallCameraChaseSpringTardis() const override { return x1a0_ballCameraChaseSpringTardis; }
float GetBallCameraBoostElevation() const override { return x1a4_ballCameraBoostElevation; }
float GetBallCameraBoostDampenAngle() const override { return x1a8_ballCameraBoostDampenAngle; }
float GetBallCameraBoostDistance() const override { return x1ac_ballCameraBoostDistance; }
float GetBallCameraBoostYawSpeed() const override { return x1b0_ballCameraBoostYawSpeed; }
float GetBallCameraBoostAnglePerSecond() const override { return x1b4_ballCameraBoostAnglePerSecond; }
const zeus::CVector3f& GetBallCameraBoostLookAtOffset() const override { return x1b8_ballCameraBoostLookAtOffset; }
float GetBallCameraBoostSpringConstant() const override { return x1c4_ballCameraBoostSpringConstant; }
float GetBallCameraBoostSpringMax() const override { return x1c8_ballCameraBoostSpringMax; }
float GetBallCameraBoostSpringTardis() const override { return x1cc_ballCameraBoostSpringTardis; }
float GetBallCameraControlDistance() const override { return x1d0_ballCameraControlDistance; }
float GetMinimumAlignmentSpeed() const override { return x1dc_minimumAlignmentSpeed; }
float GetTireness() const override { return x1e0_tireness; }
float GetMaxLeanAngle() const override { return x1ec_maxLeanAngle; }
float GetTireToMarbleThresholdSpeed() const override { return x1f0_tireToMarbleThresholdSpeed; }
float GetMarbleToTireThresholdSpeed() const override { return x1f4_marbleToTireThresholdSpeed; }
float GetForceToLeanGain() const override { return x1f8_forceToLeanGain; }
float GetLeanTrackingGain() const override { return x1fc_leanTrackingGain; }
float GetLeftStickDivisor() const override { return x1e4_leftStickDivisor; }
float GetRightStickDivisor() const override { return x1e8_rightStickDivisor; }
float GetBallTouchRadius() const override { return x204_ballTouchRadius; }
float GetBoostBallDrainTime() const override { return x20c_boostBallDrainTime; }
float GetBoostBallMaxChargeTime() const override { return x210_boostBallMaxChargeTime; }
float GetBoostBallMinChargeTime() const override { return x218_boostBallMinChargeTime; }
float GetBoostBallMinRelativeSpeedForDamage() const override { return x21c_boostBallMinRelativeSpeedForDamage; }
float GetBoostBallChargeTimeTable(int i) const override {
switch (i) {
default:
case 0:
@@ -197,7 +201,7 @@ struct CTweakBall final : public ITweakBall {
return x228_boostBallChargeTime2;
}
}
float GetBoostBallIncrementalSpeedTable(int i) const {
float GetBoostBallIncrementalSpeedTable(int i) const override {
switch (i) {
default:
case 0: