diff options
| author | EllipticEllipsis <elliptic.ellipsis@gmail.com> | 2022-05-26 04:24:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 23:24:39 -0400 |
| commit | 8049dec3393c4ade687dbdfd84d3ccde73168ab0 (patch) | |
| tree | 6df40d57a3c85c86cef089c98839eec1f0b8cf43 /docs | |
| parent | e1477702ca139175af769347a3ad0d7a13a31fde (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 'docs')
| -rw-r--r-- | docs/tutorial/documenting.md | 8 | ||||
| -rw-r--r-- | docs/tutorial/draw_functions.md | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md index a5e64d2a9..7e8435da9 100644 --- a/docs/tutorial/documenting.md +++ b/docs/tutorial/documenting.md @@ -235,8 +235,8 @@ void func_80C10590(GlobalContext *globalCtx, s32 limbIndex, Actor *thisx) { EnRecepgirl* this = THIS; if (limbIndex == 5) { - Matrix_RotateY(0x400 - this->unk_2AE.x, MTXMODE_APPLY); - Matrix_GetStateTranslationAndScaledX(500.0f, &this->actor.focus.pos); + Matrix_RotateYS(0x400 - this->unk_2AE.x, MTXMODE_APPLY); + Matrix_MultVecX(500.0f, &this->actor.focus.pos); } } @@ -426,8 +426,8 @@ void EnRecepgirl_UnkLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi EnRecepgirl* this = THIS; if (limbIndex == 5) { - Matrix_RotateY(0x400 - this->unk_2AE.x, MTXMODE_APPLY); - Matrix_GetStateTranslationAndScaledX(500.0f, &this->actor.focus.pos); + Matrix_RotateYS(0x400 - this->unk_2AE.x, MTXMODE_APPLY); + Matrix_MultVecX(500.0f, &this->actor.focus.pos); } } ``` diff --git a/docs/tutorial/draw_functions.md b/docs/tutorial/draw_functions.md index eae1c121e..4eb22bf4f 100644 --- a/docs/tutorial/draw_functions.md +++ b/docs/tutorial/draw_functions.md @@ -163,22 +163,22 @@ As for the TransformLimbDraw, it has a much simpler prototype. mips2c gives ```C void func_80C10590(GlobalContext *globalCtx, s32 limbIndex, Actor *actor) { if (limbIndex == 5) { - Matrix_RotateY((s16) (0x400 - actor->unk2AE), 1); - Matrix_GetStateTranslationAndScaledX(500.0f, (Vec3f *) &actor->focus); + Matrix_RotateYS((s16) (0x400 - actor->unk2AE), 1); + Matrix_MultVecX(500.0f, (Vec3f *) &actor->focus); } } ``` There is only minor cleanup needed here: - recasting the last argument, -- replacing the last argument of `Matrix_RotateY` by the enum `MTXMODE_APPLY` (which means "use the current matrix instead of starting from a new identity matrix"), and the first argument by `0x400 - this->unk_2AE.x`. +- replacing the last argument of `Matrix_RotateYS` by the enum `MTXMODE_APPLY` (which means "use the current matrix instead of starting from a new identity matrix"), and the first argument by `0x400 - this->unk_2AE.x`. - `(Vec3f *) &actor->focus` to `&actor->focus.pos` (this is the same issue as `(Actor*)this`, where mips2c doesn't climb deep enough into the struct). ```C void func_80C10590(GlobalContext *globalCtx, s32 limbIndex, Actor *thisx) { EnRecepgirl* this = THIS; if (limbIndex == 5) { - Matrix_RotateY(0x400 - this->unk_2AE.x, MTXMODE_APPLY); - Matrix_GetStateTranslationAndScaledX(500.0f, &this->actor.focus.pos); + Matrix_RotateYS(0x400 - this->unk_2AE.x, MTXMODE_APPLY); + Matrix_MultVecX(500.0f, &this->actor.focus.pos); } } ``` @@ -213,7 +213,7 @@ void ObjTree_Draw(Actor *thisx, GlobalContext *globalCtx) { temp_s0->polyOpa.p = temp_v0_2 + 8; temp_v0_2->words.w1 = (u32) &D_06000680; temp_v0_2->words.w0 = 0xDE000000; - Matrix_InsertRotation(sp36, 0, sp34, 1); + Matrix_RotateZYX(sp36, 0, sp34, 1); temp_v0_3 = temp_s0->polyOpa.p; temp_s0->polyOpa.p = temp_v0_3 + 8; temp_v0_3->words.w0 = 0xDA380003; @@ -286,7 +286,7 @@ void ObjTree_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, D_06000680); - Matrix_InsertRotation(sp36, 0, sp34, MTXMODE_APPLY); + Matrix_RotateZYX(sp36, 0, sp34, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, D_060007C8); |
