sync to main (#35)

esprit-grp · Feb 20, 2023 · f7e4f2a · f7e4f2a
2 parents 03eeb32 + aaa8853
commit f7e4f2a
Show file tree

Hide file tree

Showing 45 changed files with 824 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 #custom
 test/
 .vscode/
+test.c
+test2.c
 
 # Prerequisites
 *.d

diff --git a/assets/font/Minecraft.ttf b/assets/font/Minecraft.ttf
diff --git a/assets/font/forward.ttf b/assets/font/forward.ttf
diff --git a/assets/img/+.png b/assets/img/+.png
diff --git a/assets/img/-.png b/assets/img/-.png
diff --git a/assets/img/MenuClicked.png b/assets/img/MenuClicked.png
diff --git a/assets/img/back.png b/assets/img/back.png
diff --git a/assets/img/backh.png b/assets/img/backh.png
diff --git a/assets/img/exit.png b/assets/img/exit.png
diff --git a/assets/img/exitc.png b/assets/img/exitc.png
diff --git a/assets/img/exitclicked.png b/assets/img/exitclicked.png
diff --git a/assets/img/exith.png b/assets/img/exith.png
diff --git a/assets/img/full.png b/assets/img/full.png
diff --git a/assets/img/gametitle.png b/assets/img/gametitle.png
diff --git a/assets/img/lvl1.png b/assets/img/lvl1.png
diff --git a/assets/img/lvlmenutitle.png b/assets/img/lvlmenutitle.png
diff --git a/assets/img/menu.png b/assets/img/menu.png
diff --git a/assets/img/mute.png b/assets/img/mute.png
diff --git a/assets/img/nomute.png b/assets/img/nomute.png
diff --git a/assets/img/options.png b/assets/img/options.png
diff --git a/assets/img/optionsc.png b/assets/img/optionsc.png
diff --git a/assets/img/optionsh.png b/assets/img/optionsh.png
diff --git a/assets/img/playButtonClicked.png b/assets/img/playButtonClicked.png
diff --git a/assets/img/playbutton.png b/assets/img/playbutton.png
diff --git a/assets/img/star1.png b/assets/img/star1.png
diff --git a/assets/img/star2.png b/assets/img/star2.png
diff --git a/assets/img/star3.png b/assets/img/star3.png
diff --git a/assets/img/star4.png b/assets/img/star4.png
diff --git a/assets/img/start.png b/assets/img/start.png
diff --git a/assets/img/startc.png b/assets/img/startc.png
diff --git a/assets/img/starth.png b/assets/img/starth.png
diff --git a/build/makefile b/build/makefile
@@ -1,8 +1,7 @@
 CC = gcc
 CFLAGS = -Wall -I../include
 LDFLAGS = -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf
-OBJS = main.o menu.o music.o text.o
-
+OBJS = main.o menu.o music.o text.o stars.o settings.o start.o
 game: $(OBJS)
 	$(CC) $(OBJS) $(LDFLAGS) -o game
 %.o: ../src/%.c

diff --git a/doc/button select keyboard.png b/doc/button select keyboard.png
diff --git a/doc/score.jpg b/doc/score.jpg
diff --git a/how_To_RUN.txt b/how_To_RUN.txt
@@ -0,0 +1,3 @@
+1) go inside build folder
+2) run makefile by typing make
+3) run the program by typing ./game
diff --git a/include/menu.h b/include/menu.h
@@ -1,5 +1,6 @@
-#ifndef IMAGE_H
-#define IMAGE_H
+
+#ifndef MENU_H
+#define MENU_H
 
 #define SCREEN_W 1280
 #define SCREEN_H 720 // screen height and width
@@ -12,8 +13,12 @@ typedef struct
     SDL_Surface *img;  // pointer to the image
 } image;
 
-// load buttons assets
+//! LOAD AREA
+
 void imageLoad_background(image *img);
+void imageLoad_gametitle(image *img);
+
+// load buttons assets
 void imageLoad_playbutton(image *img);
 void imageLoad_settingsbutton(image *img);
 void imageLoad_quitbutton(image *img);
@@ -22,8 +27,16 @@ void imageLoadClicked_playbutton(image *img);
 void imageLoadClicked_settingsbutton(image *img);
 void imageLoadClicked_quitbutton(image *img);
 
-// draw buttons
+void imageLoadHovered_playbutton(image *img);
+void imageLoadHovered_settingsbutton(image *img);
+void imageLoadHovered_quitbutton(image *img);
+
+//! DRAW AREA
+
+void imageDraw_gametitle(SDL_Surface *screen, image img);
 void imageDraw_background(SDL_Surface *screen, image img);
+
+// draw buttons
 void imageDraw_playbutton(SDL_Surface *screen, image img);
 void imageDraw_settingsbutton(SDL_Surface *screen, image img);
 void imageDraw_quitbutton(SDL_Surface *screen, image img);
@@ -33,7 +46,14 @@ void imageDrawClicked_playbutton(SDL_Surface *screen, image img);
 void imageDrawClicked_settingsbutton(SDL_Surface *screen, image img);
 void imageDrawClicked_quitbutton(SDL_Surface *screen, image img);
 
-// free buttons
-void imageFree(image img);
+
+void imageDrawHovered_playbutton(SDL_Surface *screen, image img);
+void imageDrawHovered_settingsbutton(SDL_Surface *screen, image img);
+void imageDrawHovered_quitbutton(SDL_Surface *screen, image img);
+
+// TODO make universal functions .h and .c files
+//**UNIVERSAL FUNCTION**//
+//  free buttons
+
 
 #endif
diff --git a/include/settings.h b/include/settings.h
@@ -0,0 +1,27 @@
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#define SCREEN_W 1280
+#define SCREEN_H 720 // screen height and width
+
+//! LOAD AREA
+void imageLoad_sounddown(image *img);
+void imageLoad_soundup(image *img);
+void imageLoad_soundmute(image *img);
+void imageLoad_fullscreen(image *img);
+void imageLoad_backbutton(image *img);
+
+void imageLoadHovered_soundmute(image *img);
+void imageLoadHovered_backbutton(image *img);
+
+//! DRAW AREA
+void imageDraw_sounddown(SDL_Surface *screen, image img);
+void imageDraw_soundup(SDL_Surface *screen, image img);
+void imageDraw_soundmute(SDL_Surface *screen, image img);
+void imageDraw_fullscreen(SDL_Surface *screen, image img);
+void imageDraw_backbutton(SDL_Surface *screen, image img);
+
+void imageDrawHovered_soundmute(SDL_Surface *screen, image img);
+void imageDrawHovered_backbutton(SDL_Surface *screen, image img);
+
+#endif // SETTINGS_H
diff --git a/include/stars.h b/include/stars.h
@@ -0,0 +1,15 @@
+#ifndef STARS_H
+#define STARS_H
+
+typedef struct
+{
+    SDL_Surface *image;
+    SDL_Rect rect;
+    int speed;
+} Star;
+
+void init_star(Star *star, SDL_Surface *image, int x, int y, int speed);
+void move_star(Star *star, int delta_time);
+void draw_star(SDL_Surface *surface, Star *star);
+
+#endif /* STARS_H */
diff --git a/include/start.h b/include/start.h
@@ -0,0 +1,15 @@
+#ifndef START_H
+#define START_H
+
+#define SCREEN_W 1280
+#define SCREEN_H 720 // screen height and width
+
+//! LOAD AREA
+void imageLoad_lvlmenutitle(image *img);
+void imageLoad_lvl1(image *img);
+
+//! DRAW AREA
+void imageDraw_lvlmenutitle(SDL_Surface *screen, image img);
+void imageDraw_lvl1(SDL_Surface *screen, image img);
+
+#endif