diff --git a/GRRLIB/GRRLIB/GRRLIB_bmfx.c b/GRRLIB/GRRLIB/GRRLIB_bmfx.c index b497e69..73e2dcf 100644 --- a/GRRLIB/GRRLIB/GRRLIB_bmfx.c +++ b/GRRLIB/GRRLIB/GRRLIB_bmfx.c @@ -141,7 +141,7 @@ void GRRLIB_BMFX_Blur (const GRRLIB_texImg *texsrc, int numba = (1+(factor<<1))*(1+(factor<<1)); u32 x, y; s32 k, l; - int tmp = 0; + int tmp; int newr, newg, newb, newa; u32 colours[numba]; u32 thiscol; diff --git a/GRRLIB/GRRLIB/grrlib.h b/GRRLIB/GRRLIB/grrlib.h index c3dda41..5120055 100644 --- a/GRRLIB/GRRLIB/grrlib.h +++ b/GRRLIB/GRRLIB/grrlib.h @@ -234,7 +234,7 @@ GRR_EXTERN u32 fb GRR_INIT(0); * Welcome to the GRRLIB documentation. * * @section Introduction - * GRRLIB is a C/C++ 2D Graphics library for Wii application developers. + * GRRLIB is a C/C++ 2D/3D graphics library for Wii application developers. * It is essentially a wrapper which presents a friendly interface to the Nintendo GX core. * * @section Links diff --git a/README.html b/README.html index 649cb10..cfe95cc 100644 --- a/README.html +++ b/README.html @@ -37,7 +37,7 @@ Licence Introduction ------------ -GRRLIB is a C/C++ 2D Graphics library for Wii application developers. It is +GRRLIB is a C/C++ 2D/3D graphics library for Wii application developers. It is essentially a wrapper which presents a friendly interface to the Nintendo GX core. @@ -51,7 +51,7 @@ requires 'libpng' and 'libpng' requires 'libz'. GRRLIB also has FileIO functions to allow real-time loading and saving of graphical data, and thus also requires 'libfat'. -libgrrlib <- 2D graphics library +libgrrlib <- 2D/3D graphics library +-- libfat <- File I/O +-- libjpeg <- JPEG image processor +-- libpngu <- Wii wrapper for libpng @@ -144,7 +144,7 @@ Using GRRLIB After everything is installed, simply put #include <grrlib.h> -at the top of your .c file and use the functions as required +at the top of your .c/.cpp file and use the functions as required You will also need to add -lgrrlib -lfat -ljpeg -lpngu -lpng -lz @@ -157,10 +157,7 @@ here. You do NOT need to place /anything/ in your application directory. If you would like to see a working example of this, you can look at the example -found in: C:\grr\trunk\examples\bluechip\composition -...This example also includes a "Makefile" which tries to make it clear what is -happening (unlike the more comprehensive cross-platform Makefile supplied with -the devkitPro 'template' application). +found in: C:\grr\trunk\examples\template\source Upgrading to v4.1.0 From Previous Versions of GRRLIB diff --git a/examples/template/source/main.c b/examples/template/source/main.c index 7770877..1f5a87d 100644 --- a/examples/template/source/main.c +++ b/examples/template/source/main.c @@ -9,7 +9,7 @@ #include #include -int main() { +int main(int argc, char **argv) { // Initialise the Graphics & Video subsystem GRRLIB_Init(); @@ -19,10 +19,10 @@ int main() { // Loop forever while(1) { - WPAD_ScanPads(); // Scan the wiimotes + WPAD_ScanPads(); // Scan the Wiimotes // If [HOME] was pressed on the first Wiimote, break out of the loop - if (WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) break ; + if (WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) break; // --------------------------------------------------------------------- // Place your drawing code here