Reorganised headers to match design choices and component creation order for correct update order.

src/components/headers/components.h

@@ -2,10 +2,10 @@
 #define COMPONENTS_H
 
 #include "transform_component.h"
-#include "hitbox_component.h"
-#include "physics_system.h"
 #include "sprite_component.h"
 #include "animation_system.h"
+#include "hitbox_component.h"
+#include "physics_system.h"
 #include "player_system.h"
 // Add new components header file here
 

src/components/headers/hitbox_component.h

@@ -5,6 +5,7 @@
 #include "ecs.h"
 #include "transform_component.h"
 #include "vector2d.h"
+#include "errors.h"
 
 typedef struct hitbox_component_data_t {
     transform_component_data_t *transform_component_data;

src/components/headers/player_system.h

@@ -2,9 +2,9 @@
 #define PLAYER_SYSTEM_H
 
 #include "ecs.h"
-#include "physics_system.h"
 #include "sprite_component.h"
 #include "animation_system.h"
+#include "physics_system.h"
 
 #define PLAYER_DEFAULT_WALK_SPEED 60.0f // px / s
 #define PLAYER_DEFAULT_RUN_SPEED 100.0f // px / s
@@ -24,9 +24,9 @@ typedef enum player_state_t {
 } player_state_t;
 
 typedef struct player_system_data_t {
-    physics_system_data_t *physics_system_data;
     sprite_component_data_t *sprite_component_data;
     animation_system_data_t *animation_system_data;
+    physics_system_data_t *physics_system_data;
 
     player_state_t state;
     player_state_t last_state;

src/components/headers/transform_component.h

@@ -3,6 +3,7 @@
 
 #include "ecs.h"
 #include "vector2d.h"
+#include "errors.h"
 
 typedef struct transform_component_data_t {
     frect_t bounds;

src/components/hitbox_component.c

@@ -1,8 +1,8 @@
 #include "hitbox_component.h"
 
+#include "game.h"
 #include "transform_component.h"
 #include "memory_alloc.h"
-#include "game.h"
 
 // Args : frect_t bounds, double speed
 int hitbox_component_init(component_t *component)

src/components/physics_system.c

@@ -1,9 +1,9 @@
 #include "physics_system.h"
 
 #include <stdarg.h>
+#include "game.h"
 #include "vector2d.h"
 #include "memory_alloc.h"
-#include "game.h"
 #include "errors.h"
 
 // Args : frect_t bounds, double speed

src/components/player_system.c

@@ -1,10 +1,10 @@
 #include "player_system.h"
 
 #include "game.h"
-#include "memory_alloc.h"
 #include "animation_system.h"
 #include "sprite_component.h"
 #include "physics_system.h"
+#include "memory_alloc.h"
 
 // No args
 inline int player_system_init(component_t *component)

src/components/sprite_component.c

@@ -1,8 +1,8 @@
 #include "sprite_component.h"
 
-#include "memory_alloc.h"
-#include "display.h"
 #include "game.h"
+#include "display.h"
+#include "memory_alloc.h"
 
 // Arg : const char *name
 inline int sprite_component_init(component_t *component)

src/components/transform_component.c

@@ -1,7 +1,7 @@
 #include "transform_component.h"
 
-#include "memory_alloc.h"
 #include "game.h"
+#include "memory_alloc.h"
 
 // Args : frect_t bounds, double speed
 int transform_component_init(component_t *component)

src/game.c

@@ -36,6 +36,8 @@ int game_init(void)
         .h = 32.0f
     };
 
+    if(!entity_new_component(player, SPRITE_COMPONENT)) return EXIT_FAILURE;
+    if(!entity_new_component(player, ANIMATION_SYSTEM)) return EXIT_FAILURE;
     component = entity_new_component(player, HITBOX_COMPONENT);
     if(!component) return EXIT_FAILURE;
 
@@ -50,8 +52,6 @@ int game_init(void)
     };
 
     if(!entity_new_component(player, PHYSICS_SYSTEM))   return EXIT_FAILURE;
-    if(!entity_new_component(player, SPRITE_COMPONENT)) return EXIT_FAILURE;
-    if(!entity_new_component(player, ANIMATION_SYSTEM)) return EXIT_FAILURE;
     if(!entity_new_component(player, PLAYER_SYSTEM))    return EXIT_FAILURE;
 
     /* ======== Test entity ======== */
@@ -68,6 +68,7 @@ int game_init(void)
         .h = 32.0f
     };
 
+    if(!entity_new_component(entity, SPRITE_COMPONENT)) return EXIT_FAILURE;
     component = entity_new_component(entity, HITBOX_COMPONENT);
     if(!component) return EXIT_FAILURE;
 
@@ -81,8 +82,6 @@ int game_init(void)
         .y = 2.0f / 3.0f
     };
 
-    if(!entity_new_component(entity, SPRITE_COMPONENT)) return EXIT_FAILURE;
-
     game.is_running = true;
 
     return EXIT_SUCCESS;