Merge branch 'main' of git.vyang.org:yangvincenh/star-invaders

.gitignore

@@ -1 +1,18 @@
 build/
+.vscode/
+.idea/
+*.class
+*.jar
+*.pyc
+__pycache__/
+*.o
+*.exe
+*.out
+*.log
+.DS_Store
+
+star-invaders
+*.kra
+*.xcf
+*.png
+*.*~

CMakeLists.txt

@@ -1,16 +1,22 @@
-cmake_minimum_required(VERSION 3.10)
+# Specify the minimum required version of CMake
-project(SDL2_Example LANGUAGES C)
+cmake_minimum_required(VERSION 3.14)
 
-# Set the C standard to C99
+# Specify the C++ standard to use
-set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD 17)
 set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_C_COMPILER gcc)
 
-# Find SDL2
+# Define the project name and enable C language
-find_package(SDL2 REQUIRED)
+project(starinvaders LANGUAGES C CXX)
 
-# Add your executable target
+# Find all source files in the "src" directory
 file(GLOB SOURCES "src/*.c")
-add_executable(star-invaders ${SOURCES})
 
-# Link the SDL2 libraries to your executable
+# Find zlib and sdl2
-target_link_libraries(star-invaders PRIVATE SDL2::SDL2)
+find_package(ZLIB REQUIRED)
+find_package(SDL2 CONFIG REQUIRED)
+
+# Add an executable target named "starinvaders" from the source files in the "src" directory
+add_executable(starinvaders ${SOURCES})
+target_link_libraries(starinvaders PRIVATE ZLIB::ZLIB)
+target_link_libraries(starinvaders PRIVATE SDL2::SDL2)

Makefile

@@ -0,0 +1,29 @@
+# Simple Makefile using sdl-config for SDL flags
+CC := clang
+SDL_CFLAGS := $(shell sdl2-config --cflags)
+SDL_LIBS := $(shell sdl2-config --libs)
+CFLAGS := -Wall -Wextra -std=c99 -g $(SDL_CFLAGS)
+SRCDIR := src
+SOURCES := $(wildcard $(SRCDIR)/*.c)
+BUILD_DIR := build
+OBJECTS := $(patsubst $(SRCDIR)/%.c,$(BUILD_DIR)/%.o,$(SOURCES))
+TARGET := star-invaders
+
+.PHONY: all clean
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+	@echo " Linking $@"
+	@$(CC) $(OBJECTS) -o $@ $(SDL_LIBS)
+
+$(BUILD_DIR)/%.o: $(SRCDIR)/%.c | $(BUILD_DIR)
+	@echo " Compiling $<"
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+$(BUILD_DIR):
+	@mkdir -p $(BUILD_DIR)
+
+clean:
+	@echo "Cleaning up"
+	@rm -rf $(BUILD_DIR) $(TARGET)

src/bullet.c

@@ -1,9 +1,21 @@
 #include "bullet.h"
+#include "game.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+void initBullet(Bullet *bullet, int x, int y) {
+    bullet->rect.x = x;
+    bullet->rect.y = y;
+    bullet->rect.w = 50;  // Bullet width
+    bullet->rect.h = 50; // Bullet height
+    bullet->active = 0;
+}
 
 void updateBullets(Bullet *bullets, int *bulletCount, SDL_Renderer* renderer) {
     int bulletSpeed = 7;
     
-    for (int i = 0; i < *bulletCount; i++) {
+    for (int i = 0; i < MAX_BULLETS; i++) {
         if (bullets[i].active) {
             // Move bullet upward
             bullets[i].rect.y -= bulletSpeed;
@@ -11,22 +23,31 @@ void updateBullets(Bullet* bullets, int* bulletCount, SDL_Renderer* renderer) {
             // Deactivate if bullet goes off screen
             if (bullets[i].rect.y < 0) {
                 bullets[i].active = 0;
+                (*bulletCount)--;
             } else {
-                // Draw bullet
+                // Draw bullet using global textures
-                SDL_SetRenderDrawColor(renderer, 255, 255, 0, 255);
+                SDL_RenderCopy(renderer, textures.bulletTexture, NULL, &bullets[i].rect);
-                SDL_RenderFillRect(renderer, &bullets[i].rect);
             }
         }
     }
 }
 
 void fireBullet(Bullet *bullets, int *bulletCount, SDL_Rect* rect) {
-    if (*bulletCount < MAX_BULLETS) {
+    for (int i = 0; i < MAX_BULLETS; i++) {
-        bullets[*bulletCount].rect.x = rect->x + rect->w / 2 - 2;
+        if (!bullets[i].active) {
-        bullets[*bulletCount].rect.y = rect->y - 10;
+            bullets[i].rect.x = rect->x;
-        bullets[*bulletCount].rect.w = 4;
+            bullets[i].rect.y = rect->y;
-        bullets[*bulletCount].rect.h = 10;
+            bullets[i].active = 1;
-        bullets[*bulletCount].active = 1;
             (*bulletCount)++;
+            break;
         }
     }
+}
+
+void cleanupBullets(Bullet *bullets, int *bulletCount) {
+    // Deactivate all bullets and reset count
+    for (int i = 0; i < MAX_BULLETS; i++) {
+        bullets[i].active = 0;
+    }
+    *bulletCount = 0;
+}

src/bullet.h

@@ -1,16 +1,20 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
-#define MAX_BULLETS 100
+#define MAX_BULLETS 5
 
 typedef struct {
   SDL_Rect rect;
   int active;
 } Bullet;
 
+/* Initialize an existing Bullet struct */
+void initBullet(Bullet *bullet, int x, int y);
+
 void updateBullets(Bullet *bullets, int *bulletCount, SDL_Renderer *renderer);
 void fireBullet(Bullet *bullets, int *bulletCount, SDL_Rect *rect);
+void cleanupBullets(Bullet *bullets, int *bulletCount);
 
 #endif

src/game.h

@@ -0,0 +1,25 @@
+#ifndef GAME_H
+#define GAME_H
+
+#include <SDL.h>
+
+#define FPS 60
+#define FRAME_DELAY (1000 / FPS) // Milliseconds per frame
+#define SCREEN_WIDTH 800
+#define SCREEN_HEIGHT 600
+
+typedef struct {
+  char *spaceshipPath;
+  char *backgroundPath;
+  char *bulletPath;
+} AssetPaths;
+
+typedef struct {
+    SDL_Texture *bulletTexture;
+    SDL_Texture *playerTexture;
+    SDL_Texture *backgroundTexture;
+} Textures;
+
+extern Textures textures;
+
+#endif /* GAME_H */

src/main.c

@@ -1,27 +1,150 @@
-#include <SDL2/SDL.h>
+#include "bullet.h"
+#include "game.h"
+#include "player.h"
+#include <SDL.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "bullet.h"
+#include <string.h>
-#include "player.h"
 
-#define FPS 60
+Textures textures = {0}; // global textures storage (initialized to NULL pointers)
-#define FRAME_DELAY (1000 / FPS)  // Milliseconds per frame
-#define SCREEN_WIDTH 800
-#define SCREEN_HEIGHT 600
 
-void handlePlayer(SDL_Renderer* renderer, Player* player, int speed) {
+int loadTextures(SDL_Renderer *renderer, AssetPaths *paths) {
-    // Get current keyboard state
+  SDL_Surface *bulletSurface = SDL_LoadBMP(paths->bulletPath);
-    const Uint8* keys = SDL_GetKeyboardState(NULL);
+  if (!bulletSurface) {
-
+    fprintf(stderr, "Could not load bullet image: %s\n", SDL_GetError());
-    if (keys[SDL_SCANCODE_LEFT] || keys[SDL_SCANCODE_A]) {
+    return 0;
-        movePlayerLeft(player, speed);
-    }
-    if (keys[SDL_SCANCODE_RIGHT] || keys[SDL_SCANCODE_D]) {
-        movePlayerRight(player, speed, SCREEN_WIDTH);
   }
 
-    // Render player flipped vertically
+  textures.bulletTexture = SDL_CreateTextureFromSurface(renderer, bulletSurface);
-    renderPlayerFlipped(renderer, player, SDL_FLIP_VERTICAL);
+  SDL_FreeSurface(bulletSurface);
+  if (!textures.bulletTexture) {
+    fprintf(stderr, "Could not create bullet texture: %s\n", SDL_GetError());
+    return 0;
+  }
+
+  SDL_Surface *playerSurface = SDL_LoadBMP(paths->spaceshipPath);
+  if (!playerSurface) {
+    fprintf(stderr, "Could not load player image: %s\n", SDL_GetError());
+    SDL_DestroyTexture(textures.bulletTexture);
+    textures.bulletTexture = NULL;
+    return 0;
+  }
+
+  textures.playerTexture = SDL_CreateTextureFromSurface(renderer, playerSurface);
+  SDL_FreeSurface(playerSurface);
+  if (!textures.playerTexture) {
+    fprintf(stderr, "Could not create player texture: %s\n", SDL_GetError());
+    SDL_DestroyTexture(textures.bulletTexture);
+    textures.bulletTexture = NULL;
+    return 0;
+  }
+
+  /* Load background (non-fatal) */
+  SDL_Surface *bgSurface = SDL_LoadBMP(paths->backgroundPath);
+  if (!bgSurface) {
+    fprintf(stderr, "Could not load background %s: %s\n", paths->backgroundPath, SDL_GetError());
+    textures.backgroundTexture = NULL;
+  } else {
+    textures.backgroundTexture = SDL_CreateTextureFromSurface(renderer, bgSurface);
+    SDL_FreeSurface(bgSurface);
+    if (!textures.backgroundTexture) {
+      fprintf(stderr, "Could not create background texture: %s\n", SDL_GetError());
+      textures.backgroundTexture = NULL;
+    }
+  }
+
+  return 1;
+}
+
+/*
+ * Parse command-line arguments. Returns:
+ *  0 -> continue normally
+ *  1 -> printed help/version, should exit success
+ * -1 -> error in args, should exit failure
+ */
+static int handleArguments(int argc, char *argv[], char **resLocation) {
+  for (int args = 1; args < argc; args++) {
+    if (strcmp(argv[args], "--help") == 0 || strcmp(argv[args], "-h") == 0) {
+      printf("Star Invaders Help:\n");
+      printf("Use arrow keys or A/D to move the spaceship left and right.\n");
+      printf("Press SPACE to fire bullets.\n");
+      printf("Press ESC or close the window to exit the game.\n");
+      printf("Use --res-location or -rl to specify the resource location.\n");
+      return 1;
+    } else if (strcmp(argv[args], "--version") == 0 || strcmp(argv[args], "-v") == 0) {
+      printf("Star Invaders Version 1.0.0\n");
+      return 1;
+    } else if (strcmp(argv[args], "--res-location") == 0 || strcmp(argv[args], "-rl") == 0) {
+      if (args + 1 >= argc) {
+        fprintf(stderr, "Missing value for %s\n", argv[args]);
+        printf("Use --help or -h for usage information.\n");
+        return -1;
+      }
+      *resLocation = argv[++args];
+    } else {
+      printf("Unknown argument: %s\n", argv[args]);
+      printf("Use --help or -h for usage information.\n");
+      return -1;
+    }
+  }
+  return 0;
+}
+
+AssetPaths *getResources(const char *resLocation) {
+  AssetPaths *paths = (AssetPaths *)malloc(sizeof(AssetPaths));
+  if (!paths) {
+    fprintf(stderr, "Out of memory\n");
+    return NULL;
+  }
+
+  size_t pathLen;
+  const char *shipFile = "spaceship.bmp";
+  const char *bgFile = "background.bmp";
+  const char *bulletFile = "bullet.bmp";
+
+  pathLen = strlen(resLocation) + strlen(shipFile) + 2;
+  paths->spaceshipPath = (char *)malloc(pathLen);
+  if (!paths->spaceshipPath) {
+    free(paths);
+    fprintf(stderr, "Out of memory\n");
+    return NULL;
+  }
+  if (resLocation[strlen(resLocation) - 1] == '/') {
+    snprintf(paths->spaceshipPath, pathLen, "%s%s", resLocation, shipFile);
+  } else {
+    snprintf(paths->spaceshipPath, pathLen, "%s/%s", resLocation, shipFile);
+  }
+
+  pathLen = strlen(resLocation) + strlen(bgFile) + 2;
+  paths->backgroundPath = (char *)malloc(pathLen);
+  if (!paths->backgroundPath) {
+    free(paths->spaceshipPath);
+    free(paths);
+    fprintf(stderr, "Out of memory\n");
+    return NULL;
+  }
+  if (resLocation[strlen(resLocation) - 1] == '/') {
+    snprintf(paths->backgroundPath, pathLen, "%s%s", resLocation, bgFile);
+  } else {
+    snprintf(paths->backgroundPath, pathLen, "%s/%s", resLocation, bgFile);
+  }
+
+  pathLen = strlen(resLocation) + strlen(bulletFile) + 2;
+  paths->bulletPath = (char *)malloc(pathLen);
+  if (!paths->bulletPath) {
+    free(paths->backgroundPath);
+    free(paths->spaceshipPath);
+    free(paths);
+    fprintf(stderr, "Out of memory\n");
+    return NULL;
+  }
+  if (resLocation[strlen(resLocation) - 1] == '/') {
+    snprintf(paths->bulletPath, pathLen, "%s%s", resLocation, bulletFile);
+  } else {
+    snprintf(paths->bulletPath, pathLen, "%s/%s", resLocation, bulletFile);
+  }
+
+  return paths;
 }
 
 int main(int argc, char *argv[]) {
@@ -30,45 +153,82 @@ int main(int argc, char* argv[]) {
     return EXIT_FAILURE;
   }
 
-    SDL_Window* window = SDL_CreateWindow("Star Invaders",
+  char *resLocation = "./res/";
-                                          SDL_WINDOWPOS_CENTERED,
+  int argResult = handleArguments(argc, argv, &resLocation);
-                                          SDL_WINDOWPOS_CENTERED,
+  if (argResult == 1) {
-                                          SCREEN_WIDTH, SCREEN_HEIGHT,
+    SDL_Quit();
-                                          SDL_WINDOW_SHOWN);
+    return EXIT_SUCCESS;
-    if (!window) {
+  } else if (argResult == -1) {
-        fprintf(stderr, "Could not create window: %s\n", SDL_GetError());
     SDL_Quit();
     return EXIT_FAILURE;
   }
 
-    SDL_Renderer* renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+  AssetPaths *paths = getResources(resLocation);
+  if (!paths) {
+    fprintf(stderr, "Could not load resources\n");
+    SDL_Quit();
+    return EXIT_FAILURE;
+  }
+
+  SDL_Window *window = SDL_CreateWindow("Star Invaders", SDL_WINDOWPOS_CENTERED,
+                                        SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH,
+                                        SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
+  if (!window) {
+    fprintf(stderr, "Could not create window: %s\n", SDL_GetError());
+    free(paths->backgroundPath);
+    free(paths->bulletPath);
+    free(paths->spaceshipPath);
+    free(paths);
+    SDL_Quit();
+    return EXIT_FAILURE;
+  }
+
+  SDL_Renderer *renderer =
+      SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
   if (!renderer) {
     fprintf(stderr, "Could not create renderer: %s\n", SDL_GetError());
     SDL_DestroyWindow(window);
+    free(paths->backgroundPath);
+    free(paths->bulletPath);
+    free(paths->spaceshipPath);
+    free(paths);
     SDL_Quit();
     return EXIT_FAILURE;
   }
 
-    // Rectangle position and size
+  if (!loadTextures(renderer, paths)) {
-    SDL_Rect rect = {400, 500, 50, 50};
+    fprintf(stderr, "Could not create game textures: %s\n", SDL_GetError());
-    int speed = 5;
+    free(paths->backgroundPath);
+    free(paths->bulletPath);
+    free(paths->spaceshipPath);
+    free(paths);
+    SDL_Quit();
+    return EXIT_FAILURE;
+  }
 
   // Bullets array
-    Bullet bullets[MAX_BULLETS];
   int bulletCount = 0;
+  Bullet bullets[MAX_BULLETS];
   for (int i = 0; i < MAX_BULLETS; i++) {
-        bullets[i].active = 0;
+    initBullet(&bullets[i], 0, 0);
   }
 
   // Create player
-    Player* player = createPlayer(renderer, "../res/spaceship.bmp", 400, 500);
+  Player *player = createPlayer(400, 500);
   if (!player) {
     SDL_DestroyRenderer(renderer);
     SDL_DestroyWindow(window);
+    free(paths->spaceshipPath);
+    free(paths->backgroundPath);
+    free(paths);
+    if (textures.bulletTexture) SDL_DestroyTexture(textures.bulletTexture);
+    if (textures.playerTexture) SDL_DestroyTexture(textures.playerTexture);
     SDL_Quit();
     return EXIT_FAILURE;
   }
 
+  /* background is loaded into textures.backgroundTexture by loadTextures */
+
   // Main loop flag
   int running = 1;
   SDL_Event event;
@@ -96,12 +256,17 @@ int main(int argc, char* argv[]) {
     // Clear screen with black
     SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
     SDL_RenderClear(renderer);
+    // Draw background if available
+    if (textures.backgroundTexture) {
+      SDL_RenderCopy(renderer, textures.backgroundTexture, NULL, NULL);
+    }
 
     // Update and draw bullets
     updateBullets(bullets, &bulletCount, renderer);
+    // cleanupUnrenderedBullets(bullets, &bulletCount); // removed
 
     // Handle player movement and rendering
-        handlePlayer(renderer, player, speed);
+    handlePlayer(renderer, player, playerSpeed, keys);
 
     // Present the rendered frame
     SDL_RenderPresent(renderer);
@@ -114,6 +279,17 @@ int main(int argc, char* argv[]) {
   }
 
   destroyPlayer(player);
+
+  // Cleanup bullets (deactivate all)
+  cleanupBullets(bullets, &bulletCount);
+
+  if (textures.bulletTexture) SDL_DestroyTexture(textures.bulletTexture);
+  if (textures.playerTexture) SDL_DestroyTexture(textures.playerTexture);
+  if (textures.backgroundTexture) SDL_DestroyTexture(textures.backgroundTexture);
+
+  free(paths->spaceshipPath);
+  free(paths->backgroundPath);
+  free(paths);
   SDL_DestroyRenderer(renderer);
   SDL_DestroyWindow(window);
   SDL_Quit();

src/player.c

@@ -1,26 +1,25 @@
 #include "player.h"
+#include "game.h"
 #include <stdio.h>
 #include <stdlib.h>
 
-Player* createPlayer(SDL_Renderer* renderer, const char* imagePath, int x, int y) {
+int playerSpeed = 5;
+
+void handlePlayer(SDL_Renderer *renderer, Player *player, int playerSpeed, const Uint8 *keys) {
+  if (keys[SDL_SCANCODE_LEFT] || keys[SDL_SCANCODE_A]) {
+    movePlayerLeft(player, playerSpeed);
+  }
+  if (keys[SDL_SCANCODE_RIGHT] || keys[SDL_SCANCODE_D]) {
+    movePlayerRight(player, playerSpeed, SCREEN_WIDTH);
+  }
+
+  // Render player flipped vertically
+  renderPlayerFlipped(renderer, player, SDL_FLIP_VERTICAL);
+}
+
+Player *createPlayer(int x, int y) {
   Player *player = (Player *)malloc(sizeof(Player));
 
-    SDL_Surface* surface = SDL_LoadBMP(imagePath);
-    if (!surface) {
-        fprintf(stderr, "Could not load image %s: %s\n", imagePath, SDL_GetError());
-        free(player);
-        return NULL;
-    }
-    
-    player->texture = SDL_CreateTextureFromSurface(renderer, surface);
-    SDL_FreeSurface(surface);
-    
-    if (!player->texture) {
-        fprintf(stderr, "Could not create texture: %s\n", SDL_GetError());
-        free(player);
-        return NULL;
-    }
-    
   player->rect.x = x;
   player->rect.y = y;
   player->rect.w = 50;
@@ -30,28 +29,29 @@ Player* createPlayer(SDL_Renderer* renderer, const char* imagePath, int x, int y
 }
 
 void renderPlayer(SDL_Renderer *renderer, Player *player) {
-    SDL_RenderCopy(renderer, player->texture, NULL, &player->rect);
+  SDL_RenderCopy(renderer, textures.playerTexture, NULL, &player->rect);
 }
 
-void renderPlayerFlipped(SDL_Renderer* renderer, Player* player, SDL_RendererFlip flip) {
+void renderPlayerFlipped(SDL_Renderer *renderer, Player *player,
-    SDL_RenderCopyEx(renderer, player->texture, NULL, &player->rect, 0, NULL, flip);
+                         SDL_RendererFlip flip) {
+  SDL_RenderCopyEx(renderer, textures.playerTexture, NULL, &player->rect, 0, NULL,
+                   flip);
 }
 
-void movePlayerLeft(Player* player, int speed) {
+void movePlayerLeft(Player *player, int playerSpeed) {
-    if (player->rect.x - speed >= 0) {
+  if (player->rect.x - playerSpeed >= 0) {
-        player->rect.x -= speed;
+    player->rect.x -= playerSpeed;
   }
 }
 
-void movePlayerRight(Player* player, int speed, int screenWidth) {
+void movePlayerRight(Player *player, int playerSpeed, int screenWidth) {
-    if (player->rect.x + player->rect.w + speed <= screenWidth) {
+  if (player->rect.x + player->rect.w + playerSpeed <= screenWidth) {
-        player->rect.x += speed;
+    player->rect.x += playerSpeed;
   }
 }
 
 void destroyPlayer(Player *player) {
   if (player) {
-        SDL_DestroyTexture(player->texture);
     free(player);
   }
 }

src/player.h

@@ -1,18 +1,22 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 typedef struct {
-    SDL_Texture* texture;
   SDL_Rect rect;
 } Player;
 
-Player* createPlayer(SDL_Renderer* renderer, const char* imagePath, int x, int y);
+extern int playerSpeed;
+
+void handlePlayer(SDL_Renderer *renderer, Player *player, int playerSpeed, const Uint8 *keys);
+
+Player *createPlayer(int x, int y);
 void renderPlayer(SDL_Renderer *renderer, Player *player);
-void renderPlayerFlipped(SDL_Renderer* renderer, Player* player, SDL_RendererFlip flip);
+void renderPlayerFlipped(SDL_Renderer *renderer, Player *player,
-void movePlayerLeft(Player* player, int speed);
+                         SDL_RendererFlip flip);
-void movePlayerRight(Player* player, int speed, int screenWidth);
+void movePlayerLeft(Player *player, int playerSpeed);
+void movePlayerRight(Player *player, int playerSpeed, int screenWidth);
 void destroyPlayer(Player *player);
 
 #endif