Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-02-25 08:11:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename to TransformationMtx

Browse Source
This commit is contained in:
intns 2024-05-04 18:30:57 +01:00
parent 29480a683e
commit 7e37fb78cb
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/Game/Rigid.h
View File

@ -32,12 +32,12 @@ struct Rigid {
void integrate(f32, int);
bool resolveCollision(int, Vector3f&, Vector3f&, f32);
f32 mTimeStep; // _000
Matrixf mPrimaryMatrix; // _004
RigidConfig mConfigs[2]; // _034, [1] at _0BC
Matrixf _144; // _144
u8 _174; // _174
BitFlag<u8> mFlags; // _175
f32 mTimeStep; // _000
Matrixf mPrimaryMatrix; // _004
RigidConfig mConfigs[2]; // _034, [1] at _0BC
Matrixf mTransformationMtx; // _144
u8 _174; // _174
BitFlag<u8> mFlags; // _175
};
} // namespace Game

4
src/plugProjectKandoU/gameDynamics.cpp
View File

@ -59,7 +59,7 @@ void Game::Rigid::initPosition(Vector3f& posVec, Vector3f& quatVec)
initPositionIndex(posVec, 1, quatVec);
PSMTXIdentity(mConfigs[0]._58.mMatrix.mtxView);
PSMTXIdentity(mConfigs[1]._58.mMatrix.mtxView);
PSMTXIdentity(_144.mMatrix.mtxView);
PSMTXIdentity(mTransformationMtx.mMatrix.mtxView);
mTimeStep = 1.0f;
updateMatrix(0);
}
@ -301,7 +301,7 @@ void Game::Rigid::integrate(f32 timeStep, int configIdx)
rotationMtx.makeQ(thisConfig->mPrimaryRotation);
PSMTXTranspose(rotationMtx.mMatrix.mtxView, transposeMtx.mMatrix.mtxView);
PSMTXConcat(rotationMtx.mMatrix.mtxView, _144.mMatrix.mtxView, concatMtx.mMatrix.mtxView);
PSMTXConcat(rotationMtx.mMatrix.mtxView, mTransformationMtx.mMatrix.mtxView, concatMtx.mMatrix.mtxView);
PSMTXConcat(concatMtx.mMatrix.mtxView, transposeMtx.mMatrix.mtxView, thisConfig->_58.mMatrix.mtxView);
thisConfig->mPosition = thisConfig->mPosition + thisConfig->mVelocity * timeStep;

18
src/plugProjectKandoU/pelletMgr.cpp
View File

@ -1837,15 +1837,15 @@ void Pellet::onSetPosition()
f32 horizontal = ((radSquared / 4) + (SQUARE(heightScaling) / 12.0f)) * z;
f32 vertical = z * (radSquared / 2);
mRigid._144(0, 0) *= horizontal;
mRigid._144(0, 1) *= horizontal;
mRigid._144(0, 2) *= horizontal;
mRigid._144(1, 0) *= vertical;
mRigid._144(1, 1) *= vertical;
mRigid._144(1, 2) *= vertical;
mRigid._144(2, 0) *= horizontal;
mRigid._144(2, 1) *= horizontal;
mRigid._144(2, 2) *= horizontal;
mRigid.mTransformationMtx(0, 0) *= horizontal;
mRigid.mTransformationMtx(0, 1) *= horizontal;
mRigid.mTransformationMtx(0, 2) *= horizontal;
mRigid.mTransformationMtx(1, 0) *= vertical;
mRigid.mTransformationMtx(1, 1) *= vertical;
mRigid.mTransformationMtx(1, 2) *= vertical;
mRigid.mTransformationMtx(2, 0) *= horizontal;
mRigid.mTransformationMtx(2, 1) *= horizontal;
mRigid.mTransformationMtx(2, 2) *= horizontal;
mLodSphere.mPosition = mPelletPosition;
mRigid.mFlags.set(1);
}