diff --git a/.efrocachemap b/.efrocachemap index b55135bd..99c8b895 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3932,24 +3932,24 @@ "assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450", "assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", - "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/50/39/970b2b3f334bdbfd72469cd27f8c", - "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/bd/46/92d63ccc123d646df92cd1545d0a", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d0/8e/be85a2a57eaeb26f9d09899e6811", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ee/f8/28c1f4606f3d2234dbbe79990c61", - "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/2d/02/5843eaa3f9118883523042379292", - "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/89/dc/8b965051d0c27d5812d80ecac1d3", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/16/89/34ea43bcd3901c8e5157460c37d6", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ae/72/30fe5cbfa936477b4f61e861a7ae", - "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e6/5d/4402c2e9193641ee78d20c85ff3d", - "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/02/0b/dcdc0dd9147dd9a56992572aeb60", - "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/02/87/645ddc08b2bdb90fcc69430a7b0b", - "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/3f/ce/60d6f026d3f22d800538ffd69da8", + "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a3/b4/d47b1f9ca27dc994d225efc9b652", + "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a1/20/f75ee36d80a99dbfe1ff79db2093", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/94/91/af4a3be510e2570651fbb8d4c297", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cd/6c/73657b342cb1666dd3ac734a93c8", + "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a6/9d/8830abe356b106005b793952f60c", + "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/93/e7/063a5a038904ef0641d405a5e66d", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/69/e8/77839309e3301d62bbf77624d810", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/95/4e/9e5dbd0b19acddc2cd056eca123c", + "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/0c/bb/3990f398178b924de0b493db14d8", + "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/85/14/604f8855cfa461797c5e3c5b5aab", + "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/e1/83/9d2ffd1a9f149a18c005be57db29", + "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/f6/63/9aaf6704f8dcb6e32808d09989a4", "build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/15/54/bfba7d740c7221a5d46e8e21c756", "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4b/1f/ca36bea671a5b88a7e2ccf2e4c4a", "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/57/2d/e4b9a67cb21131cdcdfb8287f9e7", "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/59/b6/6ffc20f2c0253180496d2dae968c", - "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b9/0a/dc300391e73286380eab87f6e742", - "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/97/76/7e35dd32e4507a4521a74d8c1b03", - "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9d/60/716cde2b1ec5efb8eedfa1a978f1", - "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a2/a2/70a0bda587c2405a67c6709a5d0a" + "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/cd/4f/d760d9fce637b61efeed648063cc", + "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7c/5a/d63a634b3886c9cf1b3697d24b75", + "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/46/80/98efbaeed954d2b008a9bfb77e12", + "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/89/24/6aae1e666373c46b409e44d7cdf7" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 23814529..41addb3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### 1.5.26 (20178) - Simplified licensing header on python scripts. -- Project rework in prep for open-sourcing parts of c++ layer. +- General project refactoring in order to open source most of the C++ layer. ### 1.5.25 (20176) - Added Venetian language (thanks Federico!) diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 38385608..86a2b794 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -29,7 +29,7 @@ namespace ballistica { // These are set automatically via script; don't change here. -const int kAppBuildNumber = 20215; +const int kAppBuildNumber = 20216; const char* kAppVersion = "1.5.26"; // Our standalone globals. diff --git a/src/ballistica/input/input.h b/src/ballistica/input/input.h index c58ebd8e..ad3f0f29 100644 --- a/src/ballistica/input/input.h +++ b/src/ballistica/input/input.h @@ -13,7 +13,8 @@ namespace ballistica { -/// Class for managing input; owned and used by the game thread. +/// Class for managing input. +/// Should only be used in the game thread unless otherwise specified. class Input { public: Input(); @@ -169,21 +170,21 @@ class Input { millisecs_t last_mouse_move_time_{}; int mouse_move_count_{}; std::vector > input_devices_; - KeyboardInput* keyboard_input_ = nullptr; - KeyboardInput* keyboard_input_2_ = nullptr; - TouchInput* touch_input_ = nullptr; - int input_lock_count_temp_ = 0; - int input_lock_count_permanent_ = 0; + KeyboardInput* keyboard_input_{}; + KeyboardInput* keyboard_input_2_{}; + TouchInput* touch_input_{}; + int input_lock_count_temp_{}; + int input_lock_count_permanent_{}; std::list input_lock_temp_labels_; std::list input_unlock_temp_labels_; std::list input_lock_permanent_labels_; std::list input_unlock_permanent_labels_; std::list recent_input_locks_unlocks_; std::set keys_held_; - millisecs_t last_input_device_count_update_time_ = 0; - millisecs_t last_input_temp_lock_time_ = 0; - bool ignore_mfi_controllers_ = false; - bool ignore_sdl_controllers_ = false; + millisecs_t last_input_device_count_update_time_{}; + millisecs_t last_input_temp_lock_time_{}; + bool ignore_mfi_controllers_{}; + bool ignore_sdl_controllers_{}; std::list test_inputs_; millisecs_t stress_test_time_{}; millisecs_t stress_test_last_leave_time_{}; diff --git a/tools/batools/assetstaging.py b/tools/batools/assetstaging.py index a66ce5c3..735cec9c 100755 --- a/tools/batools/assetstaging.py +++ b/tools/batools/assetstaging.py @@ -363,27 +363,30 @@ def _sync_standard_game_data(cfg: Config) -> None: def _sync_server_files(cfg: Config) -> None: assert cfg.serverdst is not None modeval = 'debug' if cfg.debug else 'release' + + # NOTE: staging these directly from src; not build. + stage_server_file( + projroot=cfg.projroot, + mode=modeval, + infilename=f'{cfg.src}/../src/server/ballisticacore_server.py', + outfilename=os.path.join( + cfg.serverdst, 'ballisticacore_server.py' + if cfg.win_type is not None else 'ballisticacore_server')) stage_server_file(projroot=cfg.projroot, mode=modeval, - infilename='assets/src/server/ballisticacore_server.py', - outfilename=os.path.join( - cfg.serverdst, - 'ballisticacore_server.py' if cfg.win_type - is not None else 'ballisticacore_server')) - stage_server_file(projroot=cfg.projroot, - mode=modeval, - infilename='assets/src/server/README.txt', + infilename=f'{cfg.src}/../src/server/README.txt', outfilename=os.path.join(cfg.serverdst, 'README.txt')) - stage_server_file(projroot=cfg.projroot, - mode=modeval, - infilename='assets/src/server/config_template.yaml', - outfilename=os.path.join(cfg.serverdst, - 'config_template.yaml')) + stage_server_file( + projroot=cfg.projroot, + mode=modeval, + infilename=f'{cfg.src}/../src/server/config_template.yaml', + outfilename=os.path.join(cfg.serverdst, 'config_template.yaml')) if cfg.win_type is not None: stage_server_file( projroot=cfg.projroot, mode=modeval, - infilename='assets/src/server/launch_ballisticacore_server.bat', + infilename= + f'{cfg.src}/../src/server/launch_ballisticacore_server.bat', outfilename=os.path.join(cfg.serverdst, 'launch_ballisticacore_server.bat'))