From b5858e07724432bdcfeae7b3cddcf0d5fd520416 Mon Sep 17 00:00:00 2001
From: antoinemeyer5 <antoine.meyer54@gmail.com>
Date: Wed, 22 Jun 2022 09:25:55 +0200
Subject: [PATCH] coherence noms des variables, fonctions, etc
---
travail_de_groupe/chef_oeuvre/run | Bin 18880 -> 22952 bytes
.../chef_oeuvre/src/gest_event.c | 32 +++++++++---------
.../chef_oeuvre/src/gest_event.h | 4 +--
travail_de_groupe/chef_oeuvre/src/main.c | 6 ++--
travail_de_groupe/chef_oeuvre/src/main.h | 2 +-
travail_de_groupe/chef_oeuvre/src/map.h | 2 --
travail_de_groupe/chef_oeuvre/src/player.c | 14 ++++----
travail_de_groupe/chef_oeuvre/src/player.h | 10 +++---
travail_de_groupe/chef_oeuvre/src/render.c | 26 +++++++-------
travail_de_groupe/chef_oeuvre/src/render.h | 6 ++--
10 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/travail_de_groupe/chef_oeuvre/run b/travail_de_groupe/chef_oeuvre/run
index 6fcde40f90a4ae683c5724bc2c84d25da40236f6..de6e5ad8d704c532afd54cc3e4af6d2936d4558d 100755
GIT binary patch
literal 22952
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
literal 18880
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
I0~(hB0QB0dU;qFB
diff --git a/travail_de_groupe/chef_oeuvre/src/gest_event.c b/travail_de_groupe/chef_oeuvre/src/gest_event.c
index 60c7d84..0c62f08 100644
--- a/travail_de_groupe/chef_oeuvre/src/gest_event.c
+++ b/travail_de_groupe/chef_oeuvre/src/gest_event.c
@@ -4,9 +4,9 @@ int hover[2];
int x;
int y;
-int Keys[10];
+int keys[10];
-void gestMenu(){
+void manageMenu(){
SDL_Event event;
while (SDL_PollEvent(&event)){
switch(event.type)
@@ -23,19 +23,19 @@ void gestMenu(){
continue;
case SDLK_UP:
- Keys[0] = 0;
+ keys[0] = 0;
break;
case SDLK_DOWN:
- Keys[1] = 0;
+ keys[1] = 0;
break;
case SDLK_LEFT:
- Keys[2] = 0;
+ keys[2] = 0;
break;
case SDLK_RIGHT:
- Keys[3] = 0;
+ keys[3] = 0;
break;
default:
@@ -51,19 +51,19 @@ void gestMenu(){
continue;
case SDLK_UP:
- Keys[0] = 1;
+ keys[0] = 1;
break;
case SDLK_DOWN:
- Keys[1] = 1;
+ keys[1] = 1;
break;
case SDLK_LEFT:
- Keys[2] = 1;
+ keys[2] = 1;
break;
case SDLK_RIGHT:
- Keys[3] = 1;
+ keys[3] = 1;
break;
default:
@@ -72,7 +72,7 @@ void gestMenu(){
break;
case SDL_MOUSEMOTION:
- x = (event.motion.x - (ScreenDimension.w - (MAPSIZE * CELLSIZE)) / 2) / CELLSIZE;
+ x = (event.motion.x - (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2) / CELLSIZE;
y = (event.motion.y - 0) / CELLSIZE;
hover[0] = x;
hover[1] = y;
@@ -82,16 +82,16 @@ void gestMenu(){
continue;
}
}
- GestMovement();
+ manageMovement();
SDL_Delay(5);
}
-void *EventLoop(void *arg){
+void *eventLoop(void *arg){
while(running){
- switch(game_state){
- case MENU : gestMenu();break;
- case GAME : gestMenu();break;
+ switch(gameState){
+ case MENU : manageMenu();break;
+ case GAME : manageMenu();break;
default:printf("game state fault");break;
}
}
diff --git a/travail_de_groupe/chef_oeuvre/src/gest_event.h b/travail_de_groupe/chef_oeuvre/src/gest_event.h
index a1e92d2..0a2df6d 100644
--- a/travail_de_groupe/chef_oeuvre/src/gest_event.h
+++ b/travail_de_groupe/chef_oeuvre/src/gest_event.h
@@ -6,8 +6,8 @@
#include "render.h"
extern int hover[2];
-extern int Keys[10];
+extern int keys[10];
-void *EventLoop(void *arg);
+void *eventLoop(void *arg);
#endif
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/main.c b/travail_de_groupe/chef_oeuvre/src/main.c
index 1212f7a..648b0fc 100644
--- a/travail_de_groupe/chef_oeuvre/src/main.c
+++ b/travail_de_groupe/chef_oeuvre/src/main.c
@@ -1,15 +1,15 @@
#include "main.h"
int running;
-int game_state;
+int gameState;
int main(){
running = 1;
- game_state = GAME;
+ gameState = GAME;
readMapFromFile("map.txt");
initPlayer();
- MainLoop();
+ mainLoop();
}
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/main.h b/travail_de_groupe/chef_oeuvre/src/main.h
index 3580fa2..8c5c517 100644
--- a/travail_de_groupe/chef_oeuvre/src/main.h
+++ b/travail_de_groupe/chef_oeuvre/src/main.h
@@ -24,7 +24,7 @@
#define GAME 1
extern int running;
-extern int game_state;
+extern int gameState;
#endif
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/map.h b/travail_de_groupe/chef_oeuvre/src/map.h
index f6b0c73..a9b6c58 100644
--- a/travail_de_groupe/chef_oeuvre/src/map.h
+++ b/travail_de_groupe/chef_oeuvre/src/map.h
@@ -5,8 +5,6 @@
#define MAPSIZE 20
-
-
extern int map[MAPSIZE][MAPSIZE];
void readMapFromFile(char * filename);
diff --git a/travail_de_groupe/chef_oeuvre/src/player.c b/travail_de_groupe/chef_oeuvre/src/player.c
index 83f1033..7edf5f6 100644
--- a/travail_de_groupe/chef_oeuvre/src/player.c
+++ b/travail_de_groupe/chef_oeuvre/src/player.c
@@ -1,24 +1,24 @@
#include "player.h"
-Player_t player;
+player_t player;
void initPlayer(){
player.x = 0;
player.y = 0;
- player.water_level = 0;
+ player.waterLevel = 0;
}
-void GestMovement(){
- if(Keys[0] == 1){
+void manageMovement(){
+ if(keys[0] == 1){
player.y--;
}
- if(Keys[1] == 1){
+ if(keys[1] == 1){
player.y++;
}
- if(Keys[2] == 1){
+ if(keys[2] == 1){
player.x--;
}
- if(Keys[3] == 1){
+ if(keys[3] == 1){
player.x++;
}
}
diff --git a/travail_de_groupe/chef_oeuvre/src/player.h b/travail_de_groupe/chef_oeuvre/src/player.h
index 7453a97..2037f22 100644
--- a/travail_de_groupe/chef_oeuvre/src/player.h
+++ b/travail_de_groupe/chef_oeuvre/src/player.h
@@ -4,15 +4,15 @@
#include "main.h"
#include "gest_event.h"
-typedef struct Player{
+typedef struct player{
int x;
int y;
- int water_level;
-} Player_t;
+ int waterLevel;
+} player_t;
-extern Player_t player;
+extern player_t player;
void initPlayer();
-void GestMovement();
+void manageMovement();
#endif
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/render.c b/travail_de_groupe/chef_oeuvre/src/render.c
index d7feabf..4ca25b2 100644
--- a/travail_de_groupe/chef_oeuvre/src/render.c
+++ b/travail_de_groupe/chef_oeuvre/src/render.c
@@ -3,8 +3,8 @@
SDL_Window *window;
SDL_Renderer *renderer;
-TTF_Font *RobotoFont;
-SDL_DisplayMode ScreenDimension;
+TTF_Font *robotoFont;
+SDL_DisplayMode screenDimension;
SDL_Surface * grassSurface;
SDL_Texture * grassTexture;
@@ -18,16 +18,16 @@ SDL_Texture * hoverTexture;
SDL_Surface * playerSurface;
SDL_Texture * playerTexture;
-void CreateWindow(){
+void createWindow(){
if (SDL_Init(SDL_INIT_VIDEO) != 0){
printf("Couldn't create window.");
exit(EXIT_FAILURE);
}
- SDL_GetCurrentDisplayMode(0, &ScreenDimension);
+ SDL_GetCurrentDisplayMode(0, &screenDimension);
- window = SDL_CreateWindow("Game Of Life", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, ScreenDimension.w, ScreenDimension.h, SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_SHOWN | SDL_WINDOW_FULLSCREEN_DESKTOP);
+ window = SDL_CreateWindow("Game Of Life", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, screenDimension.w, screenDimension.h, SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_SHOWN | SDL_WINDOW_FULLSCREEN_DESKTOP);
if (window == NULL){
printf("Couldn't create window");
@@ -46,7 +46,7 @@ void CreateWindow(){
exit(EXIT_FAILURE);
}
- RobotoFont = TTF_OpenFont("Res/Roboto-Black.ttf", 50);
+ robotoFont = TTF_OpenFont("Res/Roboto-Black.ttf", 50);
}
@@ -55,7 +55,7 @@ void drawMap(){
SDL_Rect rect;
rect.h = CELLSIZE;
rect.w = CELLSIZE;
- rect.x = (ScreenDimension.w - (MAPSIZE * CELLSIZE)) / 2; // centers the drawing
+ rect.x = (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2; // centers the drawing
rect.y = 0;
for(i = 0; i < MAPSIZE; i++){
for(j = 0; j < MAPSIZE; j++){
@@ -68,7 +68,7 @@ void drawMap(){
}
rect.x += CELLSIZE;
}
- rect.x = (ScreenDimension.w - (MAPSIZE * CELLSIZE)) / 2;
+ rect.x = (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2;
rect.y += CELLSIZE;
}
}
@@ -77,7 +77,7 @@ void drawPlayer(){
SDL_Rect rect;
rect.h = CELLSIZE;
rect.w = CELLSIZE;
- rect.x = player.x + (ScreenDimension.w - (MAPSIZE * CELLSIZE)) / 2;
+ rect.x = player.x + (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2;
rect.y = player.y ;
SDL_Rect destRect = {32 * (SDL_GetTicks()/200%4), 0, 32, 32};
SDL_RenderCopyEx(renderer, playerTexture, &destRect, &rect, 0, NULL, SDL_FLIP_NONE);
@@ -90,8 +90,8 @@ void drawGame(){
SDL_RenderPresent(renderer);
}
-void MainLoop(){
- CreateWindow();
+void mainLoop(){
+ createWindow();
grassSurface = IMG_Load("Res/grass.png");
grassTexture = SDL_CreateTextureFromSurface(renderer, grassSurface);
@@ -115,7 +115,7 @@ void MainLoop(){
double delta = 0;
pthread_t eventThread;
- if (pthread_create(&eventThread, NULL, EventLoop, NULL) != 0){
+ if (pthread_create(&eventThread, NULL, eventLoop, NULL) != 0){
printf("Couldn't create thread.");
exit(EXIT_FAILURE);
}
@@ -125,7 +125,7 @@ void MainLoop(){
delta = (a - b) / 1000.0;
if (delta > 1/FPS_TO_GET){
b = a;
- switch (game_state){
+ switch (gameState){
case MENU:
//Menu();
break;
diff --git a/travail_de_groupe/chef_oeuvre/src/render.h b/travail_de_groupe/chef_oeuvre/src/render.h
index f9c35aa..c3dcee9 100644
--- a/travail_de_groupe/chef_oeuvre/src/render.h
+++ b/travail_de_groupe/chef_oeuvre/src/render.h
@@ -6,13 +6,13 @@
#include "player.h"
#define FPS_TO_GET 60
-#define CELLSIZE (ScreenDimension.h / MAPSIZE)
+#define CELLSIZE (screenDimension.h / MAPSIZE)
extern SDL_Window *window;
extern SDL_Renderer *renderer;
-extern SDL_DisplayMode ScreenDimension;
+extern SDL_DisplayMode screenDimension;
void drawHover(int x, int y);
-void MainLoop();
+void mainLoop();
#endif
\ No newline at end of file
--
GitLab