Refator pass 1

archive/rpg/entity/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DUSK_TARGET_NAME}
+  PRIVATE
+    entity.c
+    npc.c
+    player.c
+    direction.c
+)

archive/rpg/entity/direction.c

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "direction.h"
+#include "assert/assert.h"
+
+float_t directionToAngle(const direction_t dir) {
+  switch(dir) {
+    case DIRECTION_NORTH: return (M_PI_2);
+    case DIRECTION_SOUTH: return -(M_PI_2);
+    case DIRECTION_EAST: return 0;
+    case DIRECTION_WEST: return (M_PI);
+    default: return 0; // Should never happen
+  }
+}
+
+void directionGetVec2(const direction_t dir, vec2 out) {
+  assertNotNull(out, "Output vector cannot be NULL");
+
+  switch(dir) {
+    case DIRECTION_NORTH:
+      out[0] = 0.0f;
+      out[1] = 1.0f;
+      break;
+
+    case DIRECTION_SOUTH:
+      out[0] = 0.0f;
+      out[1] = -1.0f;
+      break;
+
+    case DIRECTION_EAST:
+      out[0] = 1.0f;
+      out[1] = 0.0f;
+      break;
+
+    case DIRECTION_WEST:
+      out[0] = -1.0f;
+      out[1] = 0.0f;
+      break;
+
+    default:
+      assertUnreachable("Invalid direction");
+  }
+}

archive/rpg/entity/direction.h

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "dusk.h"
+
+typedef enum {
+  DIRECTION_SOUTH = 0,
+  DIRECTION_EAST = 1,
+  DIRECTION_WEST = 2,
+  DIRECTION_NORTH = 3,
+
+  DIRECTION_UP = DIRECTION_NORTH,
+  DIRECTION_DOWN = DIRECTION_SOUTH,
+  DIRECTION_LEFT = DIRECTION_WEST,
+  DIRECTION_RIGHT = DIRECTION_EAST,
+} direction_t;
+
+/**
+ * Converts a direction to an angle in float_t format.
+ * 
+ * @param dir The direction to convert.
+ * @return The angle corresponding to the direction.
+ */
+float_t directionToAngle(const direction_t dir);
+
+/**
+ * Converts a direction to a vec2 unit vector.
+ * 
+ * @param dir The direction to convert.
+ * @param out Pointer to the vec2 array to populate.
+ */
+void directionGetVec2(const direction_t dir, vec2 out);

archive/rpg/entity/entity.c

@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "entity.h"
+#include "rpg/world/map.h"
+#include "assert/assert.h"
+#include "util/memory.h"
+#include "display/tileset/tileset_entities.h"
+#include "time/time.h"
+#include "util/math.h"
+
+void entityInit(entity_t *entity, const entitytype_t type, map_t *map) {
+  assertNotNull(entity, "Entity pointer cannot be NULL");
+  assertNotNull(map, "Map pointer cannot be NULL");
+  assertTrue(type < ENTITY_TYPE_COUNT, "Invalid entity type");
+  assertTrue(type != ENTITY_TYPE_NULL, "Cannot have NULL entity type");
+
+  memoryZero(entity, sizeof(entity_t));
+  entity->type = type;
+  entity->map = map;
+
+  // Init. I did use a callback struct but it was not flexible enough.
+  switch(type) {
+    case ENTITY_TYPE_PLAYER:
+      playerInit(entity);
+      break;
+
+    case ENTITY_TYPE_NPC:
+      npcInit(entity);
+      break;
+
+    default:
+      break;
+  }
+}
+
+void entityUpdate(entity_t *entity) {
+  assertNotNull(entity, "Entity pointer cannot be NULL");
+  assertTrue(entity->type < ENTITY_TYPE_COUNT, "Invalid entity type");
+  assertTrue(entity->type != ENTITY_TYPE_NULL, "Cannot have NULL entity type");
+
+  // Handle movement logic
+  switch(entity->type) {
+    case ENTITY_TYPE_PLAYER:
+      playerMovement(entity);
+      break;
+
+    case ENTITY_TYPE_NPC:
+      npcUpdate(entity);
+      break;
+
+    default:
+      break;
+  }
+
+  // Apply velocity
+  if(entity->velocity[0] != 0.0f || entity->velocity[1] != 0.0f) {
+    entity->position[0] += entity->velocity[0] * TIME.delta;
+    entity->position[1] += entity->velocity[1] * TIME.delta;
+
+    // Hit test on other entities.
+    entity_t *start = entity->map->entities;
+    entity_t *end = &entity->map->entities[entity->map->entityCount];
+
+    // Our hitbox
+    physicscircle_t self;
+    glm_vec2_copy(entity->position, self.position);
+    self.radius = TILESET_ENTITIES.tileWidth / 2.0f;
+
+    physicscircle_t other;
+    other.radius = self.radius;
+
+    // TODO: what if multiple collisions?
+    do {
+      if(start == entity) continue;
+      if(start->type == ENTITY_TYPE_NULL) continue;
+      glm_vec2_copy(start->position, other.position);
+
+      physicscirclecircleresult_t result;
+      physicsCircleCheckCircle(self, other, &result);
+
+      if(result.hit) {
+        entity->position[0] -= result.normal[0] * result.depth;
+        entity->position[1] -= result.normal[1] * result.depth;
+        break;
+      }
+    } while((start++) != end);
+
+    // Friction (and dampening)
+    entity->velocity[0] *= ENTITY_FRICTION * TIME.delta;
+    entity->velocity[1] *= ENTITY_FRICTION * TIME.delta;
+    if(mathAbs(entity->velocity[0]) < ENTITY_MIN_VELOCITY) {
+      entity->velocity[0] = 0.0f;
+    }
+    if(mathAbs(entity->velocity[1]) < ENTITY_MIN_VELOCITY) {
+      entity->velocity[1] = 0.0f;
+    }
+  }
+
+  if(entity->type == ENTITY_TYPE_PLAYER) {
+    playerInteraction(entity);
+  }
+}

archive/rpg/entity/entity.h

@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "direction.h"
+#include "rpg/entity/player.h"
+#include "npc.h"
+#include "physics/physics.h"
+
+#define ENTITY_FRICTION 0.9f
+#define ENTITY_MIN_VELOCITY 0.05f
+
+typedef struct map_s map_t;
+
+typedef enum {
+  ENTITY_TYPE_NULL,
+  ENTITY_TYPE_PLAYER,
+  ENTITY_TYPE_NPC,
+
+  ENTITY_TYPE_COUNT
+} entitytype_t;
+
+typedef struct entity_s {
+  map_t *map;
+  entitytype_t type;
+  direction_t direction;
+
+  vec2 position;
+  vec2 velocity;
+
+  union {
+    player_t player;
+    npc_t npc;
+  };
+} entity_t;
+
+/**
+ * Initializes an entity structure.
+ * 
+ * @param entity Pointer to the entity structure to initialize.
+ * @param type The type of the entity.
+ * @param map Pointer to the map the entity belongs to.
+ */
+void entityInit(entity_t *entity, const entitytype_t type, map_t *map);
+
+/**
+ * Updates an entity.
+ * 
+ * @param entity Pointer to the entity structure to update.
+ */
+void entityUpdate(entity_t *entity);

archive/rpg/entity/npc.c

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "entity.h"
+#include "assert/assert.h"
+
+void npcInit(entity_t *entity) {
+  assertNotNull(entity, "Entity pointer cannot be NULL");
+}
+
+void npcUpdate(entity_t *entity) {
+  assertNotNull(entity, "Entity pointer cannot be NULL");
+}

archive/rpg/entity/npc.h

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "dusk.h"
+
+typedef struct entity_s entity_t;
+
+typedef struct {
+  void *nothing;
+} npc_t;
+
+/**
+ * Initializes an NPC entity.
+ * 
+ * @param entity Pointer to the entity structure to initialize.
+ */
+void npcInit(entity_t *entity);
+
+/**
+ * Updates an NPC entity.
+ * 
+ * @param entity Pointer to the entity structure to update.
+ */
+void npcUpdate(entity_t *entity);

archive/rpg/entity/player.c

@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "entity.h"
+#include "assert/assert.h"
+#include "input/input.h"
+#include "display/scene/overworld/sceneoverworld.h"
+#include "display/tileset/tileset_entities.h"
+
+void playerInit(entity_t *entity) {
+  assertNotNull(entity, "Entity pointer cannot be NULL");
+}
+
+void playerMovement(entity_t *entity) {
+  assertNotNull(entity, "Entity pointer cannot be NULL");
+
+  // Update velocity.
+  vec2 dir = {
+    inputAxis(INPUT_ACTION_LEFT, INPUT_ACTION_RIGHT),
+    inputAxis(INPUT_ACTION_DOWN, INPUT_ACTION_UP)
+  };
+  if(dir[0] == 0 && dir[1] == 0) return;
+
+  glm_vec2_normalize(dir);
+  entity->velocity[0] += PLAYER_SPEED * dir[0];
+  entity->velocity[1] += PLAYER_SPEED * dir[1];
+  
+  // Update direction.
+  if(dir[0] > 0) {
+    if(entity->direction == DIRECTION_RIGHT) {
+      entity->direction = DIRECTION_RIGHT;
+    } else {
+      if(dir[1] < 0) {
+        entity->direction = DIRECTION_UP;
+      } else if(dir[1] > 0) {
+        entity->direction = DIRECTION_DOWN;
+      } else {
+        entity->direction = DIRECTION_RIGHT;
+      }
+    }
+  } else if(dir[0] < 0) {
+    if(entity->direction == DIRECTION_LEFT) {
+      entity->direction = DIRECTION_LEFT;
+    } else {
+      if(dir[1] < 0) {
+        entity->direction = DIRECTION_UP;
+      } else if(dir[1] > 0) {
+        entity->direction = DIRECTION_DOWN;
+      } else {
+        entity->direction = DIRECTION_LEFT;
+      }
+    }
+  } else if(dir[1] < 0) {
+    entity->direction = DIRECTION_UP;
+  } else if(dir[1] > 0) {
+    entity->direction = DIRECTION_DOWN;
+  }
+}
+
+void playerInteraction(entity_t *entity) {
+  assertNotNull(entity, "Entity pointer cannot be NULL");
+
+  if(!inputPressed(INPUT_ACTION_ACCEPT)) return;
+  
+  physicsbox_t interactBox;
+
+  // Get direction vector
+  directionGetVec2(entity->direction, interactBox.min);
+
+  // Scale by interact range
+  glm_vec2_scale(interactBox.min, PLAYER_INTERACTION_RANGE, interactBox.min);
+
+  // Add entity position, this makes the center of the box.
+  glm_vec2_add(interactBox.min, entity->position, interactBox.min);
+
+  // Copy to max
+  glm_vec2_copy(interactBox.min, interactBox.max);
+  
+  // Size of the hitbox
+  vec2 halfSize = {
+    TILESET_ENTITIES.tileWidth * PLAYER_INTERACTION_SIZE * 0.5f,
+    TILESET_ENTITIES.tileHeight * PLAYER_INTERACTION_SIZE * 0.5f
+  };
+
+  // Subtract from min, add to max.
+  glm_vec2_sub(interactBox.min, halfSize, interactBox.min);
+  glm_vec2_add(interactBox.max, halfSize, interactBox.max);
+
+  // For each entity
+  entity_t *start = entity->map->entities;
+  entity_t *end = &entity->map->entities[entity->map->entityCount];
+  vec2 otherSize = { TILESET_ENTITIES.tileWidth, TILESET_ENTITIES.tileHeight };
+  physicsbox_t otherBox;
+  physicsboxboxresult_t result;
+
+  do {
+    if(start->type != ENTITY_TYPE_NPC) continue;
+
+    // Setup other box.
+    glm_vec2_copy(start->position, otherBox.min);
+    glm_vec2_copy(start->position, otherBox.max);
+    glm_vec2_sub(otherBox.min, otherSize, otherBox.min);
+    glm_vec2_add(otherBox.min, otherSize, otherBox.max);
+    
+    physicsBoxCheckBox(interactBox, otherBox, &result);
+    if(!result.hit) continue;
+    
+    printf("Interacted with entity at (%.2f, %.2f)\n", start->position[0], start->position[1]);
+    break;
+  } while(++start != end);
+}

archive/rpg/entity/player.h

@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "dusk.h"
+
+#define PLAYER_SPEED 64.0f
+#define PLAYER_INTERACTION_RANGE 1.0f
+#define PLAYER_INTERACTION_SIZE 0.5f
+
+typedef struct entity_s entity_t;
+
+typedef struct {
+  void *nothing;
+} player_t;
+
+/**
+ * Initializes a player entity.
+ * 
+ * @param entity Pointer to the entity structure to initialize.
+ */
+void playerInit(entity_t *entity);
+
+/**
+ * Handles movement logic for the player entity.
+ * 
+ * @param entity Pointer to the player entity structure.
+ */
+void playerMovement(entity_t *entity);
+
+/**
+ * Handles interaction logic for the player entity.
+ * 
+ * @param entity Pointer to the player entity structure.
+ */
+void playerInteraction(entity_t *entity);