From f566362d1c27b00fb0a83ae98adea75a6d6b458b Mon Sep 17 00:00:00 2001 From: cyjullien1 Date: Tue, 7 Jan 2025 22:30:41 +0100 Subject: [PATCH] optimisation --- include/function.h | 2 +- script/display.c | 1 - script/function.c | 72 ++++++++++++++-------------------------------- script/main.c | 4 +-- 4 files changed, 24 insertions(+), 55 deletions(-) diff --git a/include/function.h b/include/function.h index 5002e89..82c8fff 100644 --- a/include/function.h +++ b/include/function.h @@ -57,5 +57,5 @@ void winOrLoseLoop(dis *display_user,score *score_user, bool win); unsigned int scoreCalculator(score *score_user, bool win); int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets, int nbr_targets, dis *display_user,score *score_user, int num_fichier); -int titleScreen (char **tab2d, vect *dim_tab, dis *display_user); +int titleScreen (dis *display_user); #endif // FONCTION_H diff --git a/script/display.c b/script/display.c index 6978d50..9bd1d6d 100644 --- a/script/display.c +++ b/script/display.c @@ -297,7 +297,6 @@ void backgroundDisplay(dis *display_user,int bg) SDL_RenderPresent (display_user->renderer); - SDL_Event event; SDL_Delay(100); diff --git a/script/function.c b/script/function.c index c67ac0c..aa36a44 100644 --- a/script/function.c +++ b/script/function.c @@ -625,12 +625,11 @@ int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets, /** * - * \brief La fonction permet de faire la boucle de l'éditeur. - * \param tab2d Le tableau 2d carre. - - * \return renvoie -2 ce qui signifie l'editeur + * \brief La fonction permet d' afficher le title screen. + * \param display_user Tout les information SDL pour afficher le jeu. + * \return renvoie -3 ce qui signifie le title screen */ -int titleScreen (char **tab2d, vect *dim_tab, dis *display_user) +int titleScreen (dis *display_user) { char input; bool finish = false; @@ -653,20 +652,8 @@ int titleScreen (char **tab2d, vect *dim_tab, dis *display_user) snprintf (txt_button, 63," Aubin and Cyprien",indice_button); displayTextSDL (display_user, txt_button, coor_time,size_txt, 30); - int tmp =0; - int tmp2 =4; - int tmp3 =8; - int tmp4 =12; - int tmp5 =16; - int tmp6 =20; - int tmp7 =24; - int sinus =10; - int sinus2 =14; - int sinus3 =18; - int sinus4 =22; - int sinus5 =26; - int sinus6 =30; - int sinus7 =34; + int tab[7] = {0,4,8,12,16,20,24}; + int sinus[7] = {10,14,18,22,26,30,34}; while (!finish) { @@ -688,41 +675,24 @@ int titleScreen (char **tab2d, vect *dim_tab, dis *display_user) } } } - tmp++; - tmp2++; - tmp3++; - tmp4++; - tmp5++; - tmp6++; - tmp7++; - if (tmp2 >30){sinus2--; } else{sinus2++;} - if (tmp3 >30){sinus3--; } else{sinus3++;} - if (tmp4 >30){sinus4--; } else{sinus4++;} - if (tmp5 >30){sinus5--; } else{sinus5++;} - if (tmp6 >30){sinus6--; } else{sinus6++;} - if (tmp7 >30){sinus7--; } else{sinus7++;} - if (tmp >30) { snprintf (txt_button, 63," press enter ",indice_button);sinus--;} - else{ sinus++; snprintf (txt_button, 63," ",indice_button);} + for(int i=0;i<7;i++) + { + tab[i]++; + if (tab[i] >30){sinus[i]--; } else{sinus[i]++;} + if(tab[i]>60){ tab[i]=0; } + } + tab[0]>30? snprintf(txt_button, 63," press enter ",indice_button):snprintf(txt_button, 63," ",indice_button); + displayTextSDL (display_user, txt_button, coor_move_player,size_txt, 20); - if(tmp>60){ tmp=0; } - if(tmp2>60){ tmp2=0; } - if(tmp3>60){ tmp3=0; } - if(tmp4>60){ tmp4=0; } - if(tmp5>60){ tmp5=0; } - if(tmp6>60){ tmp6=0; } - if(tmp7>60){ tmp7=0; } - - displayTextSDL (display_user, txt_button, coor_move_player,size_txt, 20); - - vect s = { display_user->size_window /2-200, 50 + sinus * 2 }; - vect o = { display_user->size_window /2-200+60, 50 + sinus2 * 2 }; - vect k = { display_user->size_window /2-200+120, 50 + sinus3 * 2 }; - vect oo = { display_user->size_window/2-200+180, 50 + sinus4 * 2 }; - vect b = { display_user->size_window /2-200+240, 50 + sinus5 * 2 }; - vect a = { display_user->size_window /2-200+300, 50 + sinus6 * 2 }; - vect n = { display_user->size_window /2-200+360, 50 + sinus7 * 2 }; + vect s = { display_user->size_window /2-200, 50 + sinus[0] * 2 }; + vect o = { display_user->size_window /2-200+60, 50 + sinus[1] * 2 }; + vect k = { display_user->size_window /2-200+120, 50 + sinus[2] * 2 }; + vect oo = { display_user->size_window/2-200+180, 50 + sinus[3] * 2 }; + vect b = { display_user->size_window /2-200+240, 50 + sinus[4] * 2 }; + vect a = { display_user->size_window /2-200+300, 50 + sinus[5] * 2 }; + vect n = { display_user->size_window /2-200+360, 50 + sinus[6] * 2 }; snprintf (txt_button, 63,"S",indice_button); displayTextSDL (display_user, txt_button, s,size_txt, 50); snprintf (txt_button, 63,"O",indice_button); diff --git a/script/main.c b/script/main.c index e3a622f..a83fb4c 100644 --- a/script/main.c +++ b/script/main.c @@ -138,8 +138,8 @@ int main () else if(output == -3) { Mix_PlayMusic(music_menu, -1); - backgroundDisplay(&display_user,0); - output = titleScreen(tab2d, &dim, &display_user); + backgroundDisplay(&display_user,3); + output = titleScreen(&display_user); } else {