summaryrefslogtreecommitdiff
path: root/src/code/z_view.c
diff options
context:
space:
mode:
authorEllipticEllipsis <elliptic.ellipsis@gmail.com>2022-05-26 04:24:39 +0100
committerGitHub <noreply@github.com>2022-05-25 23:24:39 -0400
commit8049dec3393c4ade687dbdfd84d3ccde73168ab0 (patch)
tree6df40d57a3c85c86cef089c98839eec1f0b8cf43 /src/code/z_view.c
parente1477702ca139175af769347a3ad0d7a13a31fde (diff)
`sys_matrix` OK, documented, rename some other mathematics functions (#787)
* Import data and bss, add some name options * Decomp rest of stack functions, remove RSPMatrix, split header * sys_matrix OK (thanks Tharo) Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * pragma weaks in sinf and cosf, change documentation change mcros to use 0x8000 * Rename sinf and cosf * Correct initialisation of sMtxFClear * More minor cleanup * Rename stack functions * Matrix_InsertMatrix -> Matrix_Mult * The big transpose rename * Fix MirRay_DrawReflectedBeam * Matrix_InsertTranslation -> Matrix_Translate * Matrix_Insert.Rotation_s -> Matrix_Rotate$1S + RotateY -> RotateYS * Matrix_Insert(.)Rotation_f -> Matrix_Rotate$1F * Matrix_RotateStateAroundXAxis -> Matrix_RotateXFApply Matrix_SetStateXRotation -> Matrix_RotateXFNew * Matrix_MultiplyVector3fByState -> Matrix_MultVec3f * Matrix_MultiplyVector3fXZByCurrentState -> Matrix_MultVec3fXZ * Matrix_GetStateTranslation -> Matrix_MultZero * Matrix_GetStateTranslationAndScaled(.) -> Matrix_MultVec$1 * Matrix_FromRSPMatrix -> Matrix_MtxToMtxF * Matrix_MultiplyVector3fByMatrix -> Matrix_MultVec3fExt * Matrix_TransposeXYZ -> Matrix_Transpose * Matrix_ToRSPMatrix -> Matrix_MtxFToMtx * Matrix_AppendToPolyOpaDisp -> Matrix_MtxFToNewMtx and document the conversion functions * Matrix_NormalizeXYZ -> Matrix_ReplaceRotation * Matrix_InsertRotationAroundUnitVector_f -> Matrix_RotateAxisF and S * Matrix_InsertRotation -> Matrix_RotateZYX * Document the last functions * Small cleanup * Matrix_JointPosition -> Matrix_TranslateRotateZYX * Matrix_SetStateRotationAndTranslation -> Matrix_SetTranslateRotateYXZ * func_8018219C -> Matrix_MtxFToYXZRot * func_801822C4 -> Matrix_MtxFToZYXRot * Fix files * Format * Review 1 * Renames * Fix warning in EnDragon * Format * Convert `mode` to an actual enum * Add enums, typedefs, externs to sys_matrix header * Review * One more * More review * Fix function names * Format * Fix names * Format * Review * engineer's review * Fix build * Format * Fix again Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Diffstat (limited to 'src/code/z_view.c')
-rw-r--r--src/code/z_view.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_view.c b/src/code/z_view.c
index d11a18201..915c196b7 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -262,15 +262,15 @@ s32 View_StepDistortion(View* view, Mtx* projectionMtx) {
F32_LERPIMP(view->curDistortionScale.z, view->distortionScale.z, view->distortionSpeed);
}
- Matrix_FromRSPMatrix(projectionMtx, &projectionMtxF);
- Matrix_SetCurrentState(&projectionMtxF);
- Matrix_RotateStateAroundXAxis(view->curDistortionDirRot.x);
- Matrix_InsertYRotation_f(view->curDistortionDirRot.y, MTXMODE_APPLY);
- Matrix_InsertZRotation_f(view->curDistortionDirRot.z, MTXMODE_APPLY);
+ Matrix_MtxToMtxF(projectionMtx, &projectionMtxF);
+ Matrix_Put(&projectionMtxF);
+ Matrix_RotateXFApply(view->curDistortionDirRot.x);
+ Matrix_RotateYF(view->curDistortionDirRot.y, MTXMODE_APPLY);
+ Matrix_RotateZF(view->curDistortionDirRot.z, MTXMODE_APPLY);
Matrix_Scale(view->curDistortionScale.x, view->curDistortionScale.y, view->curDistortionScale.z, MTXMODE_APPLY);
- Matrix_InsertZRotation_f(-view->curDistortionDirRot.z, MTXMODE_APPLY);
- Matrix_InsertYRotation_f(-view->curDistortionDirRot.y, MTXMODE_APPLY);
- Matrix_RotateStateAroundXAxis(-view->curDistortionDirRot.x);
+ Matrix_RotateZF(-view->curDistortionDirRot.z, MTXMODE_APPLY);
+ Matrix_RotateYF(-view->curDistortionDirRot.y, MTXMODE_APPLY);
+ Matrix_RotateXFApply(-view->curDistortionDirRot.x);
Matrix_ToMtx(projectionMtx);
return true;