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

[CHG] Use M_PI instead of custom macro for PI in two examples

Browse source
This commit is contained in:
Crayon2000 2010-10-05 03:02:38 +00:00
parent 675bdbab96
commit 6f00bceb2f
2 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/unlimited2d/source/main.c
View file

@ -14,8 +14,6 @@
#include "gfx/font.h" #include "gfx/font.h"
#include "gfx/ball.h" #include "gfx/ball.h"
#define PI 3.14159265358979323846F
extern GXRModeObj *rmode; extern GXRModeObj *rmode;
int main() { int main() {
@ -77,12 +75,12 @@ int main() {
spr+=0.1f; spr+=0.1f;
t+=0.01f; t+=0.01f;
if(t>n*2*PI) { if(t>n*2*M_PI) {
n++; n++;
f+=0.01f; f+=0.01f;
} }
if(f>2*PI) { if(f>2*M_PI) {
f=0; f=0;
ff+=0.02f; ff+=0.02f;
} }

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

@ -14,8 +14,6 @@
#include "gfx/logo.h" #include "gfx/logo.h"
#include "gfx/font.h" #include "gfx/font.h"
#define PI 3.14159265358979323846F
extern GXRModeObj *rmode; extern GXRModeObj *rmode;
@ -84,81 +82,81 @@ int main() {
GRRLIB_SetTexture(tex_girl, 0); GRRLIB_SetTexture(tex_girl, 0);
GX_Begin(GX_QUADS, GX_VTXFMT0, 24); GX_Begin(GX_QUADS, GX_VTXFMT0, 24);
GX_Position3f32(-1.0f,1.0f,1.0f); GX_Position3f32(-1.0f,1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,0.0f); GX_TexCoord2f32(0.0f,0.0f);
GX_Position3f32(1.0f,1.0f,1.0f); GX_Position3f32(1.0f,1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,0.0f); GX_TexCoord2f32(1.0f,0.0f);
GX_Position3f32(1.0f,-1.0f,1.0f); GX_Position3f32(1.0f,-1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,1.0f); GX_TexCoord2f32(1.0f,1.0f);
GX_Position3f32(-1.0f,-1.0f,1.0f); GX_Position3f32(-1.0f,-1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,1.0f); GX_TexCoord2f32(0.0f,1.0f);
GX_Position3f32(1.0f,1.0f,-1.0f); GX_Position3f32(1.0f,1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,0.0f); GX_TexCoord2f32(0.0f,0.0f);
GX_Position3f32(-1.0f,1.0f,-1.0f); GX_Position3f32(-1.0f,1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,0.0f); GX_TexCoord2f32(1.0f,0.0f);
GX_Position3f32(-1.0f,-1.0f,-1.0f); GX_Position3f32(-1.0f,-1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,1.0f); GX_TexCoord2f32(1.0f,1.0f);
GX_Position3f32(1.0f,-1.0f,-1.0f); GX_Position3f32(1.0f,-1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,1.0f); GX_TexCoord2f32(0.0f,1.0f);
GX_Position3f32(1.0f,1.0f,1.0f); GX_Position3f32(1.0f,1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,0.0f); GX_TexCoord2f32(0.0f,0.0f);
GX_Position3f32(1.0f,1.0f,-1.0f); GX_Position3f32(1.0f,1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,0.0f); GX_TexCoord2f32(1.0f,0.0f);
GX_Position3f32(1.0f,-1.0f,-1.0f); GX_Position3f32(1.0f,-1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,1.0f); GX_TexCoord2f32(1.0f,1.0f);
GX_Position3f32(1.0f,-1.0f,1.0f); GX_Position3f32(1.0f,-1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,1.0f); GX_TexCoord2f32(0.0f,1.0f);
GX_Position3f32(-1.0f,1.0f,-1.0f); GX_Position3f32(-1.0f,1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,0.0f); GX_TexCoord2f32(0.0f,0.0f);
GX_Position3f32(-1.0f,1.0f,1.0f); GX_Position3f32(-1.0f,1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,0.0f); GX_TexCoord2f32(1.0f,0.0f);
GX_Position3f32(-1.0f,-1.0f,1.0f); GX_Position3f32(-1.0f,-1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,1.0f); GX_TexCoord2f32(1.0f,1.0f);
GX_Position3f32(-1.0f,-1.0f,-1.0f); GX_Position3f32(-1.0f,-1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,1.0f); GX_TexCoord2f32(0.0f,1.0f);
GX_Position3f32(-1.0f,1.0f,-1.0f); GX_Position3f32(-1.0f,1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,0.0f); GX_TexCoord2f32(0.0f,0.0f);
GX_Position3f32(1.0f,1.0f,-1.0f); GX_Position3f32(1.0f,1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,0.0f); GX_TexCoord2f32(1.0f,0.0f);
GX_Position3f32(1.0f,1.0f,1.0f); GX_Position3f32(1.0f,1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,1.0f); GX_TexCoord2f32(1.0f,1.0f);
GX_Position3f32(-1.0f,1.0f,1.0f); GX_Position3f32(-1.0f,1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,1.0f); GX_TexCoord2f32(0.0f,1.0f);
GX_Position3f32(1.0f,-1.0f,-1.0f); GX_Position3f32(1.0f,-1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,0.0f); GX_TexCoord2f32(0.0f,0.0f);
GX_Position3f32(-1.0f,-1.0f,-1.0f); GX_Position3f32(-1.0f,-1.0f,-1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,0.0f); GX_TexCoord2f32(1.0f,0.0f);
GX_Position3f32(-1.0f,-1.0f,1.0f); GX_Position3f32(-1.0f,-1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(1.0f,1.0f); GX_TexCoord2f32(1.0f,1.0f);
GX_Position3f32(1.0f,-1.0f,1.0f); GX_Position3f32(1.0f,-1.0f,1.0f);
GX_Color1u32(0xFFFFFFFF); GX_Color1u32(0xFFFFFFFF);
GX_TexCoord2f32(0.0f,1.0f); GX_TexCoord2f32(0.0f,1.0f);
GX_End(); GX_End();
@ -175,12 +173,12 @@ int main() {
spr+=0.1f; spr+=0.1f;
t+=0.01f; t+=0.01f;
if(t>n*2*PI) { if(t>n*2*M_PI) {
n++; n++;
f+=0.01f; f+=0.01f;
} }
if(f>2*PI) { if(f>2*M_PI) {
f=0; f=0;
ff+=0.02f; ff+=0.02f;
} }