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

[CHG] Cleanup (part 2)

Browse source
This commit is contained in:
Crayon2000 2009-12-07 02:15:48 +00:00
parent 73e5367e4b
commit b00ef0f50f
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
GRRLIB/GRRLIB/GRRLIB_3D.c
View file

@ -1,7 +1,7 @@
#include <grrlib.h> #include <grrlib.h>
/** /**
* Set the BackGround Parameter when screen is cleared. * Set the background parameter when screen is cleared.
* @param r Red component. * @param r Red component.
* @param g Green component. * @param g Green component.
* @param b Blue component. * @param b Blue component.
@ -48,12 +48,12 @@ void GRRLIB_camera3dSettings(f32 posx, f32 posy, f32 posz,
/** /**
* Set up the position matrix (contributed my chris_c aka DaShAmAn). * Set up the position matrix (contributed my chris_c aka DaShAmAn).
* @param miniDist Minimal distance for the cam. * @param minDist Minimal distance for the cam.
* @param maxDist Maximal distance for the cam. * @param maxDist Maximal distance for the cam.
* @param fov Field of view for the cam. * @param fov Field of view for the cam.
* @param texturemode False, GX won't need TexCoord, True, GX will need TexCoord. * @param texturemode False, GX won't need TexCoord, True, GX will need TexCoord.
*/ */
void GRRLIB_3dMode(f32 minDist,f32 maxDist,f32 fov, bool texturemode) { void GRRLIB_3dMode(f32 minDist, f32 maxDist, f32 fov, bool texturemode) {
Mtx m; Mtx m;
guLookAt(_GRR_view, &_GRR_cam, &_GRR_up, &_GRR_look); guLookAt(_GRR_view, &_GRR_cam, &_GRR_up, &_GRR_look);
@ -92,7 +92,7 @@ void GRRLIB_2dMode() {
GX_LoadProjectionMtx(m, GX_ORTHOGRAPHIC); GX_LoadProjectionMtx(m, GX_ORTHOGRAPHIC);
guMtxIdentity(view); guMtxIdentity(view);
guMtxTransApply(view,view, 0,0, -100.0F); guMtxTransApply(view,view, 0, 0, -100.0F);
GX_LoadPosMtxImm(view, GX_PNMTX0); GX_LoadPosMtxImm(view, GX_PNMTX0);
GX_ClearVtxDesc(); GX_ClearVtxDesc();

19
GRRLIB/GRRLIB/GRRLIB_gecko.c
View file

@ -4,11 +4,12 @@
bool geckoinit = false; bool geckoinit = false;
bool GRRLIB_GeckoInit() /**
{ * Initialize Gecko.
*/
bool GRRLIB_GeckoInit() {
u32 geckoattached = usb_isgeckoalive(EXI_CHANNEL_1); u32 geckoattached = usb_isgeckoalive(EXI_CHANNEL_1);
if (geckoattached) if (geckoattached) {
{
usb_flush(EXI_CHANNEL_1); usb_flush(EXI_CHANNEL_1);
geckoinit = true; geckoinit = true;
return true; return true;
@ -16,17 +17,21 @@ bool GRRLIB_GeckoInit()
else return false; else return false;
} }
/**
* Print Gecko.
* @param text Text to print.
* @param ... Optional arguments.
*/
void GRRLIB_GeckoPrintf (const char *text, ...) { void GRRLIB_GeckoPrintf (const char *text, ...) {
int size; int size;
char tmp[1024]; char tmp[1024];
if (!(geckoinit))return; if (!(geckoinit)) return;
va_list argp; va_list argp;
va_start(argp, text); va_start(argp, text);
size = vsprintf(tmp, text, argp); size = vsprintf(tmp, text, argp);
va_end(argp); va_end(argp);
usb_sendbuffer_safe(1,tmp,size); usb_sendbuffer_safe(1, tmp,size);
} }

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

@ -30,7 +30,7 @@ int main() {
GRRLIB_camera3dSettings(0.0f,0.0f,13.0f, 0,1,0, 0,0,0); GRRLIB_camera3dSettings(0.0f,0.0f,13.0f, 0,1,0, 0,0,0);
while(1) { while(1) {
GRRLIB_2dMode(); GRRLIB_2dMode();
WPAD_ScanPads(); WPAD_ScanPads();
if(WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) exit(0); if(WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) exit(0);
if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_A) cubeZ++; if(WPAD_ButtonsHeld(0) & WPAD_BUTTON_A) cubeZ++;