sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Rename assets rres file

main
En Yi 2025-08-02 22:15:27 +08:00
parent fdd5bba0f9
commit f1ce952edb
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/engine_conf.h
View File

@ -22,6 +22,6 @@
#define MAX_TILE_TYPES 16 #define MAX_TILE_TYPES 16
#define N_TAGS 10 #define N_TAGS 10
#define N_COMPONENTS 20 #define N_COMPONENTS 16
#define MAX_COMP_POOL_SIZE MAX_ENTITIES #define MAX_COMP_POOL_SIZE MAX_ENTITIES
#endif // _ENGINE_CONF_H #endif // _ENGINE_CONF_H

4
main.c
View File

@ -33,8 +33,8 @@ int main(void)
load_from_infofile("res/assets.info.raw", &engine.assets); load_from_infofile("res/assets.info.raw", &engine.assets);
init_player_creation("res/player_spr.info", &engine.assets); init_player_creation("res/player_spr.info", &engine.assets);
#else #else
load_from_rres("res/myresources.rres", &engine.assets); load_from_rres("res/assets.rres", &engine.assets);
init_player_creation_rres("res/myresources.rres", "player_spr.info", &engine.assets); init_player_creation_rres("res/assets.rres", "player_spr.info", &engine.assets);
#endif #endif
init_item_creation(&engine.assets); init_item_creation(&engine.assets);

2
res/level_render.py
View File

@ -254,4 +254,4 @@ for l, level in enumerate(all_levels):
lvl_render = Image.alpha_composite(lvl_render, water_render) lvl_render = Image.alpha_composite(lvl_render, water_render)
lvl_render.save("preview.png") lvl_render.save("preview.png")
lvl_render.show() #lvl_render.show()

6
res/pack_resources.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
sed 's|res/||g' assets.info.raw > assets.info sed 's|res/||g' $1 > assets.info
./rres_packer ./rres_packer
mv ../web/res/myresources.rres ../web/res/myresources.rres.old mv ../web/res/assets.rres ../web/res/assets.rres.old
cp ./myresources.rres ../web/res/ cp ./assets.rres ../web/res/

2
res/rres_packer.c
View File

@ -236,7 +236,7 @@ typedef enum AssetInfoType
int main(void) int main(void)
{ {
FILE *rresFile = fopen("myresources.rres", "wb"); FILE *rresFile = fopen("assets.rres", "wb");
// Define rres file header // Define rres file header
// NOTE: We are loading 4 files that generate 5 resource chunks to save in rres // NOTE: We are loading 4 files that generate 5 resource chunks to save in rres

7
scene_test.c
View File

@ -46,11 +46,11 @@ int main(void)
SetTargetFPS(60); SetTargetFPS(60);
#ifndef NDEBUG #ifndef NDEBUG
load_from_infofile("res/assets.info.raw", &engine.assets); load_from_infofile("res/editor_assets.info.raw", &engine.assets);
init_player_creation("res/player_spr.info", &engine.assets); init_player_creation("res/player_spr.info", &engine.assets);
#else #else
load_from_rres("res/myresources.rres", &engine.assets); load_from_rres("res/assets.rres", &engine.assets);
init_player_creation_rres("res/myresources.rres", "player_spr.info", &engine.assets); init_player_creation_rres("res/assets.rres", "player_spr.info", &engine.assets);
#endif #endif
init_item_creation(&engine.assets); init_item_creation(&engine.assets);
@ -85,7 +85,6 @@ int main(void)
emscripten_set_keydown_callback("#canvas", NULL, 1, keyDownCallback); emscripten_set_keydown_callback("#canvas", NULL, 1, keyDownCallback);
emscripten_set_main_loop(update_loop, 0, 1); emscripten_set_main_loop(update_loop, 0, 1);
#else #else
puts("Regular main loop");
const float DT = 1.0f/60.0f; const float DT = 1.0f/60.0f;
while(true) while(true)
{ {