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] Now checks if the struct is valid / not NULL before drawing it.

Browse source
This commit is contained in:
Xane 2009-03-10 01:46:00 +00:00
parent 6197d0e717
commit 9608deb240
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
GRRLIB/GRRLIB/GRRLIB.c
View file

@ -1,9 +1,10 @@
/*=========================================== /*===========================================
GRRLIB (GX version) 4.0.0 GRRLIB (GX version) 4.0.0
Code : NoNameNo Code : NoNameNo
Additional Code : Crayon Additional Code : Crayon & Xane
GX hints : RedShade GX hints : RedShade
===========================================*/ ===========================================*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <malloc.h> #include <malloc.h>
@ -18,6 +19,7 @@
#define DEFAULT_FIFO_SIZE (256 * 1024) /**< GX fifo buffer size. */ #define DEFAULT_FIFO_SIZE (256 * 1024) /**< GX fifo buffer size. */
u32 fb = 0; u32 fb = 0;
static void *xfb[2] = {NULL, NULL}; static void *xfb[2] = {NULL, NULL};
GXRModeObj *rmode; GXRModeObj *rmode;
@ -544,7 +546,9 @@ GRRLIB_texImg *GRRLIB_CreateEmptyTexture(unsigned int w, unsigned int h) {
* @param color Color in RGBA format. * @param color Color in RGBA format.
*/ */
inline void GRRLIB_DrawImg(f32 xpos, f32 ypos, struct GRRLIB_texImg *tex, float degrees, float scaleX, f32 scaleY, u32 color) { inline void GRRLIB_DrawImg(f32 xpos, f32 ypos, struct GRRLIB_texImg *tex, float degrees, float scaleX, f32 scaleY, u32 color) {
if (!tex->data) { return; } if (tex == NULL) { return; }
if (tex->data == NULL) { return; }
GXTexObj texObj; GXTexObj texObj;
u16 width, height; u16 width, height;
Mtx m, m1, m2, mv; Mtx m, m1, m2, mv;
@ -599,6 +603,9 @@ inline void GRRLIB_DrawImg(f32 xpos, f32 ypos, struct GRRLIB_texImg *tex, float
* @param color Color in RGBA format. * @param color Color in RGBA format.
*/ */
inline void GRRLIB_DrawImgQuad(Vector pos[4], struct GRRLIB_texImg *tex, u32 color) { inline void GRRLIB_DrawImgQuad(Vector pos[4], struct GRRLIB_texImg *tex, u32 color) {
if (tex == NULL) { return; }
if (tex->data == NULL) { return; }
GXTexObj texObj; GXTexObj texObj;
Mtx m, m1, m2, mv; Mtx m, m1, m2, mv;
@ -655,6 +662,10 @@ inline void GRRLIB_DrawImgQuad(Vector pos[4], struct GRRLIB_texImg *tex, u32 col
* @param frame Specifies the frame to draw. * @param frame Specifies the frame to draw.
*/ */
inline void GRRLIB_DrawTile(f32 xpos, f32 ypos, struct GRRLIB_texImg *tex, float degrees, float scaleX, f32 scaleY, u32 color, int frame) { inline void GRRLIB_DrawTile(f32 xpos, f32 ypos, struct GRRLIB_texImg *tex, float degrees, float scaleX, f32 scaleY, u32 color, int frame) {
if (tex == NULL) { return; }
if (tex->data == NULL) { return; }
if (tex->frame > (tex->nbtilew+tex->nbtileh)) { return; }
GXTexObj texObj; GXTexObj texObj;
f32 width, height; f32 width, height;
Mtx m, m1, m2, mv; Mtx m, m1, m2, mv;
@ -721,6 +732,9 @@ inline void GRRLIB_DrawTile(f32 xpos, f32 ypos, struct GRRLIB_texImg *tex, float
* @param ... Optional arguments. * @param ... Optional arguments.
*/ */
void GRRLIB_Printf(f32 xpos, f32 ypos, struct GRRLIB_texImg *tex, u32 color, f32 zoom, const char *text, ...) { void GRRLIB_Printf(f32 xpos, f32 ypos, struct GRRLIB_texImg *tex, u32 color, f32 zoom, const char *text, ...) {
if (tex == NULL) { return; }
if (tex->data == NULL) { return; }
int i, size; int i, size;
char tmp[1024]; char tmp[1024];
@ -811,7 +825,7 @@ void GRRLIB_ClipReset() {
* @param x The x-coordinate of the handle. * @param x The x-coordinate of the handle.
* @param y The y-coordinate of the handle. * @param y The y-coordinate of the handle.
*/ */
void GRRLIB_SetHandle( struct GRRLIB_texImg * tex, int x, int y ) { void GRRLIB_SetHandle( struct GRRLIB_texImg *tex, int x, int y ) {
if (tex->tiledtex) { if (tex->tiledtex) {
tex->handlex = -(((int)tex->tilew)/2) + x; tex->handlex = -(((int)tex->tilew)/2) + x;
tex->handley = -(((int)tex->tileh)/2) + y; tex->handley = -(((int)tex->tileh)/2) + y;
@ -826,7 +840,7 @@ void GRRLIB_SetHandle( struct GRRLIB_texImg * tex, int x, int y ) {
* @param tex The texture to center. * @param tex The texture to center.
* @param enabled * @param enabled
*/ */
void GRRLIB_SetMidHandle( struct GRRLIB_texImg * tex, bool enabled ) { void GRRLIB_SetMidHandle( struct GRRLIB_texImg *tex, bool enabled ) {
if (enabled) { if (enabled) {
if (tex->tiledtex) { if (tex->tiledtex) {
tex->offsetx = (((int)tex->tilew)/2); tex->offsetx = (((int)tex->tilew)/2);
@ -1201,6 +1215,7 @@ void GRRLIB_Render() {
GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
GX_SetColorUpdate(GX_TRUE); GX_SetColorUpdate(GX_TRUE);
GX_CopyDisp(xfb[fb], GX_TRUE); GX_CopyDisp(xfb[fb], GX_TRUE);
VIDEO_SetNextFramebuffer(xfb[fb]); VIDEO_SetNextFramebuffer(xfb[fb]);
VIDEO_Flush(); VIDEO_Flush();
VIDEO_WaitVSync(); VIDEO_WaitVSync();
@ -1295,8 +1310,8 @@ void GRRLIB_GetPixelFromFB(int x, int y, u8 *R1, u8 *G1, u8 *B1, u8* R2, u8 *G2,
* @return Returns a clean, clamped unsigned char. * @return Returns a clean, clamped unsigned char.
*/ */
u8 GRRLIB_ClampVar8(float Value) { u8 GRRLIB_ClampVar8(float Value) {
/* Using float to increase the precision. /* Using float to increase the precision.
This makes a full spectrum (0 - 255) possible. */ This makes a full spectrum (0 - 255) possible. */
Value = roundf(Value); Value = roundf(Value);
if (Value < 0) { if (Value < 0) {
Value = 0; Value = 0;
@ -1315,5 +1330,5 @@ u8 GRRLIB_ClampVar8(float Value) {
* @return Returns the color in u32 format. * @return Returns the color in u32 format.
*/ */
u32 GRRLIB_GetColor( u8 r, u8 g, u8 b, u8 a ) { u32 GRRLIB_GetColor( u8 r, u8 g, u8 b, u8 a ) {
return (r << 24) | (g << 16) | (b << 8) | a; return (r << 24) | (g << 16) | (b << 8) | a;
} }

2
GRRLIB/GRRLIB/GRRLIB.h
View file

@ -1,7 +1,7 @@
/*=========================================== /*===========================================
GRRLIB (GX version) 4.0.0 GRRLIB (GX version) 4.0.0
Code : NoNameNo Code : NoNameNo
Additional Code : Crayon Additional Code : Crayon & Xane
GX hints : RedShade GX hints : RedShade
===========================================*/ ===========================================*/