diff --git a/examples/3D_CubedTileDemo/source/main.c b/examples/3D_CubedTileDemo/source/main.c index 565b17f..7353c83 100644 --- a/examples/3D_CubedTileDemo/source/main.c +++ b/examples/3D_CubedTileDemo/source/main.c @@ -139,7 +139,6 @@ int main() { float sinnonameno=0, oldsinnonameno=0; float camZ=1400.0f; float a=0; - u32 col[3] = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}; GRRLIB_Init(); GRRLIB_Settings.antialias = false; @@ -277,60 +276,44 @@ int main() { GRRLIB_Camera3dSettings(0.0f,0.0f,camZ, 0,1,0, 0,0,0); - GRRLIB_3dMode(0.1,3000,45,1); + GRRLIB_3dMode(0.1,3000,45,0,1,0); GRRLIB_SetTexture(tex_screen,0); - GRRLIB_ObjectView(0,0,0, a,a*2,a*3); + GRRLIB_ObjectView(0,0,0, a,a*2,a*3,1,1,1); GX_Begin(GX_QUADS, GX_VTXFMT0, 16); GX_Position3f32(-rmode->fbWidth/2,rmode->efbHeight/2,rmode->fbWidth/2); - GX_Color1u32(col[0]); GX_TexCoord2f32(0.0f,0.0f); GX_Position3f32(rmode->fbWidth/2,rmode->efbHeight/2,rmode->fbWidth/2); - GX_Color1u32(col[0]); GX_TexCoord2f32(1.0f,0.0f); GX_Position3f32(rmode->fbWidth/2,-rmode->efbHeight/2,rmode->fbWidth/2); - GX_Color1u32(col[0]); GX_TexCoord2f32(1.0f,1.0f); GX_Position3f32(-rmode->fbWidth/2,-rmode->efbHeight/2,rmode->fbWidth/2); - GX_Color1u32(col[0]); GX_TexCoord2f32(0.0f,1.0f); GX_Position3f32(rmode->fbWidth/2,rmode->efbHeight/2,-rmode->fbWidth/2); - GX_Color1u32(col[0]); GX_TexCoord2f32(0.0f,0.0f); GX_Position3f32(-rmode->fbWidth/2,rmode->efbHeight/2,-rmode->fbWidth/2); - GX_Color1u32(col[0]); GX_TexCoord2f32(1.0f,0.0f); GX_Position3f32(-rmode->fbWidth/2,-rmode->efbHeight/2,-rmode->fbWidth/2); - GX_Color1u32(col[0]); GX_TexCoord2f32(1.0f,1.0f); GX_Position3f32(rmode->fbWidth/2,-rmode->efbHeight/2,-rmode->fbWidth/2); - GX_Color1u32(col[0]); GX_TexCoord2f32(0.0f,1.0f); GX_Position3f32(rmode->fbWidth/2,rmode->efbHeight/2,rmode->fbWidth/2); - GX_Color1u32(col[1]); GX_TexCoord2f32(0.0f,0.0f); GX_Position3f32(rmode->fbWidth/2,rmode->efbHeight/2,-rmode->fbWidth/2); - GX_Color1u32(col[1]); GX_TexCoord2f32(1.0f,0.0f); GX_Position3f32(rmode->fbWidth/2,-rmode->efbHeight/2,-rmode->fbWidth/2); - GX_Color1u32(col[1]); GX_TexCoord2f32(1.0f,1.0f); GX_Position3f32(rmode->fbWidth/2,-rmode->efbHeight/2,rmode->fbWidth/2); - GX_Color1u32(col[1]); GX_TexCoord2f32(0.0f,1.0f); GX_Position3f32(-rmode->fbWidth/2,rmode->efbHeight/2,-rmode->fbWidth/2); - GX_Color1u32(col[1]); GX_TexCoord2f32(0.0f,0.0f); GX_Position3f32(-rmode->fbWidth/2,rmode->efbHeight/2,rmode->fbWidth/2); - GX_Color1u32(col[1]); GX_TexCoord2f32(1.0f,0.0f); GX_Position3f32(-rmode->fbWidth/2,-rmode->efbHeight/2,rmode->fbWidth/2); - GX_Color1u32(col[1]); GX_TexCoord2f32(1.0f,1.0f); GX_Position3f32(-rmode->fbWidth/2,-rmode->efbHeight/2,-rmode->fbWidth/2); - GX_Color1u32(col[1]); GX_TexCoord2f32(0.0f,1.0f); GX_End(); diff --git a/examples/3D_sample1/source/main.c b/examples/3D_sample1/source/main.c index 662d717..527123a 100644 --- a/examples/3D_sample1/source/main.c +++ b/examples/3D_sample1/source/main.c @@ -34,8 +34,8 @@ int main() { 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); + GRRLIB_3dMode(0.1,1000,45,1,0,0); + GRRLIB_ObjectView(0,0,cubeZ, a,a*2,a*3,1,1,1); GX_Begin(GX_QUADS, GX_VTXFMT0, 24); GX_Position3f32(-1.0f,1.0f,-1.0f); GX_Color1u32(col[0]); diff --git a/examples/3D_sample2/source/main.c b/examples/3D_sample2/source/main.c index 8910fcf..0261d1a 100644 --- a/examples/3D_sample2/source/main.c +++ b/examples/3D_sample2/source/main.c @@ -15,7 +15,6 @@ int main() { float a=0; - u32 col[3] = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}; int cubeZ=0; GRRLIB_Init(); @@ -39,86 +38,62 @@ int main() { if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_A) cubeZ++; if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_B) cubeZ--; - GRRLIB_3dMode(0.1,1000,45,1); + GRRLIB_3dMode(0.1,1000,45,0,1,0); GRRLIB_SetTexture(tex_girl,0); - GRRLIB_ObjectView(0,0,cubeZ, a,a*2,a*3); + GRRLIB_ObjectView(0,0,cubeZ, a,a*2,a*3,1,1,1); 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[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_End(); a+=0.5f; diff --git a/examples/3D_sample3/source/main.c b/examples/3D_sample3/source/main.c index f8d6d65..c2fbcaf 100644 --- a/examples/3D_sample3/source/main.c +++ b/examples/3D_sample3/source/main.c @@ -18,7 +18,6 @@ extern GXRModeObj *rmode; int main() { float a=0; - u32 col[3] = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}; int cubeZ=5; int i=0; float sinx=0, oldsinx=0; @@ -47,86 +46,62 @@ int main() { if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_A) cubeZ++; if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_B) cubeZ--; - GRRLIB_3dMode(0.1,1000,45,1); + GRRLIB_3dMode(0.1,1000,45,0,1,0); GRRLIB_SetTexture(tex_girl,0); - GRRLIB_ObjectView(0,0,cubeZ, a,a*2,a*3); + GRRLIB_ObjectView(0,0,cubeZ, a,a*2,a*3,1,1,1); 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[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_End(); GRRLIB_Screen2Texture(0,0,tex_screen,1); diff --git a/examples/3D_sample4/source/main.c b/examples/3D_sample4/source/main.c index 94e57d8..6945c12 100644 --- a/examples/3D_sample4/source/main.c +++ b/examples/3D_sample4/source/main.c @@ -32,21 +32,21 @@ int main() { if(WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) exit(0); - GRRLIB_3dMode(0.1,1000,45,0); - GRRLIB_ObjectView(0,0,-30, a,a*2,a*3); + GRRLIB_3dMode(0.1,1000,45,1,0,0); + GRRLIB_ObjectView(0,0,-30, a,a*2,a*3,1,1,1); GX_Begin(GX_TRIANGLES, GX_VTXFMT0, logoNbFace * 3); for(i=0; i