PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link CTweakPlayer 

Former-commit-id: 84e8d8a9fa
This commit is contained in:
Luke Street 2022-12-07 01:06:09 -05:00
parent 8dc5aee508
commit 4a4e040adf
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -35,7 +35,7 @@ LIBS = [
["MetroidPrime/CAnimData", False], ["MetroidPrime/CAnimData", False],
"MetroidPrime/Factories/CCharacterFactory", "MetroidPrime/Factories/CCharacterFactory",
"MetroidPrime/Factories/CAssetFactory", "MetroidPrime/Factories/CAssetFactory",
["MetroidPrime/Tweaks/CTweakPlayer", False], ["MetroidPrime/Tweaks/CTweakPlayer", True],
"MetroidPrime/Tweaks/CTweaks", "MetroidPrime/Tweaks/CTweaks",
["MetroidPrime/Tweaks/CTweakGame", True], ["MetroidPrime/Tweaks/CTweakGame", True],
"MetroidPrime/CGameProjectile", "MetroidPrime/CGameProjectile",

4
include/MetroidPrime/Tweaks/ITweakObject.hpp
View File

@ -5,7 +5,9 @@
class ITweakObject { class ITweakObject {
public: public:
virtual ~ITweakObject() {}; virtual ~ITweakObject() = 0;
}; };
inline ITweakObject::~ITweakObject() {}
#endif // _ITWEAKOBJECT #endif // _ITWEAKOBJECT

17
src/MetroidPrime/Tweaks/CTweakPlayer.cpp
View File

@ -10,22 +10,23 @@ CTweakPlayer::CTweakPlayer(CInputStream& in)
, x2dc_grappleBeamXWaveAmplitude(0.0) , x2dc_grappleBeamXWaveAmplitude(0.0)
, x2e0_grappleBeamZWaveAmplitude(0.0) , x2e0_grappleBeamZWaveAmplitude(0.0)
, x2e4_grappleBeamAnglePhaseDelta(0.0) { , x2e4_grappleBeamAnglePhaseDelta(0.0) {
for (int i = 0; i < 8; ++i) { int i;
for (i = 0; i < ARRAY_SIZE(x4_maxTranslationalAcceleration); ++i) {
x4_maxTranslationalAcceleration[i] = in.ReadFloat(); x4_maxTranslationalAcceleration[i] = in.ReadFloat();
} }
for (int i = 0; i < 8; ++i) { for (i = 0; i < ARRAY_SIZE(x24_maxRotationalAcceleration); ++i) {
x24_maxRotationalAcceleration[i] = in.ReadFloat(); x24_maxRotationalAcceleration[i] = in.ReadFloat();
} }
for (int i = 0; i < 8; ++i) { for (i = 0; i < ARRAY_SIZE(x44_translationFriction); ++i) {
x44_translationFriction[i] = in.ReadFloat(); x44_translationFriction[i] = in.ReadFloat();
} }
for (int i = 0; i < 8; ++i) { for (i = 0; i < ARRAY_SIZE(x64_rotationFriction); ++i) {
x64_rotationFriction[i] = in.ReadFloat(); x64_rotationFriction[i] = in.ReadFloat();
} }
for (int i = 0; i < 8; ++i) { for (i = 0; i < ARRAY_SIZE(x84_rotationMaxSpeed); ++i) {
x84_rotationMaxSpeed[i] = in.ReadFloat(); x84_rotationMaxSpeed[i] = in.ReadFloat();
} }
for (int i = 0; i < 8; ++i) { for (i = 0; i < ARRAY_SIZE(xa4_translationMaxSpeed); ++i) {
xa4_translationMaxSpeed[i] = in.ReadFloat(); xa4_translationMaxSpeed[i] = in.ReadFloat();
} }
@ -109,7 +110,7 @@ CTweakPlayer::CTweakPlayer(CInputStream& in)
x264_aimAssistHorizontalAngle = in.ReadFloat() * (M_PIF / 180.f); x264_aimAssistHorizontalAngle = in.ReadFloat() * (M_PIF / 180.f);
x268_aimAssistVerticalAngle = in.ReadFloat() * (M_PIF / 180.f); x268_aimAssistVerticalAngle = in.ReadFloat() * (M_PIF / 180.f);
for (int i = 0; i < 3; ++i) { for (i = 0; i < 3; ++i) {
x158_orbitMinDistance[i] = in.ReadFloat(); x158_orbitMinDistance[i] = in.ReadFloat();
x164_orbitNormalDistance[i] = in.ReadFloat(); x164_orbitNormalDistance[i] = in.ReadFloat();
x170_orbitMaxDistance[i] = in.ReadFloat(); x170_orbitMaxDistance[i] = in.ReadFloat();
@ -127,7 +128,7 @@ CTweakPlayer::CTweakPlayer(CInputStream& in)
x1a0_orbitMaxLockDistance = in.ReadFloat(); x1a0_orbitMaxLockDistance = in.ReadFloat();
x1a4_orbitDistanceThreshold = in.ReadFloat(); x1a4_orbitDistanceThreshold = in.ReadFloat();
for (int i = 0; i < 2; ++i) { for (i = 0; i < 2; ++i) {
x1a8_orbitScreenBoxHalfExtentX[i] = in.ReadLong(); x1a8_orbitScreenBoxHalfExtentX[i] = in.ReadLong();
x1b0_orbitScreenBoxHalfExtentY[i] = in.ReadLong(); x1b0_orbitScreenBoxHalfExtentY[i] = in.ReadLong();
x1b8_orbitScreenBoxCenterX[i] = in.ReadLong(); x1b8_orbitScreenBoxCenterX[i] = in.ReadLong();