Typos and loading tileset in sprite.
This commit is contained in:
parent
2e03f91596
commit
544e623e25
|
|
@ -1 +1 @@
|
||||||
Subproject commit 24d2ac6564e2cb3c52b872736071df540599439f
|
Subproject commit 06e7426701be858c522a20c72ba9919d876771f6
|
||||||
|
|
@ -2,7 +2,7 @@ ASSETS := \
|
||||||
misc/dummy_sheet.png \
|
misc/dummy_sheet.png \
|
||||||
player_sheets/player_idle_sheet.png \
|
player_sheets/player_idle_sheet.png \
|
||||||
player_sheets/player_walk_sheet.png \
|
player_sheets/player_walk_sheet.png \
|
||||||
player_sheets/player_run_sheet.png\
|
player_sheets/player_run_sheet.png \
|
||||||
tileset/tileset.png
|
tileset/tileset.png
|
||||||
|
|
||||||
ASSETS := $(addprefix $(ASSETS_DIR)/,$(ASSETS))
|
ASSETS := $(addprefix $(ASSETS_DIR)/,$(ASSETS))
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ int game_init(void)
|
||||||
if(asset_manager_init(&game.asset_manager)) return EXIT_FAILURE;
|
if(asset_manager_init(&game.asset_manager)) return EXIT_FAILURE;
|
||||||
|
|
||||||
if(asset_manager_load_asset(&game.asset_manager, "dummy_sheet", ASSET_TEXTURE)) return EXIT_FAILURE;
|
if(asset_manager_load_asset(&game.asset_manager, "dummy_sheet", ASSET_TEXTURE)) return EXIT_FAILURE;
|
||||||
|
if(asset_manager_load_asset(&game.asset_manager, "tileset", ASSET_TEXTURE)) return EXIT_FAILURE;
|
||||||
if(asset_manager_load_asset(&game.asset_manager, "player_idle_sheet", ASSET_TEXTURE)) return EXIT_FAILURE;
|
if(asset_manager_load_asset(&game.asset_manager, "player_idle_sheet", ASSET_TEXTURE)) return EXIT_FAILURE;
|
||||||
if(asset_manager_load_asset(&game.asset_manager, "player_walk_sheet", ASSET_TEXTURE)) return EXIT_FAILURE;
|
if(asset_manager_load_asset(&game.asset_manager, "player_walk_sheet", ASSET_TEXTURE)) return EXIT_FAILURE;
|
||||||
if(asset_manager_load_asset(&game.asset_manager, "player_run_sheet", ASSET_TEXTURE)) return EXIT_FAILURE;
|
if(asset_manager_load_asset(&game.asset_manager, "player_run_sheet", ASSET_TEXTURE)) return EXIT_FAILURE;
|
||||||
|
|
@ -68,7 +69,12 @@ int game_init(void)
|
||||||
.h = 32.0f
|
.h = 32.0f
|
||||||
};
|
};
|
||||||
|
|
||||||
if(!entity_new_component(entity, SPRITE_COMPONENT)) return EXIT_FAILURE;
|
component = entity_new_component(entity, SPRITE_COMPONENT);
|
||||||
|
if(!component) return EXIT_FAILURE;
|
||||||
|
|
||||||
|
if(sprite_component_set_texture(component->data, "tileset")) return EXIT_FAILURE;
|
||||||
|
((sprite_component_data_t *)component->data)->src_rect = (rect_t) {0,0,128,128};
|
||||||
|
|
||||||
component = entity_new_component(entity, HITBOX_COMPONENT);
|
component = entity_new_component(entity, HITBOX_COMPONENT);
|
||||||
if(!component) return EXIT_FAILURE;
|
if(!component) return EXIT_FAILURE;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue