fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2024-12-25 19:39:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CHG] Fixed all compil error due to latest commit

Browse source
This commit is contained in:
N0NameN0 2010-01-05 22:04:33 +00:00
parent dd1aa7045f
commit 45a9b43afb
6 changed files with 15 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
examples/3D_CubedTileDemo/source/main.c
View file

@ -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();

4
examples/3D_sample1/source/main.c
View file

@ -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]);

29
examples/3D_sample2/source/main.c
View file

@ -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;

29
examples/3D_sample3/source/main.c
View file

@ -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);

10
examples/3D_sample4/source/main.c
View file

@ -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<logoNbFace*3; i+=3) {
if(i<=(246*3*2))
col=0xFFFFFFFF;
else
col=0xAAAAAAFF;
GX_Position3f32(logoPos[logoFac[i][0]-1].x,logoPos[logoFac[i][0]-1].y,logoPos[logoFac[i][0]-1].z);
GX_Color1u32(col);
GX_Position3f32(logoPos[logoFac[i+1][0]-1].x,logoPos[logoFac[i+1][0]-1].y,logoPos[logoFac[i+1][0]-1].z);
GX_Color1u32(col);
GX_Position3f32(logoPos[logoFac[i+2][0]-1].x,logoPos[logoFac[i+2][0]-1].y,logoPos[logoFac[i+2][0]-1].z);
GX_Color1u32(col);
}

29
examples/unlimited3d/source/main.c
View file

@ -32,7 +32,6 @@ int main() {
float spr=0;
int n=1;
float a=0;
u32 col[3] = {0xFFFFFFFF, 0xFFFFFFFF, 0xAAAAAAFF};
float cubeZ=10.0f;
float camZ=30.0f;;
@ -76,90 +75,66 @@ int main() {
GRRLIB_2dMode();
GRRLIB_DrawImg(0, 0, tex_screen[screen_index], 0, 1, 1, 0xFFFFFFFF);
GRRLIB_3dMode(0.1, 1000, 45, 1);
GRRLIB_3dMode(0.1, 1000, 45, 0,1,0);
GRRLIB_SetBlend(GRRLIB_BLEND_ALPHA);
cubeZ+=0.02f;
GRRLIB_ObjectView((float)(((R + r-ff)*cos(t-f) - d*cos(((R + r-f)/r)*t)))/20.0f,(float)(((R + r-ff)*sin(t) - d*sin(((R + r)/r)*t)-f))/20.0f,sin(cubeZ)*10, a,a*2,a*3);
GRRLIB_ObjectView((float)(((R + r-ff)*cos(t-f) - d*cos(((R + r-f)/r)*t)))/20.0f,(float)(((R + r-ff)*sin(t) - d*sin(((R + r)/r)*t)-f))/20.0f,sin(cubeZ)*10, a,a*2,a*3,1,1,1);
GRRLIB_SetTexture(tex_girl, 0);
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();