diff --git a/.efrocachemap b/.efrocachemap index 59195f61..3128ed3e 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4060,26 +4060,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "1190edb8a3b760875460e6628831df27", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "7c4d6030a71080233ed662dacb49af8d", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "dcd3de304861dd0f85a7a0c6f819b042", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c3ac5db2032201a91da94f8794b4411f", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "a269ff4bb4f1ae7a11d03053384595bc", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "e2c7d7d143f41908dc0f048002f8cfc0", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "d3a354cbf54de689a80366a606e60519", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "821274222493f7d5ff6e85ad4550075d", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "1952387cb81df95f5552210eecab5535", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "4cb35d606af38c69ae1d6da3b098c022", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "d65d67896cec8d9865ee8c85a1499379", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7dd0abfeeae0b52733d039e352aa08b1", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "0157869c686240f6b11943a1708e84ec", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "2e4cbab38f5b83fb0f7bb651bdb15fab", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "2dc40cd1177009929a9b87bc06c54013", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "a1976d5d3afcb4bc0b522c39ff2bba3b", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e811ccf9db0ae385f93ecbde127ce068", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "c364f181207ec23533b58fc611ce957e", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "833f2039517a2f7f87462fa799801a36", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a0506d52bc0ec8c41744aef0886dc204", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "deab05678a29cc97b3735fe9f672f701", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "a78b8a42c3b38bf50f64883fb813e157", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "1a71f94d2c0b7d81cb1a94ec63a4740d", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "bab33040650b0b5cd6a51be0408a7eb5", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1fdd1c91c11c00ad414cfae5b2ed8e7f", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "2562f6a76d2509727fac5e4d9dba6024", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "790e3e9dc274f62208bb4d5d9a1c5d8a", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "7edb44bdc8f02041fce95b9ef58e914f", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "31446a8bba8454055ede15de93aa3959", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "02bb6a1791ea69af7a0d3472b2fdaf00", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "0d566139dece0e13a1055f1e1718b8ee", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7d4338020172447cca0a956b97577b52", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "e4a746112f5ec92e9d4ba63ae17a42fa", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "d81e70b56bd623ece8529ad97fb56f48", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "a9a12b47a247ff57ff70ce8188cd7eac", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7c84daa6aaec505f4ee584d1ba81fc8e", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "0cb7e1e9f509d798b95d5111827165f5", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "40ce2fb11630bb58a33af0f6eb2b322a", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "6a396a487dcc0aef42914c6a920935fe", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "f6cc0bd1decf1acc1c7cc5cfe8ca6ed3", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "db535f0ca1e01af825f75f204fbc8928", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "97d51afca996ae15b61fd9f409a00459", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "db535f0ca1e01af825f75f204fbc8928", diff --git a/src/assets/ba_data/python/bascenev1/__init__.py b/src/assets/ba_data/python/bascenev1/__init__.py index 5f3bbd17..25c1f5ef 100644 --- a/src/assets/ba_data/python/bascenev1/__init__.py +++ b/src/assets/ba_data/python/bascenev1/__init__.py @@ -469,4 +469,4 @@ if __debug__: ' should not happen.', __name__, _mdl, - ) \ No newline at end of file + ) diff --git a/src/assets/ba_data/python/bauiv1lib/mainmenu.py b/src/assets/ba_data/python/bauiv1lib/mainmenu.py index 362f5b55..4cbb9bcd 100644 --- a/src/assets/ba_data/python/bauiv1lib/mainmenu.py +++ b/src/assets/ba_data/python/bauiv1lib/mainmenu.py @@ -494,10 +494,7 @@ class MainMenuWindow(bui.Window): ) btn = bui.buttonwidget( parent=self._root_widget, - position=( - h + b_buffer_1, - v - b_size - b_buffer_2 + v_offs - ), + position=(h + b_buffer_1, v - b_size - b_buffer_2 + v_offs), button_type='square', size=(b_size, b_size), label='', @@ -519,10 +516,7 @@ class MainMenuWindow(bui.Window): ) btn = bui.buttonwidget( parent=self._root_widget, - position=( - h - b_size * 0.5, - v - b_size - b_buffer_2 + v_offs - ), + position=(h - b_size * 0.5, v - b_size - b_buffer_2 + v_offs), button_type='square', size=(b_size, b_size), label='', @@ -533,10 +527,7 @@ class MainMenuWindow(bui.Window): parent=self._root_widget, size=(b_size, b_size), draw_controller=btn, - position=( - h - b_size * 0.47, - v - b_size - b_buffer_2 + v_offs - ), + position=(h - b_size * 0.47, v - b_size - b_buffer_2 + v_offs), texture=bui.gettexture( 'pauseIcon' if bs.is_replay_paused() else 'resumeIcon' ), @@ -1420,4 +1411,4 @@ class MainMenuWindow(bui.Window): # If there's callbacks waiting for this window to go away, call them. for call in bui.app.ui_v1.main_menu_resume_callbacks: call() - del bui.app.ui_v1.main_menu_resume_callbacks[:] \ No newline at end of file + del bui.app.ui_v1.main_menu_resume_callbacks[:] diff --git a/src/ballistica/scene_v1/python/methods/python_methods_scene.cc b/src/ballistica/scene_v1/python/methods/python_methods_scene.cc index 2ccf9f2b..5e74a112 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_scene.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_scene.cc @@ -1502,8 +1502,7 @@ static PyMethodDef PySetReplaySpeedExponentDef = { // -------------------------- is_replay_paused --------------------------------- -static auto PyIsReplayPaused(PyObject* self, PyObject* args) - -> PyObject* { +static auto PyIsReplayPaused(PyObject* self, PyObject* args) -> PyObject* { BA_PYTHON_TRY; auto* appmode = SceneV1AppMode::GetActiveOrThrow(); if (appmode->is_replay_paused()) { @@ -1515,9 +1514,9 @@ static auto PyIsReplayPaused(PyObject* self, PyObject* args) } static PyMethodDef PyIsReplayPausedDef = { - "is_replay_paused", // name - PyIsReplayPaused, // method - METH_VARARGS, // flags + "is_replay_paused", // name + PyIsReplayPaused, // method + METH_VARARGS, // flags "is_replay_paused() -> bool\n" "\n" @@ -1527,8 +1526,7 @@ static PyMethodDef PyIsReplayPausedDef = { }; // ------------------------ pause_replay --------------------------------------- -static auto PyPauseReplay(PyObject* self, PyObject* args) - -> PyObject* { +static auto PyPauseReplay(PyObject* self, PyObject* args) -> PyObject* { BA_PYTHON_TRY; auto* appmode = SceneV1AppMode::GetActiveOrThrow(); appmode->PauseReplay(); @@ -1537,9 +1535,9 @@ static auto PyPauseReplay(PyObject* self, PyObject* args) } static PyMethodDef PyPauseReplayDef = { - "pause_replay", // name - PyPauseReplay, // method - METH_VARARGS, // flags + "pause_replay", // name + PyPauseReplay, // method + METH_VARARGS, // flags "pause_replay() -> None\n" "\n" @@ -1550,8 +1548,7 @@ static PyMethodDef PyPauseReplayDef = { // ------------------------ resume_replay -------------------------------------- -static auto PyResumeReplay(PyObject* self, PyObject* args) - -> PyObject* { +static auto PyResumeReplay(PyObject* self, PyObject* args) -> PyObject* { BA_PYTHON_TRY; auto* appmode = SceneV1AppMode::GetActiveOrThrow(); appmode->ResumeReplay(); @@ -1560,9 +1557,9 @@ static auto PyResumeReplay(PyObject* self, PyObject* args) } static PyMethodDef PyResumeReplayDef = { - "resume_replay", // name - PyResumeReplay, // method - METH_VARARGS, // flags + "resume_replay", // name + PyResumeReplay, // method + METH_VARARGS, // flags "resume_replay() -> None\n" "\n" diff --git a/src/ballistica/scene_v1/support/client_session.cc b/src/ballistica/scene_v1/support/client_session.cc index ded89653..7f684f0f 100644 --- a/src/ballistica/scene_v1/support/client_session.cc +++ b/src/ballistica/scene_v1/support/client_session.cc @@ -177,7 +177,7 @@ void ClientSession::Update(int time_advance_millisecs, double time_advance) { if (auto* appmode = SceneV1AppMode::GetActiveOrThrow()) { if (appmode->is_replay_paused()) { return; - } + } } // Allow replays to modulate speed, etc. diff --git a/src/ballistica/scene_v1/support/scene_v1_app_mode.cc b/src/ballistica/scene_v1/support/scene_v1_app_mode.cc index 7b95934d..a9799a81 100644 --- a/src/ballistica/scene_v1/support/scene_v1_app_mode.cc +++ b/src/ballistica/scene_v1/support/scene_v1_app_mode.cc @@ -1223,13 +1223,9 @@ void SceneV1AppMode::SetReplaySpeedExponent(int val) { replay_speed_mult_ = powf(2.0f, static_cast(replay_speed_exponent_)); } -void SceneV1AppMode::PauseReplay() { - replay_paused_ = true; -} +void SceneV1AppMode::PauseReplay() { replay_paused_ = true; } -void SceneV1AppMode::ResumeReplay() { - replay_paused_ = false; -} +void SceneV1AppMode::ResumeReplay() { replay_paused_ = false; } void SceneV1AppMode::SetDebugSpeedExponent(int val) { debug_speed_exponent_ = val;