diff --git a/GRRLIB/GRRLIB/GRRLIB_3D.c b/GRRLIB/GRRLIB/GRRLIB_3D.c index d61096f..a21e68a 100644 --- a/GRRLIB/GRRLIB/GRRLIB_3D.c +++ b/GRRLIB/GRRLIB/GRRLIB_3D.c @@ -90,14 +90,14 @@ void GRRLIB_3dMode(f32 minDist, f32 maxDist, f32 fov, bool texturemode) { GX_SetVtxDesc(GX_VA_CLR0, GX_DIRECT); if(texturemode==FALSE) GX_SetVtxDesc(GX_VA_TEX0, GX_NONE); - if(texturemode==TRUE) GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT); + else GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT); 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); if(texturemode==FALSE) GX_SetTevOp(GX_TEVSTAGE0, GX_PASSCLR); - if(texturemode==TRUE) GX_SetTevOp(GX_TEVSTAGE0, GX_REPLACE); + else GX_SetTevOp(GX_TEVSTAGE0, GX_REPLACE); } /** @@ -175,11 +175,11 @@ void GRRLIB_setTexture(GRRLIB_texImg *tex, bool rep) { else { GX_InitTexObj(&texObj, tex->data, tex->w, tex->h, GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE); } - if (GRRLIB_Settings.antialias == false){ + if (GRRLIB_Settings.antialias == false) { GX_InitTexObjLOD(&texObj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1); GX_SetCopyFilter(GX_FALSE, rmode->sample_pattern, GX_FALSE, rmode->vfilter); } - else{ + else { GX_SetCopyFilter(rmode->aa, rmode->sample_pattern, GX_TRUE, rmode->vfilter); } diff --git a/GRRLIB/GRRLIB/grrlib.h b/GRRLIB/GRRLIB/grrlib.h index 81f4713..571444f 100644 --- a/GRRLIB/GRRLIB/grrlib.h +++ b/GRRLIB/GRRLIB/grrlib.h @@ -31,7 +31,7 @@ THE SOFTWARE. /** * Version information for GRRLIB. */ -#define GRRLIB_VER_STRING "4.1.2" +#define GRRLIB_VER_STRING "4.2.0" //============================================================================== // Includes diff --git a/README.html b/README.html index 89f4763..649cb10 100644 --- a/README.html +++ b/README.html @@ -99,7 +99,7 @@ libpng is supplied as a precompiled library libz is supplied with devkitpro (Ie. preinstalled) libfat is supplied with devkitpro (Ie. preinstalled) -*1 The version of libjpeg supplied with GRRLIB v4.1.1 contains bug fixes not +*1 The version of libjpeg supplied with GRRLIB v4.2.0 contains bug fixes not available in the official release. If you can track down the original author, please tell him about these fixes. @@ -129,7 +129,7 @@ Next up the list is libjpeg *2 *3 cd \grr\trunk\GRRLIB\lib install <- If you are using Linux, type `./install.sh` instead -*3 The version of libjpeg supplied with GRRLIB v4.1.1 contains bug fixes not +*3 The version of libjpeg supplied with GRRLIB v4.2.0 contains bug fixes not available in the official release. After all three image processing libraries are installed, we can now install diff --git a/examples/lesson2/Makefile b/examples/bitmap_fx/Makefile similarity index 100% rename from examples/lesson2/Makefile rename to examples/bitmap_fx/Makefile diff --git a/examples/lesson2/source/gfx/font1.h b/examples/bitmap_fx/source/gfx/font1.h similarity index 100% rename from examples/lesson2/source/gfx/font1.h rename to examples/bitmap_fx/source/gfx/font1.h diff --git a/examples/lesson2/source/gfx/font1.png b/examples/bitmap_fx/source/gfx/font1.png similarity index 100% rename from examples/lesson2/source/gfx/font1.png rename to examples/bitmap_fx/source/gfx/font1.png diff --git a/examples/lesson2/source/gfx/pirate.c b/examples/bitmap_fx/source/gfx/pirate.c similarity index 100% rename from examples/lesson2/source/gfx/pirate.c rename to examples/bitmap_fx/source/gfx/pirate.c diff --git a/examples/lesson2/source/gfx/pirate.h b/examples/bitmap_fx/source/gfx/pirate.h similarity index 100% rename from examples/lesson2/source/gfx/pirate.h rename to examples/bitmap_fx/source/gfx/pirate.h diff --git a/examples/lesson2/source/gfx/pirate.png b/examples/bitmap_fx/source/gfx/pirate.png similarity index 100% rename from examples/lesson2/source/gfx/pirate.png rename to examples/bitmap_fx/source/gfx/pirate.png diff --git a/examples/lesson2/source/main.c b/examples/bitmap_fx/source/main.c similarity index 100% rename from examples/lesson2/source/main.c rename to examples/bitmap_fx/source/main.c diff --git a/grrlib.doxygen b/grrlib.doxygen index ec721d5..e8e7e0f 100644 --- a/grrlib.doxygen +++ b/grrlib.doxygen @@ -31,7 +31,7 @@ PROJECT_NAME = GRRLIB # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 4.1.1 +PROJECT_NUMBER = 4.2.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/grrlib_logo.png b/grrlib_logo.png index f490cfb..fc3c31e 100644 Binary files a/grrlib_logo.png and b/grrlib_logo.png differ