diff --git a/Data/Inter-Italic.otf b/Data/Fonts/Inter-Italic.otf similarity index 100% rename from Data/Inter-Italic.otf rename to Data/Fonts/Inter-Italic.otf diff --git a/Data/Inter-LICENSE.txt b/Data/Fonts/Inter-LICENSE.txt similarity index 100% rename from Data/Inter-LICENSE.txt rename to Data/Fonts/Inter-LICENSE.txt diff --git a/Data/Inter-Regular.otf b/Data/Fonts/Inter-Regular.otf similarity index 100% rename from Data/Inter-Regular.otf rename to Data/Fonts/Inter-Regular.otf diff --git a/Data/JetBrainsMonoNL-Regular-LICENSE.txt b/Data/Fonts/JetBrainsMonoNL-Regular-LICENSE.txt similarity index 100% rename from Data/JetBrainsMonoNL-Regular-LICENSE.txt rename to Data/Fonts/JetBrainsMonoNL-Regular-LICENSE.txt diff --git a/Data/JetBrainsMonoNL-Regular.ttf b/Data/Fonts/JetBrainsMonoNL-Regular.ttf similarity index 100% rename from Data/JetBrainsMonoNL-Regular.ttf rename to Data/Fonts/JetBrainsMonoNL-Regular.ttf diff --git a/Data/Talkco.otf b/Data/Fonts/Talkco.otf similarity index 100% rename from Data/Talkco.otf rename to Data/Fonts/Talkco.otf diff --git a/feely_pona.cpp b/feely_pona.cpp index af84b43..48cf89b 100644 --- a/feely_pona.cpp +++ b/feely_pona.cpp @@ -505,13 +505,12 @@ void TELY_DLL_Init(void *user_data) FP_Game *game = Dqn_Arena_New(&platform->arena, FP_Game, Dqn_ZeroMem_Yes); uint16_t font_size = 18; - game->inter_regular_font_large = platform->func_load_font(assets, DQN_STRING8("Inter (Regular)"), DQN_STRING8("Data/Inter-Regular.otf"), DQN_CAST(uint16_t)(font_size * 5.f)); - game->inter_regular_font = platform->func_load_font(assets, DQN_STRING8("Inter (Regular)"), DQN_STRING8("Data/Inter-Regular.otf"), DQN_CAST(uint16_t)(font_size)); - game->inter_italic_font = platform->func_load_font(assets, DQN_STRING8("Inter (Italic)"), DQN_STRING8("Data/Inter-Italic.otf"), font_size); - game->jetbrains_mono_font = platform->func_load_font(assets, DQN_STRING8("JetBrains Mono NL (Regular)"), DQN_STRING8("Data/JetBrainsMonoNL-Regular.ttf"), font_size); - game->talkco_font = platform->func_load_font(assets, DQN_STRING8("Talkco"), DQN_STRING8("Data/Talkco.otf"), font_size); - game->talkco_font_large = platform->func_load_font(assets, DQN_STRING8("Talkco"), DQN_STRING8("Data/Talkco.otf"), DQN_CAST(uint16_t)(font_size * 1.5f)); - game->audio[FP_GameAudio_TestAudio] = platform->func_load_audio(assets, DQN_STRING8("Test Audio"), DQN_STRING8("Data/Audio/Purrple Cat - Moonwinds.qoa")); + game->inter_regular_font_large = platform->func_load_font(assets, DQN_STRING8("Inter (Regular)"), DQN_STRING8("Data/Fonts/Inter-Regular.otf"), DQN_CAST(uint16_t)(font_size * 5.f)); + game->inter_regular_font = platform->func_load_font(assets, DQN_STRING8("Inter (Regular)"), DQN_STRING8("Data/Fonts/Inter-Regular.otf"), DQN_CAST(uint16_t)(font_size)); + game->inter_italic_font = platform->func_load_font(assets, DQN_STRING8("Inter (Italic)"), DQN_STRING8("Data/Fonts/Inter-Italic.otf"), font_size); + game->jetbrains_mono_font = platform->func_load_font(assets, DQN_STRING8("JetBrains Mono NL (Regular)"), DQN_STRING8("Data/Fonts/JetBrainsMonoNL-Regular.ttf"), font_size); + game->talkco_font = platform->func_load_font(assets, DQN_STRING8("Talkco"), DQN_STRING8("Data/Fonts/Talkco.otf"), font_size); + game->talkco_font_large = platform->func_load_font(assets, DQN_STRING8("Talkco"), DQN_STRING8("Data/Fonts/Talkco.otf"), DQN_CAST(uint16_t)(font_size * 1.5f)); game->audio[FP_GameAudio_TerryHit] = platform->func_load_audio(assets, DQN_STRING8("Terry Hit"), DQN_STRING8("Data/Audio/terry_hit.ogg")); game->audio[FP_GameAudio_Smooch] = platform->func_load_audio(assets, DQN_STRING8("Smooch"), DQN_STRING8("Data/Audio/smooch.mp3")); game->audio[FP_GameAudio_Woosh] = platform->func_load_audio(assets, DQN_STRING8("Woosh"), DQN_STRING8("Data/Audio/woosh.ogg")); @@ -1445,7 +1444,6 @@ void FP_Update(TELY_Platform *platform, FP_Game *game, TELY_PlatformInput *input { Dqn_Profiler_ZoneScopeWithIndex("FP_Update", FP_ProfileZone_FPUpdate); - FP_GameCameraM2x3 const camera_xforms = FP_Game_CameraModelViewM2x3(game->play.camera); game->play.update_counter++; game->play.clock_ms = DQN_CAST(uint64_t)(platform->input.timer_s * 1000.f); Dqn_ProfilerZone update_zone = Dqn_Profiler_BeginZoneWithIndex(DQN_STRING8("FP_Update: Entity loop"), FP_ProfileZone_FPUpdate_EntityLoop); diff --git a/feely_pona_build.cpp b/feely_pona_build.cpp index dfb2c96..3c5fc5a 100644 --- a/feely_pona_build.cpp +++ b/feely_pona_build.cpp @@ -135,11 +135,17 @@ int main(int argc, char const **argv) { robocopy_timings[0] = Dqn_OS_PerfCounterNow(); DQN_DEFER { robocopy_timings[1] = Dqn_OS_PerfCounterNow(); }; - Dqn_String8 robocopy_cmd = Dqn_String8_InitF(scratch.allocator, "robocopy /MIR /NJH /NJS /NDL /NP %.*s\\Data %.*s\\Data", DQN_STRING_FMT(exe_dir), DQN_STRING_FMT(build_dir)); - if (dry_run) { - Dqn_Print_StdLnF(Dqn_PrintStd_Out, "%.*s\n", DQN_STRING_FMT(robocopy_cmd)); - } else { - Dqn_OS_Exec(robocopy_cmd, /*working_dir*/ {}); + Dqn_String8 robocopy_cmd[] = { + Dqn_String8_InitF(scratch.allocator, "robocopy /NJH /NJS /NDL /NP %.*s\\Data %.*s\\Data\\Textures atlas.*", DQN_STRING_FMT(exe_dir), DQN_STRING_FMT(build_dir)), + Dqn_String8_InitF(scratch.allocator, "robocopy /MIR /NJH /NJS /NDL /NP %.*s\\Data\\Fonts %.*s\\Data\\Fonts", DQN_STRING_FMT(exe_dir), DQN_STRING_FMT(build_dir)), + Dqn_String8_InitF(scratch.allocator, "robocopy /MIR /NJH /NJS /NDL /NP %.*s\\Data\\Audio %.*s\\Data\\Audio", DQN_STRING_FMT(exe_dir), DQN_STRING_FMT(build_dir)), + }; + + for (Dqn_String8 cmd : robocopy_cmd) { + if (dry_run) + Dqn_Print_StdLnF(Dqn_PrintStd_Out, "%.*s\n", DQN_STRING_FMT(cmd)); + else + Dqn_OS_Exec(cmd, /*working_dir*/ {}); } } diff --git a/feely_pona_game.h b/feely_pona_game.h index e3d7017..cd5375c 100644 --- a/feely_pona_game.h +++ b/feely_pona_game.h @@ -263,22 +263,21 @@ struct FP_GameCamera enum FP_GameAudio { - FP_GameAudio_TestAudio, FP_GameAudio_TerryHit, FP_GameAudio_Smooch, - FP_GameAudio_Woosh, - FP_GameAudio_Ching, - FP_GameAudio_Church, - FP_GameAudio_Plane, - FP_GameAudio_Club, - FP_GameAudio_Dog, - FP_GameAudio_MerchantTerry, - FP_GameAudio_MerchantGhost, - FP_GameAudio_MerchantGym, - FP_GameAudio_MerchantPhone, - FP_GameAudio_Message, - FP_GameAudio_Monkey, - FP_GameAudio_PortalDestroy, + FP_GameAudio_Woosh, + FP_GameAudio_Ching, + FP_GameAudio_Church, + FP_GameAudio_Plane, + FP_GameAudio_Club, + FP_GameAudio_Dog, + FP_GameAudio_MerchantTerry, + FP_GameAudio_MerchantGhost, + FP_GameAudio_MerchantGym, + FP_GameAudio_MerchantPhone, + FP_GameAudio_Message, + FP_GameAudio_Monkey, + FP_GameAudio_PortalDestroy, FP_GameAudio_Count, };