Rename assets rres file
parent
fdd5bba0f9
commit
f1ce952edb
|
@ -22,6 +22,6 @@
|
|||
|
||||
#define MAX_TILE_TYPES 16
|
||||
#define N_TAGS 10
|
||||
#define N_COMPONENTS 20
|
||||
#define N_COMPONENTS 16
|
||||
#define MAX_COMP_POOL_SIZE MAX_ENTITIES
|
||||
#endif // _ENGINE_CONF_H
|
||||
|
|
4
main.c
4
main.c
|
@ -33,8 +33,8 @@ int main(void)
|
|||
load_from_infofile("res/assets.info.raw", &engine.assets);
|
||||
init_player_creation("res/player_spr.info", &engine.assets);
|
||||
#else
|
||||
load_from_rres("res/myresources.rres", &engine.assets);
|
||||
init_player_creation_rres("res/myresources.rres", "player_spr.info", &engine.assets);
|
||||
load_from_rres("res/assets.rres", &engine.assets);
|
||||
init_player_creation_rres("res/assets.rres", "player_spr.info", &engine.assets);
|
||||
#endif
|
||||
init_item_creation(&engine.assets);
|
||||
|
||||
|
|
|
@ -254,4 +254,4 @@ for l, level in enumerate(all_levels):
|
|||
|
||||
lvl_render = Image.alpha_composite(lvl_render, water_render)
|
||||
lvl_render.save("preview.png")
|
||||
lvl_render.show()
|
||||
#lvl_render.show()
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
sed 's|res/||g' assets.info.raw > assets.info
|
||||
sed 's|res/||g' $1 > assets.info
|
||||
./rres_packer
|
||||
mv ../web/res/myresources.rres ../web/res/myresources.rres.old
|
||||
cp ./myresources.rres ../web/res/
|
||||
mv ../web/res/assets.rres ../web/res/assets.rres.old
|
||||
cp ./assets.rres ../web/res/
|
||||
|
|
|
@ -236,7 +236,7 @@ typedef enum AssetInfoType
|
|||
|
||||
int main(void)
|
||||
{
|
||||
FILE *rresFile = fopen("myresources.rres", "wb");
|
||||
FILE *rresFile = fopen("assets.rres", "wb");
|
||||
|
||||
// Define rres file header
|
||||
// NOTE: We are loading 4 files that generate 5 resource chunks to save in rres
|
||||
|
|
|
@ -46,11 +46,11 @@ int main(void)
|
|||
SetTargetFPS(60);
|
||||
|
||||
#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);
|
||||
#else
|
||||
load_from_rres("res/myresources.rres", &engine.assets);
|
||||
init_player_creation_rres("res/myresources.rres", "player_spr.info", &engine.assets);
|
||||
load_from_rres("res/assets.rres", &engine.assets);
|
||||
init_player_creation_rres("res/assets.rres", "player_spr.info", &engine.assets);
|
||||
#endif
|
||||
init_item_creation(&engine.assets);
|
||||
|
||||
|
@ -85,7 +85,6 @@ int main(void)
|
|||
emscripten_set_keydown_callback("#canvas", NULL, 1, keyDownCallback);
|
||||
emscripten_set_main_loop(update_loop, 0, 1);
|
||||
#else
|
||||
puts("Regular main loop");
|
||||
const float DT = 1.0f/60.0f;
|
||||
while(true)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue