From 982f5bf140d74389ced2a0f7b51b6d44a2b775b8 Mon Sep 17 00:00:00 2001 From: csBlueChip Date: Sun, 23 Aug 2009 14:48:04 +0000 Subject: [PATCH] remove GRRLIB_addon from main GRRLIB directory to the nonameno03 example code ... some of the functionality of the the addon code is expected to be ported back to the GRRLIB main library --- GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.c | 133 ----------- GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.h | 33 --- GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.c | 32 --- GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.h | 14 -- GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.png | Bin 377 -> 0 bytes GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBfont.c | 231 -------------------- GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBfont.h | 14 -- GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBfont.png | Bin 3559 -> 0 bytes 8 files changed, 457 deletions(-) delete mode 100644 GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.c delete mode 100644 GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.h delete mode 100644 GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.c delete mode 100644 GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.h delete mode 100644 GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.png delete mode 100644 GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBfont.c delete mode 100644 GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBfont.h delete mode 100644 GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBfont.png diff --git a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.c b/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.c deleted file mode 100644 index 71960f1..0000000 --- a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.c +++ /dev/null @@ -1,133 +0,0 @@ -/*=========================================== - GRRLIB (GX version) 4.0.0 addon - Code : NoNameNo - Additional Code : Crayon & Xane - GX hints : RedShade -===========================================*/ - -#include -#include -#include -#include -#include -#include "../lib/libpng/pngu/pngu.h" -#include "GRRLIB.h" -#include - -#include "GRRLIB_addon/GRRLIBfont.h" -#include "GRRLIB_addon/GRRLIBbutton.h" - -extern u32 fb; -extern void *xfb[2]; -extern GXRModeObj *rmode; - -GRRLIB_texImg *tex_GRRLIBfont; -GRRLIB_texImg *tex_GRRLIBbutton; - -/** - * Initalize all addon requirement - */ -void GRRLIB_addon_Init(){ - tex_GRRLIBfont = GRRLIB_LoadTexture(GRRLIBfont); - GRRLIB_InitTileSet(tex_GRRLIBfont, 16, 19, 32); - - tex_GRRLIBbutton = GRRLIB_LoadTexture(GRRLIBbutton); - GRRLIB_InitTileSet(tex_GRRLIBbutton, 4, 24, 0); -} - -/** - * Free all addon requirement - */ -void GRRLIB_addon_Exit(){ - GRRLIB_FreeTexture(tex_GRRLIBfont); - GRRLIB_FreeTexture(tex_GRRLIBbutton); -} - -/** - * Load a texture from a file. - * @param filename The JPEG or PNG filename to load. - * @return A GRRLIB_texImg structure filled with image informations. - */ -GRRLIB_texImg *GRRLIB_LoadTextureFromFile(const char *filename) { - fatInitDefault(); - FILE *fd = fopen(filename, "rb"); - - fseek(fd, 0, SEEK_END); - long lsize = ftell(fd); - rewind(fd); - - unsigned char *buffer = (unsigned char*) malloc (sizeof(unsigned char)*lsize); - fread (buffer, 1, lsize, fd); - GRRLIB_texImg *tex = GRRLIB_LoadTexture(buffer); - free(buffer); - - fclose(fd); - return tex; -} - -/** - * Make a PNG screenshot on the SD card. - * libfat is required to use the function. - * @param File name of the file to write. - * @return true if every thing worked, false otherwise. - */ -bool GRRLIB_ScrShot(const char* File) { - int ErrorCode = -1; - IMGCTX pngContext; - - if(fatInitDefault() && (pngContext = PNGU_SelectImageFromDevice(File))) { - ErrorCode = PNGU_EncodeFromYCbYCr(pngContext, rmode->fbWidth, rmode->efbHeight, xfb[fb], 0); - PNGU_ReleaseImageContext(pngContext); - } - return !ErrorCode; -} - -/** - * Easy Button Maker. - * @param indice Index number of your button. - * @param x top-left corner X position of the button. - * @param y top-left corner Y position of the button. - * @param col color of your button. - * @param wpadx your X wpad posistion. - * @param wpady your Y wpad posistion. - * @param WPADDown your wpad button Down Status. - * @param WPADHeld your wpad button Held Status. - * @param but The wpad button you want to check. - * @param resdown You will find here the downed button index number. - * @param resheld You will find here the helded button index number. - * @param toto Text on the button. - */ -void GRRLIB_addon_Button(int indice, int x,int y,u32 col, int wpadx, int wpady, u32 WPADDown, u32 WPADHeld, int but, int *resdown, int *resheld, char toto[]){ - int butwidth=strlen(toto)*16+8; - Vector bg[]={{x+4,y,0},{x+4+strlen(toto)*16,y,0},{x+4+strlen(toto)*16,y+24,0},{x+4,y+24,0}}; - if((toto[0]=='^') && ((toto[1]=='U') || (toto[1]=='D') || (toto[1]=='L') || (toto[1]=='R'))){ - butwidth=1*16+8; - bg[1].x=x+4+1*16; - bg[2].x=x+4+1*16; - } - - GRRLIB_DrawTile(x,y, tex_GRRLIBbutton , 0, 1, 1, col,0 ); - GRRLIB_DrawTileQuad(bg, tex_GRRLIBbutton, col,1 ); - GRRLIB_DrawTile(bg[1].x,y, tex_GRRLIBbutton , 0, 1, 1, col,2); - - if(GRRLIB_PtInRect(x, y, butwidth, 24, wpadx, wpady)) { - if((toto[0]=='^') && (toto[1]=='U')) GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFFFF, 1, "%c", 0xa1); - else if((toto[0]=='^') && (toto[1]=='D')) GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFFFF, 1, "%c", 0xa2); - else if((toto[0]=='^') && (toto[1]=='L')) GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFFFF, 1, "%c", 0xa3); - else if((toto[0]=='^') && (toto[1]=='R')) GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFFFF, 1, "%c", 0xa4); - else GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFFFF, 1, toto); - if(WPADDown & but) { - *resdown=indice; - } - if(WPADHeld & but) { - *resheld=indice; - } - } - else{ - if((toto[0]=='^') && (toto[1]=='U')) GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFF77, 1, "%c", 0xa1); - else if((toto[0]=='^') && (toto[1]=='D')) GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFF77, 1, "%c", 0xa2); - else if((toto[0]=='^') && (toto[1]=='L')) GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFF77, 1, "%c", 0xa3); - else if((toto[0]=='^') && (toto[1]=='R')) GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFF77, 1, "%c", 0xa4); - else GRRLIB_Printf(x+4, y+2, tex_GRRLIBfont, 0xFFFFFF77, 1, toto); - } -} diff --git a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.h b/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.h deleted file mode 100644 index a832d09..0000000 --- a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIB_addon.h +++ /dev/null @@ -1,33 +0,0 @@ -/*=========================================== - GRRLIB (GX version) 4.0.0 addon - Code : NoNameNo - Additional Code : Crayon & Xane - GX hints : RedShade -===========================================*/ - -#ifndef __GRRLIB_ADDON__ -#define __GRRLIB_ADDON__ - -/** - * @file GRRLIBaddon.h - * GRRLIB library. - */ - - -#ifdef __cplusplus - extern "C" { -#endif /* __cplusplus */ - -void GRRLIB_addon_Init(); -void GRRLIB_addon_Exit(); -GRRLIB_texImg *GRRLIB_LoadTextureFromFile(const char *filename); -bool GRRLIB_ScrShot(const char*); -void GRRLIB_addon_Button(int indice, int x,int y,u32 col, int wpadx, int wpady, u32 WPADDown, u32 WPADHeld, int but, int *resdown, int *resheld, char toto[]); - - -#ifdef __cplusplus - } -#endif /* __cplusplus */ - -#endif - diff --git a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.c b/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.c deleted file mode 100644 index 2593403..0000000 --- a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - This file was autogenerated by raw2c. -Visit http://www.devkitpro.org -*/ - -const unsigned char GRRLIBbutton[] = { - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xce, 0x32, 0x1c, - 0x6a, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, - 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0, 0xbd, 0xa7, 0x93, - 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, - 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xd9, 0x03, - 0x13, 0x02, 0x17, 0x23, 0x58, 0x89, 0x44, 0x6c, 0x00, 0x00, 0x00, 0xf9, 0x49, 0x44, 0x41, 0x54, - 0x38, 0xcb, 0xed, 0x93, 0xcd, 0x8d, 0xc5, 0x20, 0x0c, 0x84, 0x07, 0x30, 0x01, 0x29, 0x8d, 0xa4, - 0xac, 0x94, 0x96, 0x0a, 0x52, 0x4f, 0x0a, 0x48, 0x0b, 0xf9, 0x01, 0x0c, 0xde, 0x43, 0x44, 0xf4, - 0x0e, 0x79, 0x64, 0xf7, 0xbe, 0x96, 0x10, 0x17, 0x7f, 0xf2, 0x8c, 0x19, 0x14, 0x00, 0x2c, 0xcb, - 0x22, 0x22, 0x02, 0x11, 0xc1, 0x53, 0x29, 0xa5, 0xa0, 0x94, 0xc2, 0x30, 0x0c, 0x4a, 0xcd, 0xf3, - 0x2c, 0x31, 0x46, 0xe4, 0x9c, 0x91, 0x73, 0x7e, 0x04, 0x8c, 0x31, 0x30, 0xc6, 0xa0, 0xeb, 0x3a, - 0xd0, 0xbe, 0xef, 0x08, 0x21, 0x80, 0x99, 0x9b, 0x00, 0x11, 0x81, 0x99, 0x41, 0xc7, 0x71, 0xe0, - 0x3c, 0x4f, 0xa4, 0x94, 0x9a, 0x80, 0xb5, 0x16, 0xa5, 0x14, 0x50, 0x8c, 0x11, 0x21, 0x84, 0x57, - 0xa0, 0x94, 0x02, 0xad, 0xf5, 0x05, 0xc4, 0x18, 0x5f, 0x01, 0x11, 0xb9, 0xa4, 0xa5, 0x94, 0x50, - 0x0f, 0x33, 0x3f, 0x02, 0x44, 0x74, 0xdf, 0x14, 0x42, 0x40, 0x9d, 0xf2, 0x0d, 0xc8, 0x39, 0x43, - 0x44, 0x2e, 0x49, 0xcc, 0x8c, 0xea, 0xa3, 0x94, 0xf2, 0x15, 0xb8, 0x27, 0x7c, 0xca, 0x69, 0x79, - 0xd0, 0x5a, 0x23, 0xa5, 0x74, 0x01, 0xcc, 0xfc, 0xea, 0xe1, 0x06, 0x6a, 0x73, 0x6b, 0x4b, 0x55, - 0xbf, 0xb5, 0x16, 0xb4, 0xae, 0x2b, 0xb6, 0x6d, 0xc3, 0x79, 0x9e, 0xcd, 0x09, 0xde, 0x7b, 0xf4, - 0x7d, 0x0f, 0x8d, 0x3f, 0xd6, 0x3f, 0xf0, 0x2b, 0xa0, 0xfe, 0xd7, 0xb7, 0xaa, 0x7d, 0x54, 0x73, - 0x52, 0x23, 0xdc, 0x8a, 0x86, 0x31, 0x06, 0xe4, 0x9c, 0xbb, 0x5f, 0xd8, 0x5a, 0xfb, 0x2c, 0x43, - 0x6b, 0x78, 0xef, 0xe1, 0x9c, 0x83, 0x02, 0x80, 0x71, 0x1c, 0x25, 0x84, 0xd0, 0x4c, 0xab, 0x73, - 0x0e, 0xd3, 0x34, 0xa9, 0x1f, 0x23, 0x30, 0xc3, 0x86, 0xb8, 0x36, 0x6a, 0xe5, 0x00, 0x00, 0x00, - 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 -}; -const int GRRLIBbutton_size = sizeof(GRRLIBbutton); diff --git a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.h b/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.h deleted file mode 100644 index 099faa3..0000000 --- a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - This file was autogenerated by raw2c. -Visit http://www.devkitpro.org -*/ - -//--------------------------------------------------------------------------------- -#ifndef _GRRLIBbutton_h_ -#define _GRRLIBbutton_h_ -//--------------------------------------------------------------------------------- -extern const unsigned char GRRLIBbutton[]; -extern const int GRRLIBbutton_size; -//--------------------------------------------------------------------------------- -#endif //_GRRLIBbutton_h_ -//--------------------------------------------------------------------------------- diff --git a/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.png b/GRRLIB/GRRLIB/GRRLIB_addon/GRRLIBbutton.png deleted file mode 100644 index 2a5f48ce62264a4643d33fb3fe3e525fffc594a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 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