From 53e99b0236444b0a7dd1a1c6ae73df779617d512 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Wed, 16 Feb 2011 21:59:34 +0000 Subject: [PATCH] [CHG] Code formatting and typo --- GRRLIB/GRRLIB/GRRLIB_3D.c | 36 +++++++++++++++++---------------- GRRLIB/GRRLIB/GRRLIB_snapshot.c | 3 ++- GRRLIB/GRRLIB/grrlib.h | 8 ++++---- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/GRRLIB/GRRLIB/GRRLIB_3D.c b/GRRLIB/GRRLIB/GRRLIB_3D.c index 7eaed38..39c09af 100644 --- a/GRRLIB/GRRLIB/GRRLIB_3D.c +++ b/GRRLIB/GRRLIB/GRRLIB_3D.c @@ -32,7 +32,8 @@ static guVector _GRR_cam = {0.0F, 0.0F, 0.0F}, static guVector _GRRaxisx = (guVector){1, 0, 0}; // DO NOT MODIFY!!! static guVector _GRRaxisy = (guVector){0, 1, 0}; // Even at runtime static guVector _GRRaxisz = (guVector){0, 0, 1}; // NOT ever! -static Mtx _ObjTransformationMtx; +static Mtx _ObjTransformationMtx; + /** * Set the background parameter when screen is cleared. * @param r Red component. @@ -597,24 +598,25 @@ void GRRLIB_DrawCone(f32 r, f32 h, int d, bool filled, u32 col) { * @param col Color in RGBA format. */ void GRRLIB_DrawTessPanel(f32 w, f32 wstep, f32 h, f32 hstep, bool filled, u32 col) { - f32 x,y,tmpx, tmpy; - int tmp; - tmpy = h/2.0f; - tmpx = w/2.0f; - tmp = ((w/wstep)*2)+2; + f32 x, y, tmpx, tmpy; + int tmp; + + tmpy = h/2.0f; + tmpx = w/2.0f; + tmp = ((w/wstep)*2)+2; for ( y = -tmpy ; y <= tmpy ; y+=hstep ) { if(filled) GX_Begin(GX_TRIANGLESTRIP, GX_VTXFMT0, tmp); else GX_Begin(GX_LINESTRIP, GX_VTXFMT0, tmp); - for ( x = -tmpx ; x <= tmpx ; x+=wstep ) - { - GX_Position3f32( x, y, 0.0f ); - GX_Normal3f32( 0.0f, 0.0f, 1.0f); - GX_Color1u32(col); - GX_Position3f32( x, y+hstep, 0.0f ); - GX_Normal3f32( 0.0f, 0.0f, 1.0f); - GX_Color1u32(col); - } + for ( x = -tmpx ; x <= tmpx ; x+=wstep ) + { + GX_Position3f32( x, y, 0.0f ); + GX_Normal3f32( 0.0f, 0.0f, 1.0f); + GX_Color1u32(col); + GX_Position3f32( x, y+hstep, 0.0f ); + GX_Normal3f32( 0.0f, 0.0f, 1.0f); + GX_Color1u32(col); + } GX_End(); } } @@ -693,8 +695,8 @@ void GRRLIB_SetLightSpec(u8 num, guVector dir, f32 shy, u32 lightcolor, u32 spec GX_SetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_ENABLE, GX_TEVPREV ); GX_SetTevColorIn(GX_TEVSTAGE1, GX_CC_ZERO, GX_CC_RASC, GX_CC_ONE, GX_CC_CPREV ); - /////////////////////// Define Material and Ambiant color and draw object ///////////////////////////////////// - GX_SetChanAmbColor(GX_COLOR1, (GXColor){0x00,0x00,0x00,0xFF}); // specualr ambient forced to black + /////////////////////// Define Material and Ambient color and draw object ///////////////////////////////////// + GX_SetChanAmbColor(GX_COLOR1, (GXColor){0x00,0x00,0x00,0xFF}); // specular ambient forced to black GX_SetChanMatColor(GX_COLOR1, (GXColor) { R(speccolor), G(speccolor), B(speccolor), 0xFF }); // couleur du reflet specular } diff --git a/GRRLIB/GRRLIB/GRRLIB_snapshot.c b/GRRLIB/GRRLIB/GRRLIB_snapshot.c index 3b0501d..e6c41db 100644 --- a/GRRLIB/GRRLIB/GRRLIB_snapshot.c +++ b/GRRLIB/GRRLIB/GRRLIB_snapshot.c @@ -36,8 +36,9 @@ void GRRLIB_Screen2Texture (int posx, int posy, GRRLIB_texImg *tex, bool clear) GX_CopyTex(tex->data, GX_FALSE); GX_PixModeSync(); GRRLIB_FlushTex(tex); - if(clear) + if(clear) { GX_CopyDisp(xfb[!fb], GX_TRUE); + } } } diff --git a/GRRLIB/GRRLIB/grrlib.h b/GRRLIB/GRRLIB/grrlib.h index 6e9db04..ebf9164 100644 --- a/GRRLIB/GRRLIB/grrlib.h +++ b/GRRLIB/GRRLIB/grrlib.h @@ -60,10 +60,10 @@ typedef unsigned int uint;/**< The uint keyword signifies an integral type. */ //============================================================================== // Primitive colour macros //============================================================================== -#define R(c) (((c) >>24) &0xFF) /**< Extract Red component of colour. */ -#define G(c) (((c) >>16) &0xFF) /**< Extract Green component of colour. */ -#define B(c) (((c) >> 8) &0xFF) /**< Extract Blue component of colour. */ -#define A(c) ( (c) &0xFF) /**< Extract Alpha component of colour. */ +#define R(c) (((c) >>24) &0xFF) /**< Extract red component of colour. */ +#define G(c) (((c) >>16) &0xFF) /**< Extract green component of colour. */ +#define B(c) (((c) >> 8) &0xFF) /**< Extract blue component of colour. */ +#define A(c) ( (c) &0xFF) /**< Extract alpha component of colour. */ /** * Build an RGB pixel from components.