diff --git a/examples/3D_sample1/source/main.c b/examples/3D_sample1/source/main.c index 97a5ce9..53ac564 100644 --- a/examples/3D_sample1/source/main.c +++ b/examples/3D_sample1/source/main.c @@ -11,12 +11,12 @@ #include "gfx/font.h" int main() { -float a=0; -u32 col[3]; -col[0]=0xFFFFFFFF; -col[1]=0xAAAAAAFF; -col[2]=0x666666FF; -int cubeZ=0; + float a=0; + u32 col[3]; + col[0]=0xFFFFFFFF; + col[1]=0xAAAAAAFF; + col[2]=0x666666FF; + int cubeZ=0; GRRLIB_Init(); WPAD_Init(); @@ -30,70 +30,70 @@ int cubeZ=0; GRRLIB_camera3dSettings(0.0f,0.0f,13.0f, 0,1,0, 0,0,0); while(1) { - GRRLIB_2dMode(); + GRRLIB_2dMode(); WPAD_ScanPads(); if(WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) exit(0); if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_A) cubeZ++; if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_B) cubeZ--; - GRRLIB_3dMode(0.1,1000,45,0); - GRRLIB_objectView(0,0,cubeZ, a,a*2,a*3); - GX_Begin(GX_QUADS, GX_VTXFMT0, 24); - GX_Position3f32(-1.0f,1.0f,-1.0f); - GX_Color1u32(col[0]); - GX_Position3f32(-1.0f,-1.0f,-1.0f); - GX_Color1u32(col[0]); - GX_Position3f32(1.0f,-1.0f,-1.0f); - GX_Color1u32(col[0]); - GX_Position3f32(1.0f,1.0f,-1.0f); - GX_Color1u32(col[0]); + GRRLIB_3dMode(0.1,1000,45,0); + GRRLIB_objectView(0,0,cubeZ, a,a*2,a*3); + GX_Begin(GX_QUADS, GX_VTXFMT0, 24); + GX_Position3f32(-1.0f,1.0f,-1.0f); + GX_Color1u32(col[0]); + GX_Position3f32(-1.0f,-1.0f,-1.0f); + GX_Color1u32(col[0]); + GX_Position3f32(1.0f,-1.0f,-1.0f); + GX_Color1u32(col[0]); + GX_Position3f32(1.0f,1.0f,-1.0f); + GX_Color1u32(col[0]); - GX_Position3f32(-1.0f,1.0f,1.0f); - GX_Color1u32(col[0]); - GX_Position3f32(-1.0f,-1.0f,1.0f); - GX_Color1u32(col[0]); - GX_Position3f32(1.0f,-1.0f,1.0f); - GX_Color1u32(col[0]); - GX_Position3f32(1.0f,1.0f,1.0f); - GX_Color1u32(col[0]); + GX_Position3f32(-1.0f,1.0f,1.0f); + GX_Color1u32(col[0]); + GX_Position3f32(-1.0f,-1.0f,1.0f); + GX_Color1u32(col[0]); + GX_Position3f32(1.0f,-1.0f,1.0f); + GX_Color1u32(col[0]); + GX_Position3f32(1.0f,1.0f,1.0f); + GX_Color1u32(col[0]); - GX_Position3f32(-1.0f,1.0f,1.0f); - GX_Color1u32(col[1]); - GX_Position3f32(1.0f,1.0f,1.0f); - GX_Color1u32(col[1]); - GX_Position3f32(1.0f,1.0f,-1.0f); - GX_Color1u32(col[1]); - GX_Position3f32(-1.0f,1.0f,-1.0f); - GX_Color1u32(col[1]); + GX_Position3f32(-1.0f,1.0f,1.0f); + GX_Color1u32(col[1]); + GX_Position3f32(1.0f,1.0f,1.0f); + GX_Color1u32(col[1]); + GX_Position3f32(1.0f,1.0f,-1.0f); + GX_Color1u32(col[1]); + GX_Position3f32(-1.0f,1.0f,-1.0f); + GX_Color1u32(col[1]); - GX_Position3f32(-1.0f,-1.0f,1.0f); - GX_Color1u32(col[1]); - GX_Position3f32(1.0f,-1.0f,1.0f); - GX_Color1u32(col[1]); - GX_Position3f32(1.0f,-1.0f,-1.0f); - GX_Color1u32(col[1]); - GX_Position3f32(-1.0f,-1.0f,-1.0f); - GX_Color1u32(col[1]); + GX_Position3f32(-1.0f,-1.0f,1.0f); + GX_Color1u32(col[1]); + GX_Position3f32(1.0f,-1.0f,1.0f); + GX_Color1u32(col[1]); + GX_Position3f32(1.0f,-1.0f,-1.0f); + GX_Color1u32(col[1]); + GX_Position3f32(-1.0f,-1.0f,-1.0f); + GX_Color1u32(col[1]); - GX_Position3f32(-1.0f,1.0f,1.0f); - GX_Color1u32(col[2]); - GX_Position3f32(-1.0f,1.0f,-1.0f); - GX_Color1u32(col[2]); - GX_Position3f32(-1.0f,-1.0f,-1.0f); - GX_Color1u32(col[2]); - GX_Position3f32(-1.0f,-1.0f,1.0f); - GX_Color1u32(col[2]); + GX_Position3f32(-1.0f,1.0f,1.0f); + GX_Color1u32(col[2]); + GX_Position3f32(-1.0f,1.0f,-1.0f); + GX_Color1u32(col[2]); + GX_Position3f32(-1.0f,-1.0f,-1.0f); + GX_Color1u32(col[2]); + GX_Position3f32(-1.0f,-1.0f,1.0f); + GX_Color1u32(col[2]); - GX_Position3f32(1.0f,1.0f,1.0f); - GX_Color1u32(col[2]); - GX_Position3f32(1.0f,1.0f,-1.0f); - GX_Color1u32(col[2]); - GX_Position3f32(1.0f,-1.0f,-1.0f); - GX_Color1u32(col[2]); - GX_Position3f32(1.0f,-1.0f,1.0f); - GX_Color1u32(col[2]); + GX_Position3f32(1.0f,1.0f,1.0f); + GX_Color1u32(col[2]); + GX_Position3f32(1.0f,1.0f,-1.0f); + GX_Color1u32(col[2]); + GX_Position3f32(1.0f,-1.0f,-1.0f); + GX_Color1u32(col[2]); + GX_Position3f32(1.0f,-1.0f,1.0f); + GX_Color1u32(col[2]); GX_End(); - a+=0.5f; + a+=0.5f; // Switch To 2D Mode to display text GRRLIB_2dMode(); diff --git a/examples/3D_sample2/source/main.c b/examples/3D_sample2/source/main.c index 69c8c70..0fc9172 100644 --- a/examples/3D_sample2/source/main.c +++ b/examples/3D_sample2/source/main.c @@ -13,12 +13,12 @@ #include "gfx/girl.h" int main() { -float a=0; -u32 col[3]; -col[0]=0xFFFFFFFF; -col[1]=0xFFFFFFFF; -col[2]=0xFFFFFFFF; -int cubeZ=0; + float a=0; + u32 col[3]; + col[0]=0xFFFFFFFF; + col[1]=0xFFFFFFFF; + col[2]=0xFFFFFFFF; + int cubeZ=0; GRRLIB_Init(); WPAD_Init(); @@ -35,99 +35,99 @@ int cubeZ=0; GRRLIB_camera3dSettings(0.0f,0.0f,13.0f, 0,1,0, 0,0,0); while(1) { - GRRLIB_2dMode(); + GRRLIB_2dMode(); WPAD_ScanPads(); if(WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) exit(0); if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_A) cubeZ++; if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_B) cubeZ--; - GRRLIB_3dMode(0.1,1000,45,1); - GRRLIB_setTexture(tex_girl,0); - GRRLIB_objectView(0,0,cubeZ, a,a*2,a*3); - GX_Begin(GX_QUADS, GX_VTXFMT0, 24); - GX_Position3f32(-1.0f,1.0f,1.0f); - GX_Color1u32(col[0]); - GX_TexCoord2f32(0.0f,0.0f); - GX_Position3f32(1.0f,1.0f,1.0f); - GX_Color1u32(col[0]); - GX_TexCoord2f32(1.0f,0.0f); - GX_Position3f32(1.0f,-1.0f,1.0f); - GX_Color1u32(col[0]); - GX_TexCoord2f32(1.0f,1.0f); - GX_Position3f32(-1.0f,-1.0f,1.0f); - GX_Color1u32(col[0]); - GX_TexCoord2f32(0.0f,1.0f); + GRRLIB_3dMode(0.1,1000,45,1); + GRRLIB_setTexture(tex_girl,0); + GRRLIB_objectView(0,0,cubeZ, a,a*2,a*3); + GX_Begin(GX_QUADS, GX_VTXFMT0, 24); + GX_Position3f32(-1.0f,1.0f,1.0f); + GX_Color1u32(col[0]); + GX_TexCoord2f32(0.0f,0.0f); + GX_Position3f32(1.0f,1.0f,1.0f); + GX_Color1u32(col[0]); + GX_TexCoord2f32(1.0f,0.0f); + GX_Position3f32(1.0f,-1.0f,1.0f); + GX_Color1u32(col[0]); + GX_TexCoord2f32(1.0f,1.0f); + GX_Position3f32(-1.0f,-1.0f,1.0f); + GX_Color1u32(col[0]); + GX_TexCoord2f32(0.0f,1.0f); - GX_Position3f32(1.0f,1.0f,-1.0f); - GX_Color1u32(col[0]); - GX_TexCoord2f32(0.0f,0.0f); - GX_Position3f32(-1.0f,1.0f,-1.0f); - GX_Color1u32(col[0]); - GX_TexCoord2f32(1.0f,0.0f); - GX_Position3f32(-1.0f,-1.0f,-1.0f); - GX_Color1u32(col[0]); - GX_TexCoord2f32(1.0f,1.0f); - GX_Position3f32(1.0f,-1.0f,-1.0f); - GX_Color1u32(col[0]); - GX_TexCoord2f32(0.0f,1.0f); + GX_Position3f32(1.0f,1.0f,-1.0f); + GX_Color1u32(col[0]); + GX_TexCoord2f32(0.0f,0.0f); + GX_Position3f32(-1.0f,1.0f,-1.0f); + GX_Color1u32(col[0]); + GX_TexCoord2f32(1.0f,0.0f); + GX_Position3f32(-1.0f,-1.0f,-1.0f); + GX_Color1u32(col[0]); + GX_TexCoord2f32(1.0f,1.0f); + GX_Position3f32(1.0f,-1.0f,-1.0f); + GX_Color1u32(col[0]); + GX_TexCoord2f32(0.0f,1.0f); - GX_Position3f32(1.0f,1.0f,1.0f); - GX_Color1u32(col[1]); - GX_TexCoord2f32(0.0f,0.0f); - GX_Position3f32(1.0f,1.0f,-1.0f); - GX_Color1u32(col[1]); - GX_TexCoord2f32(1.0f,0.0f); - GX_Position3f32(1.0f,-1.0f,-1.0f); - GX_Color1u32(col[1]); - GX_TexCoord2f32(1.0f,1.0f); - GX_Position3f32(1.0f,-1.0f,1.0f); - GX_Color1u32(col[1]); - GX_TexCoord2f32(0.0f,1.0f); + GX_Position3f32(1.0f,1.0f,1.0f); + GX_Color1u32(col[1]); + GX_TexCoord2f32(0.0f,0.0f); + GX_Position3f32(1.0f,1.0f,-1.0f); + GX_Color1u32(col[1]); + GX_TexCoord2f32(1.0f,0.0f); + GX_Position3f32(1.0f,-1.0f,-1.0f); + GX_Color1u32(col[1]); + GX_TexCoord2f32(1.0f,1.0f); + GX_Position3f32(1.0f,-1.0f,1.0f); + GX_Color1u32(col[1]); + GX_TexCoord2f32(0.0f,1.0f); - GX_Position3f32(-1.0f,1.0f,-1.0f); - GX_Color1u32(col[1]); - GX_TexCoord2f32(0.0f,0.0f); - GX_Position3f32(-1.0f,1.0f,1.0f); - GX_Color1u32(col[1]); - GX_TexCoord2f32(1.0f,0.0f); - GX_Position3f32(-1.0f,-1.0f,1.0f); - GX_Color1u32(col[1]); - GX_TexCoord2f32(1.0f,1.0f); - GX_Position3f32(-1.0f,-1.0f,-1.0f); - GX_Color1u32(col[1]); - GX_TexCoord2f32(0.0f,1.0f); + GX_Position3f32(-1.0f,1.0f,-1.0f); + GX_Color1u32(col[1]); + GX_TexCoord2f32(0.0f,0.0f); + GX_Position3f32(-1.0f,1.0f,1.0f); + GX_Color1u32(col[1]); + GX_TexCoord2f32(1.0f,0.0f); + GX_Position3f32(-1.0f,-1.0f,1.0f); + GX_Color1u32(col[1]); + GX_TexCoord2f32(1.0f,1.0f); + GX_Position3f32(-1.0f,-1.0f,-1.0f); + GX_Color1u32(col[1]); + GX_TexCoord2f32(0.0f,1.0f); - GX_Position3f32(-1.0f,1.0f,-1.0f); - GX_Color1u32(col[2]); - GX_TexCoord2f32(0.0f,0.0f); - GX_Position3f32(1.0f,1.0f,-1.0f); - GX_Color1u32(col[2]); - GX_TexCoord2f32(1.0f,0.0f); - GX_Position3f32(1.0f,1.0f,1.0f); - GX_Color1u32(col[2]); - GX_TexCoord2f32(1.0f,1.0f); - GX_Position3f32(-1.0f,1.0f,1.0f); - GX_Color1u32(col[2]); - GX_TexCoord2f32(0.0f,1.0f); + GX_Position3f32(-1.0f,1.0f,-1.0f); + GX_Color1u32(col[2]); + GX_TexCoord2f32(0.0f,0.0f); + GX_Position3f32(1.0f,1.0f,-1.0f); + GX_Color1u32(col[2]); + GX_TexCoord2f32(1.0f,0.0f); + GX_Position3f32(1.0f,1.0f,1.0f); + GX_Color1u32(col[2]); + GX_TexCoord2f32(1.0f,1.0f); + GX_Position3f32(-1.0f,1.0f,1.0f); + GX_Color1u32(col[2]); + GX_TexCoord2f32(0.0f,1.0f); - GX_Position3f32(1.0f,-1.0f,-1.0f); - GX_Color1u32(col[2]); - GX_TexCoord2f32(0.0f,0.0f); - GX_Position3f32(-1.0f,-1.0f,-1.0f); - GX_Color1u32(col[2]); - GX_TexCoord2f32(1.0f,0.0f); - GX_Position3f32(-1.0f,-1.0f,1.0f); - GX_Color1u32(col[2]); - GX_TexCoord2f32(1.0f,1.0f); - GX_Position3f32(1.0f,-1.0f,1.0f); - GX_Color1u32(col[2]); - GX_TexCoord2f32(0.0f,1.0f); + GX_Position3f32(1.0f,-1.0f,-1.0f); + GX_Color1u32(col[2]); + GX_TexCoord2f32(0.0f,0.0f); + GX_Position3f32(-1.0f,-1.0f,-1.0f); + GX_Color1u32(col[2]); + GX_TexCoord2f32(1.0f,0.0f); + GX_Position3f32(-1.0f,-1.0f,1.0f); + GX_Color1u32(col[2]); + GX_TexCoord2f32(1.0f,1.0f); + GX_Position3f32(1.0f,-1.0f,1.0f); + GX_Color1u32(col[2]); + GX_TexCoord2f32(0.0f,1.0f); GX_End(); - a+=0.5f; + a+=0.5f; - // Switch To 2D Mode to display text - GRRLIB_2dMode(); - GRRLIB_Printf((640-(16*29))/2, 20, tex_font, 0xFFFFFFFF, 1, "PRESS A OR B TO ZOOM THE CUBE"); + // Switch To 2D Mode to display text + GRRLIB_2dMode(); + GRRLIB_Printf((640-(16*29))/2, 20, tex_font, 0xFFFFFFFF, 1, "PRESS A OR B TO ZOOM THE CUBE"); GRRLIB_Render(); } diff --git a/examples/compositing/source/main.c b/examples/compositing/source/main.c index e857c82..fb6e639 100644 --- a/examples/compositing/source/main.c +++ b/examples/compositing/source/main.c @@ -15,7 +15,7 @@ extern GXRModeObj *rmode; int main() { float rot=0; - float i=0; + float i; int circsize=150; GRRLIB_Init();