Mercurial > sdl-ios-xcode
diff test/nds-test-progs/general/source/main.c @ 2694:c1c7cb1b5a47 gsoc2008_nds
More sprite-work in the render driver, and some updates to the nds-test-progs.
| author | Darren Alton <dalton@stevens.edu> |
|---|---|
| date | Sat, 16 Aug 2008 12:58:36 +0000 |
| parents | cd8978f47849 |
| children | 0b395a60deff |
line wrap: on
line diff
--- a/test/nds-test-progs/general/source/main.c Sat Aug 16 12:08:12 2008 +0000 +++ b/test/nds-test-progs/general/source/main.c Sat Aug 16 12:58:36 2008 +0000 @@ -2,13 +2,26 @@ #include <SDL/SDL.h> #if defined(NDS) || defined(__NDS__) || defined (__NDS) #include <nds.h> +#include <fat.h> #else #define swiWaitForVBlank() #define consoleDemoInit() +#define fatInitDefault() #define RGB15(r,g,b) SDL_MapRGB(screen->format,((r)<<3),((g)<<3),((b)<<3)) #endif -void delay(int s) { +void splash(SDL_Surface *screen, int s) { + SDL_Surface *logo; + SDL_Rect area = {0,0,256,192}; + + logo = SDL_LoadBMP("sdl.bmp"); + if(!logo) { + printf("Couldn't splash.\n"); + return; + } + /*logo->flags &= ~SDL_PREALLOC;*/ + SDL_BlitSurface(logo, NULL, screen, &area); + SDL_Flip(screen); while(s-- > 0) { int i = 60; while(--i) swiWaitForVBlank(); @@ -22,7 +35,8 @@ SDL_Rect rect = {8,8,240,176}; int i; - consoleDemoInit(); + consoleDemoInit(); puts("Hello world! Initializing FAT..."); + fatInitDefault(); if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_JOYSTICK) < 0) { puts("# error initializing SDL"); puts(SDL_GetError()); @@ -44,6 +58,9 @@ // return 3; } puts("* opened joystick"); + + /*splash(screen, 3);*/ + SDL_FillRect(screen, &rect, RGB15(0,0,31)|0x8000); SDL_Flip(screen); @@ -66,7 +83,7 @@ break; default: break; } - printf("joy_%d\n", event.jbutton.which); + printf("joy_%d, at %d\n", event.jbutton.which, SDL_GetTicks()); SDL_Flip(screen); break; case SDL_QUIT: SDL_Quit(); return 0;