From 9bc36644848b5a691f26f77c64193bc82853c581 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Mon, 13 Jan 2020 14:41:26 -0500 Subject: [PATCH] Format code --- CHANGELOG.md | 2 +- GRRLIB/GRRLIB/GRRLIB_3D.c | 28 ++++++++++++------------- GRRLIB/GRRLIB/GRRLIB_ttf.c | 2 +- GRRLIB/GRRLIB/grrlib.h | 2 +- examples/3D_CubedTileDemo/source/main.c | 4 ++-- examples/3D_sample3/source/main.c | 2 +- examples/3D_sample4/source/main.c | 2 +- examples/TileDemo/source/main.c | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b8de66..192c295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -93,7 +93,7 @@ All notable changes to this project will be documented in this file. ## 4.0.0 - 2009-03-05 -- Color format changed to RGBA for ALL GRRLib functions to fit to GX_Color format and use `GX_Color1u32` +- Color format changed to RGBA for ALL GRRLib functions to fit to `GXColor` format and use `GX_Color1u32` - `GRRLIB_LoadTexture()` now auto detect PNG or JPEG - GRRLib introduce a new texture structure (easier to handle texture width, height, etc ...) - Add `GRRLIB_InitTileSet()` to initialize a tile set diff --git a/GRRLIB/GRRLIB/GRRLIB_3D.c b/GRRLIB/GRRLIB/GRRLIB_3D.c index 5607f64..76038b0 100644 --- a/GRRLIB/GRRLIB/GRRLIB_3D.c +++ b/GRRLIB/GRRLIB/GRRLIB_3D.c @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ -Copyright (c) 2009-2019 The GRRLIB Team +Copyright (c) 2009-2020 The GRRLIB Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -94,24 +94,24 @@ void GRRLIB_3dMode(f32 minDist, f32 maxDist, f32 fov, bool texturemode, bool nor GX_ClearVtxDesc(); GX_SetVtxDesc(GX_VA_POS, GX_DIRECT); - if(normalmode) { + if(normalmode == true) { GX_SetVtxDesc(GX_VA_NRM, GX_DIRECT); } GX_SetVtxDesc(GX_VA_CLR0, GX_DIRECT); - if(texturemode) { + if(texturemode == true) { GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT); } GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); - if(normalmode) { + if(normalmode == true) { GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0); } GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); - if(texturemode) { + if(texturemode == true) { GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0); } - if(texturemode) { + if(texturemode == true) { GX_SetTevOp(GX_TEVSTAGE0, GX_MODULATE); } else { @@ -342,7 +342,7 @@ void GRRLIB_ObjectViewInv(f32 posx, f32 posy, f32 posz, f32 angx, f32 angy, f32 void GRRLIB_SetTexture(GRRLIB_texImg *tex, bool rep) { GXTexObj texObj; - if (rep) { + if (rep == true) { GX_InitTexObj(&texObj, tex->data, tex->w, tex->h, GX_TF_RGBA8, GX_REPEAT, GX_REPEAT, GX_FALSE); } else { @@ -540,7 +540,7 @@ void GRRLIB_DrawCylinder(f32 r, f32 h, int d, bool filled, u32 col) { else { GX_Begin(GX_LINESTRIP, GX_VTXFMT0, 2 * (d+1)); } - for(i = 0 ; i <= d ; i++) { + for(i = 0; i <= d; i++) { dx = cosf( M_PI * 2.0f * i / d ); dy = sinf( M_PI * 2.0f * i / d ); GX_Position3f32( r * dx, -0.5f * h, r * dy ); @@ -561,7 +561,7 @@ void GRRLIB_DrawCylinder(f32 r, f32 h, int d, bool filled, u32 col) { GX_Position3f32(0.0f, -0.5f * h, 0.0f); GX_Normal3f32(0.0f, -1.0f, 0.0f); GX_Color1u32(col); - for(i = 0 ; i <= d ; i++) { + for(i = 0; i <= d; i++) { GX_Position3f32( r * cosf( M_PI * 2.0f * i / d ), -0.5f * h, r * sinf( M_PI * 2.0f * i / d ) ); GX_Normal3f32(0.0f, -1.0f, 0.0f); GX_Color1u32(col); @@ -577,7 +577,7 @@ void GRRLIB_DrawCylinder(f32 r, f32 h, int d, bool filled, u32 col) { GX_Position3f32(0.0f, 0.5f * h, 0.0f); GX_Normal3f32(0.0f, 1.0f, 0.0f); GX_Color1u32(col); - for(i = 0 ; i <= d ; i++) { + for(i = 0; i <= d; i++) { GX_Position3f32( r * cosf( M_PI * 2.0f * i / d ), 0.5f * h, r * sinf( M_PI * 2.0f * i / d ) ); GX_Normal3f32(0.0f, 1.0f, 0.0f); GX_Color1u32(col); @@ -603,7 +603,7 @@ void GRRLIB_DrawCone(f32 r, f32 h, int d, bool filled, u32 col) { else { GX_Begin(GX_LINESTRIP, GX_VTXFMT0, 2 * (d+1)); } - for(i = 0 ; i <= d ; i++) { + for(i = 0; i <= d; i++) { dx = cosf( M_PI * 2.0f * i / d ); dy = sinf( M_PI * 2.0f * i / d ); GX_Position3f32( 0, -0.5f * h,0); @@ -624,7 +624,7 @@ void GRRLIB_DrawCone(f32 r, f32 h, int d, bool filled, u32 col) { GX_Position3f32(0.0f, 0.5f * h, 0.0f); GX_Normal3f32(0.0f, 1.0f, 0.0f); GX_Color1u32(col); - for(i = 0 ; i <= d ; i++) { + for(i = 0; i <= d; i++) { GX_Position3f32( r * cosf( M_PI * 2.0f * i / d ), 0.5f * h, r * sinf( M_PI * 2.0f * i / d ) ); GX_Normal3f32(0.0f, 1.0f, 0.0f); GX_Color1u32(col); @@ -648,7 +648,7 @@ void GRRLIB_DrawTessPanel(f32 w, f32 wstep, f32 h, f32 hstep, bool filled, u32 c tmpy = h/2.0f; tmpx = w/2.0f; tmp = ((w/wstep)*2)+2; - for ( y = -tmpy ; y <= tmpy ; y+=hstep ) + for ( y = -tmpy; y <= tmpy; y += hstep ) { if(filled == true) { GX_Begin(GX_TRIANGLESTRIP, GX_VTXFMT0, tmp); @@ -656,7 +656,7 @@ void GRRLIB_DrawTessPanel(f32 w, f32 wstep, f32 h, f32 hstep, bool filled, u32 c else { GX_Begin(GX_LINESTRIP, GX_VTXFMT0, tmp); } - for ( x = -tmpx ; x <= tmpx ; x+=wstep ) + for ( x = -tmpx; x <= tmpx; x += wstep ) { GX_Position3f32( x, y, 0.0f ); GX_Normal3f32( 0.0f, 0.0f, 1.0f); diff --git a/GRRLIB/GRRLIB/GRRLIB_ttf.c b/GRRLIB/GRRLIB/GRRLIB_ttf.c index 63a47f0..06b71f7 100644 --- a/GRRLIB/GRRLIB/GRRLIB_ttf.c +++ b/GRRLIB/GRRLIB/GRRLIB_ttf.c @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ -Copyright (c) 2009-2019 The GRRLIB Team +Copyright (c) 2009-2020 The GRRLIB Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/GRRLIB/GRRLIB/grrlib.h b/GRRLIB/GRRLIB/grrlib.h index d274d75..b680772 100644 --- a/GRRLIB/GRRLIB/grrlib.h +++ b/GRRLIB/GRRLIB/grrlib.h @@ -211,7 +211,7 @@ GRR_EXTERN u32 fb GRR_INIT(0); * @section Links * Forum: http://grrlib.santo.fr/forum\n * Code: https://github.com/GRRLIB/GRRLIB\n - * IRC: \#GRRLIB on EFnet + * Chat: \#GRRLIB on EFnet * * @section Credits * Project Leader : NoNameNo\n diff --git a/examples/3D_CubedTileDemo/source/main.c b/examples/3D_CubedTileDemo/source/main.c index 20ef376..fc08ada 100644 --- a/examples/3D_CubedTileDemo/source/main.c +++ b/examples/3D_CubedTileDemo/source/main.c @@ -167,8 +167,8 @@ int main() { if((dirx==0) && (diry==0)) { if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_LEFT) { diry=-4; idperso=15;} else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_RIGHT) { diry=4; idperso=15;} - else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_DOWN) { dirx=-4 ; idperso=1;} - else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_UP) { dirx=4 ; idperso=8;} + else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_DOWN) { dirx=-4; idperso=1;} + else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_UP) { dirx=4; idperso=8;} } if((dirx==0) && (diry==0)) { diff --git a/examples/3D_sample3/source/main.c b/examples/3D_sample3/source/main.c index ea5b523..0c3086c 100644 --- a/examples/3D_sample3/source/main.c +++ b/examples/3D_sample3/source/main.c @@ -18,7 +18,7 @@ int main() { float a=0; int cubeZ=5; - int i=0; + int i; float sinx=0; GRRLIB_Init(); diff --git a/examples/3D_sample4/source/main.c b/examples/3D_sample4/source/main.c index 0df7b4c..4f47afc 100644 --- a/examples/3D_sample4/source/main.c +++ b/examples/3D_sample4/source/main.c @@ -13,7 +13,7 @@ #include "gfx/logo.h" int main() { - int i=0; + int i; float a=0; u32 col; diff --git a/examples/TileDemo/source/main.c b/examples/TileDemo/source/main.c index 1ba3a96..a0be04a 100644 --- a/examples/TileDemo/source/main.c +++ b/examples/TileDemo/source/main.c @@ -156,8 +156,8 @@ int main() { if((dirx==0) && (diry==0)) { if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_LEFT) { diry=-4; idperso=15;} else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_RIGHT) { diry=4; idperso=15;} - else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_DOWN) { dirx=-4 ; idperso=1;} - else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_UP) { dirx=4 ; idperso=8;} + else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_DOWN) { dirx=-4; idperso=1;} + else if (WPAD_ButtonsHeld(0) & WPAD_BUTTON_UP) { dirx=4; idperso=8;} } if((dirx==0) && (diry==0)) {