diff --git a/src/ecs/components/headers/sprite_component.h b/src/ecs/components/headers/sprite_component.h index 3c8b33e..cee6ed4 100644 --- a/src/ecs/components/headers/sprite_component.h +++ b/src/ecs/components/headers/sprite_component.h @@ -3,7 +3,7 @@ #include "ecs.h" #include "transform_component.h" -#include "texture_manager.h" +#include "asset_manager.h" typedef struct sprite_component_data_t { transform_component_data_t *transform_component_data; diff --git a/src/ecs/components/sprite_component.c b/src/ecs/components/sprite_component.c index 8ed8537..a58057d 100644 --- a/src/ecs/components/sprite_component.c +++ b/src/ecs/components/sprite_component.c @@ -27,7 +27,7 @@ inline void sprite_component_update(component_t *component) inline void sprite_component_draw(component_t *component) { sprite_component_data_t *component_data = component->component_data; - draw_texture(component_data->texture, &component_data->src_rect, &component_data->dst_rect, component_data->flip); + asset_manager_draw_texture(component_data->texture, &component_data->src_rect, &component_data->dst_rect, component_data->flip); } inline void sprite_component_destroy(component_t *component) @@ -37,5 +37,5 @@ inline void sprite_component_destroy(component_t *component) inline void sprite_component_set_texture(sprite_component_data_t *component_data, const char *name) { - component_data->texture = texture_manager_get_texture(&game.texture_manager, name); + component_data->texture = asset_manager_get_texture(&game.asset_manager, name); } diff --git a/src/game.c b/src/game.c index 46c692d..6a92dfd 100644 --- a/src/game.c +++ b/src/game.c @@ -8,9 +8,8 @@ void game_init(void) { display_init(); - asset_manager_init(); - texture_manager_init(&game.texture_manager); + asset_manager_init(&game.asset_manager); entity_manager_init(&game.entity_manager); entity_t *player = create_entity(0); @@ -69,9 +68,8 @@ void game_render(void) void game_exit(void) { + asset_manager_exit(&game.asset_manager); entity_manager_clear(&game.entity_manager); - texture_manager_clear(&game.texture_manager); - asset_manager_exit(); display_exit(); } diff --git a/src/headers/game.h b/src/headers/game.h index a4be893..bf7fee0 100644 --- a/src/headers/game.h +++ b/src/headers/game.h @@ -4,7 +4,7 @@ #include #include "events.h" -#include "texture_manager.h" +#include "asset_manager.h" #include "ecs.h" /** @@ -19,7 +19,7 @@ */ typedef struct game_t { events_t events; - texture_manager_t texture_manager; + asset_manager_t asset_manager; entity_manager_t entity_manager; bool is_running;