diff --git a/GRRLIB/GRRLIB/GRRLIB_3D.c b/GRRLIB/GRRLIB/GRRLIB_3D.c index 8491766..d61096f 100644 --- a/GRRLIB/GRRLIB/GRRLIB_3D.c +++ b/GRRLIB/GRRLIB/GRRLIB_3D.c @@ -104,7 +104,7 @@ void GRRLIB_3dMode(f32 minDist, f32 maxDist, f32 fov, bool texturemode) { * Go back to 2D Mode (contributed my chris_c aka DaShAmAn). */ void GRRLIB_2dMode() { - Mtx view,m; + Mtx view, m; GX_SetZMode(GX_FALSE, GX_LEQUAL, GX_TRUE); @@ -114,7 +114,7 @@ void GRRLIB_2dMode() { GX_LoadProjectionMtx(m, GX_ORTHOGRAPHIC); guMtxIdentity(view); - guMtxTransApply(view,view, 0, 0, -100.0F); + guMtxTransApply(view, view, 0, 0, -100.0F); GX_LoadPosMtxImm(view, GX_PNMTX0); GX_ClearVtxDesc(); @@ -142,22 +142,22 @@ static guVector _GRRaxisz = (guVector){0,0,1}; // NOT ever! * @param angz z rotation angle of the object. */ void GRRLIB_objectView(f32 posx, f32 posy, f32 posz, f32 angx, f32 angy, f32 angz) { - Mtx m,mv,rx,ry,rz; + Mtx m, mv, rx, ry, rz; Mtx mvi ; guMtxIdentity(m); guMtxRotAxisDeg(rx, &_GRRaxisx, angx); guMtxRotAxisDeg(ry, &_GRRaxisy, angy); guMtxRotAxisDeg(rz, &_GRRaxisz, angz); - guMtxConcat(ry,rx,m); - guMtxConcat(m,rz,m); + guMtxConcat(ry, rx, m); + guMtxConcat(m, rz, m); - guMtxTransApply(m, m, posx,posy,posz); - guMtxConcat(_GRR_view,m,mv); + guMtxTransApply(m, m, posx, posy, posz); + guMtxConcat(_GRR_view, m, mv); GX_LoadPosMtxImm(mv, GX_PNMTX0); - guMtxInverse(mv,mvi); - guMtxTranspose(mvi,mv); + guMtxInverse(mv, mvi); + guMtxTranspose(mvi, mv); GX_LoadNrmMtxImm(mv, GX_PNMTX0); } @@ -170,10 +170,10 @@ void GRRLIB_setTexture(GRRLIB_texImg *tex, bool rep) { GXTexObj texObj; if (rep) { - GX_InitTexObj(&texObj, tex->data, tex->w, tex->h,GX_TF_RGBA8, GX_REPEAT, GX_REPEAT, GX_FALSE); + GX_InitTexObj(&texObj, tex->data, tex->w, tex->h, GX_TF_RGBA8, GX_REPEAT, GX_REPEAT, GX_FALSE); } else { - GX_InitTexObj(&texObj, tex->data, tex->w, tex->h,GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE); + GX_InitTexObj(&texObj, tex->data, tex->w, tex->h, GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE); } if (GRRLIB_Settings.antialias == false){ GX_InitTexObjLOD(&texObj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1); diff --git a/GRRLIB/GRRLIB/grrlib/GRRLIB__lib.h b/GRRLIB/GRRLIB/grrlib/GRRLIB__lib.h index 11d2bdf..6e5ff66 100644 --- a/GRRLIB/GRRLIB/grrlib/GRRLIB__lib.h +++ b/GRRLIB/GRRLIB/grrlib/GRRLIB__lib.h @@ -89,7 +89,7 @@ GRRLIB_texImg* GRRLIB_LoadTextureFromFile (const char* filename) ; bool GRRLIB_ScrShot (const char* filename) ; //------------------------------------------------------------------------------ -//! GRRLIB_print.c - Will someome please tell me what these are :) +// GRRLIB_print.c - Will someome please tell me what these are :) void GRRLIB_Printf (const f32 xpos, const f32 ypos, const GRRLIB_texImg *tex, const u32 color, const f32 zoom, const char *text, ...) ; @@ -141,7 +141,7 @@ void GRRLIB_GeckoPrintf (const char *text, ...); // GRRLIB_3D.c - 3D functions for GRRLIB void GRRLIB_setBackgroundColour(u8 r, u8 g, u8 b, u8 a); void GRRLIB_camera3dSettings(f32 posx, f32 posy, f32 posz, f32 upx, f32 upy, f32 upz, f32 lookx, f32 looky, f32 lookz); -void GRRLIB_3dMode(f32 minDist,f32 maxDist,f32 fov, bool texturemode); +void GRRLIB_3dMode(f32 minDist, f32 maxDist, f32 fov, bool texturemode); void GRRLIB_2dMode(); void GRRLIB_objectView(f32 posx, f32 posy, f32 posz, f32 angx, f32 angy, f32 angz); void GRRLIB_setTexture(GRRLIB_texImg *tex, bool rep);