funkey/Bibi
1
0
Fork 0
mirror of https://github.com/FunKey-Project/Bibi.git synced 2025-12-12 17:58:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

menu displayed with pollEvent and FPS handling, faster KeyReapeat detection during game

Browse Source
This commit is contained in:
Vincent-FK 2021-06-06 10:26:13 +02:00
parent 7b143fd775
commit dfc5c53d43
3 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/game.c
View File

@ -63,6 +63,8 @@ t_game game_new(int nb_joueur, int niveau, int mode, int kill_bomb) {
bomb_explose = FSOUND_Sample_Load(FSOUND_FREE, "audio/bomb.wav", 0, 0, 0); bomb_explose = FSOUND_Sample_Load(FSOUND_FREE, "audio/bomb.wav", 0, 0, 0);
#elif defined(SOUND_SDL_ACTIVATED) #elif defined(SOUND_SDL_ACTIVATED)
bomb_explose = Mix_LoadWAV("audio/bomb.wav"); bomb_explose = Mix_LoadWAV("audio/bomb.wav");
//Mix_VolumeChunk(bomb_explose, MIX_MAX_VOLUME/2);
Mix_VolumeChunk(bomb_explose, 20);
#endif //SOUND_FMOD_ACTIVATED #endif //SOUND_FMOD_ACTIVATED
return &the_game; return &the_game;
@ -1177,7 +1179,6 @@ void game_display(t_game game, SDL_Surface *screen) {
/** Flip screen */ /** Flip screen */
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
HW_SCREEN_WIDTH, HW_SCREEN_WIDTH,
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));

84
src/main.c
View File

@ -198,18 +198,19 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill
t_game game = game_new(nb_joueur,niveau,mode, kill_bomb); //on lance le jeu t_game game = game_new(nb_joueur,niveau,mode, kill_bomb); //on lance le jeu
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
if(screen != NULL) SDL_FreeSurface(screen); SDL_FillRect(hw_screen, NULL, 0x000000);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, SIZE_BLOC * map_get_width(game_the_map(game)), if(screen != NULL) SDL_FreeSurface(screen);
SIZE_BLOC * map_get_height(game_the_map(game)), WINDOW_BPP, screen = SDL_CreateRGBSurface(SDL_SWSURFACE, SIZE_BLOC * map_get_width(game_the_map(game)),
0, 0, 0, 0); SIZE_BLOC * map_get_height(game_the_map(game)), WINDOW_BPP,
#else //HW_SCREEN_RESIZE 0, 0, 0, 0);
screen = SDL_SetVideoMode(SIZE_BLOC * map_get_width(game_the_map(game)), #else
SIZE_BLOC * map_get_height(game_the_map(game)), WINDOW_BPP, screen = SDL_SetVideoMode(SIZE_BLOC * map_get_width(game_the_map(game)),
SDL_HWSURFACE); SIZE_BLOC * map_get_height(game_the_map(game)), WINDOW_BPP,
if (screen == NULL) { SDL_HWSURFACE);
error("Can't set video mode: %s\n", SDL_GetError()); if (screen == NULL) {
exit(1); error("Can't set video mode: %s\n", SDL_GetError());
} exit(1);
}
#endif //HW_SCREEN_RESIZE #endif //HW_SCREEN_RESIZE
game_display(game, screen); game_display(game, screen);
@ -222,7 +223,8 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill
if (nb_joueur == 2) if (nb_joueur == 2)
player2 = game_get_player2(game); player2 = game_get_player2(game);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); //SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_INTERVAL, SDL_DEFAULT_REPEAT_INTERVAL);
if (nb_joueur==1){ // boucle principale d'un jeu à 1 joueur: if (nb_joueur==1){ // boucle principale d'un jeu à 1 joueur:
while (done==0 && player_get_dead(player1)!=0) { while (done==0 && player_get_dead(player1)!=0) {
@ -310,14 +312,15 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill
} }
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
if(screen != NULL) SDL_FreeSurface(screen); SDL_FillRect(hw_screen, NULL, 0x000000);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); if(screen != NULL) SDL_FreeSurface(screen);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
screen = SDL_SetVideoMode(480,480, WINDOW_BPP,SDL_HWSURFACE); screen = SDL_SetVideoMode(480,480, WINDOW_BPP,SDL_HWSURFACE);
if (screen == NULL) { if (screen == NULL) {
error("Can't set video mode: %s\n", SDL_GetError()); error("Can't set video mode: %s\n", SDL_GetError());
exit(1); exit(1);
} }
#endif //HW_SCREEN_RESIZE #endif //HW_SCREEN_RESIZE
int boucle=0; //cette variable autorise ou non l'affichage de messages comme "vous avez gagné", "game over", ... int boucle=0; //cette variable autorise ou non l'affichage de messages comme "vous avez gagné", "game over", ...
@ -375,13 +378,12 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill
} }
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000); flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, HW_SCREEN_WIDTH,
HW_SCREEN_WIDTH, MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); SDL_Flip(hw_screen);
SDL_Flip(hw_screen);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
SDL_Flip(screen); SDL_Flip(screen);
#endif //HW_SCREEN_RESIZE #endif //HW_SCREEN_RESIZE
@ -495,13 +497,14 @@ int main(int argc, char *argv[]) {
Mix_Music *musique_p_e = NULL; Mix_Music *musique_p_e = NULL;
//if(Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 640)==-1){ //if(Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 640)==-1){
if(Mix_OpenAudio(44100, AUDIO_S16, 1, 4096) < 0){ //if(Mix_OpenAudio(44100, AUDIO_S16, 1, 4096) < 0){
//if(Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 1024)==-1){ if(Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 1024)==-1){
printf("Mix_OpenAudio: %s\n", Mix_GetError()); printf("Mix_OpenAudio: %s\n", Mix_GetError());
//exit(2); //exit(2);
} }
else{ else{
audio_init_ok = true; audio_init_ok = true;
//Mix_Volume(1,MIX_MAX_VOLUME);
const char *music_file; const char *music_file;
music_file = "audio/mm2titl2.ogg"; music_file = "audio/mm2titl2.ogg";
musique_menu_p = Mix_LoadMUS(music_file); musique_menu_p = Mix_LoadMUS(music_file);
@ -557,9 +560,10 @@ int main(int argc, char *argv[]) {
//3:editeur, 4:jouer aux niveaux edités, 5: options, 6: quitter) //3:editeur, 4:jouer aux niveaux edités, 5: options, 6: quitter)
int game_over=NB_DECES; int game_over=NB_DECES;
int resize=0; //Si resize=1 on remet l'écran à la taille 700*500 int resize=0; //Si resize=1 on remet l'écran à la taille 700*500
bool menu_change = true;
int play_music=1; int play_music=1;
int audio=1; int audio=1;
int prev_time_ms = 0;
while (!done) while (!done)
{ {
@ -577,7 +581,8 @@ int main(int argc, char *argv[]) {
play_music=0; play_music=0;
} }
SDL_WaitEvent(&event); //SDL_WaitEvent(&event);
while (SDL_PollEvent(&event));
switch(event.type) switch(event.type)
{ {
@ -631,6 +636,7 @@ int main(int argc, char *argv[]) {
choix_actuel=5; choix_actuel=5;
break; break;
} }
menu_change = true;
break; break;
case SDLK_DOWN: case SDLK_DOWN:
@ -661,6 +667,7 @@ int main(int argc, char *argv[]) {
choix_actuel=1; choix_actuel=1;
break; break;
} }
menu_change = true;
break; break;
case SDLK_RETURN: case SDLK_RETURN:
@ -933,6 +940,7 @@ int main(int argc, char *argv[]) {
if (resize==1){ if (resize==1){
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
if(screen != NULL) SDL_FreeSurface(screen); if(screen != NULL) SDL_FreeSurface(screen);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 700,500, WINDOW_BPP, 0, 0, 0, 0); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 700,500, WINDOW_BPP, 0, 0, 0, 0);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
@ -946,11 +954,13 @@ int main(int argc, char *argv[]) {
} }
// Effacement de l'écran // Effacement de l'écran
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); if(menu_change){
SDL_BlitSurface(menu, NULL, screen, &positionMenu); //SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
SDL_BlitSurface(menu, NULL, screen, &positionMenu);
menu_change = false;
}
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
HW_SCREEN_WIDTH, HW_SCREEN_WIDTH,
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));
@ -959,6 +969,14 @@ int main(int argc, char *argv[]) {
SDL_Flip(screen); SDL_Flip(screen);
#endif //HW_SCREEN_RESIZE #endif //HW_SCREEN_RESIZE
/** FPS handling */
#define FPS_MENU 30
int cur_time_ms = SDL_GetTicks();
int wait_time_ms = 1000/FPS_MENU - (cur_time_ms-prev_time_ms);
if(wait_time_ms > 0){
SDL_Delay(wait_time_ms);
}
prev_time_ms = SDL_GetTicks();
} }
if(audio_init_ok){ if(audio_init_ok){

12
src/niveau.c
View File

@ -18,6 +18,7 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){
SDL_Rect positionMenu; SDL_Rect positionMenu;
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
//if(screen != NULL) SDL_FreeSurface(screen); //if(screen != NULL) SDL_FreeSurface(screen);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
@ -99,7 +100,6 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
SDL_BlitSurface(menu, NULL, screen, &positionMenu); SDL_BlitSurface(menu, NULL, screen, &positionMenu);
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
HW_SCREEN_WIDTH, HW_SCREEN_WIDTH,
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));
@ -115,6 +115,7 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){
int niveau_2_joueur(SDL_Surface *screen, int choix_niveau){ int niveau_2_joueur(SDL_Surface *screen, int choix_niveau){
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
//if(screen != NULL) SDL_FreeSurface(screen); //if(screen != NULL) SDL_FreeSurface(screen);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
@ -240,7 +241,6 @@ int niveau_2_joueur(SDL_Surface *screen, int choix_niveau){
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
SDL_BlitSurface(menu, NULL, screen, &positionMenu); SDL_BlitSurface(menu, NULL, screen, &positionMenu);
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
HW_SCREEN_WIDTH, HW_SCREEN_WIDTH,
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));
@ -256,6 +256,7 @@ int niveau_2_joueur(SDL_Surface *screen, int choix_niveau){
int editeur_choix_niveau(SDL_Surface *screen){ int editeur_choix_niveau(SDL_Surface *screen){
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
//if(screen != NULL) SDL_FreeSurface(screen); //if(screen != NULL) SDL_FreeSurface(screen);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
@ -361,7 +362,6 @@ int editeur_choix_niveau(SDL_Surface *screen){
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
SDL_BlitSurface(menu, NULL, screen, &positionMenu); SDL_BlitSurface(menu, NULL, screen, &positionMenu);
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
HW_SCREEN_WIDTH, HW_SCREEN_WIDTH,
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));
@ -383,6 +383,7 @@ int are_you_sure(SDL_Surface *screen){
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
//if(screen != NULL) SDL_FreeSurface(screen); //if(screen != NULL) SDL_FreeSurface(screen);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
@ -461,7 +462,6 @@ int are_you_sure(SDL_Surface *screen){
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
SDL_BlitSurface(menu, NULL, screen, &positionMenu); SDL_BlitSurface(menu, NULL, screen, &positionMenu);
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
HW_SCREEN_WIDTH, HW_SCREEN_WIDTH,
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));
@ -477,6 +477,7 @@ int are_you_sure(SDL_Surface *screen){
int choix_nb_joueurs(SDL_Surface *screen){ int choix_nb_joueurs(SDL_Surface *screen){
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
//if(screen != NULL) SDL_FreeSurface(screen); //if(screen != NULL) SDL_FreeSurface(screen);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
@ -550,7 +551,6 @@ int choix_nb_joueurs(SDL_Surface *screen){
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
SDL_BlitSurface(menu, NULL, screen, &positionMenu); SDL_BlitSurface(menu, NULL, screen, &positionMenu);
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
HW_SCREEN_WIDTH, HW_SCREEN_WIDTH,
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));
@ -566,6 +566,7 @@ int choix_nb_joueurs(SDL_Surface *screen){
int options(SDL_Surface *screen){ int options(SDL_Surface *screen){
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
//if(screen != NULL) SDL_FreeSurface(screen); //if(screen != NULL) SDL_FreeSurface(screen);
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0);
#else //HW_SCREEN_RESIZE #else //HW_SCREEN_RESIZE
@ -697,7 +698,6 @@ int options(SDL_Surface *screen){
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
SDL_BlitSurface(menu, NULL, screen, &positionMenu); SDL_BlitSurface(menu, NULL, screen, &positionMenu);
#ifdef HW_SCREEN_RESIZE #ifdef HW_SCREEN_RESIZE
SDL_FillRect(hw_screen, NULL, 0x000000);
flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, flip_NNOptimized_AllowOutOfScreen(screen, hw_screen,
HW_SCREEN_WIDTH, HW_SCREEN_WIDTH,
MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT));