From f5d25a55a5c0be9b9e02f54e3d34899fc7c6baee Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Sun, 18 Jan 2009 17:59:43 +0000 Subject: [PATCH] [CHG] Code formatting and some doxygen comments --- template/source/GRRLIB/GRRLIB.c | 518 +++++++++++++++++--------------- template/source/GRRLIB/GRRLIB.h | 29 +- template/source/main.c | 25 +- 3 files changed, 316 insertions(+), 256 deletions(-) diff --git a/template/source/GRRLIB/GRRLIB.c b/template/source/GRRLIB/GRRLIB.c index b6507fa..ac72d4a 100644 --- a/template/source/GRRLIB/GRRLIB.c +++ b/template/source/GRRLIB/GRRLIB.c @@ -7,316 +7,366 @@ #include "GRRLIB.h" #define DEFAULT_FIFO_SIZE (256 * 1024) - u32 fb=0; + u32 fb = 0; static void *xfb[2] = { NULL, NULL}; GXRModeObj *rmode; void *gp_fifo = NULL; - +/** + * Clear screen with a specific color. + * @param color the color to use to fill the screen. + */ inline void GRRLIB_FillScreen(u32 color){ - GRRLIB_Rectangle(-40, -40, 680,520, color, 1); + GRRLIB_Rectangle(-40, -40, 680,520, color, 1); } +/** + * + */ inline void GRRLIB_Plot(f32 x,f32 y, u32 color){ - Vector v[]={{x,y,0.0f}}; - - GRRLIB_NPlot(v,color,1); + Vector v[]={{x,y,0.0f}}; + + GRRLIB_NPlot(v,color,1); } + +/** + * + */ void GRRLIB_NPlot(Vector v[],u32 color,long n){ - GRRLIB_GXEngine(v,color,n,GX_POINTS); + GRRLIB_GXEngine(v,color,n,GX_POINTS); } +/** + * Draw a line. + * @param x1 start point for line for the x coordinate. + * @param y1 start point for line for the y coordinate. + * @param x2 end point for line for the x coordinate. + * @param y2 end point for line for the x coordinate. + * @param color line color. + */ inline void GRRLIB_Line(f32 x1, f32 y1, f32 x2, f32 y2, u32 color){ - Vector v[]={{x1,y1,0.0f},{x2,y2,0.0f}}; + Vector v[]={{x1,y1,0.0f},{x2,y2,0.0f}}; - GRRLIB_NGone(v,color,2); + GRRLIB_NGone(v,color,2); } +/** + * Draw a rectangle. + */ inline void GRRLIB_Rectangle(f32 x, f32 y, f32 width, f32 height, u32 color, u8 filled){ - Vector v[]={{x,y,0.0f},{x+width,y,0.0f},{x+width,y+height,0.0f},{x,y+height,0.0f},{x,y,0.0f}}; + Vector v[] = {{x,y,0.0f},{x+width,y,0.0f},{x+width,y+height,0.0f},{x,y+height,0.0f},{x,y,0.0f}}; - if(!filled){ - GRRLIB_NGone(v,color,5); - } - else{ - GRRLIB_NGoneFilled(v,color,4); - } + if(!filled){ + GRRLIB_NGone(v,color,5); + } + else{ + GRRLIB_NGoneFilled(v,color,4); + } } + +/** + * + */ void GRRLIB_NGone(Vector v[],u32 color,long n){ - GRRLIB_GXEngine(v,color,n,GX_LINESTRIP); + GRRLIB_GXEngine(v,color,n,GX_LINESTRIP); } + +/** + * + */ void GRRLIB_NGoneFilled(Vector v[],u32 color,long n){ - GRRLIB_GXEngine(v,color,n,GX_TRIANGLEFAN); + GRRLIB_GXEngine(v,color,n,GX_TRIANGLEFAN); } +/** + * + */ void GRRLIB_InitTileSet(struct GRRLIB_texImg *tex, unsigned int tilew, unsigned int tileh, unsigned int tilestart){ - tex->tilew=tilew; - tex->tileh=tileh; - tex->nbtilew=tex->w/tilew; - tex->nbtileh=tex->h/tileh; - tex->tilestart=tilestart; + tex->tilew = tilew; + tex->tileh = tileh; + tex->nbtilew = tex->w/tilew; + tex->nbtileh = tex->h/tileh; + tex->tilestart = tilestart; } - +/** + * Load a texture from a buffer. + * @param my_png the PNG buffer to load. + * @return A GRRLIB_texImg structure filled with PNG informations. + */ GRRLIB_texImg GRRLIB_LoadTexture(const unsigned char my_png[]) { - PNGUPROP imgProp; - IMGCTX ctx; - GRRLIB_texImg my_texture; + PNGUPROP imgProp; + IMGCTX ctx; + GRRLIB_texImg my_texture; - ctx = PNGU_SelectImageFromBuffer(my_png); - PNGU_GetImageProperties (ctx, &imgProp); - my_texture.data = memalign (32, imgProp.imgWidth * imgProp.imgHeight * 4); - PNGU_DecodeTo4x4RGBA8 (ctx, imgProp.imgWidth, imgProp.imgHeight, my_texture.data, 255); - PNGU_ReleaseImageContext (ctx); - DCFlushRange (my_texture.data, imgProp.imgWidth * imgProp.imgHeight * 4); - my_texture.w= imgProp.imgWidth; - my_texture.h= imgProp.imgHeight; - return my_texture; -} - -// GRRLIB_LoadTextureFromFile -// Contribution by GRILLO -GRRLIB_texImg GRRLIB_LoadTextureFromFile(const char *filename) { - - PNGUPROP imgProp; - IMGCTX ctx; - GRRLIB_texImg my_texture; - - ctx = PNGU_SelectImageFromDevice(filename); - PNGU_GetImageProperties (ctx, &imgProp); - my_texture.data = memalign (32, imgProp.imgWidth * imgProp.imgHeight * 4); - PNGU_DecodeTo4x4RGBA8 (ctx, imgProp.imgWidth, imgProp.imgHeight, my_texture.data, 255); - PNGU_ReleaseImageContext (ctx); - DCFlushRange (my_texture.data, imgProp.imgWidth * imgProp.imgHeight * 4); - my_texture.w= imgProp.imgWidth; - my_texture.h= imgProp.imgHeight; + ctx = PNGU_SelectImageFromBuffer(my_png); + PNGU_GetImageProperties (ctx, &imgProp); + my_texture.data = memalign (32, imgProp.imgWidth * imgProp.imgHeight * 4); + PNGU_DecodeTo4x4RGBA8 (ctx, imgProp.imgWidth, imgProp.imgHeight, my_texture.data, 255); + PNGU_ReleaseImageContext (ctx); + DCFlushRange (my_texture.data, imgProp.imgWidth * imgProp.imgHeight * 4); + my_texture.w = imgProp.imgWidth; + my_texture.h = imgProp.imgHeight; return my_texture; } +/** + * Load a texture from a file. + * @author GRILLO + * @param filename the PNG file to load. + * @return A GRRLIB_texImg structure filled with PNG informations. + */ +GRRLIB_texImg GRRLIB_LoadTextureFromFile(const char *filename) { + PNGUPROP imgProp; + IMGCTX ctx; + GRRLIB_texImg my_texture; + + ctx = PNGU_SelectImageFromDevice(filename); + PNGU_GetImageProperties (ctx, &imgProp); + my_texture.data = memalign (32, imgProp.imgWidth * imgProp.imgHeight * 4); + PNGU_DecodeTo4x4RGBA8 (ctx, imgProp.imgWidth, imgProp.imgHeight, my_texture.data, 255); + PNGU_ReleaseImageContext (ctx); + DCFlushRange (my_texture.data, imgProp.imgWidth * imgProp.imgHeight * 4); + my_texture.w = imgProp.imgWidth; + my_texture.h = imgProp.imgHeight; + return my_texture; +} + +/** + * + */ inline void GRRLIB_DrawImg(f32 xpos, f32 ypos, GRRLIB_texImg tex, float degrees, float scaleX, f32 scaleY, u32 color ){ - GXTexObj texObj; - u16 width,height; + GXTexObj texObj; + u16 width,height; - - GX_InitTexObj(&texObj, tex.data, tex.w,tex.h, GX_TF_RGBA8,GX_CLAMP, GX_CLAMP,GX_FALSE); - GX_InitTexObjLOD(&texObj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1); - GX_LoadTexObj(&texObj, GX_TEXMAP0); + GX_InitTexObj(&texObj, tex.data, tex.w,tex.h, GX_TF_RGBA8,GX_CLAMP, GX_CLAMP,GX_FALSE); + GX_InitTexObjLOD(&texObj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1); + GX_LoadTexObj(&texObj, GX_TEXMAP0); - GX_SetTevOp (GX_TEVSTAGE0, GX_MODULATE); - GX_SetVtxDesc (GX_VA_TEX0, GX_DIRECT); + GX_SetTevOp (GX_TEVSTAGE0, GX_MODULATE); + GX_SetVtxDesc (GX_VA_TEX0, GX_DIRECT); - Mtx m,m1,m2, mv; - width=tex.w * .5; - height=tex.h * .5; - guMtxIdentity (m1); - guMtxScaleApply(m1,m1,scaleX,scaleY,1.0); - Vector axis =(Vector) {0 , 0, 1 }; - guMtxRotAxisDeg (m2, &axis, degrees); - guMtxConcat(m2,m1,m); + Mtx m,m1,m2, mv; + width=tex.w * .5; + height=tex.h * .5; + guMtxIdentity (m1); + guMtxScaleApply(m1,m1,scaleX,scaleY,1.0); + Vector axis =(Vector) {0 , 0, 1 }; + guMtxRotAxisDeg (m2, &axis, degrees); + guMtxConcat(m2,m1,m); - guMtxTransApply(m,m, xpos+width,ypos+height,0); - guMtxConcat (GXmodelView2D, m, mv); - GX_LoadPosMtxImm (mv, GX_PNMTX0); - - GX_Begin(GX_QUADS, GX_VTXFMT0,4); - GX_Position3f32(-width, -height, 0); - GX_Color1u32(color); - GX_TexCoord2f32(0, 0); - - GX_Position3f32(width, -height, 0); - GX_Color1u32(color); - GX_TexCoord2f32(1, 0); - - GX_Position3f32(width, height, 0); - GX_Color1u32(color); - GX_TexCoord2f32(1, 1); - - GX_Position3f32(-width, height, 0); - GX_Color1u32(color); - GX_TexCoord2f32(0, 1); - GX_End(); - GX_LoadPosMtxImm (GXmodelView2D, GX_PNMTX0); + guMtxTransApply(m,m, xpos+width,ypos+height,0); + guMtxConcat (GXmodelView2D, m, mv); + GX_LoadPosMtxImm (mv, GX_PNMTX0); - GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR); - GX_SetVtxDesc (GX_VA_TEX0, GX_NONE); + GX_Begin(GX_QUADS, GX_VTXFMT0,4); + GX_Position3f32(-width, -height, 0); + GX_Color1u32(color); + GX_TexCoord2f32(0, 0); + GX_Position3f32(width, -height, 0); + GX_Color1u32(color); + GX_TexCoord2f32(1, 0); + + GX_Position3f32(width, height, 0); + GX_Color1u32(color); + GX_TexCoord2f32(1, 1); + + GX_Position3f32(-width, height, 0); + GX_Color1u32(color); + GX_TexCoord2f32(0, 1); + GX_End(); + GX_LoadPosMtxImm (GXmodelView2D, GX_PNMTX0); + + GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR); + GX_SetVtxDesc (GX_VA_TEX0, GX_NONE); } +/** + * + */ inline void GRRLIB_DrawTile(f32 xpos, f32 ypos, GRRLIB_texImg tex, float degrees, float scaleX, f32 scaleY, u32 color, int frame){ -GXTexObj texObj; -// Frame Correction by spiffen -f32 FRAME_CORR = 0.001f; -f32 s1= (((frame%tex.nbtilew))/(f32)tex.nbtilew)+(FRAME_CORR/tex.w); -f32 s2= (((frame%tex.nbtilew)+1)/(f32)tex.nbtilew)-(FRAME_CORR/tex.w); -f32 t1= (((int)(frame/tex.nbtilew))/(f32)tex.nbtileh)+(FRAME_CORR/tex.h); -f32 t2= (((int)(frame/tex.nbtilew)+1)/(f32)tex.nbtileh)-(FRAME_CORR/tex.h); -f32 width,height; - - GX_InitTexObj(&texObj, tex.data, tex.tilew*tex.nbtilew,tex.tileh*tex.nbtileh, GX_TF_RGBA8,GX_CLAMP, GX_CLAMP,GX_FALSE); - GX_InitTexObjLOD(&texObj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1); - GX_LoadTexObj(&texObj, GX_TEXMAP0); + GXTexObj texObj; + // Frame Correction by spiffen + f32 FRAME_CORR = 0.001f; + f32 s1 = (((frame%tex.nbtilew))/(f32)tex.nbtilew)+(FRAME_CORR/tex.w); + f32 s2 = (((frame%tex.nbtilew)+1)/(f32)tex.nbtilew)-(FRAME_CORR/tex.w); + f32 t1 = (((int)(frame/tex.nbtilew))/(f32)tex.nbtileh)+(FRAME_CORR/tex.h); + f32 t2 = (((int)(frame/tex.nbtilew)+1)/(f32)tex.nbtileh)-(FRAME_CORR/tex.h); + f32 width,height; - GX_SetTevOp (GX_TEVSTAGE0, GX_MODULATE); - GX_SetVtxDesc (GX_VA_TEX0, GX_DIRECT); + GX_InitTexObj(&texObj, tex.data, tex.tilew*tex.nbtilew,tex.tileh*tex.nbtileh, GX_TF_RGBA8,GX_CLAMP, GX_CLAMP,GX_FALSE); + GX_InitTexObjLOD(&texObj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1); + GX_LoadTexObj(&texObj, GX_TEXMAP0); - Mtx m,m1,m2, mv; - width =tex.tilew * 0.5f; - height = tex.tileh * 0.5f; - guMtxIdentity (m1); - guMtxScaleApply(m1,m1,scaleX,scaleY,1.0f); - Vector axis =(Vector) {0 , 0, 1 }; - guMtxRotAxisDeg (m2, &axis, degrees); - guMtxConcat(m2,m1,m); - guMtxTransApply(m,m, xpos+width,ypos+height,0); - guMtxConcat (GXmodelView2D, m, mv); - GX_LoadPosMtxImm (mv, GX_PNMTX0); - GX_Begin(GX_QUADS, GX_VTXFMT0,4); - GX_Position3f32(-width, -height, 0); - GX_Color1u32(color); - GX_TexCoord2f32(s1, t1); - - GX_Position3f32(width, -height, 0); - GX_Color1u32(color); - GX_TexCoord2f32(s2, t1); - - GX_Position3f32(width, height, 0); - GX_Color1u32(color); - GX_TexCoord2f32(s2, t2); - - GX_Position3f32(-width, height, 0); - GX_Color1u32(color); - GX_TexCoord2f32(s1, t2); - GX_End(); - GX_LoadPosMtxImm (GXmodelView2D, GX_PNMTX0); + GX_SetTevOp (GX_TEVSTAGE0, GX_MODULATE); + GX_SetVtxDesc (GX_VA_TEX0, GX_DIRECT); - GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR); - GX_SetVtxDesc (GX_VA_TEX0, GX_NONE); + Mtx m,m1,m2, mv; + width = tex.tilew * 0.5f; + height = tex.tileh * 0.5f; + guMtxIdentity (m1); + guMtxScaleApply(m1,m1,scaleX,scaleY,1.0f); + Vector axis = (Vector) {0 , 0, 1 }; + guMtxRotAxisDeg (m2, &axis, degrees); + guMtxConcat(m2,m1,m); + guMtxTransApply(m,m, xpos+width,ypos+height,0); + guMtxConcat (GXmodelView2D, m, mv); + GX_LoadPosMtxImm (mv, GX_PNMTX0); + GX_Begin(GX_QUADS, GX_VTXFMT0,4); + GX_Position3f32(-width, -height, 0); + GX_Color1u32(color); + GX_TexCoord2f32(s1, t1); + GX_Position3f32(width, -height, 0); + GX_Color1u32(color); + GX_TexCoord2f32(s2, t1); + + GX_Position3f32(width, height, 0); + GX_Color1u32(color); + GX_TexCoord2f32(s2, t2); + + GX_Position3f32(-width, height, 0); + GX_Color1u32(color); + GX_TexCoord2f32(s1, t2); + GX_End(); + GX_LoadPosMtxImm (GXmodelView2D, GX_PNMTX0); + + GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR); + GX_SetVtxDesc (GX_VA_TEX0, GX_NONE); } +/** + * + */ void GRRLIB_Printf(f32 xpos, f32 ypos, GRRLIB_texImg tex, u32 color, f32 zoom, char *text,...){ - int i ; - char tmp[1024]; - int size=0; + int i; + char tmp[1024]; + int size; - va_list argp; - va_start(argp, text); - vsprintf(tmp, text, argp); - va_end(argp); - size = strlen(tmp); + va_list argp; + va_start(argp, text); + vsprintf(tmp, text, argp); + va_end(argp); + size = strlen(tmp); - for(i=0;iviTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync(); + VIDEO_SetNextFramebuffer(xfb[fb]); + VIDEO_SetBlack(FALSE); + VIDEO_Flush(); + VIDEO_WaitVSync(); + if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync(); - - gp_fifo = (u8 *) memalign(32,DEFAULT_FIFO_SIZE); + gp_fifo = (u8 *) memalign(32,DEFAULT_FIFO_SIZE); } +/** + * + */ void GRRLIB_Start(){ - - f32 yscale; - u32 xfbHeight; - Mtx perspective; + f32 yscale; + u32 xfbHeight; + Mtx perspective; - GX_Init (gp_fifo, DEFAULT_FIFO_SIZE); + GX_Init (gp_fifo, DEFAULT_FIFO_SIZE); - // clears the bg to color and clears the z buffer - GXColor background = { 0, 0, 0, 0xff }; - GX_SetCopyClear (background, GX_MAX_Z24); + // clears the bg to color and clears the z buffer + GXColor background = { 0, 0, 0, 0xff }; + GX_SetCopyClear (background, GX_MAX_Z24); - // other gx setup - yscale = GX_GetYScaleFactor(rmode->efbHeight,rmode->xfbHeight); - xfbHeight = GX_SetDispCopyYScale(yscale); - GX_SetScissor(0,0,rmode->fbWidth,rmode->efbHeight); - GX_SetDispCopySrc(0,0,rmode->fbWidth,rmode->efbHeight); - GX_SetDispCopyDst(rmode->fbWidth,xfbHeight); - GX_SetCopyFilter(rmode->aa,rmode->sample_pattern,GX_TRUE,rmode->vfilter); - GX_SetFieldMode(rmode->field_rendering,((rmode->viHeight==2*rmode->xfbHeight)?GX_ENABLE:GX_DISABLE)); + // other gx setup + yscale = GX_GetYScaleFactor(rmode->efbHeight,rmode->xfbHeight); + xfbHeight = GX_SetDispCopyYScale(yscale); + GX_SetScissor(0,0,rmode->fbWidth,rmode->efbHeight); + GX_SetDispCopySrc(0,0,rmode->fbWidth,rmode->efbHeight); + GX_SetDispCopyDst(rmode->fbWidth,xfbHeight); + GX_SetCopyFilter(rmode->aa,rmode->sample_pattern,GX_TRUE,rmode->vfilter); + GX_SetFieldMode(rmode->field_rendering,((rmode->viHeight==2*rmode->xfbHeight)?GX_ENABLE:GX_DISABLE)); - if (rmode->aa) - GX_SetPixelFmt(GX_PF_RGB565_Z16, GX_ZC_LINEAR); - else - GX_SetPixelFmt(GX_PF_RGB8_Z24, GX_ZC_LINEAR); + if (rmode->aa) + GX_SetPixelFmt(GX_PF_RGB565_Z16, GX_ZC_LINEAR); + else + GX_SetPixelFmt(GX_PF_RGB8_Z24, GX_ZC_LINEAR); - GX_SetDispCopyGamma(GX_GM_1_0); - - - // setup the vertex descriptor - // tells the flipper to expect direct data - GX_ClearVtxDesc(); - GX_InvVtxCache (); - GX_InvalidateTexAll(); - - GX_SetVtxDesc(GX_VA_TEX0, GX_NONE); - GX_SetVtxDesc(GX_VA_POS, GX_DIRECT); - GX_SetVtxDesc (GX_VA_CLR0, GX_DIRECT); + GX_SetDispCopyGamma(GX_GM_1_0); - GX_SetVtxAttrFmt (GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); - GX_SetVtxAttrFmt (GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); - GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0); - GX_SetZMode (GX_FALSE, GX_LEQUAL, GX_TRUE); + // setup the vertex descriptor + // tells the flipper to expect direct data + GX_ClearVtxDesc(); + GX_InvVtxCache (); + GX_InvalidateTexAll(); - GX_SetNumChans(1); - GX_SetNumTexGens(1); - GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR); - GX_SetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); - GX_SetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY); + GX_SetVtxDesc(GX_VA_TEX0, GX_NONE); + GX_SetVtxDesc(GX_VA_POS, GX_DIRECT); + GX_SetVtxDesc (GX_VA_CLR0, GX_DIRECT); - guMtxIdentity(GXmodelView2D); - guMtxTransApply (GXmodelView2D, GXmodelView2D, 0.0F, 0.0F, -50.0F); - GX_LoadPosMtxImm(GXmodelView2D,GX_PNMTX0); - guOrtho(perspective,0,479,0,639,0,300); - GX_LoadProjectionMtx(perspective, GX_ORTHOGRAPHIC); + GX_SetVtxAttrFmt (GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GX_SetVtxAttrFmt (GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); + GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0); + GX_SetZMode (GX_FALSE, GX_LEQUAL, GX_TRUE); - GX_SetViewport(0,0,rmode->fbWidth,rmode->efbHeight,0,1); - GX_SetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_CLEAR); - GX_SetAlphaUpdate(GX_TRUE); - - GX_SetCullMode(GX_CULL_NONE); + GX_SetNumChans(1); + GX_SetNumTexGens(1); + GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR); + GX_SetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GX_SetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY); + + guMtxIdentity(GXmodelView2D); + guMtxTransApply (GXmodelView2D, GXmodelView2D, 0.0F, 0.0F, -50.0F); + GX_LoadPosMtxImm(GXmodelView2D,GX_PNMTX0); + + guOrtho(perspective,0,479,0,639,0,300); + GX_LoadProjectionMtx(perspective, GX_ORTHOGRAPHIC); + + GX_SetViewport(0,0,rmode->fbWidth,rmode->efbHeight,0,1); + GX_SetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_CLEAR); + GX_SetAlphaUpdate(GX_TRUE); + + GX_SetCullMode(GX_CULL_NONE); } +/** + * + */ void GRRLIB_Render () { - GX_DrawDone (); - - fb ^= 1; // flip framebuffer - GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); - GX_SetColorUpdate(GX_TRUE); - GX_CopyDisp(xfb[fb],GX_TRUE); - VIDEO_SetNextFramebuffer(xfb[fb]); - VIDEO_Flush(); - VIDEO_WaitVSync(); + GX_DrawDone (); + fb ^= 1; // flip framebuffer + GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); + GX_SetColorUpdate(GX_TRUE); + GX_CopyDisp(xfb[fb],GX_TRUE); + VIDEO_SetNextFramebuffer(xfb[fb]); + VIDEO_Flush(); + VIDEO_WaitVSync(); } - diff --git a/template/source/GRRLIB/GRRLIB.h b/template/source/GRRLIB/GRRLIB.h index cb46a3b..c12f0b9 100644 --- a/template/source/GRRLIB/GRRLIB.h +++ b/template/source/GRRLIB/GRRLIB.h @@ -16,15 +16,27 @@ #include "../libpng/pngu/pngu.h" +/** + * @struct GRRLIB_texImg + * @brief Structure to hold the texture informations. + * @param w width of the texture. + * @param h height of the texture. + * @param tilew widht of a tile. + * @param tileh height of a tile. + * @param nbtilew number of tiles for the x axis. + * @param nbtileh number of tiles for the y axis. + * @param tilestart + * @param data pointer to the texture data. + */ typedef struct GRRLIB_texImg{ - unsigned int w; - unsigned int h; - unsigned int tilew; - unsigned int tileh; - unsigned int nbtilew; - unsigned int nbtileh; - unsigned int tilestart; - void *data; + unsigned int w; + unsigned int h; + unsigned int tilew; + unsigned int tileh; + unsigned int nbtilew; + unsigned int nbtileh; + unsigned int tilestart; + void *data; } GRRLIB_texImg; extern Mtx GXmodelView2D; @@ -52,7 +64,6 @@ inline void GRRLIB_DrawTile(f32 xpos, f32 ypos, GRRLIB_texImg tex, float degrees void GRRLIB_Printf(f32 xpos, f32 ypos, GRRLIB_texImg tex, u32 color, f32 zoom, char *text,...); - void GRRLIB_GXEngine(Vector v[], u32 color, long count,u8 fmt); diff --git a/template/source/main.c b/template/source/main.c index 4dd88db..972c282 100644 --- a/template/source/main.c +++ b/template/source/main.c @@ -26,7 +26,7 @@ Mtx GXmodelView2D; int main(){ -int rot=0; + int rot = 0; GRRLIB_InitVideo(); GRRLIB_Start(); @@ -50,25 +50,24 @@ int rot=0; while(1){ - WPAD_SetVRes(0, 640, 480); + WPAD_SetVRes(0, 640, 480); WPAD_ScanPads(); - u32 wpaddown=WPAD_ButtonsDown(0); - u32 wpadheld=WPAD_ButtonsHeld(0); + u32 wpaddown = WPAD_ButtonsDown(0); + u32 wpadheld = WPAD_ButtonsHeld(0); - - ir_t ir1; - WPAD_IR(WPAD_CHAN_0, &ir1); + ir_t ir1; + WPAD_IR(WPAD_CHAN_0, &ir1); GRRLIB_FillScreen(0x000000FF); - GRRLIB_Printf(rot, 200, tex_BMfont1, 0xFFFFFFFF, 1, "X VALUE:%d",(int)ir1.sx); - GRRLIB_Printf(rot, 250, tex_BMfont4, 0xFFFFFFFF, 1, "X VALUE:%d",(int)ir1.sx); - GRRLIB_Printf(rot, 300, tex_BMfont3, 0xFFFFFFFF, 1 , "X VALUE : 1"); - GRRLIB_Printf(rot, 350, tex_BMfont2, 0xFFFFFFFF, 1 , "X VALUE : 1"); - + GRRLIB_Printf(rot, 200, tex_BMfont1, 0xFFFFFFFF, 1, "X VALUE:%d",(int)ir1.sx); + GRRLIB_Printf(rot, 250, tex_BMfont4, 0xFFFFFFFF, 1, "X VALUE:%d",(int)ir1.sx); + GRRLIB_Printf(rot, 300, tex_BMfont3, 0xFFFFFFFF, 1 , "X VALUE : 1"); + GRRLIB_Printf(rot, 350, tex_BMfont2, 0xFFFFFFFF, 1 , "X VALUE : 1"); + GRRLIB_Render(); if (wpaddown & WPAD_BUTTON_A) exit(0); - if (wpadheld & WPAD_BUTTON_B) rot++; + if (wpadheld & WPAD_BUTTON_B) rot++; } return 0; }