From 174af7384d1cfcbf15da02d9069bf02bdc433c20 Mon Sep 17 00:00:00 2001 From: Random <28494085+Random06457@users.noreply.github.com> Date: Sat, 3 Oct 2020 17:22:44 +0200 Subject: libultra cleanup (#215) * cleanup libultra * fixes - use quotes instead of <> for includes - add macros for zelda specific thread priorities - fix Makefile - properly format the remaining pfs structs * fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL * remove ULTRA_ABS * fix includes * update z_player.c/z_lib.c + run format.sh * merge upstream/master * fix include in En_Goroiwa * fix includes --- src/libultra_code_O2/guPosition.c | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/libultra_code_O2/guPosition.c (limited to 'src/libultra_code_O2/guPosition.c') diff --git a/src/libultra_code_O2/guPosition.c b/src/libultra_code_O2/guPosition.c new file mode 100644 index 000000000..25dfe5c8e --- /dev/null +++ b/src/libultra_code_O2/guPosition.c @@ -0,0 +1,55 @@ +#include "global.h" + +/** + * guPositionF + * Creates a rotation/parallel translation modeling matrix (floating point) + **/ + +void guPositionF(f32 mf[4][4], f32 rot, f32 pitch, f32 yaw, f32 scale, f32 x, f32 y, f32 z) { + static f32 D_80134D00 = M_PI / 180.0; + f32 sinr, sinp, sinh; + f32 cosr, cosp, cosh; + + rot *= D_80134D00; + pitch *= D_80134D00; + yaw *= D_80134D00; + + sinr = sinf(rot); + cosr = cosf(rot); + sinp = sinf(pitch); + cosp = cosf(pitch); + sinh = sinf(yaw); + cosh = cosf(yaw); + + mf[0][0] = (cosp * cosh) * scale; + mf[0][1] = (cosp * sinh) * scale; + mf[0][2] = (-sinp) * scale; + mf[0][3] = 0.0f; + + mf[1][0] = ((sinr * sinp * cosh) - (cosr * sinh)) * scale; + mf[1][1] = ((sinr * sinp * sinh) + (cosr * cosh)) * scale; + mf[1][2] = (sinr * cosp) * scale; + mf[1][3] = 0.0f; + + mf[2][0] = ((cosr * sinp * cosh) + (sinr * sinh)) * scale; + mf[2][1] = ((cosr * sinp * sinh) - (sinr * cosh)) * scale; + mf[2][2] = (cosr * cosp) * scale; + mf[2][3] = 0.0f; + + mf[3][0] = x; + mf[3][1] = y; + mf[3][2] = z; + mf[3][3] = 1.0f; +} + +/** + * guPosition + * Creates a rotational/paralell translation moeling matrix (fixed point) + */ +void guPosition(Mtx* m, f32 rot, f32 pitch, f32 yaw, f32 scale, f32 x, f32 y, f32 z) { + f32 mf[4][4]; + + guPositionF(mf, rot, pitch, yaw, scale, x, y, z); + + guMtxF2L(mf, m); +} -- cgit v1.2.3