Merge branch 'main' of github.com:maberet/ProjetZZ1 into main

travail_individuel/Belkhiri/Animate/src/gest_event.c

 #include "gest_event.h"
 
 
-void gestMenu(){
+void gestGame(){
     SDL_Event event;
     while (SDL_PollEvent(&event)){
             switch(event.type)
@@ -33,8 +33,8 @@ void gestMenu(){
 void *EventLoop(void *arg){
     while(running){
         switch(game_state){
-            case MENU : gestMenu();break;
-            //case GAME : gestGame();break;
+            //case MENU : gestMenu();break;
+            case GAME : gestGame();break;
             default:printf("game state fault");break;
         }
     }

travail_individuel/Belkhiri/Animate/src/main.c

@@ -6,7 +6,7 @@ int game_state;
 
 int main(){
     running = 1;
-    game_state = MENU;
+    game_state = GAME;
 
     MainLoop();
 

travail_individuel/Belkhiri/Animate/src/render.c

@@ -5,6 +5,23 @@ SDL_Renderer *renderer;
 
 TTF_Font *RobotoFont;
 
+SDL_Surface * character_walk_surface;
+SDL_Surface * character_jump_surface;
+SDL_Surface * character_attack_surface;
+
+SDL_Texture * character_walk_texture;
+SDL_Texture * character_jump_texture;
+SDL_Texture * character_attack_texture;
+
+int character_walk_w;
+int character_walk_h;
+
+int character_jump_w;
+int character_jump_h;
+
+int character_attack_w;
+int character_attack_h;
+
 void CreateWindow(){
     SDL_DisplayMode ScreenDimension;
 
@@ -38,9 +55,48 @@ void CreateWindow(){
 
 }
 
+void Game(int step){
+    SDL_RenderClear(renderer);
+    SDL_Rect character_walk_rect;
+
+    character_walk_rect.x = step;
+    character_walk_rect.y = 0;
+    character_walk_rect.w = 100;
+    character_walk_rect.h = 250;
+
+    if (step < 100){
+        SDL_Rect destRect;
+        destRect.w = character_walk_w/8;
+        destRect.h = character_walk_h;
+        destRect.x = (destRect.w * step)%character_walk_w;
+        destRect.y = 0;
+        SDL_RenderCopyEx(renderer, character_walk_texture, &destRect, &character_walk_rect, 0, NULL, SDL_FLIP_NONE);
+    }
+
+    SDL_RenderPresent(renderer);
+    SDL_Delay(100);
+}
+
 
 void MainLoop(){
     CreateWindow();
+    int step = 0;
+
+    character_walk_surface = IMG_Load("Res/king_run_spritesheet.png");
+    character_jump_surface = IMG_Load("Res/king_jump_spritesheet.png");
+    character_attack_surface = IMG_Load("Res/king_attack_spritesheet.png");
+
+    character_walk_texture = SDL_CreateTextureFromSurface(renderer, character_walk_surface);
+    character_jump_texture = SDL_CreateTextureFromSurface(renderer, character_jump_surface);
+    character_attack_texture = SDL_CreateTextureFromSurface(renderer, character_attack_surface);
+
+    SDL_FreeSurface(character_walk_surface);
+    SDL_FreeSurface(character_jump_surface);
+    SDL_FreeSurface(character_attack_surface);
+
+    SDL_QueryTexture(character_walk_texture, NULL, NULL, &character_walk_w, &character_walk_h);
+    SDL_QueryTexture(character_jump_texture, NULL, NULL, &character_jump_w, &character_jump_h);
+    SDL_QueryTexture(character_attack_texture, NULL, NULL, &character_attack_w, &character_attack_h);
 
     unsigned int a = SDL_GetTicks();
     unsigned int b = SDL_GetTicks();
@@ -58,11 +114,9 @@ void MainLoop(){
         if (delta > 1/FPS_TO_GET){
             b = a;
             switch (game_state){
-                case MENU:
-                    //Menu();
-                    break;
                 case GAME:
-                    //Game();
+                    Game(step);
+                    step++;
                     break;
             }
         }

travail_individuel/Beret/jeu_de_la_vie/Makefile

 CC=gcc
-CFLAGS=-Wextra -Wall -lm -lSDL2
-LDFLAGS=
+
+LDFLAG=$(shell sdl2-config --cflags --libs) -Wall -Wextra -lm -lSDL2_ttf -D_REENTRANT -lSDL2_image -pthread
+CFLAG=-Wall $(shell sdl2-config --cflags --libs)
+
 EXEC=run
+SRC=$(wildcard src/*.c)
+OBJ=$(SRC:.c=.o)
 
 all:$(EXEC)
 
-run: main.o render.o map.o
-	$(CC) -o $@ $^ $(LDFLAGS)
-	@echo "Lancer le programme avec ./run"
+$(EXEC):$(OBJ)
+	$(CC) -o $@ $^ $(LDFLAG)
+	mv $^ bin/
 
-map.o : src/map.c src/map.h 
-	$(CC) -o $@ -c $< $(CFLAGS)
+%.o:%.c
+	$(CC) -o $@ -c $< $(CFLAG)
 
-render.o : src/render.c src/render.h 
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-main.o : src/main.c
-	$(CC) -o $@ -c $< $(CFLAGS)
+.PHONY:clean 
 
 clean:
-	rm -rf *.o
-
-rmExec: clean
+	rm -rf bin/*.o
 	rm -rf $(EXEC)
\ No newline at end of file

travail_individuel/Beret/jeu_de_la_vie/src/map.h

-#ifndef projet
+#ifndef map_h
+#define map_h
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <SDL2/SDL.h>
 
-#endif 
+
 
 /* ------------------------------- Déclaration des fonctions.---------------------------------------*/
 
@@ -13,3 +14,4 @@ int nombrevoisin(int **grille,int i , int j,int w);
 void liberer_grille(int **grille,int taille);
 void iteration_suivante(int **grille,int **nouvelle_grille, int *regles_mort, int *regles_naissances, int taille);
 void changer_case(int **grille,int i,int j,int taille);
+#endif 
\ No newline at end of file

travail_individuel/Beret/jeu_de_la_vie/src/render.h

-#ifndef projet
+#ifndef render_h   
+#define render_h
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <SDL2/SDL.h>
 
-#endif 
 void init_sdl(SDL_Window *window_1 ,SDL_Renderer *renderer,int dimension_grille);
 void dessiner_grille(SDL_Renderer* renderer, int ** grille, int taille);
 void fin_sdl(SDL_Renderer* renderer,SDL_Window *window_1);
+#endif 
\ No newline at end of file