From d1603831ae15784b58d4207b5d79e36866b7ebca Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 23 Sep 2024 19:14:47 -0700 Subject: [PATCH] updates for latest pylint and lang updates --- .efrocachemap | 98 +++++++++---------- CHANGELOG.md | 10 +- config/requirements.txt | 2 +- .../ba_data/python/babase/_devconsole.py | 2 + .../ba_data/python/baclassic/_achievement.py | 2 + .../ba_data/python/baclassic/_appsubsystem.py | 2 + src/assets/ba_data/python/baclassic/_net.py | 7 +- src/assets/ba_data/python/baenv.py | 3 +- .../ba_data/python/baplus/_appsubsystem.py | 1 + .../ba_data/python/bascenev1/_gameactivity.py | 1 + .../ba_data/python/bascenev1/_gameutils.py | 1 + src/assets/ba_data/python/bascenev1/_level.py | 1 + .../ba_data/python/bascenev1/_messages.py | 1 + .../ba_data/python/bascenev1/_playlist.py | 1 + .../ba_data/python/bascenev1/_session.py | 1 + src/assets/ba_data/python/bascenev1/_stats.py | 2 + .../bascenev1lib/activity/dualteamscore.py | 1 + .../activity/freeforallvictory.py | 1 + .../bascenev1lib/activity/multiteamscore.py | 2 + .../ba_data/python/bascenev1lib/actor/bomb.py | 2 + .../bascenev1lib/actor/controlsguide.py | 1 + .../ba_data/python/bascenev1lib/actor/flag.py | 1 + .../python/bascenev1lib/actor/image.py | 1 + .../python/bascenev1lib/actor/playerspaz.py | 2 + .../python/bascenev1lib/actor/popuptext.py | 1 + .../python/bascenev1lib/actor/scoreboard.py | 3 + .../python/bascenev1lib/actor/spawner.py | 1 + .../ba_data/python/bascenev1lib/actor/spaz.py | 1 + .../python/bascenev1lib/actor/spazbot.py | 4 +- .../ba_data/python/bascenev1lib/actor/text.py | 1 + .../python/bascenev1lib/actor/zoomtext.py | 1 + .../bascenev1lib/game/capturetheflag.py | 1 + .../python/bascenev1lib/game/elimination.py | 1 + .../python/bascenev1lib/game/onslaught.py | 1 + .../ba_data/python/bascenev1lib/mainmenu.py | 2 + .../ba_data/python/bascenev1lib/tutorial.py | 2 + .../ba_data/python/bauiv1/_appsubsystem.py | 1 + .../python/bauiv1lib/account/viewer.py | 1 + .../ba_data/python/bauiv1lib/benchmarks.py | 2 +- .../python/bauiv1lib/characterpicker.py | 1 + .../ba_data/python/bauiv1lib/colorpicker.py | 2 + src/assets/ba_data/python/bauiv1lib/config.py | 2 + .../ba_data/python/bauiv1lib/confirm.py | 1 + .../python/bauiv1lib/coop/gamebutton.py | 1 + .../python/bauiv1lib/coop/tournamentbutton.py | 1 + .../ba_data/python/bauiv1lib/fileselector.py | 1 + .../python/bauiv1lib/gather/__init__.py | 1 + .../python/bauiv1lib/gather/abouttab.py | 1 + .../python/bauiv1lib/gather/manualtab.py | 1 + .../python/bauiv1lib/gather/nearbytab.py | 1 + .../python/bauiv1lib/gather/privatetab.py | 1 + .../python/bauiv1lib/gather/publictab.py | 2 + .../ba_data/python/bauiv1lib/iconpicker.py | 1 + .../python/bauiv1lib/league/rankbutton.py | 1 + .../python/bauiv1lib/league/rankwindow.py | 4 +- .../ba_data/python/bauiv1lib/partyqueue.py | 5 +- src/assets/ba_data/python/bauiv1lib/play.py | 1 + .../bauiv1lib/playlist/editcontroller.py | 1 + .../python/bauiv1lib/playlist/editgame.py | 6 +- .../python/bauiv1lib/playlist/mapselect.py | 1 + .../ba_data/python/bauiv1lib/playoptions.py | 1 + src/assets/ba_data/python/bauiv1lib/popup.py | 3 + .../python/bauiv1lib/settings/gamepad.py | 3 + .../bauiv1lib/settings/gamepadadvanced.py | 1 + .../python/bauiv1lib/settings/keyboard.py | 1 + .../bauiv1lib/soundtrack/entrytypeselect.py | 1 + .../bauiv1lib/soundtrack/macmusicapp.py | 1 + .../ba_data/python/bauiv1lib/store/button.py | 1 + .../ba_data/python/bauiv1lib/store/item.py | 2 + src/assets/ba_data/python/bauiv1lib/tabs.py | 1 + .../python/bauiv1lib/tournamententry.py | 2 +- .../python/bauiv1lib/tournamentscores.py | 1 + .../ba_data/python/bauiv1lib/trophies.py | 1 + src/ballistica/base/assets/assets.cc | 8 +- src/ballistica/base/assets/assets.h | 8 +- src/ballistica/base/assets/sound_asset.cc | 6 +- src/ballistica/base/audio/audio.cc | 8 +- src/ballistica/base/audio/ogg_stream.cc | 4 +- .../base/graphics/gl/renderer_gl.cc | 14 +-- src/ballistica/base/graphics/gl/renderer_gl.h | 13 +-- src/ballistica/base/graphics/graphics.cc | 9 +- src/ballistica/base/graphics/graphics.h | 5 +- src/ballistica/base/graphics/graphics_vr.cc | 13 +-- .../base/graphics/renderer/renderer.cc | 6 +- .../base/graphics/renderer/renderer.h | 14 +-- .../base/input/device/joystick_input.cc | 4 +- src/ballistica/base/input/input.h | 4 +- src/ballistica/base/logic/logic.cc | 8 +- src/ballistica/base/logic/logic.h | 4 +- .../base/networking/network_reader.cc | 12 +-- src/ballistica/base/platform/base_platform.cc | 4 +- src/ballistica/base/python/base_python.cc | 16 +-- src/ballistica/base/python/base_python.h | 4 +- .../python/class/python_class_app_timer.h | 4 +- .../python/class/python_class_context_call.cc | 4 +- .../python/class/python_class_context_call.h | 4 +- .../python/class/python_class_context_ref.cc | 4 +- .../python/class/python_class_context_ref.h | 8 +- .../python/class/python_class_display_timer.h | 4 +- .../base/python/class/python_class_env.cc | 4 +- .../base/python/class/python_class_env.h | 4 +- .../class/python_class_feature_set_data.h | 4 +- .../python/class/python_class_simple_sound.h | 4 +- .../base/python/class/python_class_vec3.cc | 24 ++--- .../base/python/class/python_class_vec3.h | 16 +-- .../python/methods/python_methods_base_1.cc | 68 ++++++------- .../python/methods/python_methods_base_2.cc | 52 +++++----- .../python/methods/python_methods_base_3.cc | 96 +++++++++--------- src/ballistica/base/support/classic_soft.h | 5 +- src/ballistica/base/ui/ui.cc | 4 +- src/ballistica/classic/classic.cc | 10 +- .../classic/python/classic_python.cc | 5 +- .../python/methods/python_methods_classic.cc | 4 +- .../classic/support/classic_app_mode.cc | 2 +- .../core/platform/apple/core_platform_apple.h | 8 +- src/ballistica/core/platform/core_platform.cc | 24 ++--- src/ballistica/core/platform/core_platform.h | 4 +- .../platform/windows/core_platform_windows.cc | 8 +- .../platform/windows/core_platform_windows.h | 4 +- .../scene_v1/connection/connection_set.cc | 4 +- src/ballistica/scene_v1/dynamics/dynamics.cc | 4 +- .../dynamics/material/material_component.cc | 4 +- .../dynamics/material/material_component.h | 4 +- src/ballistica/scene_v1/node/spaz_node.cc | 4 +- src/ballistica/scene_v1/node/spaz_node.h | 8 +- .../python/class/python_class_activity_data.h | 4 +- .../python/class/python_class_base_timer.h | 4 +- .../python/class/python_class_input_device.cc | 12 +-- .../python/class/python_class_input_device.h | 8 +- .../python/class/python_class_material.cc | 4 +- .../python/class/python_class_material.h | 8 +- .../python/class/python_class_node.cc | 16 +-- .../scene_v1/python/class/python_class_node.h | 16 +-- .../class/python_class_scene_collision_mesh.h | 4 +- .../class/python_class_scene_data_asset.h | 4 +- .../python/class/python_class_scene_mesh.h | 4 +- .../python/class/python_class_scene_sound.h | 4 +- .../python/class/python_class_scene_texture.h | 4 +- .../python/class/python_class_scene_timer.h | 4 +- .../python/class/python_class_session_data.h | 4 +- .../class/python_class_session_player.cc | 32 +++--- .../class/python_class_session_player.h | 8 +- .../python/methods/python_methods_assets.cc | 32 +++--- .../python/methods/python_methods_input.cc | 28 +++--- .../methods/python_methods_networking.cc | 32 +++--- .../python/methods/python_methods_scene.cc | 92 ++++++++--------- .../scene_v1/python/scene_v1_python.cc | 18 ++-- .../scene_v1/python/scene_v1_python.h | 9 +- .../scene_v1/support/host_session.h | 8 +- .../scene_v1/support/session_stream.h | 4 +- src/ballistica/shared/ballistica.cc | 2 +- .../shared/foundation/event_loop.cc | 4 +- src/ballistica/shared/foundation/macros.cc | 4 +- src/ballistica/shared/foundation/macros.h | 4 +- src/ballistica/shared/generic/base64.cc | 4 +- src/ballistica/shared/generic/base64.h | 4 +- src/ballistica/shared/generic/timer_list.h | 4 +- src/ballistica/shared/generic/utils.cc | 4 +- src/ballistica/shared/generic/utils.h | 4 +- src/ballistica/shared/math/matrix44f.cc | 8 +- src/ballistica/shared/math/matrix44f.h | 12 +-- src/ballistica/shared/networking/sockaddr.cc | 4 +- src/ballistica/shared/python/python_class.cc | 8 +- src/ballistica/shared/python/python_class.h | 8 +- .../shared/python/python_command.cc | 8 +- src/ballistica/shared/python/python_command.h | 4 +- src/ballistica/shared/python/python_ref.cc | 12 +-- .../python/class/python_class_hello.h | 4 +- .../methods/python_methods_template_fs.cc | 4 +- .../ui_v1/python/class/python_class_ui_mesh.h | 4 +- .../python/class/python_class_ui_sound.h | 12 +-- .../python/class/python_class_ui_texture.h | 4 +- .../ui_v1/python/class/python_class_widget.cc | 8 +- .../ui_v1/python/class/python_class_widget.h | 8 +- .../python/methods/python_methods_ui_v1.cc | 27 +++-- .../ui_v1/widget/container_widget.cc | 4 +- tools/batools/assetsmakefile.py | 3 + tools/batools/docker.py | 1 + tools/batools/project/_updater.py | 1 + tools/batools/spinoff/_context.py | 22 +++-- tools/batools/xcodeproject.py | 4 +- tools/efro/dataclassio/_api.py | 1 + tools/efro/dataclassio/_base.py | 1 + tools/efro/dataclassio/_inputter.py | 5 + tools/efro/dataclassio/_outputter.py | 3 + tools/efro/dataclassio/_prep.py | 1 + tools/efro/debug.py | 1 + tools/efro/log.py | 5 +- tools/efro/message/_module.py | 2 + tools/efro/message/_protocol.py | 3 + tools/efro/rpc.py | 2 + tools/efro/util.py | 1 + tools/efrotools/code.py | 2 + tools/efrotools/emacs.py | 1 + tools/efrotools/genwrapper.py | 8 ++ tools/efrotools/lazybuild.py | 1 + tools/efrotools/message.py | 2 + tools/efrotools/util.py | 1 + tools/efrotools/xcodebuild.py | 1 + 199 files changed, 787 insertions(+), 615 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index fc5c4413..12c0bce9 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,13 +421,13 @@ "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", - "build/assets/ba_data/data/langdata.json": "fa2cb506dd6628e30b775ca44604e4f8", + "build/assets/ba_data/data/langdata.json": "a3d27b587a1b206a3338ef820a802313", "build/assets/ba_data/data/languages/arabic.json": "609f5d698a488e40e61787b62ee8ea5e", "build/assets/ba_data/data/languages/belarussian.json": "3d5523d0004293aa2df02f3f6f3b84f8", - "build/assets/ba_data/data/languages/chinese.json": "d03ed49486d41cfbdf770e5a54f974a1", + "build/assets/ba_data/data/languages/chinese.json": "57d199cfd2a5cf493e777dd96cc12f7c", "build/assets/ba_data/data/languages/chinesetraditional.json": "d85c58cc1e0e4bd0b09b2bc768cb1971", "build/assets/ba_data/data/languages/croatian.json": "b23619cb396ac16640c47458f884b16a", - "build/assets/ba_data/data/languages/czech.json": "61bcfce75c0d53d2f2af709cee42187a", + "build/assets/ba_data/data/languages/czech.json": "be5d536a1160607dfa158e59ecc1c324", "build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7", "build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343", "build/assets/ba_data/data/languages/english.json": "5a73dea22df1117d58a79459def62ff5", @@ -443,7 +443,7 @@ "build/assets/ba_data/data/languages/italian.json": "d9eb41f6eafb19040f8d5c0608790b62", "build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597", "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f", - "build/assets/ba_data/data/languages/persian.json": "ededb9c015afb58b1324a096ea740f72", + "build/assets/ba_data/data/languages/persian.json": "fc25780341e0dfebc393e4c1c846b7a9", "build/assets/ba_data/data/languages/polish.json": "89333fb207f9eb2f22fff5a95b022c35", "build/assets/ba_data/data/languages/portuguese.json": "eb2563e245e1ea00b870264dced3ebd7", "build/assets/ba_data/data/languages/romanian.json": "55a8744e466801013ea131266a856924", @@ -455,7 +455,7 @@ "build/assets/ba_data/data/languages/tamil.json": "ead39b864228696a9b0d19344bc4b5ec", "build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945", "build/assets/ba_data/data/languages/turkish.json": "6153ca5248b8e4743e9501ac72378493", - "build/assets/ba_data/data/languages/ukrainian.json": "23a98e5722d3e71e809a8a0063daa603", + "build/assets/ba_data/data/languages/ukrainian.json": "3a5b8132690fcd583d280879876c85b7", "build/assets/ba_data/data/languages/venetian.json": "a1315f5233ebbee1464683ac55d5d9d5", "build/assets/ba_data/data/languages/vietnamese.json": "5ae84265600b6cfda45c9bed18724e1d", "build/assets/ba_data/data/maps/big_g.json": "1dd301d490643088a435ce75df971054", @@ -4096,50 +4096,50 @@ "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": "fad0592c63dbf5623fd085b1f94dc5b5", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "b18b7d1073b180dd2b0ed563e3befda7", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "2ea095b28288927982060509174ed625", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "bdd91ad1d25228813e6123adecc16031", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "354635e2cdb27b523c229ee3c723e136", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "6a3ecdf84a34549f451cfa43e87bae28", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "5e01a1b583a53c3d475013363b6e0372", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "179905fc0b716c99c57b56179f84166e", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "be15731bcd223a8723f146d8e3153b53", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "dfc1d123a5517302f5869b151a436a7f", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b1ef6725fdcf9071aba0f0f5e038727d", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "24ac52a8b44b2b815cce76a150f38629", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "488119eac17785da1bf534702e8ed51f", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "cb59173e8b176b98206b7f69b9a08972", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "60700ee6b7ed262215fca2c02ec5561b", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "972c6e59e59ca24c7d1739b1d7530a30", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "b04c87e6dec8916aaf3666fe0aa4d158", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "04ddbccf8268c1199d196b3dc4559e1b", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "02c9824a5e1951e8298c75196ae154e2", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "da0705f8cc9e9eece02592fd1295ea40", - "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "73ad3303fe1a82005918fbc5dae3446c", - "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "fa659b5d6119acba6570c92ce4d35ae2", - "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "73ad3303fe1a82005918fbc5dae3446c", - "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "fa659b5d6119acba6570c92ce4d35ae2", - "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "ab8467107ed371eb542e0317a7e7395d", - "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "4a4c19120f810ff5b4c7afbf11c23cf6", - "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "ab8467107ed371eb542e0317a7e7395d", - "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "4a4c19120f810ff5b4c7afbf11c23cf6", - "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "f4c36e72fa8d9d06f8a00684a3fc4679", - "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "3168e8377498df85a4adacede63d126a", - "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "f4c36e72fa8d9d06f8a00684a3fc4679", - "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "3168e8377498df85a4adacede63d126a", - "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "427a392c291aa9562e93c570c9f1b92c", - "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "3f50101eed1a5178d5630064dbafb3ee", - "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "78cf6a2069ab46f5f0be3f5b57a6ee70", - "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "3f50101eed1a5178d5630064dbafb3ee", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "4769b8b8a99ef0e08aa968af3072fa38", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "f999d258cb8c7645c5b462ff81012289", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "aee027b5a96a835583d07ea95ac6d608", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "3f7d65bf17deb2714862df46c6772e06", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "d332af0eee1178cc7c00b6e3ed5ca8a2", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "2c8f29b6b26f657c776fee12f81bd28e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "26a02edb690a0f9e5baaf0923cc1e57d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "62d7688c402895869b794541366a3e20", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "aa72881174380859e777358af1da8d1f", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "bb5c1ca60d9683f2d24d4d8d35af9121", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "89a73b9312c48ed182d54263707a0982", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "f8e25d00480757c6fef0d125fbabe7d3", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "116a9fff16cc5cefd91d24415e9b09e7", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "01a542f1515ee659f99550c34ca2f749", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "16aa91530f2abea70f8c648db20872b9", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "5c19c58e3163c2b4c21eb1cde8f2712a", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f3e54e879fe538a6f0e52c1833e03739", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "36b20cfad166d7229684cd0b88be0ca0", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "64bdc98a71e9bcb63999e7fb1c57722f", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "583086e11d495f3439bdd6029bde0466", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "701f03b8ba74493d935f795a84c13455", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "3e9f1feaf14d30f740d84280432cb236", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "31da2a14cc69755f3a8f68b17482832f", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "8ef21c1df9040fb8e2d38258dc80a4d5", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "74a0b75b877954015798a6289d26c26c", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ed2b2f673f2ed41fc24613a937a954d9", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "16824b0155479f54293cb2230553d174", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "379f72d2ce79111490ba9c87087488f3", + "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "ad908b297b41c2fdf13582e34c434245", + "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "086a2ce72497e44079ad6b747fc5439f", + "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "ad908b297b41c2fdf13582e34c434245", + "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "086a2ce72497e44079ad6b747fc5439f", + "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "d562f21a435b7a888028689ffdf06d02", + "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "226df279a267c72853b7242fd1507dd1", + "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "d562f21a435b7a888028689ffdf06d02", + "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "226df279a267c72853b7242fd1507dd1", + "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "5a17ee891f9113060a2f462cd9d04dc7", + "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "46f23c6890b06fa29f97604b42113c5e", + "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "5a17ee891f9113060a2f462cd9d04dc7", + "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "46f23c6890b06fa29f97604b42113c5e", + "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "ecb7fec32ddd75652e657c2076ff2b69", + "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "d7a1d4deb51b0792d083737477e6833b", + "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "4c11b81a574aa9af593f54db4d998e61", + "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "d7a1d4deb51b0792d083737477e6833b", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "c6a3ce3f5dbfa705ef6d7e4b94bca8ed", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "61a4f8795d6cd96f90bc2bed25087bfe", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "0af969c789949825652e6b09020867b5", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "839ebfcfcbc87f4470b96f986485a4f6", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "b161b991f68d7fc5a23e1bbf3041693f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "48add2ca39f42cf1129fd56deac471e1", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "bd7faaa40c5b448554d524d2d5fddeb1", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "d18d44e3e100240220523f4bc54f9d85", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index ddad06aa..245eaa46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,17 @@ -### 1.7.37 (build 22007, api 9, 2024-09-19) +### 1.7.37 (build 22009, api 9, 2024-09-23) - Bumping api version to 9. As you'll see below, there's some UI changes that will require a bit of work for any UI mods to adapt to. If your mods don't touch UI stuff at all you can simply bump your api version and call it a day. I'm hopeful that api version won't need to be bumped again for along time (if ever). +- The newest Pylint update (3.3) added a check for + 'too-many-positional-arguments'. This seems like a good idea, so I updated + various functions to conform to it and set some others to ignore it. Basically + if you see a function like `def dothing(a, b, *, c, d)` then everything after + the `*` needs to be passed as a keyword. So you can't do `dothing(val1, val2, + val3, val4)`; you need to do `dothing(val1, val2, c=val3, d=val4)`. Requiring + keywords for complex functions generally leads to more readable code and less + breakage if arguments are added or removed from the function. - Playlist customization no longer requires pro. - Soundtrack customization no longer requires pro. - Campaign hard mode no longer requires pro. diff --git a/config/requirements.txt b/config/requirements.txt index 0f456306..75a8e8ab 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -6,7 +6,7 @@ mypy==1.11.2 pbxproj==4.2.1 pdoc==14.7.0 pur==7.3.2 -pylint==3.2.7 +pylint==3.3.0 pylsp-mypy==0.6.9 pytest==8.3.3 python-daemon==3.0.1 diff --git a/src/assets/ba_data/python/babase/_devconsole.py b/src/assets/ba_data/python/babase/_devconsole.py index fbae9fa2..d7e4eb00 100644 --- a/src/assets/ba_data/python/babase/_devconsole.py +++ b/src/assets/ba_data/python/babase/_devconsole.py @@ -33,6 +33,7 @@ class DevConsoleTab: pos: tuple[float, float], size: tuple[float, float], call: Callable[[], Any] | None = None, + *, h_anchor: Literal['left', 'center', 'right'] = 'center', label_scale: float = 1.0, corner_radius: float = 8.0, @@ -57,6 +58,7 @@ class DevConsoleTab: self, text: str, pos: tuple[float, float], + *, h_anchor: Literal['left', 'center', 'right'] = 'center', h_align: Literal['left', 'center', 'right'] = 'center', v_align: Literal['top', 'center', 'bottom', 'none'] = 'center', diff --git a/src/assets/ba_data/python/baclassic/_achievement.py b/src/assets/ba_data/python/baclassic/_achievement.py index 3ef3bed8..908ef6ad 100644 --- a/src/assets/ba_data/python/baclassic/_achievement.py +++ b/src/assets/ba_data/python/baclassic/_achievement.py @@ -657,6 +657,7 @@ class Achievement: award: int, hard_mode_only: bool = False, ): + # pylint: disable=too-many-positional-arguments self._name = name self._icon_name = icon_name self._icon_color: Sequence[float] = list(icon_color) + [1] @@ -870,6 +871,7 @@ class Achievement: x: float, y: float, delay: float, + *, outdelay: float | None = None, color: Sequence[float] | None = None, style: str = 'post_game', diff --git a/src/assets/ba_data/python/baclassic/_appsubsystem.py b/src/assets/ba_data/python/baclassic/_appsubsystem.py index c09889cc..f68b0bd4 100644 --- a/src/assets/ba_data/python/baclassic/_appsubsystem.py +++ b/src/assets/ba_data/python/baclassic/_appsubsystem.py @@ -543,6 +543,7 @@ class ClassicAppSubsystem(babase.AppSubsystem): def run_stress_test( self, + *, playlist_type: str = 'Random', playlist_name: str = '__default__', player_count: int = 8, @@ -694,6 +695,7 @@ class ClassicAppSubsystem(babase.AppSubsystem): def tournament_entry_window( self, tournament_id: str, + *, tournament_activity: bascenev1.Activity | None = None, position: tuple[float, float] = (0.0, 0.0), delegate: Any = None, diff --git a/src/assets/ba_data/python/baclassic/_net.py b/src/assets/ba_data/python/baclassic/_net.py index 359c4425..185f24b6 100644 --- a/src/assets/ba_data/python/baclassic/_net.py +++ b/src/assets/ba_data/python/baclassic/_net.py @@ -35,6 +35,8 @@ class MasterServerV1CallThread(threading.Thread): callback: MasterServerCallback | None, response_type: MasterServerResponseType, ): + # pylint: disable=too-many-positional-arguments + # Set daemon=True so long-running requests don't keep us from # quitting the app. super().__init__(daemon=True) @@ -52,8 +54,9 @@ class MasterServerV1CallThread(threading.Thread): self._activity = weakref.ref(activity) if activity is not None else None def _run_callback(self, arg: None | dict[str, Any]) -> None: - # If we were created in an activity context and that activity has - # since died, do nothing. + # If we were created in an activity context and that activity + # has since died, do nothing. + # FIXME: Should we just be using a ContextCall instead of doing # this check manually? if self._activity is not None: diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 77a13c89..45f47bb0 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22007 +TARGET_BALLISTICA_BUILD = 22009 TARGET_BALLISTICA_VERSION = '1.7.37' @@ -156,6 +156,7 @@ def get_config() -> EnvConfig: def configure( + *, config_dir: str | None = None, data_dir: str | None = None, user_python_dir: str | None = None, diff --git a/src/assets/ba_data/python/baplus/_appsubsystem.py b/src/assets/ba_data/python/baplus/_appsubsystem.py index 6733699c..0036a114 100644 --- a/src/assets/ba_data/python/baplus/_appsubsystem.py +++ b/src/assets/ba_data/python/baplus/_appsubsystem.py @@ -221,6 +221,7 @@ class PlusAppSubsystem(AppSubsystem): name: Any, score: int | None, callback: Callable, + *, order: str = 'increasing', tournament_id: str | None = None, score_type: str = 'points', diff --git a/src/assets/ba_data/python/bascenev1/_gameactivity.py b/src/assets/ba_data/python/bascenev1/_gameactivity.py index fc9f0b83..14f3c2db 100644 --- a/src/assets/ba_data/python/bascenev1/_gameactivity.py +++ b/src/assets/ba_data/python/bascenev1/_gameactivity.py @@ -1247,6 +1247,7 @@ class GameActivity(Activity[PlayerT, TeamT]): def show_zoom_message( self, message: babase.Lstr, + *, color: Sequence[float] = (0.9, 0.4, 0.0), scale: float = 0.8, duration: float = 2.0, diff --git a/src/assets/ba_data/python/bascenev1/_gameutils.py b/src/assets/ba_data/python/bascenev1/_gameutils.py index 36a1f31d..c67f0667 100644 --- a/src/assets/ba_data/python/bascenev1/_gameutils.py +++ b/src/assets/ba_data/python/bascenev1/_gameutils.py @@ -112,6 +112,7 @@ def animate_array( attr: str, size: int, keys: dict[float, Sequence[float]], + *, loop: bool = False, offset: float = 0, ) -> None: diff --git a/src/assets/ba_data/python/bascenev1/_level.py b/src/assets/ba_data/python/bascenev1/_level.py index 6da0a7ec..ce8ddf58 100644 --- a/src/assets/ba_data/python/bascenev1/_level.py +++ b/src/assets/ba_data/python/bascenev1/_level.py @@ -27,6 +27,7 @@ class Level: gametype: type[bascenev1.GameActivity], settings: dict, preview_texture_name: str, + *, displayname: str | None = None, ): self._name = name diff --git a/src/assets/ba_data/python/bascenev1/_messages.py b/src/assets/ba_data/python/bascenev1/_messages.py index cecf8db2..45f83c88 100644 --- a/src/assets/ba_data/python/bascenev1/_messages.py +++ b/src/assets/ba_data/python/bascenev1/_messages.py @@ -241,6 +241,7 @@ class HitMessage: def __init__( self, + *, srcnode: bascenev1.Node | None = None, pos: Sequence[float] | None = None, velocity: Sequence[float] | None = None, diff --git a/src/assets/ba_data/python/bascenev1/_playlist.py b/src/assets/ba_data/python/bascenev1/_playlist.py index 013f6e56..c06199dc 100644 --- a/src/assets/ba_data/python/bascenev1/_playlist.py +++ b/src/assets/ba_data/python/bascenev1/_playlist.py @@ -21,6 +21,7 @@ PlaylistType = list[dict[str, Any]] def filter_playlist( playlist: PlaylistType, sessiontype: type[Session], + *, add_resolved_type: bool = False, remove_unowned: bool = True, mark_unowned: bool = False, diff --git a/src/assets/ba_data/python/bascenev1/_session.py b/src/assets/ba_data/python/bascenev1/_session.py index dd757346..85c341f6 100644 --- a/src/assets/ba_data/python/bascenev1/_session.py +++ b/src/assets/ba_data/python/bascenev1/_session.py @@ -96,6 +96,7 @@ class Session: def __init__( self, depsets: Sequence[bascenev1.DependencySet], + *, team_names: Sequence[str] | None = None, team_colors: Sequence[Sequence[float]] | None = None, min_players: int = 1, diff --git a/src/assets/ba_data/python/bascenev1/_stats.py b/src/assets/ba_data/python/bascenev1/_stats.py index 4f3a0dbe..59e02bf2 100644 --- a/src/assets/ba_data/python/bascenev1/_stats.py +++ b/src/assets/ba_data/python/bascenev1/_stats.py @@ -196,6 +196,7 @@ class PlayerRecord: scale2: float, sound2: bascenev1.Sound | None, ) -> None: + # pylint: disable=too-many-positional-arguments from bascenev1lib.actor.popuptext import PopupText # Only award this if they're still alive and we can get @@ -341,6 +342,7 @@ class Stats: self, player: bascenev1.Player, base_points: int = 1, + *, target: Sequence[float] | None = None, kill: bool = False, victim_player: bascenev1.Player | None = None, diff --git a/src/assets/ba_data/python/bascenev1lib/activity/dualteamscore.py b/src/assets/ba_data/python/bascenev1lib/activity/dualteamscore.py index dc01ac58..6929a102 100644 --- a/src/assets/ba_data/python/bascenev1lib/activity/dualteamscore.py +++ b/src/assets/ba_data/python/bascenev1lib/activity/dualteamscore.py @@ -145,6 +145,7 @@ class TeamVictoryScoreScreenActivity(MultiTeamScoreScreenActivity): kill_delay: float, shiftdelay: float, ) -> None: + # pylint: disable=too-many-positional-arguments del kill_delay # Unused arg. ZoomText( str(sessionteam.customdata['score']), diff --git a/src/assets/ba_data/python/bascenev1lib/activity/freeforallvictory.py b/src/assets/ba_data/python/bascenev1lib/activity/freeforallvictory.py index 5f2189fa..3f88e3b6 100644 --- a/src/assets/ba_data/python/bascenev1lib/activity/freeforallvictory.py +++ b/src/assets/ba_data/python/bascenev1lib/activity/freeforallvictory.py @@ -87,6 +87,7 @@ class FreeForAllVictoryScoreScreenActivity(MultiTeamScoreScreenActivity): extrascale: float, flash: bool = False, ) -> Text: + # pylint: disable=too-many-positional-arguments return Text( text, position=( diff --git a/src/assets/ba_data/python/bascenev1lib/activity/multiteamscore.py b/src/assets/ba_data/python/bascenev1lib/activity/multiteamscore.py index 9feb385d..b398f7d4 100644 --- a/src/assets/ba_data/python/bascenev1lib/activity/multiteamscore.py +++ b/src/assets/ba_data/python/bascenev1lib/activity/multiteamscore.py @@ -57,6 +57,7 @@ class MultiTeamScoreScreenActivity(bs.ScoreScreenActivity): def show_player_scores( self, + *, delay: float = 2.5, results: bs.GameResults | None = None, scale: float = 1.0, @@ -134,6 +135,7 @@ class MultiTeamScoreScreenActivity(bs.ScoreScreenActivity): xoffs: float, yoffs: float, text: bs.Lstr, + *, h_align: Text.HAlign = Text.HAlign.RIGHT, extrascale: float = 1.0, maxwidth: float | None = 120.0, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/bomb.py b/src/assets/ba_data/python/bascenev1lib/actor/bomb.py index c73eceba..126f0f2d 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/bomb.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/bomb.py @@ -333,6 +333,7 @@ class Blast(bs.Actor): def __init__( self, + *, position: Sequence[float] = (0.0, 1.0, 0.0), velocity: Sequence[float] = (0.0, 0.0, 0.0), blast_radius: float = 2.0, @@ -715,6 +716,7 @@ class Bomb(bs.Actor): def __init__( self, + *, position: Sequence[float] = (0.0, 1.0, 0.0), velocity: Sequence[float] = (0.0, 0.0, 0.0), bomb_type: str = 'normal', diff --git a/src/assets/ba_data/python/bascenev1lib/actor/controlsguide.py b/src/assets/ba_data/python/bascenev1lib/actor/controlsguide.py index a750dfdc..40b3f189 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/controlsguide.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/controlsguide.py @@ -24,6 +24,7 @@ class ControlsGuide(bs.Actor): def __init__( self, + *, position: tuple[float, float] = (390.0, 120.0), scale: float = 1.0, delay: float = 0.0, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/flag.py b/src/assets/ba_data/python/bascenev1lib/actor/flag.py index 03472039..79ac4486 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/flag.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/flag.py @@ -169,6 +169,7 @@ class Flag(bs.Actor): def __init__( self, + *, position: Sequence[float] = (0.0, 1.0, 0.0), color: Sequence[float] = (1.0, 1.0, 1.0), materials: Sequence[bs.Material] | None = None, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/image.py b/src/assets/ba_data/python/bascenev1lib/actor/image.py index daa648be..2a71c878 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/image.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/image.py @@ -37,6 +37,7 @@ class Image(bs.Actor): def __init__( self, texture: bs.Texture | dict[str, Any], + *, position: tuple[float, float] = (0, 0), transition: Transition | None = None, transition_delay: float = 0.0, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py b/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py index 07caae58..1aa7ed5a 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py @@ -46,6 +46,7 @@ class PlayerSpaz(Spaz): def __init__( self, player: bs.Player, + *, color: Sequence[float] = (1.0, 1.0, 1.0), highlight: Sequence[float] = (0.5, 0.5, 0.5), character: str = 'Spaz', @@ -102,6 +103,7 @@ class PlayerSpaz(Spaz): def connect_controls_to_player( self, + *, enable_jump: bool = True, enable_punch: bool = True, enable_pickup: bool = True, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/popuptext.py b/src/assets/ba_data/python/bascenev1lib/actor/popuptext.py index ca375fce..9c0d09c2 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/popuptext.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/popuptext.py @@ -22,6 +22,7 @@ class PopupText(bs.Actor): def __init__( self, text: str | bs.Lstr, + *, position: Sequence[float] = (0.0, 0.0, 0.0), color: Sequence[float] = (1.0, 1.0, 1.0, 1.0), random_offset: float = 0.5, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/scoreboard.py b/src/assets/ba_data/python/bascenev1lib/actor/scoreboard.py index 05a1ba50..f5e30583 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/scoreboard.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/scoreboard.py @@ -24,6 +24,7 @@ class _Entry: flash_length: float, ): # pylint: disable=too-many-statements + # pylint: disable=too-many-positional-arguments self._scoreboard = weakref.ref(scoreboard) self._do_cover = do_cover self._scale = scale @@ -277,6 +278,7 @@ class _Entry: def set_value( self, score: float, + *, max_score: float | None = None, countdown: bool = False, flash: bool = True, @@ -399,6 +401,7 @@ class Scoreboard: team: bs.Team, score: float, max_score: float | None = None, + *, countdown: bool = False, flash: bool = True, show_value: bool = True, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spawner.py b/src/assets/ba_data/python/bascenev1lib/actor/spawner.py index 78fa56cf..95cc2838 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spawner.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spawner.py @@ -50,6 +50,7 @@ class Spawner: def __init__( self, + *, data: Any = None, pt: Sequence[float] = (0, 0, 0), spawn_time: float = 1.0, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py index f70383f0..a35bea08 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py @@ -71,6 +71,7 @@ class Spaz(bs.Actor): def __init__( self, + *, color: Sequence[float] = (1.0, 1.0, 1.0), highlight: Sequence[float] = (0.5, 0.5, 0.5), character: str = 'Spaz', diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spazbot.py b/src/assets/ba_data/python/bascenev1lib/actor/spazbot.py index 56118af8..86d1620b 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spazbot.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spazbot.py @@ -947,9 +947,9 @@ class SpazBotSet: on_spawn_call: Callable[[SpazBot], Any] | None = None, ) -> None: """Spawn a bot from this set.""" - from bascenev1lib.actor import spawner + from bascenev1lib.actor.spawner import Spawner - spawner.Spawner( + Spawner( pt=pos, spawn_time=spawn_time, send_spawn_message=False, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/text.py b/src/assets/ba_data/python/bascenev1lib/actor/text.py index cdea37d2..42611e85 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/text.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/text.py @@ -56,6 +56,7 @@ class Text(bs.Actor): def __init__( self, text: str | bs.Lstr, + *, position: tuple[float, float] = (0.0, 0.0), h_align: HAlign = HAlign.LEFT, v_align: VAlign = VAlign.NONE, diff --git a/src/assets/ba_data/python/bascenev1lib/actor/zoomtext.py b/src/assets/ba_data/python/bascenev1lib/actor/zoomtext.py index 46525aaf..573c6001 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/zoomtext.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/zoomtext.py @@ -26,6 +26,7 @@ class ZoomText(bs.Actor): self, text: str | bs.Lstr, position: tuple[float, float] = (0.0, 0.0), + *, shiftposition: tuple[float, float] | None = None, shiftdelay: float | None = None, lifespan: float | None = None, diff --git a/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py b/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py index b97c6aa4..e86af03e 100644 --- a/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py +++ b/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py @@ -73,6 +73,7 @@ class Team(bs.Team[Player]): def __init__( self, + *, base_pos: Sequence[float], base_region_material: bs.Material, base_region: bs.Node, diff --git a/src/assets/ba_data/python/bascenev1lib/game/elimination.py b/src/assets/ba_data/python/bascenev1lib/game/elimination.py index 7df1d7da..693d36ba 100644 --- a/src/assets/ba_data/python/bascenev1lib/game/elimination.py +++ b/src/assets/ba_data/python/bascenev1lib/game/elimination.py @@ -27,6 +27,7 @@ class Icon(bs.Actor): player: Player, position: tuple[float, float], scale: float, + *, show_lives: bool = True, show_death: bool = True, name_scale: float = 1.0, diff --git a/src/assets/ba_data/python/bascenev1lib/game/onslaught.py b/src/assets/ba_data/python/bascenev1lib/game/onslaught.py index 8635d31e..604d2d82 100644 --- a/src/assets/ba_data/python/bascenev1lib/game/onslaught.py +++ b/src/assets/ba_data/python/bascenev1lib/game/onslaught.py @@ -805,6 +805,7 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]): max_level: int, ) -> list[list[tuple[int, int]]]: """Calculate a distribution of bad guys given some params.""" + # pylint: disable=too-many-positional-arguments max_iterations = 10 + max_dudes * 2 groups: list[list[tuple[int, int]]] = [] diff --git a/src/assets/ba_data/python/bascenev1lib/mainmenu.py b/src/assets/ba_data/python/bascenev1lib/mainmenu.py index a395abbf..bbb89834 100644 --- a/src/assets/ba_data/python/bascenev1lib/mainmenu.py +++ b/src/assets/ba_data/python/bascenev1lib/mainmenu.py @@ -433,6 +433,7 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]): word: str, x: float, y: float, + *, scale: float = 1.0, delay: float = 0.0, vr_depth_offset: float = 0.0, @@ -561,6 +562,7 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]): y: float, scale: float, delay: float, + *, custom_texture: str | None = None, jitter_scale: float = 1.0, rotate: float = 0.0, diff --git a/src/assets/ba_data/python/bascenev1lib/tutorial.py b/src/assets/ba_data/python/bascenev1lib/tutorial.py index 541e6119..d9b6e291 100644 --- a/src/assets/ba_data/python/bascenev1lib/tutorial.py +++ b/src/assets/ba_data/python/bascenev1lib/tutorial.py @@ -515,6 +515,7 @@ class TutorialActivity(bs.Activity[Player, Team]): self, num: int, position: Sequence[float], + *, color: Sequence[float] = (1.0, 1.0, 1.0), make_current: bool = False, relative_to: int | None = None, @@ -577,6 +578,7 @@ class TutorialActivity(bs.Activity[Player, Team]): self, num: int, position: Sequence[float], + *, color: Sequence[float] = (1.0, 1.0, 1.0), make_current: bool = False, relative_to: int | None = None, diff --git a/src/assets/ba_data/python/bauiv1/_appsubsystem.py b/src/assets/ba_data/python/bauiv1/_appsubsystem.py index e425f7fd..9eeb6755 100644 --- a/src/assets/ba_data/python/bauiv1/_appsubsystem.py +++ b/src/assets/ba_data/python/bauiv1/_appsubsystem.py @@ -201,6 +201,7 @@ class UIV1AppSubsystem(babase.AppSubsystem): def set_main_window( self, window: bauiv1.MainWindow, + *, from_window: bauiv1.MainWindow | None | bool = True, is_back: bool = False, is_top_level: bool = False, diff --git a/src/assets/ba_data/python/bauiv1lib/account/viewer.py b/src/assets/ba_data/python/bauiv1lib/account/viewer.py index 2dbb1dea..9f0d606a 100644 --- a/src/assets/ba_data/python/bauiv1lib/account/viewer.py +++ b/src/assets/ba_data/python/bauiv1lib/account/viewer.py @@ -23,6 +23,7 @@ class AccountViewerWindow(PopupWindow): def __init__( self, account_id: str, + *, profile_id: str | None = None, position: tuple[float, float] = (0.0, 0.0), scale: float | None = None, diff --git a/src/assets/ba_data/python/bauiv1lib/benchmarks.py b/src/assets/ba_data/python/bauiv1lib/benchmarks.py index 357be9ee..d9bba76a 100644 --- a/src/assets/ba_data/python/bauiv1lib/benchmarks.py +++ b/src/assets/ba_data/python/bauiv1lib/benchmarks.py @@ -316,7 +316,7 @@ class BenchmarksAndStressTestsWindow(bui.MainWindow): label=bui.Lstr(resource=f'{self._r}.runStressTestText'), on_activate_call=self._stress_test_pressed, ) - bui.widget(btn, show_buffer_bottom=50) + bui.widget(edit=btn, show_buffer_bottom=50) @override def get_main_window_state(self) -> bui.MainWindowState: diff --git a/src/assets/ba_data/python/bauiv1lib/characterpicker.py b/src/assets/ba_data/python/bauiv1lib/characterpicker.py index 1e16f45f..2d5e413a 100644 --- a/src/assets/ba_data/python/bauiv1lib/characterpicker.py +++ b/src/assets/ba_data/python/bauiv1lib/characterpicker.py @@ -41,6 +41,7 @@ class CharacterPicker(PopupWindow): selected_character: str | None = None, ): # pylint: disable=too-many-locals + # pylint: disable=too-many-positional-arguments from bascenev1lib.actor import spazappearance assert bui.app.classic is not None diff --git a/src/assets/ba_data/python/bauiv1lib/colorpicker.py b/src/assets/ba_data/python/bauiv1lib/colorpicker.py index 0067f684..fcc93bf4 100644 --- a/src/assets/ba_data/python/bauiv1lib/colorpicker.py +++ b/src/assets/ba_data/python/bauiv1lib/colorpicker.py @@ -25,6 +25,7 @@ class ColorPicker(PopupWindow): self, parent: bui.Widget, position: tuple[float, float], + *, initial_color: Sequence[float] = (1.0, 1.0, 1.0), delegate: Any = None, scale: float | None = None, @@ -184,6 +185,7 @@ class ColorPickerExact(PopupWindow): self, parent: bui.Widget, position: tuple[float, float], + *, initial_color: Sequence[float] = (1.0, 1.0, 1.0), delegate: Any = None, scale: float | None = None, diff --git a/src/assets/ba_data/python/bauiv1lib/config.py b/src/assets/ba_data/python/bauiv1lib/config.py index 337a25f9..fd46303c 100644 --- a/src/assets/ba_data/python/bauiv1lib/config.py +++ b/src/assets/ba_data/python/bauiv1lib/config.py @@ -28,6 +28,7 @@ class ConfigCheckBox: configkey: str, position: tuple[float, float], size: tuple[float, float], + *, displayname: str | bui.Lstr | None = None, scale: float | None = None, maxwidth: float | None = None, @@ -85,6 +86,7 @@ class ConfigNumberEdit: parent: bui.Widget, configkey: str, position: tuple[float, float], + *, minval: float = 0.0, maxval: float = 100.0, increment: float = 1.0, diff --git a/src/assets/ba_data/python/bauiv1lib/confirm.py b/src/assets/ba_data/python/bauiv1lib/confirm.py index d0e848ad..3aff09d2 100644 --- a/src/assets/ba_data/python/bauiv1lib/confirm.py +++ b/src/assets/ba_data/python/bauiv1lib/confirm.py @@ -22,6 +22,7 @@ class ConfirmWindow: action: Callable[[], Any] | None = None, width: float = 360.0, height: float = 100.0, + *, cancel_button: bool = True, cancel_is_selected: bool = False, color: tuple[float, float, float] = (1, 1, 1), diff --git a/src/assets/ba_data/python/bauiv1lib/coop/gamebutton.py b/src/assets/ba_data/python/bauiv1lib/coop/gamebutton.py index 5172e3a6..fee0a388 100644 --- a/src/assets/ba_data/python/bauiv1lib/coop/gamebutton.py +++ b/src/assets/ba_data/python/bauiv1lib/coop/gamebutton.py @@ -26,6 +26,7 @@ class GameButton: select: bool, row: str, ): + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-statements # pylint: disable=too-many-locals diff --git a/src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py b/src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py index 1c5a9267..549f5b90 100644 --- a/src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py +++ b/src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py @@ -24,6 +24,7 @@ class TournamentButton: select: bool, on_pressed: Callable[[TournamentButton], None], ) -> None: + # pylint: disable=too-many-positional-arguments self._r = 'coopSelectWindow' sclx = 300 scly = 195.0 diff --git a/src/assets/ba_data/python/bauiv1lib/fileselector.py b/src/assets/ba_data/python/bauiv1lib/fileselector.py index de92e6fb..9bafedc9 100644 --- a/src/assets/ba_data/python/bauiv1lib/fileselector.py +++ b/src/assets/ba_data/python/bauiv1lib/fileselector.py @@ -23,6 +23,7 @@ class FileSelectorWindow(bui.MainWindow): self, path: str, callback: Callable[[str | None], Any] | None = None, + *, show_base_path: bool = True, valid_file_extensions: Sequence[str] | None = None, allow_folders: bool = False, diff --git a/src/assets/ba_data/python/bauiv1lib/gather/__init__.py b/src/assets/ba_data/python/bauiv1lib/gather/__init__.py index 8d3c18f6..f3f01e32 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/__init__.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/__init__.py @@ -44,6 +44,7 @@ class GatherTab: The tab should create and return a container widget covering the specified region. """ + # pylint: disable=too-many-positional-arguments raise RuntimeError('Should not get here.') def on_deactivate(self) -> None: diff --git a/src/assets/ba_data/python/bauiv1lib/gather/abouttab.py b/src/assets/ba_data/python/bauiv1lib/gather/abouttab.py index dacf2c6c..7b1bdac6 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/abouttab.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/abouttab.py @@ -27,6 +27,7 @@ class AboutGatherTab(GatherTab): region_bottom: float, ) -> bui.Widget: # pylint: disable=too-many-locals + # pylint: disable=too-many-positional-arguments plus = bui.app.plus assert plus is not None diff --git a/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py b/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py index 4dcc9c79..e59ad3bd 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py @@ -114,6 +114,7 @@ class ManualGatherTab(GatherTab): region_left: float, region_bottom: float, ) -> bui.Widget: + # pylint: disable=too-many-positional-arguments c_width = region_width c_height = region_height - 20 diff --git a/src/assets/ba_data/python/bauiv1lib/gather/nearbytab.py b/src/assets/ba_data/python/bauiv1lib/gather/nearbytab.py index 3301204a..551b74d7 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/nearbytab.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/nearbytab.py @@ -115,6 +115,7 @@ class NearbyGatherTab(GatherTab): region_left: float, region_bottom: float, ) -> bui.Widget: + # pylint: disable=too-many-positional-arguments c_width = region_width c_height = region_height - 20 sub_scroll_height = c_height - 85 diff --git a/src/assets/ba_data/python/bauiv1lib/gather/privatetab.py b/src/assets/ba_data/python/bauiv1lib/gather/privatetab.py index 65854a1a..fa5a2e86 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/privatetab.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/privatetab.py @@ -99,6 +99,7 @@ class PrivateGatherTab(GatherTab): region_left: float, region_bottom: float, ) -> bui.Widget: + # pylint: disable=too-many-positional-arguments self._c_width = region_width self._c_height = region_height - 20 self._container = bui.containerwidget( diff --git a/src/assets/ba_data/python/bauiv1lib/gather/publictab.py b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py index ca799188..66104345 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/publictab.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py @@ -96,6 +96,7 @@ class UIRow: ) -> None: """Update for the given data.""" # pylint: disable=too-many-locals + # pylint: disable=too-many-positional-arguments plus = bui.app.plus assert plus is not None @@ -404,6 +405,7 @@ class PublicGatherTab(GatherTab): region_left: float, region_bottom: float, ) -> bui.Widget: + # pylint: disable=too-many-positional-arguments c_width = region_width c_height = region_height - 20 self._container = bui.containerwidget( diff --git a/src/assets/ba_data/python/bauiv1lib/iconpicker.py b/src/assets/ba_data/python/bauiv1lib/iconpicker.py index 20ebdb0c..779100cd 100644 --- a/src/assets/ba_data/python/bauiv1lib/iconpicker.py +++ b/src/assets/ba_data/python/bauiv1lib/iconpicker.py @@ -23,6 +23,7 @@ class IconPicker(PopupWindow): position: tuple[float, float] = (0.0, 0.0), delegate: Any = None, scale: float | None = None, + *, offset: tuple[float, float] = (0.0, 0.0), tint_color: Sequence[float] = (1.0, 1.0, 1.0), tint2_color: Sequence[float] = (1.0, 1.0, 1.0), diff --git a/src/assets/ba_data/python/bauiv1lib/league/rankbutton.py b/src/assets/ba_data/python/bauiv1lib/league/rankbutton.py index d9528273..6aeee08f 100644 --- a/src/assets/ba_data/python/bauiv1lib/league/rankbutton.py +++ b/src/assets/ba_data/python/bauiv1lib/league/rankbutton.py @@ -22,6 +22,7 @@ class LeagueRankButton: position: tuple[float, float], size: tuple[float, float], scale: float, + *, on_activate_call: Callable[[], Any] | None = None, transition_delay: float | None = None, color: tuple[float, float, float] | None = None, diff --git a/src/assets/ba_data/python/bauiv1lib/league/rankwindow.py b/src/assets/ba_data/python/bauiv1lib/league/rankwindow.py index b4e235e6..97078465 100644 --- a/src/assets/ba_data/python/bauiv1lib/league/rankwindow.py +++ b/src/assets/ba_data/python/bauiv1lib/league/rankwindow.py @@ -1151,10 +1151,10 @@ class LeagueRankWindow(bui.MainWindow): def _show_account_info( self, account_id: str, textwidget: bui.Widget ) -> None: - from bauiv1lib.account import viewer + from bauiv1lib.account.viewer import AccountViewerWindow bui.getsound('swish').play() - viewer.AccountViewerWindow( + AccountViewerWindow( account_id=account_id, position=textwidget.get_screen_space_center() ) diff --git a/src/assets/ba_data/python/bauiv1lib/partyqueue.py b/src/assets/ba_data/python/bauiv1lib/partyqueue.py index 8435562d..7554568f 100644 --- a/src/assets/ba_data/python/bauiv1lib/partyqueue.py +++ b/src/assets/ba_data/python/bauiv1lib/partyqueue.py @@ -33,6 +33,7 @@ class PartyQueueWindow(bui.Window): account_id: str, name: str, ): + # pylint: disable=too-many-positional-arguments self.claimed = False self._line_left = parent.get_line_left() self._line_width = parent.get_line_width() @@ -351,12 +352,12 @@ class PartyQueueWindow(bui.Window): self, account_id: str | None, origin_widget: bui.Widget ) -> None: """A dude was clicked so we should show his account info.""" - from bauiv1lib.account import viewer + from bauiv1lib.account.viewer import AccountViewerWindow if account_id is None: bui.getsound('error').play() return - viewer.AccountViewerWindow( + AccountViewerWindow( account_id=account_id, position=origin_widget.get_screen_space_center(), ) diff --git a/src/assets/ba_data/python/bauiv1lib/play.py b/src/assets/ba_data/python/bauiv1lib/play.py index c52d27fb..2276f0cd 100644 --- a/src/assets/ba_data/python/bauiv1lib/play.py +++ b/src/assets/ba_data/python/bauiv1lib/play.py @@ -632,6 +632,7 @@ class PlayWindow(bui.MainWindow): position: tuple[float, float], color: tuple[float, float, float], ) -> None: + # pylint: disable=too-many-positional-arguments h_extra = -100 v_extra = 130 eye_color = ( diff --git a/src/assets/ba_data/python/bauiv1lib/playlist/editcontroller.py b/src/assets/ba_data/python/bauiv1lib/playlist/editcontroller.py index f398e5b0..71260224 100644 --- a/src/assets/ba_data/python/bauiv1lib/playlist/editcontroller.py +++ b/src/assets/ba_data/python/bauiv1lib/playlist/editcontroller.py @@ -21,6 +21,7 @@ class PlaylistEditController: self, sessiontype: type[bs.Session], from_window: bui.MainWindow, + *, existing_playlist_name: str | None = None, playlist: list[dict[str, Any]] | None = None, playlist_name: str | None = None, diff --git a/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py b/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py index 22a10fda..fa18b1e9 100644 --- a/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py +++ b/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py @@ -31,6 +31,7 @@ class PlaylistEditGameWindow(bui.MainWindow): edit_info: dict[str, Any] | None = None, ): # pylint: disable=too-many-branches + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-statements # pylint: disable=too-many-locals from bascenev1 import ( @@ -485,11 +486,11 @@ class PlaylistEditGameWindow(bui.MainWindow): if prev_widgets is not None: # Wire our rightmost to their rightmost. bui.widget(edit=prev_widgets[-1], down_widget=cwdg[-1]) - bui.widget(cwdg[-1], up_widget=prev_widgets[-1]) + bui.widget(edit=cwdg[-1], up_widget=prev_widgets[-1]) # Wire our leftmost to their leftmost. bui.widget(edit=prev_widgets[0], down_widget=cwdg[0]) - bui.widget(cwdg[0], up_widget=prev_widgets[0]) + bui.widget(edit=cwdg[0], up_widget=prev_widgets[0]) prev_widgets = cwdg except Exception: logging.exception( @@ -617,6 +618,7 @@ class PlaylistEditGameWindow(bui.MainWindow): setting_type: type, setting_name: str, ) -> None: + # pylint: disable=too-many-positional-arguments if setting_type == float: val = float(cast(str, bui.textwidget(query=ctrl))) else: diff --git a/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py b/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py index c58128dc..65690a0f 100644 --- a/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py +++ b/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py @@ -30,6 +30,7 @@ class PlaylistMapSelectWindow(bui.MainWindow): select_get_more_maps_button: bool = False, ): # pylint: disable=too-many-locals + # pylint: disable=too-many-positional-arguments from bascenev1 import get_filtered_map_name diff --git a/src/assets/ba_data/python/bauiv1lib/playoptions.py b/src/assets/ba_data/python/bauiv1lib/playoptions.py index 0c772183..17f9c410 100644 --- a/src/assets/ba_data/python/bauiv1lib/playoptions.py +++ b/src/assets/ba_data/python/bauiv1lib/playoptions.py @@ -23,6 +23,7 @@ class PlayOptionsWindow(PopupWindow): def __init__( self, + *, sessiontype: type[bs.Session], playlist: str, scale_origin: tuple[float, float], diff --git a/src/assets/ba_data/python/bauiv1lib/popup.py b/src/assets/ba_data/python/bauiv1lib/popup.py index df9d111c..a4acf696 100644 --- a/src/assets/ba_data/python/bauiv1lib/popup.py +++ b/src/assets/ba_data/python/bauiv1lib/popup.py @@ -23,6 +23,7 @@ class PopupWindow: position: tuple[float, float], size: tuple[float, float], scale: float = 1.0, + *, offset: tuple[float, float] = (0, 0), bg_color: tuple[float, float, float] = (0.35, 0.55, 0.15), focus_position: tuple[float, float] = (0, 0), @@ -116,6 +117,7 @@ class PopupMenuWindow(PopupWindow): position: tuple[float, float], choices: Sequence[str], current_choice: str, + *, delegate: Any = None, width: float = 230.0, maxwidth: float | None = None, @@ -301,6 +303,7 @@ class PopupMenu: parent: bui.Widget, position: tuple[float, float], choices: Sequence[str], + *, current_choice: str | None = None, on_value_change_call: Callable[[str], Any] | None = None, opening_call: Callable[[], Any] | None = None, diff --git a/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py index 94b266d1..c79c210a 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py @@ -25,6 +25,7 @@ class GamepadSettingsWindow(bui.MainWindow): def __init__( self, inputdevice: bs.InputDevice, + *, modal: bool = False, transition: str = 'in_right', transition_out: str = 'out_right', @@ -744,6 +745,7 @@ class GamepadSettingsWindow(bui.MainWindow): color: tuple[float, float, float], texture: bui.Texture, button: str, + *, scale: float = 1.0, message: bui.Lstr | None = None, message2: bui.Lstr | None = None, @@ -955,6 +957,7 @@ class AwaitGamepadInputWindow(bui.Window): message: bui.Lstr | None = None, message2: bui.Lstr | None = None, ): + # pylint: disable=too-many-positional-arguments if message is None: print('AwaitGamepadInputWindow message is None!') # Shouldn't get here. diff --git a/src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py b/src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py index 7db6b2e7..53b1eafe 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py @@ -473,6 +473,7 @@ class GamepadAdvancedSettingsWindow(bui.Window): name: bui.Lstr, control: str, position: tuple[float, float], + *, min_val: float = 0.0, max_val: float = 100.0, increment: float = 1.0, diff --git a/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py index 5d2f6f96..0225a6fd 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py @@ -271,6 +271,7 @@ class ConfigKeyboardWindow(bui.MainWindow): button: str, scale: float = 1.0, ) -> None: + # pylint: disable=too-many-positional-arguments base_size = 79 btn = bui.buttonwidget( parent=self._root_widget, diff --git a/src/assets/ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py index 64ae95c0..ff47eac4 100644 --- a/src/assets/ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py +++ b/src/assets/ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py @@ -20,6 +20,7 @@ class SoundtrackEntryTypeSelectWindow(bui.MainWindow): callback: Callable[[Any], Any], current_entry: Any, selection_target_name: str, + *, transition: str | None = 'in_right', origin_widget: bui.Widget | None = None, ): diff --git a/src/assets/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py index b4c34ef8..6354fdf4 100644 --- a/src/assets/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py +++ b/src/assets/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py @@ -21,6 +21,7 @@ class MacMusicAppPlaylistSelectWindow(bui.MainWindow): callback: Callable[[Any], Any], existing_playlist: str | None, existing_entry: Any, + *, transition: str | None = 'in_right', origin_widget: bui.Widget | None = None, ): diff --git a/src/assets/ba_data/python/bauiv1lib/store/button.py b/src/assets/ba_data/python/bauiv1lib/store/button.py index 5571fef1..892db29e 100644 --- a/src/assets/ba_data/python/bauiv1lib/store/button.py +++ b/src/assets/ba_data/python/bauiv1lib/store/button.py @@ -23,6 +23,7 @@ class StoreButton: position: Sequence[float], size: Sequence[float], scale: float, + *, on_activate_call: Callable[[], Any] | None = None, transition_delay: float | None = None, color: Sequence[float] | None = None, diff --git a/src/assets/ba_data/python/bauiv1lib/store/item.py b/src/assets/ba_data/python/bauiv1lib/store/item.py index ee779cb4..54a8d0a1 100644 --- a/src/assets/ba_data/python/bauiv1lib/store/item.py +++ b/src/assets/ba_data/python/bauiv1lib/store/item.py @@ -19,6 +19,7 @@ def instantiate_store_item_display( b_pos: tuple[float, float], b_width: float, b_height: float, + *, boffs_h: float = 0.0, boffs_h2: float = 0.0, boffs_v2: float = 0, @@ -26,6 +27,7 @@ def instantiate_store_item_display( button: bool = True, ) -> None: """(internal)""" + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-statements # pylint: disable=too-many-branches # pylint: disable=too-many-locals diff --git a/src/assets/ba_data/python/bauiv1lib/tabs.py b/src/assets/ba_data/python/bauiv1lib/tabs.py index ffb0cff4..be3a1bab 100644 --- a/src/assets/ba_data/python/bauiv1lib/tabs.py +++ b/src/assets/ba_data/python/bauiv1lib/tabs.py @@ -37,6 +37,7 @@ class TabRow(Generic[T]): tabdefs: list[tuple[T, bui.Lstr]], pos: tuple[float, float], size: tuple[float, float], + *, on_select_call: Callable[[T], None] | None = None, ) -> None: if not tabdefs: diff --git a/src/assets/ba_data/python/bauiv1lib/tournamententry.py b/src/assets/ba_data/python/bauiv1lib/tournamententry.py index 025ae53b..ba0a76a4 100644 --- a/src/assets/ba_data/python/bauiv1lib/tournamententry.py +++ b/src/assets/ba_data/python/bauiv1lib/tournamententry.py @@ -28,7 +28,7 @@ class TournamentEntryWindow(PopupWindow): offset: tuple[float, float] = (0.0, 0.0), on_close_call: Callable[[], Any] | None = None, ): - # Needs some tidying. + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-locals # pylint: disable=too-many-branches # pylint: disable=too-many-statements diff --git a/src/assets/ba_data/python/bauiv1lib/tournamentscores.py b/src/assets/ba_data/python/bauiv1lib/tournamentscores.py index e4be2db0..7cff3db1 100644 --- a/src/assets/ba_data/python/bauiv1lib/tournamentscores.py +++ b/src/assets/ba_data/python/bauiv1lib/tournamentscores.py @@ -21,6 +21,7 @@ class TournamentScoresWindow(PopupWindow): def __init__( self, tournament_id: str, + *, tournament_activity: bs.GameActivity | None = None, position: tuple[float, float] = (0.0, 0.0), scale: float | None = None, diff --git a/src/assets/ba_data/python/bauiv1lib/trophies.py b/src/assets/ba_data/python/bauiv1lib/trophies.py index a7982f6c..c4419c5e 100644 --- a/src/assets/ba_data/python/bauiv1lib/trophies.py +++ b/src/assets/ba_data/python/bauiv1lib/trophies.py @@ -134,6 +134,7 @@ class TrophiesWindow(popup.PopupWindow): sub_width: int, trophy_types: list[list[str]], ) -> int: + # pylint: disable=too-many-positional-arguments from bascenev1 import get_trophy_string total_pts = 0 diff --git a/src/ballistica/base/assets/assets.cc b/src/ballistica/base/assets/assets.cc index 2f135ecd..7a0ecc90 100644 --- a/src/ballistica/base/assets/assets.cc +++ b/src/ballistica/base/assets/assets.cc @@ -699,8 +699,8 @@ auto Assets::GetPendingLoadCount() -> int { template auto Assets::GetAssetPendingLoadCount( - std::unordered_map >* t_list, - AssetType type) -> int { + std::unordered_map >* t_list, AssetType type) + -> int { assert(g_base->InLogicThread()); assert(asset_lists_locked_); @@ -1056,8 +1056,8 @@ void Assets::Prune(int level) { } } -auto Assets::FindAssetFile(FileType type, - const std::string& name) -> std::string { +auto Assets::FindAssetFile(FileType type, const std::string& name) + -> std::string { std::string file_out; // We don't protect package-path access so make sure its always from here. diff --git a/src/ballistica/base/assets/assets.h b/src/ballistica/base/assets/assets.h index f9cbbe94..aa396371 100644 --- a/src/ballistica/base/assets/assets.h +++ b/src/ballistica/base/assets/assets.h @@ -38,8 +38,8 @@ class Assets { /// is deleted once the load is completed. void AddPendingLoad(Object::Ref* c); enum class FileType { kMesh, kCollisionMesh, kTexture, kSound, kData }; - auto FindAssetFile(FileType fileType, - const std::string& file_in) -> std::string; + auto FindAssetFile(FileType fileType, const std::string& file_in) + -> std::string; /// Unload renderer-specific bits only (gl display lists, etc) - used when /// recreating/adjusting the renderer. @@ -131,8 +131,8 @@ class Assets { template auto GetAssetPendingLoadCount( - std::unordered_map >* t_list, - AssetType type) -> int; + std::unordered_map >* t_list, AssetType type) + -> int; template auto GetAsset(const std::string& file_name, diff --git a/src/ballistica/base/assets/sound_asset.cc b/src/ballistica/base/assets/sound_asset.cc index c6e64dcb..34acd22a 100644 --- a/src/ballistica/base/assets/sound_asset.cc +++ b/src/ballistica/base/assets/sound_asset.cc @@ -33,8 +33,8 @@ static auto CallbackRead(void* ptr, size_t size, size_t nmemb, void* data_source) -> size_t { return fread(ptr, size, nmemb, static_cast(data_source)); } -static auto CallbackSeek(void* data_source, ogg_int64_t offset, - int whence) -> int { +static auto CallbackSeek(void* data_source, ogg_int64_t offset, int whence) + -> int { return fseek(static_cast(data_source), static_cast_check_fit(offset), whence); // NOLINT } @@ -175,7 +175,7 @@ static void LoadCachedOgg(const char* file_name, std::vector* buffer, // If we have a cache file and it matches the mod time on the ogg, attempt to // load it. - struct BA_STAT stat_ogg {}; + struct BA_STAT stat_ogg{}; time_t ogg_mod_time = 0; if (g_core->platform->Stat(file_name, &stat_ogg) == 0) { ogg_mod_time = stat_ogg.st_mtime; diff --git a/src/ballistica/base/audio/audio.cc b/src/ballistica/base/audio/audio.cc index 7638f032..f37f4632 100644 --- a/src/ballistica/base/audio/audio.cc +++ b/src/ballistica/base/audio/audio.cc @@ -124,8 +124,8 @@ auto Audio::IsSoundPlaying(uint32_t play_id) -> bool { return result; } -auto Audio::SourceBeginExisting(uint32_t play_id, - int debug_id) -> AudioSource* { +auto Audio::SourceBeginExisting(uint32_t play_id, int debug_id) + -> AudioSource* { BA_DEBUG_FUNCTION_TIMER_BEGIN(); uint32_t source_id = AudioServer::SourceIdFromPlayId(play_id); @@ -186,8 +186,8 @@ auto Audio::SafePlaySysSound(SysSoundID sound_id) -> std::optional { return PlaySound(g_base->assets->SysSound(sound_id)); } -auto Audio::PlaySound(SoundAsset* sound, - float volume) -> std::optional { +auto Audio::PlaySound(SoundAsset* sound, float volume) + -> std::optional { assert(g_core); assert(g_base->InLogicThread()); BA_DEBUG_FUNCTION_TIMER_BEGIN(); diff --git a/src/ballistica/base/audio/ogg_stream.cc b/src/ballistica/base/audio/ogg_stream.cc index c62c4799..5b51d427 100644 --- a/src/ballistica/base/audio/ogg_stream.cc +++ b/src/ballistica/base/audio/ogg_stream.cc @@ -15,8 +15,8 @@ static auto CallbackRead(void* ptr, size_t size, size_t nmemb, return fread(ptr, size, nmemb, static_cast(data_source)); } -static auto CallbackSeek(void* data_source, ogg_int64_t offset, - int whence) -> int { +static auto CallbackSeek(void* data_source, ogg_int64_t offset, int whence) + -> int { return fseek(static_cast(data_source), static_cast_check_fit(offset), whence); // NOLINT } diff --git a/src/ballistica/base/graphics/gl/renderer_gl.cc b/src/ballistica/base/graphics/gl/renderer_gl.cc index bfb5582a..156f8630 100644 --- a/src/ballistica/base/graphics/gl/renderer_gl.cc +++ b/src/ballistica/base/graphics/gl/renderer_gl.cc @@ -2824,17 +2824,19 @@ auto RendererGL::NewScreenRenderTarget() -> RenderTarget* { return Object::NewDeferred(this); } -auto RendererGL::NewFramebufferRenderTarget( - int width, int height, bool linear_interp, bool depth, bool texture, - bool depth_texture, bool high_quality, bool msaa, - bool alpha) -> Object::Ref { +auto RendererGL::NewFramebufferRenderTarget(int width, int height, + bool linear_interp, bool depth, + bool texture, bool depth_texture, + bool high_quality, bool msaa, + bool alpha) + -> Object::Ref { return Object::New( this, width, height, linear_interp, depth, texture, depth_texture, high_quality, msaa, alpha); } -auto RendererGL::NewMeshData(MeshDataType mesh_type, - MeshDrawType draw_type) -> MeshRendererData* { +auto RendererGL::NewMeshData(MeshDataType mesh_type, MeshDrawType draw_type) + -> MeshRendererData* { switch (mesh_type) { case MeshDataType::kIndexedSimpleSplit: { MeshDataSimpleSplitGL* data; diff --git a/src/ballistica/base/graphics/gl/renderer_gl.h b/src/ballistica/base/graphics/gl/renderer_gl.h index c747f9d1..4beceec6 100644 --- a/src/ballistica/base/graphics/gl/renderer_gl.h +++ b/src/ballistica/base/graphics/gl/renderer_gl.h @@ -141,17 +141,18 @@ class RendererGL : public Renderer { void SetDepthTesting(bool enable) override; void SetDrawAtEqualDepth(bool enable) override; auto NewScreenRenderTarget() -> RenderTarget* override; - auto NewFramebufferRenderTarget( - int width, int height, bool linear_interp, bool depth, bool texture, - bool depth_is_texture, bool high_quality, bool msaa, - bool alpha) -> Object::Ref override; + auto NewFramebufferRenderTarget(int width, int height, bool linear_interp, + bool depth, bool texture, + bool depth_is_texture, bool high_quality, + bool msaa, bool alpha) + -> Object::Ref override; auto NewMeshAssetData(const MeshAsset& mesh) -> Object::Ref override; auto NewTextureData(const TextureAsset& texture) -> Object::Ref override; - auto NewMeshData(MeshDataType type, - MeshDrawType drawType) -> MeshRendererData* override; + auto NewMeshData(MeshDataType type, MeshDrawType drawType) + -> MeshRendererData* override; void DeleteMeshData(MeshRendererData* data, MeshDataType type) override; void ProcessRenderCommandBuffer(RenderCommandBuffer* buffer, diff --git a/src/ballistica/base/graphics/graphics.cc b/src/ballistica/base/graphics/graphics.cc index 0ca9a658..bbf66a55 100644 --- a/src/ballistica/base/graphics/graphics.cc +++ b/src/ballistica/base/graphics/graphics.cc @@ -484,8 +484,8 @@ void Graphics::DrawMiscOverlays(FrameDef* frame_def) { screenmessages->DrawMiscOverlays(frame_def); } -auto Graphics::GetDebugGraph(const std::string& name, - bool smoothed) -> NetGraph* { +auto Graphics::GetDebugGraph(const std::string& name, bool smoothed) + -> NetGraph* { auto out = debug_graphs_.find(name); if (out == debug_graphs_.end()) { debug_graphs_[name] = Object::New(); @@ -1681,8 +1681,9 @@ auto Graphics::GraphicsQualityFromRequest(GraphicsQualityRequest request, } } -auto Graphics::TextureQualityFromRequest( - TextureQualityRequest request, TextureQuality auto_val) -> TextureQuality { +auto Graphics::TextureQualityFromRequest(TextureQualityRequest request, + TextureQuality auto_val) + -> TextureQuality { switch (request) { case TextureQualityRequest::kLow: return TextureQuality::kLow; diff --git a/src/ballistica/base/graphics/graphics.h b/src/ballistica/base/graphics/graphics.h index 73072734..a8e8e116 100644 --- a/src/ballistica/base/graphics/graphics.h +++ b/src/ballistica/base/graphics/graphics.h @@ -339,8 +339,9 @@ class Graphics { static auto GraphicsQualityFromRequest(GraphicsQualityRequest request, GraphicsQuality auto_val) -> GraphicsQuality; - static auto TextureQualityFromRequest( - TextureQualityRequest request, TextureQuality auto_val) -> TextureQuality; + static auto TextureQualityFromRequest(TextureQualityRequest request, + TextureQuality auto_val) + -> TextureQuality; /// For temporary use from arbitrary threads. This should be removed when /// possible and replaced with proper safe thread-specific access patterns diff --git a/src/ballistica/base/graphics/graphics_vr.cc b/src/ballistica/base/graphics/graphics_vr.cc index f4717fab..60c5484c 100644 --- a/src/ballistica/base/graphics/graphics_vr.cc +++ b/src/ballistica/base/graphics/graphics_vr.cc @@ -16,8 +16,8 @@ namespace ballistica::base { -static auto ValueTestFloat(float* storage, double* absval, - double* deltaval) -> double { +static auto ValueTestFloat(float* storage, double* absval, double* deltaval) + -> double { if (absval) { *storage = static_cast(*absval); } @@ -27,8 +27,8 @@ static auto ValueTestFloat(float* storage, double* absval, return *storage; } -static auto ValueTestBool(bool* storage, double* absval, - double* deltaval) -> double { +static auto ValueTestBool(bool* storage, double* absval, double* deltaval) + -> double { if (absval) { *storage = static_cast(*absval); } @@ -241,8 +241,9 @@ void GraphicsVR::CalcVROverlayMatrices(FrameDef* frame_def) { } } -auto GraphicsVR::CalcVROverlayMatrix( - const Vector3f& cam_pt, const Vector3f& cam_target_pt) const -> Matrix44f { +auto GraphicsVR::CalcVROverlayMatrix(const Vector3f& cam_pt, + const Vector3f& cam_target_pt) const + -> Matrix44f { Matrix44f m = Matrix44fTranslate(cam_target_pt); Vector3f diff = cam_pt - cam_target_pt; diff.Normalize(); diff --git a/src/ballistica/base/graphics/renderer/renderer.cc b/src/ballistica/base/graphics/renderer/renderer.cc index 813b45e4..c3cc98db 100644 --- a/src/ballistica/base/graphics/renderer/renderer.cc +++ b/src/ballistica/base/graphics/renderer/renderer.cc @@ -99,9 +99,9 @@ void Renderer::RenderFrameDef(FrameDef* frame_def) { // If preprocess decided not to render this. if (!frame_def->rendering()) return; - // Set camera/hand/etc positioning with latest VR data if applicable. - // (we do this here at render time as opposed to frame construction time - // so we have the most up-to-date data possible). + // Set camera/hand/etc positioning with latest VR data if applicable. + // (we do this here at render time as opposed to frame construction time + // so we have the most up-to-date data possible). #if BA_VR_BUILD VRUpdateForEyeRender(frame_def); #endif // BA_VR_BUILD diff --git a/src/ballistica/base/graphics/renderer/renderer.h b/src/ballistica/base/graphics/renderer/renderer.h index 4a4a0466..3bc6ccc2 100644 --- a/src/ballistica/base/graphics/renderer/renderer.h +++ b/src/ballistica/base/graphics/renderer/renderer.h @@ -152,8 +152,8 @@ class Renderer { -> Object::Ref = 0; virtual auto NewTextureData(const TextureAsset& texture) -> Object::Ref = 0; - virtual auto NewMeshData(MeshDataType t, - MeshDrawType drawType) -> MeshRendererData* = 0; + virtual auto NewMeshData(MeshDataType t, MeshDrawType drawType) + -> MeshRendererData* = 0; virtual void DeleteMeshData(MeshRendererData* data, MeshDataType t) = 0; virtual void ProcessRenderCommandBuffer(RenderCommandBuffer* buffer, const RenderPass& pass, @@ -176,10 +176,12 @@ class Renderer { virtual void InvalidateFramebuffer(bool color, bool depth, bool target_read_framebuffer) = 0; virtual auto NewScreenRenderTarget() -> RenderTarget* = 0; - virtual auto NewFramebufferRenderTarget( - int width, int height, bool linear_interp, bool depth, bool texture, - bool depth_texture, bool high_quality, bool msaa, - bool alpha) -> Object::Ref = 0; + virtual auto NewFramebufferRenderTarget(int width, int height, + bool linear_interp, bool depth, + bool texture, bool depth_texture, + bool high_quality, bool msaa, + bool alpha) + -> Object::Ref = 0; virtual void PushGroupMarker(const char* label) = 0; virtual void PopGroupMarker() = 0; virtual void BlitBuffer(RenderTarget* src, RenderTarget* dst, bool depth, diff --git a/src/ballistica/base/input/device/joystick_input.cc b/src/ballistica/base/input/device/joystick_input.cc index 4e333224..08f7386c 100644 --- a/src/ballistica/base/input/device/joystick_input.cc +++ b/src/ballistica/base/input/device/joystick_input.cc @@ -331,8 +331,8 @@ auto JoystickInput::ShouldBeHiddenFromUser() -> bool { } } -auto JoystickInput::GetCalibratedValue(float raw, - float neutral) const -> int32_t { +auto JoystickInput::GetCalibratedValue(float raw, float neutral) const + -> int32_t { int32_t val; float dead_zone = 0.5f; float mag, target; diff --git a/src/ballistica/base/input/input.h b/src/ballistica/base/input/input.h index 5d7b0b12..5c23bf33 100644 --- a/src/ballistica/base/input/input.h +++ b/src/ballistica/base/input/input.h @@ -43,8 +43,8 @@ class Input { // Given a device name and persistent identifier for it, returns a device or // nullptr. Note that this can return hidden devices (ones the user has // flagged as totally-ignored, etc). - auto GetInputDevice(const std::string& name, - const std::string& persistent_id) -> InputDevice*; + auto GetInputDevice(const std::string& name, const std::string& persistent_id) + -> InputDevice*; // Return a device by id, or nullptr for an invalid id. Note that this can // return hidden devices (ones the user has flagged as totally-ignored, etc). diff --git a/src/ballistica/base/logic/logic.cc b/src/ballistica/base/logic/logic.cc index 2a2bbc79..3acc82fa 100644 --- a/src/ballistica/base/logic/logic.cc +++ b/src/ballistica/base/logic/logic.cc @@ -636,8 +636,8 @@ void Logic::NotifyOfPendingAssetLoads() { UpdatePendingWorkTimer_(); } -auto Logic::NewAppTimer(microsecs_t length, bool repeat, - Runnable* runnable) -> int { +auto Logic::NewAppTimer(microsecs_t length, bool repeat, Runnable* runnable) + -> int { // App-Timers simply get injected into our loop and run alongside our own // stuff. assert(g_base->InLogicThread()); @@ -661,8 +661,8 @@ void Logic::SetAppTimerLength(int timer_id, microsecs_t length) { } } -auto Logic::NewDisplayTimer(microsecs_t length, bool repeat, - Runnable* runnable) -> int { +auto Logic::NewDisplayTimer(microsecs_t length, bool repeat, Runnable* runnable) + -> int { // Display-Timers go into a timer-list that we exec explicitly when we // step display-time. assert(g_base->InLogicThread()); diff --git a/src/ballistica/base/logic/logic.h b/src/ballistica/base/logic/logic.h index 58cf8d0c..d74e7de4 100644 --- a/src/ballistica/base/logic/logic.h +++ b/src/ballistica/base/logic/logic.h @@ -94,8 +94,8 @@ class Logic { void DeleteAppTimer(int timer_id); void SetAppTimerLength(int timer_id, microsecs_t length); - auto NewDisplayTimer(microsecs_t length, bool repeat, - Runnable* runnable) -> int; + auto NewDisplayTimer(microsecs_t length, bool repeat, Runnable* runnable) + -> int; void DeleteDisplayTimer(int timer_id); void SetDisplayTimerLength(int timer_id, microsecs_t length); diff --git a/src/ballistica/base/networking/network_reader.cc b/src/ballistica/base/networking/network_reader.cc index 40f64c25..44b48089 100644 --- a/src/ballistica/base/networking/network_reader.cc +++ b/src/ballistica/base/networking/network_reader.cc @@ -59,7 +59,7 @@ void NetworkReader::PokeSelf_() { Log(LogLevel::kError, "Unable to create sleep ping socket; errno " + g_core->platform->GetSocketErrorString()); } else { - struct sockaddr_in serv_addr {}; + struct sockaddr_in serv_addr{}; memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); // NOLINT @@ -69,7 +69,7 @@ void NetworkReader::PokeSelf_() { Log(LogLevel::kError, "Unable to bind sleep socket: " + g_core->platform->GetSocketErrorString()); } else { - struct sockaddr_in t_addr {}; + struct sockaddr_in t_addr{}; memset(&t_addr, 0, sizeof(t_addr)); t_addr.sin_family = AF_INET; t_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); // NOLINT @@ -414,7 +414,7 @@ void NetworkReader::OpenSockets_() { g_core->platform->SetSocketNonBlocking(sd4_); // Bind to local server port. - struct sockaddr_in serv_addr {}; + struct sockaddr_in serv_addr{}; serv_addr.sin_family = AF_INET; serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); // NOLINT @@ -443,7 +443,7 @@ void NetworkReader::OpenSockets_() { // See what v4 port we actually wound up with. if (sd4_ != -1) { - struct sockaddr_in sa {}; + struct sockaddr_in sa{}; socklen_t sa_len = sizeof(sa); if (getsockname(sd4_, reinterpret_cast(&sa), &sa_len) == 0) { port4_ = ntohs(sa.sin_port); // NOLINT @@ -474,7 +474,7 @@ void NetworkReader::OpenSockets_() { } g_core->platform->SetSocketNonBlocking(sd6_); - struct sockaddr_in6 serv_addr {}; + struct sockaddr_in6 serv_addr{}; memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin6_family = AF_INET6; serv_addr.sin6_port = htons(port6_); // NOLINT @@ -505,7 +505,7 @@ void NetworkReader::OpenSockets_() { // See what v6 port we actually wound up with. if (sd6_ != -1) { - struct sockaddr_in sa {}; + struct sockaddr_in sa{}; socklen_t sa_len = sizeof(sa); if (getsockname(sd6_, reinterpret_cast(&sa), &sa_len) == 0) { port6_ = ntohs(sa.sin_port); // NOLINT diff --git a/src/ballistica/base/platform/base_platform.cc b/src/ballistica/base/platform/base_platform.cc index 7c226efb..dcaf72c2 100644 --- a/src/ballistica/base/platform/base_platform.cc +++ b/src/ballistica/base/platform/base_platform.cc @@ -207,14 +207,14 @@ void BasePlatform::SetupInterruptHandling() { throw Exception(); #else { - struct sigaction handler {}; + struct sigaction handler{}; handler.sa_handler = HandleSIGINT; sigemptyset(&handler.sa_mask); handler.sa_flags = 0; sigaction(SIGINT, &handler, nullptr); } { - struct sigaction handler {}; + struct sigaction handler{}; handler.sa_handler = HandleSIGTERM; sigemptyset(&handler.sa_mask); handler.sa_flags = 0; diff --git a/src/ballistica/base/python/base_python.cc b/src/ballistica/base/python/base_python.cc index 251544eb..cec3b878 100644 --- a/src/ballistica/base/python/base_python.cc +++ b/src/ballistica/base/python/base_python.cc @@ -333,8 +333,8 @@ auto BasePython::GetRawConfigValue(const char* name) -> PyObject* { return PyDict_GetItemString(objs().Get(ObjID::kConfig).Get(), name); } -auto BasePython::GetRawConfigValue(const char* name, - const char* default_value) -> std::string { +auto BasePython::GetRawConfigValue(const char* name, const char* default_value) + -> std::string { assert(g_base->InLogicThread()); assert(objs().Exists(ObjID::kConfig)); PyObject* value = @@ -345,8 +345,8 @@ auto BasePython::GetRawConfigValue(const char* name, return PyUnicode_AsUTF8(value); } -auto BasePython::GetRawConfigValue(const char* name, - float default_value) -> float { +auto BasePython::GetRawConfigValue(const char* name, float default_value) + -> float { assert(g_base->InLogicThread()); assert(objs().Exists(ObjID::kConfig)); PyObject* value = @@ -402,8 +402,8 @@ auto BasePython::GetRawConfigValue(const char* name, int default_value) -> int { } } -auto BasePython::GetRawConfigValue(const char* name, - bool default_value) -> bool { +auto BasePython::GetRawConfigValue(const char* name, bool default_value) + -> bool { assert(g_base->InLogicThread()); assert(objs().Exists(ObjID::kConfig)); PyObject* value = @@ -537,8 +537,8 @@ auto BasePython::GetResource(const char* key, const char* fallback_resource, return std::string(""; } -auto BasePython::GetTranslation(const char* category, - const char* s) -> std::string { +auto BasePython::GetTranslation(const char* category, const char* s) + -> std::string { assert(Python::HaveGIL()); PythonRef results; PythonRef args(Py_BuildValue("(ss)", category, s), PythonRef::kSteal); diff --git a/src/ballistica/base/python/base_python.h b/src/ballistica/base/python/base_python.h index 176db71b..479cde21 100644 --- a/src/ballistica/base/python/base_python.h +++ b/src/ballistica/base/python/base_python.h @@ -145,8 +145,8 @@ class BasePython { // functions (which themselves call these functions) auto GetRawConfigValue(const char* name) -> PyObject*; // (returns a borrowed ref) - auto GetRawConfigValue(const char* name, - const char* default_value) -> std::string; + auto GetRawConfigValue(const char* name, const char* default_value) + -> std::string; auto GetRawConfigValue(const char* name, float default_value) -> float; auto GetRawConfigValue(const char* name, std::optional default_value) -> std::optional; diff --git a/src/ballistica/base/python/class/python_class_app_timer.h b/src/ballistica/base/python/class/python_class_app_timer.h index 0c086a2e..7295988a 100644 --- a/src/ballistica/base/python/class/python_class_app_timer.h +++ b/src/ballistica/base/python/class/python_class_app_timer.h @@ -18,8 +18,8 @@ class PythonClassAppTimer : public PythonClass { static PyTypeObject type_obj; private: - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassAppTimer* self); int timer_id_{}; bool have_timer_{}; diff --git a/src/ballistica/base/python/class/python_class_context_call.cc b/src/ballistica/base/python/class/python_class_context_call.cc index e50b227e..3dad799a 100644 --- a/src/ballistica/base/python/class/python_class_context_call.cc +++ b/src/ballistica/base/python/class/python_class_context_call.cc @@ -92,8 +92,8 @@ auto PythonClassContextCall::tp_new(PyTypeObject* type, PyObject* args, } auto PythonClassContextCall::tp_call(PythonClassContextCall* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", diff --git a/src/ballistica/base/python/class/python_class_context_call.h b/src/ballistica/base/python/class/python_class_context_call.h index 349cc289..8d0c3020 100644 --- a/src/ballistica/base/python/class/python_class_context_call.h +++ b/src/ballistica/base/python/class/python_class_context_call.h @@ -23,8 +23,8 @@ class PythonClassContextCall : public PythonClass { static auto tp_call(PythonClassContextCall* self, PyObject* args, PyObject* keywds) -> PyObject*; static auto tp_repr(PythonClassContextCall* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassContextCall* self); Object::Ref* context_call_{}; }; diff --git a/src/ballistica/base/python/class/python_class_context_ref.cc b/src/ballistica/base/python/class/python_class_context_ref.cc index 90fef920..e32fb729 100644 --- a/src/ballistica/base/python/class/python_class_context_ref.cc +++ b/src/ballistica/base/python/class/python_class_context_ref.cc @@ -151,8 +151,8 @@ auto PythonClassContextRef::Enter(PythonClassContextRef* self) -> PyObject* { BA_PYTHON_CATCH; } -auto PythonClassContextRef::Exit(PythonClassContextRef* self, - PyObject* args) -> PyObject* { +auto PythonClassContextRef::Exit(PythonClassContextRef* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; g_base->SetCurrentContext(*self->context_ref_prev_); Py_RETURN_NONE; diff --git a/src/ballistica/base/python/class/python_class_context_ref.h b/src/ballistica/base/python/class/python_class_context_ref.h index 9c3c5edd..b325dfca 100644 --- a/src/ballistica/base/python/class/python_class_context_ref.h +++ b/src/ballistica/base/python/class/python_class_context_ref.h @@ -22,10 +22,10 @@ class PythonClassContextRef : public PythonClass { private: static PyMethodDef tp_methods[]; static auto tp_repr(PythonClassContextRef* self) -> PyObject*; - static auto tp_richcompare(PythonClassContextRef* c1, PyObject* c2, - int op) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_richcompare(PythonClassContextRef* c1, PyObject* c2, int op) + -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassContextRef* self); static auto Enter(PythonClassContextRef* self) -> PyObject*; static auto Exit(PythonClassContextRef* self, PyObject* args) -> PyObject*; diff --git a/src/ballistica/base/python/class/python_class_display_timer.h b/src/ballistica/base/python/class/python_class_display_timer.h index 35b10d3b..61c25888 100644 --- a/src/ballistica/base/python/class/python_class_display_timer.h +++ b/src/ballistica/base/python/class/python_class_display_timer.h @@ -18,8 +18,8 @@ class PythonClassDisplayTimer : public PythonClass { static PyTypeObject type_obj; private: - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassDisplayTimer* self); int timer_id_; bool have_timer_; diff --git a/src/ballistica/base/python/class/python_class_env.cc b/src/ballistica/base/python/class/python_class_env.cc index b5970b0b..c84055c5 100644 --- a/src/ballistica/base/python/class/python_class_env.cc +++ b/src/ballistica/base/python/class/python_class_env.cc @@ -214,8 +214,8 @@ void PythonClassEnv::tp_dealloc(PythonClassEnv* self) { Py_TYPE(self)->tp_free(reinterpret_cast(self)); } -auto PythonClassEnv::tp_getattro(PythonClassEnv* self, - PyObject* attr) -> PyObject* { +auto PythonClassEnv::tp_getattro(PythonClassEnv* self, PyObject* attr) + -> PyObject* { BA_PYTHON_TRY; // Do we need to support other attr types? diff --git a/src/ballistica/base/python/class/python_class_env.h b/src/ballistica/base/python/class/python_class_env.h index dd28f68b..dcca64c5 100644 --- a/src/ballistica/base/python/class/python_class_env.h +++ b/src/ballistica/base/python/class/python_class_env.h @@ -34,8 +34,8 @@ class PythonClassEnv : public PythonClass { PythonClassEnv(); ~PythonClassEnv(); static PyMethodDef tp_methods[]; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassEnv* self); static auto Dir(PythonClassEnv* self) -> PyObject*; }; diff --git a/src/ballistica/base/python/class/python_class_feature_set_data.h b/src/ballistica/base/python/class/python_class_feature_set_data.h index 5df100e4..f9283d4d 100644 --- a/src/ballistica/base/python/class/python_class_feature_set_data.h +++ b/src/ballistica/base/python/class/python_class_feature_set_data.h @@ -40,8 +40,8 @@ class PythonClassFeatureSetData : public PythonClass { private: static PyMethodDef tp_methods[]; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassFeatureSetData* self); FeatureSetNativeComponent* feature_set_{}; static auto Play(PythonClassFeatureSetData* self, PyObject* args, diff --git a/src/ballistica/base/python/class/python_class_simple_sound.h b/src/ballistica/base/python/class/python_class_simple_sound.h index a0cd3244..6f4e3e69 100644 --- a/src/ballistica/base/python/class/python_class_simple_sound.h +++ b/src/ballistica/base/python/class/python_class_simple_sound.h @@ -42,8 +42,8 @@ class PythonClassSimpleSound : public PythonClass { private: static PyMethodDef tp_methods[]; static auto tp_repr(PythonClassSimpleSound* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassSimpleSound* self); Object::Ref* sound_; static auto Play(PythonClassSimpleSound* self, PyObject* args, diff --git a/src/ballistica/base/python/class/python_class_vec3.cc b/src/ballistica/base/python/class/python_class_vec3.cc index 31602fc2..cbf96e4d 100644 --- a/src/ballistica/base/python/class/python_class_vec3.cc +++ b/src/ballistica/base/python/class/python_class_vec3.cc @@ -138,8 +138,8 @@ auto PythonClassVec3::sq_length(PythonClassVec3* self) -> Py_ssize_t { return kMemberCount; } -auto PythonClassVec3::sq_item(PythonClassVec3* self, - Py_ssize_t i) -> PyObject* { +auto PythonClassVec3::sq_item(PythonClassVec3* self, Py_ssize_t i) + -> PyObject* { if (i < 0 || i >= kMemberCount) { PyErr_SetString(PyExc_IndexError, "Vec3 index out of range"); return nullptr; @@ -159,8 +159,8 @@ auto PythonClassVec3::sq_ass_item(PythonClassVec3* self, Py_ssize_t i, BA_PYTHON_INT_CATCH; } -auto PythonClassVec3::nb_add(PythonClassVec3* l, - PythonClassVec3* r) -> PyObject* { +auto PythonClassVec3::nb_add(PythonClassVec3* l, PythonClassVec3* r) + -> PyObject* { BA_PYTHON_TRY; // We can add if both sides are Vec3. @@ -175,8 +175,8 @@ auto PythonClassVec3::nb_add(PythonClassVec3* l, BA_PYTHON_CATCH; } -auto PythonClassVec3::nb_subtract(PythonClassVec3* l, - PythonClassVec3* r) -> PyObject* { +auto PythonClassVec3::nb_subtract(PythonClassVec3* l, PythonClassVec3* r) + -> PyObject* { BA_PYTHON_TRY; // We can subtract if both sides are Vec3. @@ -240,8 +240,8 @@ auto PythonClassVec3::nb_multiply(PyObject* l, PyObject* r) -> PyObject* { BA_PYTHON_CATCH; } -auto PythonClassVec3::tp_richcompare(PythonClassVec3* c1, PyObject* c2, - int op) -> PyObject* { +auto PythonClassVec3::tp_richcompare(PythonClassVec3* c1, PyObject* c2, int op) + -> PyObject* { // Always return false against other types. if (!Check(c2)) { Py_RETURN_FALSE; @@ -283,8 +283,8 @@ auto PythonClassVec3::Dot(PythonClassVec3* self, PyObject* other) -> PyObject* { BA_PYTHON_CATCH; } -auto PythonClassVec3::Cross(PythonClassVec3* self, - PyObject* other) -> PyObject* { +auto PythonClassVec3::Cross(PythonClassVec3* self, PyObject* other) + -> PyObject* { BA_PYTHON_TRY; return Create(Vector3f::Cross(self->value, BasePython::GetPyVector3f(other))); BA_PYTHON_CATCH; @@ -309,8 +309,8 @@ PyMethodDef PythonClassVec3::tp_methods[] = { "Returns the cross product of this vector and another."}, {nullptr}}; -auto PythonClassVec3::tp_getattro(PythonClassVec3* self, - PyObject* attr) -> PyObject* { +auto PythonClassVec3::tp_getattro(PythonClassVec3* self, PyObject* attr) + -> PyObject* { BA_PYTHON_TRY; assert(PyUnicode_Check(attr)); diff --git a/src/ballistica/base/python/class/python_class_vec3.h b/src/ballistica/base/python/class/python_class_vec3.h index 3290b420..1855a4cd 100644 --- a/src/ballistica/base/python/class/python_class_vec3.h +++ b/src/ballistica/base/python/class/python_class_vec3.h @@ -30,19 +30,19 @@ class PythonClassVec3 : public PythonClass { static auto tp_repr(PythonClassVec3* self) -> PyObject*; static auto sq_length(PythonClassVec3* self) -> Py_ssize_t; static auto sq_item(PythonClassVec3* self, Py_ssize_t i) -> PyObject*; - static auto sq_ass_item(PythonClassVec3* self, Py_ssize_t i, - PyObject* val) -> int; + static auto sq_ass_item(PythonClassVec3* self, Py_ssize_t i, PyObject* val) + -> int; static auto nb_add(PythonClassVec3* l, PythonClassVec3* r) -> PyObject*; static auto nb_subtract(PythonClassVec3* l, PythonClassVec3* r) -> PyObject*; static auto nb_multiply(PyObject* l, PyObject* r) -> PyObject*; static auto nb_negative(PythonClassVec3* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static auto tp_getattro(PythonClassVec3* self, PyObject* attr) -> PyObject*; - static auto tp_richcompare(PythonClassVec3* c1, PyObject* c2, - int op) -> PyObject*; - static auto tp_setattro(PythonClassVec3* self, PyObject* attr, - PyObject* val) -> int; + static auto tp_richcompare(PythonClassVec3* c1, PyObject* c2, int op) + -> PyObject*; + static auto tp_setattro(PythonClassVec3* self, PyObject* attr, PyObject* val) + -> int; }; } // namespace ballistica::base diff --git a/src/ballistica/base/python/methods/python_methods_base_1.cc b/src/ballistica/base/python/methods/python_methods_base_1.cc index 6ae95dd7..0b63f144 100644 --- a/src/ballistica/base/python/methods/python_methods_base_1.cc +++ b/src/ballistica/base/python/methods/python_methods_base_1.cc @@ -184,8 +184,8 @@ static PyMethodDef PyCanDisplayFullUnicodeDef = { // -------------------------- app_instance_uuid -------------------------------- -static auto PyAppInstanceUUID(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyAppInstanceUUID(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -208,8 +208,8 @@ static PyMethodDef PyAppInstanceUUIDDef = { // --------------------------- user_ran_commands ------------------------------- -static auto PyUserRanCommands(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyUserRanCommands(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -233,8 +233,8 @@ static PyMethodDef PyUserRanCommandsDef = { // -------------------------------- pushcall ---------------------------------- -static auto PyPushCall(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyPushCall(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; PyObject* call_obj; int from_other_thread{}; @@ -337,8 +337,8 @@ static PyMethodDef PyPushCallDef = { // ------------------------------ apptime -------------------------------------- -static auto PyAppTime(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyAppTime(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -373,8 +373,8 @@ static PyMethodDef PyAppTimeDef = { // ------------------------------ apptimer ------------------------------------- -static auto PyAppTimer(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyAppTimer(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); double length; @@ -431,8 +431,8 @@ static PyMethodDef PyAppTimerDef = { // --------------------------- displaytime ------------------------------------- -static auto PyDisplayTime(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyDisplayTime(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -466,8 +466,8 @@ static PyMethodDef PyDisplayTimeDef = { // ---------------------------- displaytimer ----------------------------------- -static auto PyDisplayTimer(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyDisplayTimer(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); double length; @@ -529,8 +529,8 @@ static PyMethodDef PyDisplayTimerDef = { // ----------------------------------- quit ------------------------------------ -static auto PyQuit(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyQuit(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->IsAppStarted()); @@ -594,8 +594,8 @@ static PyMethodDef PyDoApplyAppConfigDef = { // ----------------------------- commit_config --------------------------------- -static auto PyCommitConfig(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyCommitConfig(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; PyObject* config_obj; static const char* kwlist[] = {"config", nullptr}; @@ -794,8 +794,8 @@ static PyMethodDef PyEnvDef = { // -------------------------------- emit_log ----------------------------------- -static auto PyEmitLog(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyEmitLog(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {"name", "level", "message", nullptr}; const char* name; @@ -846,8 +846,8 @@ static PyMethodDef PyEmitLogDef = { // ------------------------------ lifecyclelog --------------------------------- -static auto PyLifecycleLog(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyLifecycleLog(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {"message", nullptr}; const char* message; @@ -874,8 +874,8 @@ static PyMethodDef PyLifecycleLogDef = { // ----------------------------- v1_cloud_log ---------------------------------- -static auto PyV1CloudLog(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyV1CloudLog(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* message; static const char* kwlist[] = {"message", nullptr}; @@ -903,8 +903,8 @@ static PyMethodDef PyV1CloudLogDef = { // --------------------------- music_player_stop ------------------------------- -static auto PyMusicPlayerStop(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyMusicPlayerStop(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -929,8 +929,8 @@ static PyMethodDef PyMusicPlayerStopDef = { // ---------------------------- music_player_play ------------------------------ -static auto PyMusicPlayerPlay(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyMusicPlayerPlay(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; PyObject* files_obj; static const char* kwlist[] = {"files", nullptr}; @@ -1035,8 +1035,8 @@ static PyMethodDef PyReloadMediaDef = { // --------------------------- mac_music_app_init ------------------------------ -static auto PyMacMusicAppInit(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyMacMusicAppInit(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; g_core->platform->MacMusicAppInit(); Py_RETURN_NONE; @@ -1099,8 +1099,8 @@ static PyMethodDef PyMacMusicAppSetVolumeDef = { // --------------------------- mac_music_app_stop ------------------------------ -static auto PyMacMusicAppStop(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyMacMusicAppStop(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; g_core->platform->MacMusicAppStop(); Py_RETURN_NONE; @@ -1177,8 +1177,8 @@ static PyMethodDef PyMacMusicAppGetPlaylistsDef = { // -------------------------- is_os_playing_music ------------------------------ -static auto PyIsOSPlayingMusic(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyIsOSPlayingMusic(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; if (g_core->platform->IsOSPlayingMusic()) { Py_RETURN_TRUE; diff --git a/src/ballistica/base/python/methods/python_methods_base_2.cc b/src/ballistica/base/python/methods/python_methods_base_2.cc index 64ea4617..508724ec 100644 --- a/src/ballistica/base/python/methods/python_methods_base_2.cc +++ b/src/ballistica/base/python/methods/python_methods_base_2.cc @@ -28,8 +28,8 @@ namespace ballistica::base { // ------------------------------- open_url ------------------------------------ -static auto PyOpenURL(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyOpenURL(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* address{}; int force_fallback{}; @@ -169,8 +169,8 @@ static PyMethodDef PyOverlayWebBrowserCloseDef = { "Category: **General Utility Functions**\n"}; // ---------------------------- screenmessage ---------------------------------- -static auto PyScreenMessage(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyScreenMessage(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; PyObject* color_obj = Py_None; PyObject* message_obj; @@ -247,8 +247,8 @@ static PyMethodDef PyGetCameraPositionDef = { // --------------------------- get_camera_target ------------------------------- -static auto PyGetCameraTarget(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetCameraTarget(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; float x = 0.0f; float y = 0.0f; @@ -308,8 +308,8 @@ static PyMethodDef PySetCameraPositionDef = { // ---------------------------- set_camera_target ------------------------------ -static auto PySetCameraTarget(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySetCameraTarget(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; float x = 0.0f; float y = 0.0f; @@ -341,8 +341,8 @@ static PyMethodDef PySetCameraTargetDef = { // ---------------------------- set_camera_manual ------------------------------ -static auto PySetCameraManual(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySetCameraManual(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; bool value = false; static const char* kwlist[] = {"value", nullptr}; @@ -372,8 +372,8 @@ static PyMethodDef PySetCameraManualDef = { // -------------------------------- charstr ------------------------------------ -static auto PyCharStr(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyCharStr(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; PyObject* name_obj; static const char* kwlist[] = {"name", nullptr}; @@ -408,8 +408,8 @@ static PyMethodDef PyCharStrDef = { // ------------------------------- safecolor ----------------------------------- -static auto PySafeColor(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySafeColor(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; PyObject* color_obj; float red, green, blue; @@ -485,8 +485,8 @@ static PyMethodDef PyGetMaxGraphicsQualityDef = { // ------------------------------ evaluate_lstr -------------------------------- -static auto PyEvaluateLstr(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyEvaluateLstr(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* value; static const char* kwlist[] = {"value", nullptr}; @@ -511,8 +511,8 @@ static PyMethodDef PyEvaluateLstrDef = { // --------------------------- get_string_height ------------------------------- -static auto PyGetStringHeight(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetStringHeight(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; std::string s; int suppress_warning = 0; @@ -557,8 +557,8 @@ static PyMethodDef PyGetStringHeightDef = { // ---------------------------- get_string_width ------------------------------- -static auto PyGetStringWidth(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetStringWidth(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; std::string s; PyObject* s_obj; @@ -604,8 +604,8 @@ static PyMethodDef PyGetStringWidthDef = { // ------------------------------ have_chars ----------------------------------- -static auto PyHaveChars(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyHaveChars(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; std::string text; PyObject* text_obj; @@ -635,8 +635,8 @@ static PyMethodDef PyHaveCharsDef = { // ----------------------------- fade_screen ----------------------------------- -static auto PyFadeScreen(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyFadeScreen(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; int fade{}; @@ -905,8 +905,8 @@ static PyMethodDef PySupportsMaxFPSDef = { // --------------------------- show_progress_bar ------------------------------- -static auto PyShowProgressBar(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyShowProgressBar(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; g_base->graphics->EnableProgressBar(false); diff --git a/src/ballistica/base/python/methods/python_methods_base_3.cc b/src/ballistica/base/python/methods/python_methods_base_3.cc index e3ff2dbe..de15d716 100644 --- a/src/ballistica/base/python/methods/python_methods_base_3.cc +++ b/src/ballistica/base/python/methods/python_methods_base_3.cc @@ -28,8 +28,8 @@ namespace ballistica::base { // ---------------------------- getsimplesound -------------------------------- -static auto PyGetSimpleSound(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetSimpleSound(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; static const char* kwlist[] = {"name", nullptr}; @@ -59,8 +59,8 @@ static PyMethodDef PyGetSimpleSoundDef = { // -------------------------- set_ui_input_device ------------------------------ -static auto PySetUIInputDevice(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySetUIInputDevice(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); static const char* kwlist[] = {"input_device_id", nullptr}; @@ -99,8 +99,8 @@ static PyMethodDef PySetUIInputDeviceDef = { // ------------------------------ set_ui_scale --------------------------------- -static auto PySetUIScale(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySetUIScale(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); @@ -182,8 +182,8 @@ static PyMethodDef PyGetUIScaleDef = { // ----------------------------- hastouchscreen -------------------------------- -static auto PyHasTouchScreen(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyHasTouchScreen(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); static const char* kwlist[] = {nullptr}; @@ -265,8 +265,8 @@ static PyMethodDef PyClipboardHasTextDef = { // --------------------------- clipboard_set_text ------------------------------ -static auto PyClipboardSetText(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyClipboardSetText(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* value; static const char* kwlist[] = {"value", nullptr}; @@ -343,8 +343,8 @@ static PyMethodDef PySetUpSigIntDef = { // ---------------------------- have_permission -------------------------------- -static auto PyHavePermission(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyHavePermission(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); Permission permission; @@ -407,8 +407,8 @@ static PyMethodDef PyRequestPermissionDef = { // ----------------------------- in_logic_thread ------------------------------- -static auto PyInLogicThread(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyInLogicThread(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -436,8 +436,8 @@ static PyMethodDef PyInLogicThreadDef = { // ------------------------------ in_main_menu --------------------------------- -static auto PyInMainMenu(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyInMainMenu(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -467,8 +467,8 @@ static PyMethodDef PyInMainMenuDef = { // ----------------------------- set_thread_name ------------------------------- -static auto PySetThreadName(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySetThreadName(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; static const char* kwlist[] = {"name", nullptr}; @@ -497,8 +497,8 @@ static PyMethodDef PySetThreadNameDef = { // ------------------------------ get_thread_name ------------------------------ -static auto PyGetThreadName(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetThreadName(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -528,8 +528,8 @@ static PyMethodDef PyGetThreadNameDef = { // Returns an extra hash value that can be incorporated into security // checks; this contains things like whether console commands have been run, // etc. -auto PyExtraHashValue(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +auto PyExtraHashValue(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -663,8 +663,8 @@ static PyMethodDef PyDebugPrintPyErrDef = { // ----------------------------- print_context --------------------------------- -static auto PyPrintContext(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyPrintContext(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -690,8 +690,8 @@ static PyMethodDef PyPrintContextDef = { // --------------------------- print_load_info --------------------------------- -static auto PyPrintLoadInfo(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyPrintLoadInfo(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; g_base->assets->PrintLoadInfo(); Py_RETURN_NONE; @@ -712,8 +712,8 @@ static PyMethodDef PyPrintLoadInfoDef = { // -------------------------- get_replays_dir ---------------------------------- -static auto PyGetReplaysDir(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetReplaysDir(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -956,8 +956,8 @@ static PyMethodDef PyGetLogFilePathDef = { // --------------------- get_volatile_data_directory --------------------------- -static auto PyGetVolatileDataDirectory(PyObject* self, - PyObject* args) -> PyObject* { +static auto PyGetVolatileDataDirectory(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; return PyUnicode_FromString( g_core->platform->GetVolatileDataDirectory().c_str()); @@ -1000,8 +1000,8 @@ static PyMethodDef PyIsLogFullDef = { // -------------------------- get_v1_cloud_log --------------------------------- -static auto PyGetV1CloudLog(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetV1CloudLog(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; std::string log_fin; { @@ -1027,8 +1027,8 @@ static PyMethodDef PyGetV1CloudLogDef = { // ---------------------------- mark_log_sent ---------------------------------- -static auto PyMarkLogSent(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyMarkLogSent(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; // This way we won't try to send it at shutdown time and whatnot g_core->did_put_v1_cloud_log = true; @@ -1048,8 +1048,8 @@ static PyMethodDef PyMarkLogSentDef = { // --------------------- increment_analytics_count ----------------------------- -auto PyIncrementAnalyticsCount(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +auto PyIncrementAnalyticsCount(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; int increment = 1; @@ -1240,8 +1240,8 @@ static PyMethodDef PyLoginAdapterBackEndActiveChangeDef = { // ---------------------- set_internal_language_keys --------------------------- -static auto PySetInternalLanguageKeys(PyObject* self, - PyObject* args) -> PyObject* { +static auto PySetInternalLanguageKeys(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; PyObject* list_obj; PyObject* random_names_list_obj; @@ -1338,8 +1338,8 @@ static PyMethodDef PyAndroidGetExternalFilesDirDef = { // ------------------------------- do_once ------------------------------------- -static auto PyDoOnce(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyDoOnce(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; if (g_base->python->DoOnce()) { Py_RETURN_TRUE; @@ -1373,8 +1373,8 @@ static PyMethodDef PyDoOnceDef = { // ------------------------------- getapp -------------------------------------- -static auto PyGetApp(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetApp(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; if (!PyArg_ParseTupleAndKeywords(args, keywds, "", @@ -1529,8 +1529,8 @@ static PyMethodDef PyOpenDirExternallyDef = { // ----------------------------- fatal_error ----------------------------------- -static auto PyFatalError(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyFatalError(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* message; static const char* kwlist[] = {"message", nullptr}; @@ -1651,8 +1651,8 @@ static PyMethodDef PyDevConsoleAddTextDef = { // -------------------- dev_console_add_python_terminal ------------------------ -static auto PyDevConsoleAddPythonTerminal(PyObject* self, - PyObject* args) -> PyObject* { +static auto PyDevConsoleAddPythonTerminal(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); auto* dev_console = g_base->ui->dev_console(); @@ -1969,8 +1969,8 @@ static PyMethodDef PyGetDrawUIBoundsDef = { // --------------------------- set_draw_ui_bounds ----------------------------- -static auto PySetDrawUIBounds(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySetDrawUIBounds(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); diff --git a/src/ballistica/base/support/classic_soft.h b/src/ballistica/base/support/classic_soft.h index 445205b9..5e388e93 100644 --- a/src/ballistica/base/support/classic_soft.h +++ b/src/ballistica/base/support/classic_soft.h @@ -18,8 +18,9 @@ class ClassicSoftInterface { public: virtual auto GetControllerValue(base::InputDevice* device, const std::string& value_name) -> int = 0; - virtual auto GetControllerFloatValue( - base::InputDevice* device, const std::string& value_name) -> float = 0; + virtual auto GetControllerFloatValue(base::InputDevice* device, + const std::string& value_name) + -> float = 0; virtual auto IsV1AccountSignedIn() -> bool = 0; virtual auto HandleSignOutV1() -> bool = 0; virtual void V2SetV1AccountState(const char* statestr, const char* loginid, diff --git a/src/ballistica/base/ui/ui.cc b/src/ballistica/base/ui/ui.cc index 68773492..eeec38f9 100644 --- a/src/ballistica/base/ui/ui.cc +++ b/src/ballistica/base/ui/ui.cc @@ -221,8 +221,8 @@ auto UI::PartyWindowOpen() -> bool { return false; } -auto UI::HandleMouseDown(int button, float x, float y, - bool double_click) -> bool { +auto UI::HandleMouseDown(int button, float x, float y, bool double_click) + -> bool { assert(g_base->InLogicThread()); bool handled{}; diff --git a/src/ballistica/classic/classic.cc b/src/ballistica/classic/classic.cc index f78d6acd..56a42e41 100644 --- a/src/ballistica/classic/classic.cc +++ b/src/ballistica/classic/classic.cc @@ -70,13 +70,15 @@ auto ClassicFeatureSet::Import() -> ClassicFeatureSet* { return ImportThroughPythonModule("_baclassic"); } -auto ClassicFeatureSet::GetControllerValue( - base::InputDevice* device, const std::string& value_name) -> int { +auto ClassicFeatureSet::GetControllerValue(base::InputDevice* device, + const std::string& value_name) + -> int { return python->GetControllerValue(device, value_name); } -auto ClassicFeatureSet::GetControllerFloatValue( - base::InputDevice* device, const std::string& value_name) -> float { +auto ClassicFeatureSet::GetControllerFloatValue(base::InputDevice* device, + const std::string& value_name) + -> float { return python->GetControllerFloatValue(device, value_name); } diff --git a/src/ballistica/classic/python/classic_python.cc b/src/ballistica/classic/python/classic_python.cc index 41d52348..1c1219c7 100644 --- a/src/ballistica/classic/python/classic_python.cc +++ b/src/ballistica/classic/python/classic_python.cc @@ -66,8 +66,9 @@ auto ClassicPython::GetControllerValue(base::InputDevice* device, return static_cast(PyLong_AsLong(ret_val.Get())); } -auto ClassicPython::GetControllerFloatValue( - base::InputDevice* device, const std::string& value_name) -> float { +auto ClassicPython::GetControllerFloatValue(base::InputDevice* device, + const std::string& value_name) + -> float { assert(device); assert(objs().Exists(ObjID::kGetInputDeviceMappedValueCall)); diff --git a/src/ballistica/classic/python/methods/python_methods_classic.cc b/src/ballistica/classic/python/methods/python_methods_classic.cc index eab05e73..eb442393 100644 --- a/src/ballistica/classic/python/methods/python_methods_classic.cc +++ b/src/ballistica/classic/python/methods/python_methods_classic.cc @@ -22,8 +22,8 @@ namespace ballistica::classic { // -------------------------------- value_test --------------------------------- -static auto PyValueTest(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyValueTest(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* arg; double change = 0.0f; diff --git a/src/ballistica/classic/support/classic_app_mode.cc b/src/ballistica/classic/support/classic_app_mode.cc index 17c4e31d..1549e91c 100644 --- a/src/ballistica/classic/support/classic_app_mode.cc +++ b/src/ballistica/classic/support/classic_app_mode.cc @@ -167,7 +167,7 @@ void ClassicAppMode::HostScanCycle() { } // Bind to whatever. - struct sockaddr_in serv_addr {}; + struct sockaddr_in serv_addr{}; memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); // NOLINT diff --git a/src/ballistica/core/platform/apple/core_platform_apple.h b/src/ballistica/core/platform/apple/core_platform_apple.h index 1d3851a7..982fb8f9 100644 --- a/src/ballistica/core/platform/apple/core_platform_apple.h +++ b/src/ballistica/core/platform/apple/core_platform_apple.h @@ -33,14 +33,14 @@ class CorePlatformApple : public CorePlatform { auto CreateTextTexture(int width, int height, const std::vector& strings, const std::vector& positions, - const std::vector& widths, - float scale) -> void* override; + const std::vector& widths, float scale) + -> void* override; auto GetTextTextureData(void* tex) -> uint8_t* override; void SubmitScore(const std::string& game, const std::string& version, int64_t score) override; void ReportAchievement(const std::string& achievement) override; - auto HaveLeaderboard(const std::string& game, - const std::string& config) -> bool override; + auto HaveLeaderboard(const std::string& game, const std::string& config) + -> bool override; void ShowGameServiceUI(const std::string& show, const std::string& game, const std::string& game_version) override; void ResetAchievements() override; diff --git a/src/ballistica/core/platform/core_platform.cc b/src/ballistica/core/platform/core_platform.cc index a30e03f2..d03596a6 100644 --- a/src/ballistica/core/platform/core_platform.cc +++ b/src/ballistica/core/platform/core_platform.cc @@ -219,8 +219,8 @@ auto CorePlatform::GetConfigFilePath() -> std::string { } // FIXME: should make this unnecessary. -auto CorePlatform::GetLowLevelConfigValue(const char* key, - int default_value) -> int { +auto CorePlatform::GetLowLevelConfigValue(const char* key, int default_value) + -> int { std::string path = g_core->GetConfigDirectory() + BA_DIRSLASH + ".cvar_" + key; int val = default_value; @@ -318,7 +318,7 @@ auto CorePlatform::FOpen(const char* path, const char* mode) -> FILE* { } auto CorePlatform::FilePathExists(const std::string& name) -> bool { - struct BA_STAT buffer {}; + struct BA_STAT buffer{}; return (Stat(name.c_str(), &buffer) == 0); } @@ -512,14 +512,16 @@ void CorePlatform::EmitPlatformLog(const std::string& name, LogLevel level, // Do nothing by default. } -auto CorePlatform::ReportFatalError( - const std::string& message, bool in_top_level_exception_handler) -> bool { +auto CorePlatform::ReportFatalError(const std::string& message, + bool in_top_level_exception_handler) + -> bool { // Don't override handling by default. return false; } -auto CorePlatform::HandleFatalError( - bool exit_cleanly, bool in_top_level_exception_handler) -> bool { +auto CorePlatform::HandleFatalError(bool exit_cleanly, + bool in_top_level_exception_handler) + -> bool { // Don't override handling by default. return false; } @@ -851,8 +853,8 @@ void CorePlatform::Unlink(const char* path) { #endif } -auto CorePlatform::AbsPath(const std::string& path, - std::string* outpath) -> bool { +auto CorePlatform::AbsPath(const std::string& path, std::string* outpath) + -> bool { // Ensure all implementations fail if the file does not exist. if (!FilePathExists(path)) { return false; @@ -860,8 +862,8 @@ auto CorePlatform::AbsPath(const std::string& path, return DoAbsPath(path, outpath); } -auto CorePlatform::DoAbsPath(const std::string& path, - std::string* outpath) -> bool { +auto CorePlatform::DoAbsPath(const std::string& path, std::string* outpath) + -> bool { // This covers all but windows. #if BA_OSTYPE_WINDOWS throw Exception(); diff --git a/src/ballistica/core/platform/core_platform.h b/src/ballistica/core/platform/core_platform.h index 978b5e1a..7be064b3 100644 --- a/src/ballistica/core/platform/core_platform.h +++ b/src/ballistica/core/platform/core_platform.h @@ -229,8 +229,8 @@ class CorePlatform { virtual auto CreateTextTexture(int width, int height, const std::vector& strings, const std::vector& positions, - const std::vector& widths, - float scale) -> void*; + const std::vector& widths, float scale) + -> void*; virtual auto GetTextTextureData(void* tex) -> uint8_t*; #pragma mark ACCOUNTS ---------------------------------------------------------- diff --git a/src/ballistica/core/platform/windows/core_platform_windows.cc b/src/ballistica/core/platform/windows/core_platform_windows.cc index 5951440b..7e0d8442 100644 --- a/src/ballistica/core/platform/windows/core_platform_windows.cc +++ b/src/ballistica/core/platform/windows/core_platform_windows.cc @@ -342,13 +342,13 @@ auto CorePlatformWindows::Remove(const char* path) -> int { return _wremove(UTF8Decode(path).c_str()); } -auto CorePlatformWindows::Stat(const char* path, - struct BA_STAT* buffer) -> int { +auto CorePlatformWindows::Stat(const char* path, struct BA_STAT* buffer) + -> int { return _wstat(UTF8Decode(path).c_str(), buffer); } -auto CorePlatformWindows::Rename(const char* oldname, - const char* newname) -> int { +auto CorePlatformWindows::Rename(const char* oldname, const char* newname) + -> int { // Unlike other platforms, windows will error if the target file already // exists instead of simply overwriting it. So let's attempt to blow away // anything there first. diff --git a/src/ballistica/core/platform/windows/core_platform_windows.h b/src/ballistica/core/platform/windows/core_platform_windows.h index 27820814..4943e85e 100644 --- a/src/ballistica/core/platform/windows/core_platform_windows.h +++ b/src/ballistica/core/platform/windows/core_platform_windows.h @@ -31,8 +31,8 @@ class CorePlatformWindows : public CorePlatform { auto Remove(const char* path) -> int; auto Stat(const char* path, struct BA_STAT* buffer) -> int; auto Rename(const char* oldname, const char* newname) -> int; - auto DoAbsPath(const std::string& path, - std::string* outpath) -> bool override; + auto DoAbsPath(const std::string& path, std::string* outpath) + -> bool override; auto FOpen(const char* path, const char* mode) -> FILE* override; auto GetErrnoString() -> std::string override; auto GetSocketErrorString() -> std::string override; diff --git a/src/ballistica/scene_v1/connection/connection_set.cc b/src/ballistica/scene_v1/connection/connection_set.cc index a6336fd8..78dafb0c 100644 --- a/src/ballistica/scene_v1/connection/connection_set.cc +++ b/src/ballistica/scene_v1/connection/connection_set.cc @@ -700,8 +700,8 @@ void ConnectionSet::HandleIncomingUDPPacket(const std::vector& data_in, } } -auto ConnectionSet::VerifyClientAddr(uint8_t client_id, - const SockAddr& addr) -> bool { +auto ConnectionSet::VerifyClientAddr(uint8_t client_id, const SockAddr& addr) + -> bool { auto connection_to_client = connections_to_clients_.find(client_id); if (connection_to_client != connections_to_clients_.end()) { diff --git a/src/ballistica/scene_v1/dynamics/dynamics.cc b/src/ballistica/scene_v1/dynamics/dynamics.cc index e46543e1..ba6e5564 100644 --- a/src/ballistica/scene_v1/dynamics/dynamics.cc +++ b/src/ballistica/scene_v1/dynamics/dynamics.cc @@ -25,8 +25,8 @@ namespace ballistica::scene_v1 { // Given two parts, returns true if part1 is major in // the storage order. -static auto IsInStoreOrder(int64_t node1, int part1, int64_t node2, - int part2) -> bool { +static auto IsInStoreOrder(int64_t node1, int part1, int64_t node2, int part2) + -> bool { assert(node1 >= 0 && part1 >= 0 && node2 >= 0 && part2 >= 0); // Node with smaller id is primary search node. diff --git a/src/ballistica/scene_v1/dynamics/material/material_component.cc b/src/ballistica/scene_v1/dynamics/material/material_component.cc index 80eaf88f..55b9963d 100644 --- a/src/ballistica/scene_v1/dynamics/material/material_component.cc +++ b/src/ballistica/scene_v1/dynamics/material/material_component.cc @@ -28,8 +28,8 @@ MaterialComponent::~MaterialComponent() {} auto MaterialComponent::eval_conditions( const Object::Ref& condition, const Material& c, - const Part* part, const Part* opposing_part, - const MaterialContext& s) -> bool { + const Part* part, const Part* opposing_part, const MaterialContext& s) + -> bool { // If there's no condition, succeed. if (!condition.Exists()) { return true; diff --git a/src/ballistica/scene_v1/dynamics/material/material_component.h b/src/ballistica/scene_v1/dynamics/material/material_component.h index 53e7cde4..bbd06761 100644 --- a/src/ballistica/scene_v1/dynamics/material/material_component.h +++ b/src/ballistica/scene_v1/dynamics/material/material_component.h @@ -29,8 +29,8 @@ class MaterialComponent : public Object { Object::Ref conditions; auto eval_conditions(const Object::Ref& condition, const Material& c, const Part* part, - const Part* opposing_part, - const MaterialContext& s) -> bool; + const Part* opposing_part, const MaterialContext& s) + -> bool; // Apply the component to a context. void Apply(MaterialContext* c, const Part* src_part, const Part* dst_part); diff --git a/src/ballistica/scene_v1/node/spaz_node.cc b/src/ballistica/scene_v1/node/spaz_node.cc index cfc36364..8efa91ea 100644 --- a/src/ballistica/scene_v1/node/spaz_node.cc +++ b/src/ballistica/scene_v1/node/spaz_node.cc @@ -146,8 +146,8 @@ enum SpazBodyType { kHairPonyTailBottomBodyID }; -static auto AngleBetween2DVectors(dReal x1, dReal y1, dReal x2, - dReal y2) -> dReal { +static auto AngleBetween2DVectors(dReal x1, dReal y1, dReal x2, dReal y2) + -> dReal { dReal x1_norm, y1_norm, x2_norm, y2_norm; dReal len1, len2; len1 = sqrtf(x1 * x1 + y1 * y1); diff --git a/src/ballistica/scene_v1/node/spaz_node.h b/src/ballistica/scene_v1/node/spaz_node.h index dd660902..3440ef59 100644 --- a/src/ballistica/scene_v1/node/spaz_node.h +++ b/src/ballistica/scene_v1/node/spaz_node.h @@ -271,8 +271,8 @@ class SpazNode : public Node { // points line up. auto CreateFixedJoint(RigidBody* b1, RigidBody* b2, float ls, float ld, float as, float ad, float a1x, float a1y, float a1z, - float a2x, float a2y, float a2z, - bool reposition = true) -> JointFixedEF*; + float a2x, float a2y, float a2z, bool reposition = true) + -> JointFixedEF*; void Throw(bool withBombButton); // Reset to a standing, non-moving state at the given point. @@ -285,8 +285,8 @@ class SpazNode : public Node { auto IsBrokenBodyPart(int id) -> bool; static auto StaticCollideCallback(dContact* c, int count, RigidBody* colliding_body, - RigidBody* opposingbody, - void* data) -> bool { + RigidBody* opposingbody, void* data) + -> bool { auto* a = static_cast(data); return a->CollideCallback(c, count, colliding_body, opposingbody); } diff --git a/src/ballistica/scene_v1/python/class/python_class_activity_data.h b/src/ballistica/scene_v1/python/class/python_class_activity_data.h index f2d8323a..bb7a7122 100644 --- a/src/ballistica/scene_v1/python/class/python_class_activity_data.h +++ b/src/ballistica/scene_v1/python/class/python_class_activity_data.h @@ -24,8 +24,8 @@ class PythonClassActivityData : public PythonClass { static PyMethodDef tp_methods[]; static PyNumberMethods as_number_; static auto tp_repr(PythonClassActivityData* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassActivityData* self); static auto nb_bool(PythonClassActivityData* self) -> int; diff --git a/src/ballistica/scene_v1/python/class/python_class_base_timer.h b/src/ballistica/scene_v1/python/class/python_class_base_timer.h index c061226d..bcd1179e 100644 --- a/src/ballistica/scene_v1/python/class/python_class_base_timer.h +++ b/src/ballistica/scene_v1/python/class/python_class_base_timer.h @@ -18,8 +18,8 @@ class PythonClassBaseTimer : public PythonClass { static PyTypeObject type_obj; private: - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassBaseTimer* self); int timer_id_; ContextRefSceneV1* context_ref_; diff --git a/src/ballistica/scene_v1/python/class/python_class_input_device.cc b/src/ballistica/scene_v1/python/class/python_class_input_device.cc index b4115a04..4d54399b 100644 --- a/src/ballistica/scene_v1/python/class/python_class_input_device.cc +++ b/src/ballistica/scene_v1/python/class/python_class_input_device.cc @@ -344,8 +344,8 @@ auto PythonClassInputDevice::GetPlayerProfiles(PythonClassInputDevice* self) } auto PythonClassInputDevice::GetV1AccountName(PythonClassInputDevice* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; int full; static const char* kwlist[] = {"full", nullptr}; @@ -388,8 +388,8 @@ auto PythonClassInputDevice::Exists(PythonClassInputDevice* self) -> PyObject* { } auto PythonClassInputDevice::GetAxisName(PythonClassInputDevice* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); int id; @@ -409,8 +409,8 @@ auto PythonClassInputDevice::GetAxisName(PythonClassInputDevice* self, } auto PythonClassInputDevice::GetButtonName(PythonClassInputDevice* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); int id{}; diff --git a/src/ballistica/scene_v1/python/class/python_class_input_device.h b/src/ballistica/scene_v1/python/class/python_class_input_device.h index ab1ab209..987b2ece 100644 --- a/src/ballistica/scene_v1/python/class/python_class_input_device.h +++ b/src/ballistica/scene_v1/python/class/python_class_input_device.h @@ -23,12 +23,12 @@ class PythonClassInputDevice : public PythonClass { private: static PyMethodDef tp_methods[]; static auto tp_repr(PythonClassInputDevice* self) -> PyObject*; - static auto tp_getattro(PythonClassInputDevice* self, - PyObject* attr) -> PyObject*; + static auto tp_getattro(PythonClassInputDevice* self, PyObject* attr) + -> PyObject*; static auto tp_setattro(PythonClassInputDevice* self, PyObject* attr, PyObject* val) -> int; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassInputDevice* self); static auto nb_bool(PythonClassInputDevice* self) -> int; static auto DetachFromPlayer(PythonClassInputDevice* self) -> PyObject*; diff --git a/src/ballistica/scene_v1/python/class/python_class_material.cc b/src/ballistica/scene_v1/python/class/python_class_material.cc index 02d7f08a..3ea51b8d 100644 --- a/src/ballistica/scene_v1/python/class/python_class_material.cc +++ b/src/ballistica/scene_v1/python/class/python_class_material.cc @@ -174,8 +174,8 @@ auto PythonClassMaterial::tp_repr(PythonClassMaterial* self) -> PyObject* { BA_PYTHON_CATCH; } -auto PythonClassMaterial::tp_getattro(PythonClassMaterial* self, - PyObject* attr) -> PyObject* { +auto PythonClassMaterial::tp_getattro(PythonClassMaterial* self, PyObject* attr) + -> PyObject* { BA_PYTHON_TRY; // Assuming this will always be a str? diff --git a/src/ballistica/scene_v1/python/class/python_class_material.h b/src/ballistica/scene_v1/python/class/python_class_material.h index c61855ac..fc452860 100644 --- a/src/ballistica/scene_v1/python/class/python_class_material.h +++ b/src/ballistica/scene_v1/python/class/python_class_material.h @@ -27,12 +27,12 @@ class PythonClassMaterial : public PythonClass { private: static bool s_create_empty_; static PyMethodDef tp_methods[]; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void Delete(Object::Ref* m); static void tp_dealloc(PythonClassMaterial* self); - static auto tp_getattro(PythonClassMaterial* self, - PyObject* attr) -> PyObject*; + static auto tp_getattro(PythonClassMaterial* self, PyObject* attr) + -> PyObject*; static auto tp_setattro(PythonClassMaterial* self, PyObject* attr, PyObject* val) -> int; static auto tp_repr(PythonClassMaterial* self) -> PyObject*; diff --git a/src/ballistica/scene_v1/python/class/python_class_node.cc b/src/ballistica/scene_v1/python/class/python_class_node.cc index 1636863f..fad31158 100644 --- a/src/ballistica/scene_v1/python/class/python_class_node.cc +++ b/src/ballistica/scene_v1/python/class/python_class_node.cc @@ -141,8 +141,8 @@ auto PythonClassNode::tp_repr(PythonClassNode* self) -> PyObject* { BA_PYTHON_CATCH; } -auto PythonClassNode::tp_getattro(PythonClassNode* self, - PyObject* attr) -> PyObject* { +auto PythonClassNode::tp_getattro(PythonClassNode* self, PyObject* attr) + -> PyObject* { BA_PYTHON_TRY; // Do we need to support other attr types? @@ -259,8 +259,8 @@ auto PythonClassNode::Delete(PythonClassNode* self, PyObject* args, BA_PYTHON_CATCH; } -auto PythonClassNode::HandleMessage(PythonClassNode* self, - PyObject* args) -> PyObject* { +auto PythonClassNode::HandleMessage(PythonClassNode* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; Py_ssize_t tuple_size = PyTuple_GET_SIZE(args); if (tuple_size < 1) { @@ -294,8 +294,8 @@ auto PythonClassNode::HandleMessage(PythonClassNode* self, BA_PYTHON_CATCH; } -auto PythonClassNode::AddDeathAction(PythonClassNode* self, - PyObject* args) -> PyObject* { +auto PythonClassNode::AddDeathAction(PythonClassNode* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; PyObject* call_obj; if (!PyArg_ParseTuple(args, "O", &call_obj)) { @@ -317,8 +317,8 @@ auto PythonClassNode::AddDeathAction(PythonClassNode* self, BA_PYTHON_CATCH; } -auto PythonClassNode::ConnectAttr(PythonClassNode* self, - PyObject* args) -> PyObject* { +auto PythonClassNode::ConnectAttr(PythonClassNode* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; PyObject* dst_node_obj; Node* node = self->node_->Get(); diff --git a/src/ballistica/scene_v1/python/class/python_class_node.h b/src/ballistica/scene_v1/python/class/python_class_node.h index c3c118ef..0765b87e 100644 --- a/src/ballistica/scene_v1/python/class/python_class_node.h +++ b/src/ballistica/scene_v1/python/class/python_class_node.h @@ -21,23 +21,23 @@ class PythonClassNode : public PythonClass { auto GetNode(bool doraise = true) const -> Node*; private: - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassNode* self); static auto tp_repr(PythonClassNode* self) -> PyObject*; static auto tp_getattro(PythonClassNode* self, PyObject* attr) -> PyObject*; - static auto tp_setattro(PythonClassNode* self, PyObject* attr, - PyObject* val) -> int; + static auto tp_setattro(PythonClassNode* self, PyObject* attr, PyObject* val) + -> int; static auto Exists(PythonClassNode* self) -> PyObject*; static auto GetNodeType(PythonClassNode* self) -> PyObject*; static auto GetName(PythonClassNode* self) -> PyObject*; static auto GetDelegate(PythonClassNode* self, PyObject* args, PyObject* keywds) -> PyObject*; - static auto Delete(PythonClassNode* self, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto Delete(PythonClassNode* self, PyObject* args, PyObject* keywds) + -> PyObject*; static auto HandleMessage(PythonClassNode* self, PyObject* args) -> PyObject*; - static auto AddDeathAction(PythonClassNode* self, - PyObject* args) -> PyObject*; + static auto AddDeathAction(PythonClassNode* self, PyObject* args) + -> PyObject*; static auto ConnectAttr(PythonClassNode* self, PyObject* args) -> PyObject*; static auto Dir(PythonClassNode* self) -> PyObject*; static auto nb_bool(PythonClassNode* self) -> int; diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_collision_mesh.h b/src/ballistica/scene_v1/python/class/python_class_scene_collision_mesh.h index 89e0a9a6..c6ec83a8 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_collision_mesh.h +++ b/src/ballistica/scene_v1/python/class/python_class_scene_collision_mesh.h @@ -22,8 +22,8 @@ class PythonClassSceneCollisionMesh : public PythonClass { auto GetCollisionMesh(bool doraise = true) const -> SceneCollisionMesh*; private: - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* kwds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* kwds) + -> PyObject*; static void tp_dealloc(PythonClassSceneCollisionMesh* self); static bool s_create_empty_; Object::Ref* collision_mesh_; diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_data_asset.h b/src/ballistica/scene_v1/python/class/python_class_scene_data_asset.h index da164792..58df60e2 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_data_asset.h +++ b/src/ballistica/scene_v1/python/class/python_class_scene_data_asset.h @@ -24,8 +24,8 @@ class PythonClassSceneDataAsset : public PythonClass { private: static PyMethodDef tp_methods[]; static auto GetValue(PythonClassSceneDataAsset* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* kwds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* kwds) + -> PyObject*; static void tp_dealloc(PythonClassSceneDataAsset* self); static bool s_create_empty_; Object::Ref* data_; diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_mesh.h b/src/ballistica/scene_v1/python/class/python_class_scene_mesh.h index dc55f6b3..b703b5d1 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_mesh.h +++ b/src/ballistica/scene_v1/python/class/python_class_scene_mesh.h @@ -23,8 +23,8 @@ class PythonClassSceneMesh : public PythonClass { private: static bool s_create_empty_; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* kwds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* kwds) + -> PyObject*; static void tp_dealloc(PythonClassSceneMesh* self); Object::Ref* mesh_; }; diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_sound.h b/src/ballistica/scene_v1/python/class/python_class_scene_sound.h index b71c2b77..9be96fed 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_sound.h +++ b/src/ballistica/scene_v1/python/class/python_class_scene_sound.h @@ -24,8 +24,8 @@ class PythonClassSceneSound : public PythonClass { private: static auto Play(PythonClassSceneSound* self, PyObject* args, PyObject* keywds) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* kwds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* kwds) + -> PyObject*; static void tp_dealloc(PythonClassSceneSound* self); static PyMethodDef tp_methods[]; static bool s_create_empty_; diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_texture.h b/src/ballistica/scene_v1/python/class/python_class_scene_texture.h index e198e7cf..2f78a1da 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_texture.h +++ b/src/ballistica/scene_v1/python/class/python_class_scene_texture.h @@ -23,8 +23,8 @@ class PythonClassSceneTexture : public PythonClass { private: static bool s_create_empty_; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassSceneTexture* self); Object::Ref* texture_; }; diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_timer.h b/src/ballistica/scene_v1/python/class/python_class_scene_timer.h index d87a475a..51005bae 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_timer.h +++ b/src/ballistica/scene_v1/python/class/python_class_scene_timer.h @@ -18,8 +18,8 @@ class PythonClassSceneTimer : public PythonClass { static PyTypeObject type_obj; private: - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassSceneTimer* self); int timer_id_; ContextRefSceneV1* context_ref_; diff --git a/src/ballistica/scene_v1/python/class/python_class_session_data.h b/src/ballistica/scene_v1/python/class/python_class_session_data.h index 4a75654b..a4de57bc 100644 --- a/src/ballistica/scene_v1/python/class/python_class_session_data.h +++ b/src/ballistica/scene_v1/python/class/python_class_session_data.h @@ -24,8 +24,8 @@ class PythonClassSessionData : public PythonClass { static PyMethodDef tp_methods[]; static PyNumberMethods as_number_; static auto tp_repr(PythonClassSessionData* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassSessionData* self); static auto Exists(PythonClassSessionData* self) -> PyObject*; diff --git a/src/ballistica/scene_v1/python/class/python_class_session_player.cc b/src/ballistica/scene_v1/python/class/python_class_session_player.cc index 833e4aab..5431aff9 100644 --- a/src/ballistica/scene_v1/python/class/python_class_session_player.cc +++ b/src/ballistica/scene_v1/python/class/python_class_session_player.cc @@ -324,8 +324,8 @@ auto PythonClassSessionPlayer::tp_getattro(PythonClassSessionPlayer* self, } auto PythonClassSessionPlayer::tp_setattro(PythonClassSessionPlayer* self, - PyObject* attr, - PyObject* val) -> int { + PyObject* attr, PyObject* val) + -> int { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); @@ -351,8 +351,8 @@ auto PythonClassSessionPlayer::tp_setattro(PythonClassSessionPlayer* self, } auto PythonClassSessionPlayer::GetName(PythonClassSessionPlayer* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); int full = false; @@ -383,8 +383,8 @@ auto PythonClassSessionPlayer::Exists(PythonClassSessionPlayer* self) } auto PythonClassSessionPlayer::SetName(PythonClassSessionPlayer* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); PyObject* name_obj; @@ -425,8 +425,8 @@ auto PythonClassSessionPlayer::ResetInput(PythonClassSessionPlayer* self) } auto PythonClassSessionPlayer::AssignInputCall(PythonClassSessionPlayer* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); PyObject* input_type_obj; @@ -518,8 +518,8 @@ auto PythonClassSessionPlayer::GetV1AccountID(PythonClassSessionPlayer* self) } auto PythonClassSessionPlayer::SetData(PythonClassSessionPlayer* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); PyObject* team_obj; @@ -564,8 +564,8 @@ auto PythonClassSessionPlayer::GetIconInfo(PythonClassSessionPlayer* self) } auto PythonClassSessionPlayer::SetIconInfo(PythonClassSessionPlayer* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); PyObject* texture_name_obj; @@ -599,8 +599,8 @@ auto PythonClassSessionPlayer::SetIconInfo(PythonClassSessionPlayer* self, } auto PythonClassSessionPlayer::SetActivity(PythonClassSessionPlayer* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); PyObject* activity_obj; @@ -625,8 +625,8 @@ auto PythonClassSessionPlayer::SetActivity(PythonClassSessionPlayer* self, } auto PythonClassSessionPlayer::SetNode(PythonClassSessionPlayer* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); PyObject* node_obj; diff --git a/src/ballistica/scene_v1/python/class/python_class_session_player.h b/src/ballistica/scene_v1/python/class/python_class_session_player.h index 64475655..dbe92676 100644 --- a/src/ballistica/scene_v1/python/class/python_class_session_player.h +++ b/src/ballistica/scene_v1/python/class/python_class_session_player.h @@ -24,11 +24,11 @@ class PythonClassSessionPlayer : public PythonClass { static bool s_create_empty_; static PyMethodDef tp_methods[]; static auto tp_repr(PythonClassSessionPlayer* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassSessionPlayer* self); - static auto tp_getattro(PythonClassSessionPlayer* self, - PyObject* attr) -> PyObject*; + static auto tp_getattro(PythonClassSessionPlayer* self, PyObject* attr) + -> PyObject*; static auto tp_setattro(PythonClassSessionPlayer* self, PyObject* attr, PyObject* val) -> int; static auto GetName(PythonClassSessionPlayer* self, PyObject* args, diff --git a/src/ballistica/scene_v1/python/methods/python_methods_assets.cc b/src/ballistica/scene_v1/python/methods/python_methods_assets.cc index a99bc200..58f63c19 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_assets.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_assets.cc @@ -22,8 +22,8 @@ namespace ballistica::scene_v1 { // ------------------------------- gettexture ---------------------------------- -static auto PyGetTexture(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetTexture(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; static const char* kwlist[] = {"name", nullptr}; @@ -82,8 +82,8 @@ static PyMethodDef PyGetPackageTextureDef = { // ------------------------------- getsound ------------------------------------ -static auto PyGetSound(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetSound(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; static const char* kwlist[] = {"name", nullptr}; @@ -113,8 +113,8 @@ static PyMethodDef PyGetSoundDef = { // --------------------------- get_package_sound ------------------------------- -static auto PyGetPackageSound(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetPackageSound(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; PyObject* package_obj; @@ -142,8 +142,8 @@ static PyMethodDef PyGetPackageSoundDef = { // ------------------------------- getdata ------------------------------------- -static auto PyGetData(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetData(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; static const char* kwlist[] = {"name", nullptr}; @@ -173,8 +173,8 @@ static PyMethodDef PyGetDataDef = { // --------------------------- get_package_data -------------------------------- -static auto PyGetPackageData(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetPackageData(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; PyObject* package_obj; @@ -202,8 +202,8 @@ static PyMethodDef PyGetPackageDataDef = { // -------------------------------- getmesh ------------------------------------ -static auto PyGetMesh(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetMesh(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; static const char* kwlist[] = {"name", nullptr}; @@ -233,8 +233,8 @@ static PyMethodDef PyGetMeshDef = { // ---------------------------- get_package_mesh ------------------------------- -static auto PyGetPackageMesh(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetPackageMesh(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; PyObject* package_obj; @@ -263,8 +263,8 @@ static PyMethodDef PyGetPackageMeshDef = { // ----------------------------- getcollisionmesh ------------------------------ -static auto PyGetCollisionMesh(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetCollisionMesh(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; static const char* kwlist[] = {"name", nullptr}; diff --git a/src/ballistica/scene_v1/python/methods/python_methods_input.cc b/src/ballistica/scene_v1/python/methods/python_methods_input.cc index a41556be..55700a64 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_input.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_input.cc @@ -17,8 +17,8 @@ namespace ballistica::scene_v1 { // ----------------------- get_configurable_game_pads -------------------------- -static auto PyGetConfigurableGamePads(PyObject* self, - PyObject* args) -> PyObject* { +static auto PyGetConfigurableGamePads(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; std::vector gamepads = g_base->input->GetConfigurableGamePads(); @@ -52,8 +52,8 @@ static PyMethodDef PyGetConfigurableGamePadsDef = { // ------------------------ have_touchscreen_input ----------------------------- -static auto PyHaveTouchScreenInput(PyObject* self, - PyObject* args) -> PyObject* { +static auto PyHaveTouchScreenInput(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; if (g_base->touch_input) { Py_RETURN_TRUE; @@ -77,8 +77,8 @@ static PyMethodDef PyHaveTouchScreenInputDef = { // ------------------------- set_touchscreen_editing --------------------------- -static auto PySetTouchscreenEditing(PyObject* self, - PyObject* args) -> PyObject* { +static auto PySetTouchscreenEditing(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; int editing; if (!PyArg_ParseTuple(args, "p", &editing)) { @@ -152,8 +152,8 @@ static PyMethodDef PyReleaseGamePadInputDef = { // ------------------------ capture_keyboard_input ----------------------------- -static auto PyCaptureKeyboardInput(PyObject* self, - PyObject* args) -> PyObject* { +static auto PyCaptureKeyboardInput(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); assert(g_scene_v1); @@ -181,8 +181,8 @@ static PyMethodDef PyCaptureKeyboardInputDef = { // ------------------------- release_keyboard_input ---------------------------- -static auto PyReleaseKeyboardInput(PyObject* self, - PyObject* args) -> PyObject* { +static auto PyReleaseKeyboardInput(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); assert(g_scene_v1); @@ -205,8 +205,8 @@ static PyMethodDef PyReleaseKeyboardInputDef = { // --------------------------- get_ui_input_device ----------------------------- -static auto PyGetUIInputDevice(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetUIInputDevice(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); static const char* kwlist[] = {nullptr}; @@ -252,8 +252,8 @@ static PyMethodDef PyGetUIInputDeviceDef = { // ---------------------------- getinputdevice --------------------------------- -static auto PyGetInputDevice(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetInputDevice(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); const char* name; diff --git a/src/ballistica/scene_v1/python/methods/python_methods_networking.cc b/src/ballistica/scene_v1/python/methods/python_methods_networking.cc index eb2a95b5..8cca87e5 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_networking.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_networking.cc @@ -313,8 +313,8 @@ static PyMethodDef PySetAuthenticateClientsDef = { // ------------------------------- set_admins ---------------------------------- -static auto PySetAdmins(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySetAdmins(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; PyObject* admins_obj; static const char* kwlist[] = {"admins", nullptr}; @@ -378,8 +378,8 @@ static PyMethodDef PySetEnableDefaultKickVotingDef = { // --------------------------- connect_to_party -------------------------------- -static auto PyConnectToParty(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyConnectToParty(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; std::string address; PyObject* address_obj; @@ -590,8 +590,8 @@ static PyMethodDef PyDisconnectFromHostDef = { // --------------------------- disconnect_client ------------------------------- -static auto PyDisconnectClient(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyDisconnectClient(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; int client_id; int ban_time = 300; // Old default before we exposed this. @@ -701,8 +701,8 @@ static PyMethodDef PyGetGamePortDef = { // ------------------------ set_master_server_source --------------------------- -static auto PySetMasterServerSource(PyObject* self, - PyObject* args) -> PyObject* { +static auto PySetMasterServerSource(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; int source; if (!PyArg_ParseTuple(args, "i", &source)) return nullptr; @@ -728,8 +728,8 @@ static PyMethodDef PySetMasterServerSourceDef = { // ----------------------------- host_scan_cycle ------------------------------- -static auto PyHostScanCycle(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyHostScanCycle(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; auto* appmode = classic::ClassicAppMode::GetActiveOrThrow(); appmode->HostScanCycle(); @@ -757,8 +757,8 @@ static PyMethodDef PyHostScanCycleDef = { // ---------------------------- end_host_scanning ------------------------------ -static auto PyEndHostScanning(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyEndHostScanning(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; auto* appmode = classic::ClassicAppMode::GetActiveOrThrow(); appmode->EndHostScanning(); @@ -805,8 +805,8 @@ static PyMethodDef PyHaveConnectedClientsDef = { // ------------------------------ chatmessage ---------------------------------- -static auto PyChatMessage(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyChatMessage(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; std::string message; PyObject* message_obj; @@ -857,8 +857,8 @@ static PyMethodDef PyChatMessageDef = { // --------------------------- get_chat_messages ------------------------------- -static auto PyGetChatMessages(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetChatMessages(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); 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 bbcf8f21..aa862616 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_scene.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_scene.cc @@ -41,8 +41,8 @@ namespace ballistica::scene_v1 { // --------------------------------- time -------------------------------------- -static auto PyTime(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyTime(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; @@ -79,8 +79,8 @@ static PyMethodDef PyTimeDef = { // --------------------------------- timer ------------------------------------- -static auto PyTimer(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyTimer(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); @@ -152,8 +152,8 @@ static PyMethodDef PyTimerDef = { // ----------------------------- basetime ----------------------------------- -static auto PyBaseTime(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyBaseTime(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {nullptr}; @@ -190,8 +190,8 @@ static PyMethodDef PyBaseTimeDef = { // --------------------------------- timer ------------------------------------- -static auto PyBaseTimer(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyBaseTimer(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); @@ -261,8 +261,8 @@ static PyMethodDef PyBaseTimerDef = { // ------------------------------- getsession ---------------------------------- -static auto PyGetSession(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetSession(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; int raise = true; static const char* kwlist[] = {"doraise", nullptr}; @@ -305,8 +305,8 @@ static PyMethodDef PyGetSessionDef = { // --------------------------- new_host_session -------------------------------- -static auto PyNewHostSession(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyNewHostSession(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* benchmark_type_str = nullptr; static const char* kwlist[] = {"sessiontype", "benchmark_type", nullptr}; @@ -347,8 +347,8 @@ static PyMethodDef PyNewHostSessionDef = { // -------------------------- new_replay_session ------------------------------- -static auto PyNewReplaySession(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyNewReplaySession(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; std::string file_name; PyObject* file_name_obj; @@ -377,8 +377,8 @@ static PyMethodDef PyNewReplaySessionDef = { // ------------------------------ is_in_replay --------------------------------- -static auto PyIsInReplay(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyIsInReplay(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); static const char* kwlist[] = {nullptr}; @@ -408,8 +408,8 @@ static PyMethodDef PyIsInReplayDef = { // -------------------------- register_session-------- ------------------------- -static auto PyRegisterSession(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyRegisterSession(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); PyObject* session_obj; @@ -443,8 +443,8 @@ static PyMethodDef PyRegisterSessionDef = { // --------------------------- register_activity ------------------------------- -static auto PyRegisterActivity(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyRegisterActivity(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); PyObject* activity_obj; @@ -516,8 +516,8 @@ static PyMethodDef PyGetForegroundHostSessionDef = { // ----------------------------- newactivity ----------------------------------- -static auto PyNewActivity(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyNewActivity(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {"activity_type", "settings", nullptr}; @@ -575,8 +575,8 @@ static PyMethodDef PyNewActivityDef = { // ----------------------------- getactivity ----------------------------------- -static auto PyGetActivity(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetActivity(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; int raise = true; static const char* kwlist[] = {"doraise", nullptr}; @@ -624,8 +624,8 @@ static PyMethodDef PyGetActivityDef = { // -------------------------- broadcastmessage --------------------------------- -static auto PyBroadcastMessage(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyBroadcastMessage(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* message = nullptr; PyObject* color_obj = Py_None; @@ -800,8 +800,8 @@ static PyMethodDef PyBroadcastMessageDef = { // ------------------------------- newnode ------------------------------------- -static auto PyNewNode(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyNewNode(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; Node* n = SceneV1Python::DoNewNode(args, keywds); if (!n) { @@ -1037,8 +1037,8 @@ static PyMethodDef PyGetCollisionInfoDef = { // ------------------------------ camerashake ---------------------------------- -static auto PyCameraShake(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyCameraShake(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; assert(g_base->InLogicThread()); float intensity = 1.0f; @@ -1088,8 +1088,8 @@ static PyMethodDef PyCameraShakeDef = { // -------------------------------- emitfx ------------------------------------- -static auto PyEmitFx(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyEmitFx(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; static const char* kwlist[] = {"position", "velocity", "count", "scale", "spread", "chunk_type", @@ -1304,8 +1304,8 @@ static PyMethodDef PyGetForegroundHostActivityDef = { // --------------------------- get_game_roster --------------------------------- -static auto PyGetGameRoster(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyGetGameRoster(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); static const char* kwlist[] = {nullptr}; @@ -1414,8 +1414,8 @@ static PyMethodDef PyGetGameRosterDef = { // ----------------------- set_debug_speed_exponent ---------------------------- -static auto PySetDebugSpeedExponent(PyObject* self, - PyObject* args) -> PyObject* { +static auto PySetDebugSpeedExponent(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; int speed; if (!PyArg_ParseTuple(args, "i", &speed)) { @@ -1453,8 +1453,8 @@ static PyMethodDef PySetDebugSpeedExponentDef = { // ----------------------- get_replay_speed_exponent --------------------------- -static auto PyGetReplaySpeedExponent(PyObject* self, - PyObject* args) -> PyObject* { +static auto PyGetReplaySpeedExponent(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; auto* appmode = classic::ClassicAppMode::GetActiveOrThrow(); return PyLong_FromLong(appmode->replay_speed_exponent()); @@ -1476,8 +1476,8 @@ static PyMethodDef PyGetReplaySpeedExponentDef = { // ------------------------ set_replay_speed_exponent -------------------------- -static auto PySetReplaySpeedExponent(PyObject* self, - PyObject* args) -> PyObject* { +static auto PySetReplaySpeedExponent(PyObject* self, PyObject* args) + -> PyObject* { BA_PYTHON_TRY; int speed; if (!PyArg_ParseTuple(args, "i", &speed)) { @@ -1652,8 +1652,8 @@ static PyMethodDef PyGetRandomNamesDef = { // -------------------------------- ls_objects --------------------------------- -static auto PyLsObjects(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyLsObjects(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; Object::LsObjects(); Py_RETURN_NONE; @@ -1677,8 +1677,8 @@ static PyMethodDef PyLsObjectsDef = { // --------------------------- ls_input_devices -------------------------------- -static auto PyLsInputDevices(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyLsInputDevices(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; g_base->input->LsInputDevices(); Py_RETURN_NONE; @@ -1702,8 +1702,8 @@ static PyMethodDef PyLsInputDevicesDef = { // -------------------------- set_internal_music ------------------------------- -static auto PySetInternalMusic(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PySetInternalMusic(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); PyObject* music_obj; diff --git a/src/ballistica/scene_v1/python/scene_v1_python.cc b/src/ballistica/scene_v1/python/scene_v1_python.cc index f99c9611..1c7ed978 100644 --- a/src/ballistica/scene_v1/python/scene_v1_python.cc +++ b/src/ballistica/scene_v1/python/scene_v1_python.cc @@ -422,8 +422,8 @@ auto SceneV1Python::DoNewNode(PyObject* args, PyObject* keywds) -> Node* { // Return the node attr as a PyObject, or nullptr if the node doesn't have that // attr. -auto SceneV1Python::GetNodeAttr(Node* node, - const char* attr_name) -> PyObject* { +auto SceneV1Python::GetNodeAttr(Node* node, const char* attr_name) + -> PyObject* { assert(node); NodeAttribute attr = node->GetAttribute(attr_name); switch (attr.type()) { @@ -972,8 +972,9 @@ auto SceneV1Python::GetPySceneSounds(PyObject* o) -> std::vector { return vals; } -auto SceneV1Python::GetPySceneCollisionMesh( - PyObject* o, bool allow_empty_ref, bool allow_none) -> SceneCollisionMesh* { +auto SceneV1Python::GetPySceneCollisionMesh(PyObject* o, bool allow_empty_ref, + bool allow_none) + -> SceneCollisionMesh* { assert(Python::HaveGIL()); BA_PRECONDITION_FATAL(o != nullptr); @@ -1101,8 +1102,8 @@ auto SceneV1Python::GetPySceneDataAsset(PyObject* o, bool allow_empty_ref, PyExcType::kType); } -auto SceneV1Python::FilterChatMessage(std::string* message, - int client_id) -> bool { +auto SceneV1Python::FilterChatMessage(std::string* message, int client_id) + -> bool { assert(message); base::ScopedSetContext ssc(nullptr); @@ -1423,8 +1424,9 @@ auto SceneV1Python::HandleCapturedKeyRelease(const SDL_Keysym& keysym) -> bool { return true; } -auto SceneV1Python::HandleCapturedJoystickEvent( - const SDL_Event& event, base::InputDevice* input_device) -> bool { +auto SceneV1Python::HandleCapturedJoystickEvent(const SDL_Event& event, + base::InputDevice* input_device) + -> bool { assert(g_base->InLogicThread()); assert(input_device != nullptr); if (!joystick_capture_call_.Exists()) { diff --git a/src/ballistica/scene_v1/python/scene_v1_python.h b/src/ballistica/scene_v1/python/scene_v1_python.h index c711ea45..afa67832 100644 --- a/src/ballistica/scene_v1/python/scene_v1_python.h +++ b/src/ballistica/scene_v1/python/scene_v1_python.h @@ -70,8 +70,8 @@ class SceneV1Python { /// Given an asset-package python object and a media name, verify /// that the asset-package is valid in the current context_ref and return /// its fully qualified name if so. Throw an Exception if not. - auto ValidatedPackageAssetName(PyObject* package, - const char* name) -> std::string; + auto ValidatedPackageAssetName(PyObject* package, const char* name) + -> std::string; /// Specific Python objects we hold in objs_. enum class ObjID { @@ -101,8 +101,9 @@ class SceneV1Python { const auto& objs() { return objs_; } private: - static auto HandleCapturedJoystickEventCall( - const SDL_Event& event, base::InputDevice* input_device) -> bool; + static auto HandleCapturedJoystickEventCall(const SDL_Event& event, + base::InputDevice* input_device) + -> bool; static auto HandleCapturedKeyPressCall(const SDL_Keysym& keysym) -> bool; static auto HandleCapturedKeyReleaseCall(const SDL_Keysym& keysym) -> bool; auto HandleCapturedJoystickEvent(const SDL_Event& event, diff --git a/src/ballistica/scene_v1/support/host_session.h b/src/ballistica/scene_v1/support/host_session.h index 5515a48f..cf53cccf 100644 --- a/src/ballistica/scene_v1/support/host_session.h +++ b/src/ballistica/scene_v1/support/host_session.h @@ -58,8 +58,8 @@ class HostSession : public Session { } // Given an activity python type, instantiate a new activity // and return a new reference. - auto NewHostActivity(PyObject* activity_type_obj, - PyObject* settings_obj) -> PyObject*; + auto NewHostActivity(PyObject* activity_type_obj, PyObject* settings_obj) + -> PyObject*; void DestroyHostActivity(HostActivity* a); void RemovePlayer(Player* player); void RequestPlayer(SceneV1InputDeviceDelegate* device); @@ -99,8 +99,8 @@ class HostSession : public Session { // New HostActivities should call this in their constructors. void AddHostActivity(HostActivity* sgc); - auto GetUnusedPlayerName(Player* p, - const std::string& base_name) -> std::string; + auto GetUnusedPlayerName(Player* p, const std::string& base_name) + -> std::string; auto ContextAllowsDefaultTimerTypes() -> bool override; auto TimeToNextEvent() -> std::optional override; diff --git a/src/ballistica/scene_v1/support/session_stream.h b/src/ballistica/scene_v1/support/session_stream.h index 4d97fe4f..ae15b633 100644 --- a/src/ballistica/scene_v1/support/session_stream.h +++ b/src/ballistica/scene_v1/support/session_stream.h @@ -122,8 +122,8 @@ class SessionStream : public Object, public ClientControllerInterface { template auto GetPointerCount(const std::vector& vec) -> size_t; template - auto GetFreeIndex(std::vector* vec, - std::vector* free_indices) -> size_t; + auto GetFreeIndex(std::vector* vec, std::vector* free_indices) + -> size_t; template void Add(T* val, std::vector* vec, std::vector* free_indices); template diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 2bc62d95..dd8de96d 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 22007; +const int kEngineBuildNumber = 22009; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9; diff --git a/src/ballistica/shared/foundation/event_loop.cc b/src/ballistica/shared/foundation/event_loop.cc index d390defa..eb36357f 100644 --- a/src/ballistica/shared/foundation/event_loop.cc +++ b/src/ballistica/shared/foundation/event_loop.cc @@ -575,8 +575,8 @@ auto EventLoop::AreEventLoopsSuspended() -> bool { return g_core->event_loops_suspended(); } -auto EventLoop::NewTimer(microsecs_t length, bool repeat, - Runnable* runnable) -> Timer* { +auto EventLoop::NewTimer(microsecs_t length, bool repeat, Runnable* runnable) + -> Timer* { assert(g_core); assert(ThreadIsCurrent()); assert(Object::IsValidManagedObject(runnable)); diff --git a/src/ballistica/shared/foundation/macros.cc b/src/ballistica/shared/foundation/macros.cc index e1e1791b..c2ae788d 100644 --- a/src/ballistica/shared/foundation/macros.cc +++ b/src/ballistica/shared/foundation/macros.cc @@ -138,8 +138,8 @@ void MacroLogPythonTrace(core::CoreFeatureSet* corefs, const std::string& msg) { Log(LogLevel::kError, msg); } -auto MacroPathFilter(core::CoreFeatureSet* corefs, - const char* filename) -> const char* { +auto MacroPathFilter(core::CoreFeatureSet* corefs, const char* filename) + -> const char* { // If we've got a build_src_dir set and filename starts with it, skip past // it. assert(corefs); diff --git a/src/ballistica/shared/foundation/macros.h b/src/ballistica/shared/foundation/macros.h index 946ffe26..60ad3b07 100644 --- a/src/ballistica/shared/foundation/macros.h +++ b/src/ballistica/shared/foundation/macros.h @@ -172,8 +172,8 @@ namespace ballistica { // Support functions used by some of our macros; not intended to be used // directly. -auto MacroPathFilter(core::CoreFeatureSet* corefs, - const char* filename) -> const char*; +auto MacroPathFilter(core::CoreFeatureSet* corefs, const char* filename) + -> const char*; void MacroFunctionTimerEnd(core::CoreFeatureSet* corefs, millisecs_t starttime, millisecs_t time, const char* funcname); void MacroFunctionTimerEndThread(core::CoreFeatureSet* corefs, diff --git a/src/ballistica/shared/generic/base64.cc b/src/ballistica/shared/generic/base64.cc index cada6c25..77df7e20 100644 --- a/src/ballistica/shared/generic/base64.cc +++ b/src/ballistica/shared/generic/base64.cc @@ -102,8 +102,8 @@ auto base64_encode(const unsigned char* bytes_to_encode, unsigned int in_len, return ret; } -auto base64_decode(const std::string& encoded_string, - bool urlsafe) -> std::string { +auto base64_decode(const std::string& encoded_string, bool urlsafe) + -> std::string { int in_len = static_cast(encoded_string.size()); int i = 0; // int j = 0; diff --git a/src/ballistica/shared/generic/base64.h b/src/ballistica/shared/generic/base64.h index 2faab459..0df02824 100644 --- a/src/ballistica/shared/generic/base64.h +++ b/src/ballistica/shared/generic/base64.h @@ -7,8 +7,8 @@ namespace ballistica { -auto base64_encode(const unsigned char*, unsigned int len, - bool urlsafe = false) -> std::string; +auto base64_encode(const unsigned char*, unsigned int len, bool urlsafe = false) + -> std::string; auto base64_decode(const std::string& s, bool urlsafe = false) -> std::string; } // namespace ballistica diff --git a/src/ballistica/shared/generic/timer_list.h b/src/ballistica/shared/generic/timer_list.h index f2ad5408..a954b759 100644 --- a/src/ballistica/shared/generic/timer_list.h +++ b/src/ballistica/shared/generic/timer_list.h @@ -22,8 +22,8 @@ class TimerList { // Create a timer with provided runnable. auto NewTimer(TimerMedium current_time, TimerMedium length, - TimerMedium offset, int repeat_count, - Runnable* runnable) -> Timer*; + TimerMedium offset, int repeat_count, Runnable* runnable) + -> Timer*; // Return a timer by its id, or nullptr if the timer no longer exists. auto GetTimer(int id) -> Timer*; diff --git a/src/ballistica/shared/generic/utils.cc b/src/ballistica/shared/generic/utils.cc index d87a10df..10025b03 100644 --- a/src/ballistica/shared/generic/utils.cc +++ b/src/ballistica/shared/generic/utils.cc @@ -332,8 +332,8 @@ auto Utils::UTF8FromUnicode(std::vector unichars) -> std::string { return buffer.data(); } -auto Utils::UnicodeFromUTF8(const std::string& s_in, - const char* loc) -> std::vector { +auto Utils::UnicodeFromUTF8(const std::string& s_in, const char* loc) + -> std::vector { std::string s = GetValidUTF8(s_in.c_str(), loc); // worst case every char is a character (plus trailing 0) std::vector vals(s.size() + 1); diff --git a/src/ballistica/shared/generic/utils.h b/src/ballistica/shared/generic/utils.h index 1d969586..db5088ae 100644 --- a/src/ballistica/shared/generic/utils.h +++ b/src/ballistica/shared/generic/utils.h @@ -48,8 +48,8 @@ class Utils { /// control characters). static auto StripNonAsciiFromUTF8(const std::string& s) -> std::string; - static auto UnicodeFromUTF8(const std::string& s, - const char* loc) -> std::vector; + static auto UnicodeFromUTF8(const std::string& s, const char* loc) + -> std::vector; static auto UTF8FromUnicode(std::vector unichars) -> std::string; static auto UTF8FromUnicodeChar(uint32_t c) -> std::string; static auto UTF8StringLength(const char* val) -> int; diff --git a/src/ballistica/shared/math/matrix44f.cc b/src/ballistica/shared/math/matrix44f.cc index f2e093a4..46d08c3e 100644 --- a/src/ballistica/shared/math/matrix44f.cc +++ b/src/ballistica/shared/math/matrix44f.cc @@ -57,8 +57,8 @@ auto Matrix44fRotate(float azimuth, float elevation) -> Matrix44f { return rotate; } -auto Matrix44fOrient(const Vector3f& x, const Vector3f& y, - const Vector3f& z) -> Matrix44f { +auto Matrix44fOrient(const Vector3f& x, const Vector3f& y, const Vector3f& z) + -> Matrix44f { Matrix44f orient{kMatrix44fIdentity}; orient.set(0, 0, x.x); @@ -76,8 +76,8 @@ auto Matrix44fOrient(const Vector3f& x, const Vector3f& y, return orient; } -auto Matrix44fOrient(const Vector3f& direction, - const Vector3f& up) -> Matrix44f { +auto Matrix44fOrient(const Vector3f& direction, const Vector3f& up) + -> Matrix44f { assert(direction.LengthSquared() > 0.0f); assert(up.LengthSquared() > 0.0f); diff --git a/src/ballistica/shared/math/matrix44f.h b/src/ballistica/shared/math/matrix44f.h index 20b321b0..e8bcd52c 100644 --- a/src/ballistica/shared/math/matrix44f.h +++ b/src/ballistica/shared/math/matrix44f.h @@ -161,8 +161,8 @@ inline auto Matrix44fTranslate(const Vector3f& trans) -> Matrix44f { return translate; } -inline auto Matrix44fTranslate(const float x, const float y, - const float z) -> Matrix44f { +inline auto Matrix44fTranslate(const float x, const float y, const float z) + -> Matrix44f { Matrix44f translate{kMatrix44fIdentity}; translate.set(3, 0, x); translate.set(3, 1, y); @@ -188,12 +188,12 @@ inline auto Matrix44fScale(const Vector3f& sf) -> Matrix44f { auto Matrix44fRotate(const Vector3f& axis, float angle) -> Matrix44f; auto Matrix44fRotate(float azimuth, float elevation) -> Matrix44f; -auto Matrix44fOrient(const Vector3f& x, const Vector3f& y, - const Vector3f& z) -> Matrix44f; +auto Matrix44fOrient(const Vector3f& x, const Vector3f& y, const Vector3f& z) + -> Matrix44f; // Note: direction and up need to be perpendicular and normalized here. -auto Matrix44fOrient(const Vector3f& direction, - const Vector3f& up) -> Matrix44f; +auto Matrix44fOrient(const Vector3f& direction, const Vector3f& up) + -> Matrix44f; auto Matrix44fFrustum(float left, float right, float bottom, float top, float near, float far) -> Matrix44f; diff --git a/src/ballistica/shared/networking/sockaddr.cc b/src/ballistica/shared/networking/sockaddr.cc index 6dd5b190..af4c5dab 100644 --- a/src/ballistica/shared/networking/sockaddr.cc +++ b/src/ballistica/shared/networking/sockaddr.cc @@ -9,7 +9,7 @@ SockAddr::SockAddr(const std::string& addr, int port) { // Try ipv4 and then ipv6. { - struct in_addr addr_out {}; + struct in_addr addr_out{}; int result = inet_pton(AF_INET, addr.c_str(), &addr_out); if (result == 1) { auto* a = reinterpret_cast(&addr_); @@ -18,7 +18,7 @@ SockAddr::SockAddr(const std::string& addr, int port) { a->sin_addr = addr_out; return; } else { - struct in6_addr addr6_out {}; + struct in6_addr addr6_out{}; result = inet_pton(AF_INET6, addr.c_str(), &addr6_out); if (result == 1) { auto* a = reinterpret_cast(&addr_); diff --git a/src/ballistica/shared/python/python_class.cc b/src/ballistica/shared/python/python_class.cc index 1e652df3..b6530162 100644 --- a/src/ballistica/shared/python/python_class.cc +++ b/src/ballistica/shared/python/python_class.cc @@ -35,8 +35,8 @@ auto PythonClass::TypeIsSetUp(PyTypeObject* cls) -> bool { return Py_REFCNT(cls) > 0; } -auto PythonClass::tp_new(PyTypeObject* type, PyObject* args, - PyObject* kwds) -> PyObject* { +auto PythonClass::tp_new(PyTypeObject* type, PyObject* args, PyObject* kwds) + -> PyObject* { // Simply allocating and returning a zeroed instance of our class here. // If subclasses need to construct/destruct any other values in the object // they can either do it manually here and in tp_dealloc *or* they can get @@ -57,8 +57,8 @@ auto PythonClass::tp_getattro(PythonClass* node, PyObject* attr) -> PyObject* { BA_PYTHON_CATCH; } -auto PythonClass::tp_setattro(PythonClass* node, PyObject* attr, - PyObject* val) -> int { +auto PythonClass::tp_setattro(PythonClass* node, PyObject* attr, PyObject* val) + -> int { BA_PYTHON_TRY; return PyObject_GenericSetAttr(reinterpret_cast(node), attr, val); BA_PYTHON_INT_CATCH; diff --git a/src/ballistica/shared/python/python_class.h b/src/ballistica/shared/python/python_class.h index 5036a08e..572fea36 100644 --- a/src/ballistica/shared/python/python_class.h +++ b/src/ballistica/shared/python/python_class.h @@ -35,12 +35,12 @@ class PythonClass { private: static auto tp_repr(PythonClass* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* kwds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* kwds) + -> PyObject*; static void tp_dealloc(PythonClass* self); static auto tp_getattro(PythonClass* node, PyObject* attr) -> PyObject*; - static auto tp_setattro(PythonClass* node, PyObject* attr, - PyObject* val) -> int; + static auto tp_setattro(PythonClass* node, PyObject* attr, PyObject* val) + -> int; }; } // namespace ballistica diff --git a/src/ballistica/shared/python/python_command.cc b/src/ballistica/shared/python/python_command.cc index 68cf3275..ab04999f 100644 --- a/src/ballistica/shared/python/python_command.cc +++ b/src/ballistica/shared/python/python_command.cc @@ -97,8 +97,8 @@ auto PythonCommand::CanEval() -> bool { return true; } -auto PythonCommand::Exec(bool print_errors, PyObject* globals, - PyObject* locals) -> bool { +auto PythonCommand::Exec(bool print_errors, PyObject* globals, PyObject* locals) + -> bool { assert(Python::HaveGIL()); // If we're being used before core is up, we need both global and @@ -163,8 +163,8 @@ auto PythonCommand::Exec(bool print_errors, PyObject* globals, return false; } -auto PythonCommand::Eval(bool print_errors, PyObject* globals, - PyObject* locals) -> PythonRef { +auto PythonCommand::Eval(bool print_errors, PyObject* globals, PyObject* locals) + -> PythonRef { assert(Python::HaveGIL()); assert(!dead_); diff --git a/src/ballistica/shared/python/python_command.h b/src/ballistica/shared/python/python_command.h index bf712080..a0a34704 100644 --- a/src/ballistica/shared/python/python_command.h +++ b/src/ballistica/shared/python/python_command.h @@ -46,8 +46,8 @@ class PythonCommand { /// Run the command and return the result as a new Python reference. /// Only works for eval-able commands. /// Returns nullptr on errors, but Python error state will be cleared. - auto Eval(bool print_errors, PyObject* globals, - PyObject* locals) -> PythonRef; + auto Eval(bool print_errors, PyObject* globals, PyObject* locals) + -> PythonRef; void PrintContext(); diff --git a/src/ballistica/shared/python/python_ref.cc b/src/ballistica/shared/python/python_ref.cc index b209a561..eb74d121 100644 --- a/src/ballistica/shared/python/python_ref.cc +++ b/src/ballistica/shared/python/python_ref.cc @@ -277,8 +277,8 @@ auto PythonRef::UnicodeCheck() const -> bool { return static_cast(PyUnicode_Check(obj_)); } -static inline auto _HandleCallResults(PyObject* out, - bool print_errors) -> PyObject* { +static inline auto _HandleCallResults(PyObject* out, bool print_errors) + -> PyObject* { if (!out) { if (print_errors) { // Save/restore error or it can mess with context print calls. @@ -297,8 +297,8 @@ static inline auto _HandleCallResults(PyObject* out, return out; } -auto PythonRef::Call(PyObject* args, PyObject* keywds, - bool print_errors) const -> PythonRef { +auto PythonRef::Call(PyObject* args, PyObject* keywds, bool print_errors) const + -> PythonRef { assert(obj_); assert(Python::HaveGIL()); assert(CallableCheck()); @@ -319,8 +319,8 @@ auto PythonRef::Call(bool print_errors) const -> PythonRef { return out ? PythonRef(out, PythonRef::kSteal) : PythonRef(); } -auto PythonRef::Call(const Vector2f& val, - bool print_errors) const -> PythonRef { +auto PythonRef::Call(const Vector2f& val, bool print_errors) const + -> PythonRef { assert(Python::HaveGIL()); PythonRef args(Py_BuildValue("((ff))", val.x, val.y), PythonRef::kSteal); return Call(args.Get(), nullptr, print_errors); diff --git a/src/ballistica/template_fs/python/class/python_class_hello.h b/src/ballistica/template_fs/python/class/python_class_hello.h index d717da9b..e2e3f28d 100644 --- a/src/ballistica/template_fs/python/class/python_class_hello.h +++ b/src/ballistica/template_fs/python/class/python_class_hello.h @@ -33,8 +33,8 @@ class PythonClassHello : public PythonClass { PythonClassHello(); ~PythonClassHello(); static PyMethodDef tp_methods[]; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassHello* self); static auto TestMethod(PythonClassHello* self, PyObject* args, PyObject* keywds) -> PyObject*; diff --git a/src/ballistica/template_fs/python/methods/python_methods_template_fs.cc b/src/ballistica/template_fs/python/methods/python_methods_template_fs.cc index a644e4e9..2e0015ad 100644 --- a/src/ballistica/template_fs/python/methods/python_methods_template_fs.cc +++ b/src/ballistica/template_fs/python/methods/python_methods_template_fs.cc @@ -9,8 +9,8 @@ namespace ballistica::template_fs { // -------------------------- hello_again_world -------------------------------- -static auto PyHelloAgainWorld(PyObject* self, PyObject* args, - PyObject* keywds) -> PyObject* { +static auto PyHelloAgainWorld(PyObject* self, PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; const char* name; static const char* kwlist[] = {nullptr}; diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_mesh.h b/src/ballistica/ui_v1/python/class/python_class_ui_mesh.h index 49ce22a0..09edebc9 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_mesh.h +++ b/src/ballistica/ui_v1/python/class/python_class_ui_mesh.h @@ -39,8 +39,8 @@ class PythonClassUIMesh : public PythonClass { private: static PyMethodDef tp_methods[]; static auto tp_repr(PythonClassUIMesh* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassUIMesh* self); Object::Ref* mesh_; }; diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_sound.h b/src/ballistica/ui_v1/python/class/python_class_ui_sound.h index 1dfcb57e..50aefb51 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_sound.h +++ b/src/ballistica/ui_v1/python/class/python_class_ui_sound.h @@ -39,13 +39,13 @@ class PythonClassUISound : public PythonClass { private: static PyMethodDef tp_methods[]; static auto tp_repr(PythonClassUISound* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassUISound* self); - static auto Play(PythonClassUISound* self, PyObject* args, - PyObject* keywds) -> PyObject*; - static auto Stop(PythonClassUISound* self, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto Play(PythonClassUISound* self, PyObject* args, PyObject* keywds) + -> PyObject*; + static auto Stop(PythonClassUISound* self, PyObject* args, PyObject* keywds) + -> PyObject*; Object::Ref* sound_; bool playing_; diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_texture.h b/src/ballistica/ui_v1/python/class/python_class_ui_texture.h index b50815c9..56e720b6 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_texture.h +++ b/src/ballistica/ui_v1/python/class/python_class_ui_texture.h @@ -40,8 +40,8 @@ class PythonClassUITexture : public PythonClass { private: static PyMethodDef tp_methods[]; static auto tp_repr(PythonClassUITexture* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassUITexture* self); Object::Ref* texture_; }; diff --git a/src/ballistica/ui_v1/python/class/python_class_widget.cc b/src/ballistica/ui_v1/python/class/python_class_widget.cc index 57978903..62b879be 100644 --- a/src/ballistica/ui_v1/python/class/python_class_widget.cc +++ b/src/ballistica/ui_v1/python/class/python_class_widget.cc @@ -90,8 +90,8 @@ auto PythonClassWidget::GetWidget() const -> Widget* { return w; } -auto PythonClassWidget::tp_getattro(PythonClassWidget* self, - PyObject* attr) -> PyObject* { +auto PythonClassWidget::tp_getattro(PythonClassWidget* self, PyObject* attr) + -> PyObject* { BA_PYTHON_TRY; BA_PRECONDITION(g_base->InLogicThread()); @@ -312,8 +312,8 @@ auto PythonClassWidget::Delete(PythonClassWidget* self, PyObject* args, } auto PythonClassWidget::AddDeleteCallback(PythonClassWidget* self, - PyObject* args, - PyObject* keywds) -> PyObject* { + PyObject* args, PyObject* keywds) + -> PyObject* { BA_PYTHON_TRY; PyObject* call_obj; static const char* kwlist[] = {"call", nullptr}; diff --git a/src/ballistica/ui_v1/python/class/python_class_widget.h b/src/ballistica/ui_v1/python/class/python_class_widget.h index e38fd152..b4e98409 100644 --- a/src/ballistica/ui_v1/python/class/python_class_widget.h +++ b/src/ballistica/ui_v1/python/class/python_class_widget.h @@ -23,8 +23,8 @@ class PythonClassWidget : public PythonClass { private: static PyMethodDef tp_methods[]; static auto tp_repr(PythonClassWidget* self) -> PyObject*; - static auto tp_new(PyTypeObject* type, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto tp_new(PyTypeObject* type, PyObject* args, PyObject* keywds) + -> PyObject*; static void tp_dealloc(PythonClassWidget* self); static auto tp_getattro(PythonClassWidget* self, PyObject* attr) -> PyObject*; static auto tp_setattro(PythonClassWidget* self, PyObject* attr, @@ -35,8 +35,8 @@ class PythonClassWidget : public PythonClass { static auto GetChildren(PythonClassWidget* self) -> PyObject*; static auto GetSelectedChild(PythonClassWidget* self) -> PyObject*; static auto GetScreenSpaceCenter(PythonClassWidget* self) -> PyObject*; - static auto Delete(PythonClassWidget* self, PyObject* args, - PyObject* keywds) -> PyObject*; + static auto Delete(PythonClassWidget* self, PyObject* args, PyObject* keywds) + -> PyObject*; static auto AddDeleteCallback(PythonClassWidget* self, PyObject* args, PyObject* keywds) -> PyObject*; Object::WeakRef* widget_; diff --git a/src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc b/src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc index b594da2c..0edfcf5b 100644 --- a/src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc +++ b/src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc @@ -457,7 +457,8 @@ static PyMethodDef PyButtonWidgetDef = { (PyCFunction)PyButtonWidget, // method METH_VARARGS | METH_KEYWORDS, // flags - "buttonwidget(edit: bauiv1.Widget | None = None,\n" + "buttonwidget(*,\n" + " edit: bauiv1.Widget | None = None,\n" " parent: bauiv1.Widget | None = None,\n" " size: Sequence[float] | None = None,\n" " position: Sequence[float] | None = None,\n" @@ -653,7 +654,8 @@ static PyMethodDef PyCheckBoxWidgetDef = { (PyCFunction)PyCheckBoxWidget, // method METH_VARARGS | METH_KEYWORDS, // flags - "checkboxwidget(edit: bauiv1.Widget | None = None,\n" + "checkboxwidget(*,\n" + " edit: bauiv1.Widget | None = None,\n" " parent: bauiv1.Widget | None = None,\n" " size: Sequence[float] | None = None,\n" " position: Sequence[float] | None = None,\n" @@ -853,7 +855,8 @@ static PyMethodDef PyImageWidgetDef = { (PyCFunction)PyImageWidget, // method METH_VARARGS | METH_KEYWORDS, // flags - "imagewidget(edit: bauiv1.Widget | None = None,\n" + "imagewidget(*,\n" + " edit: bauiv1.Widget | None = None,\n" " parent: bauiv1.Widget | None = None,\n" " size: Sequence[float] | None = None,\n" " position: Sequence[float] | None = None,\n" @@ -1038,7 +1041,8 @@ static PyMethodDef PyColumnWidgetDef = { (PyCFunction)PyColumnWidget, // method METH_VARARGS | METH_KEYWORDS, // flags - "columnwidget(edit: bauiv1.Widget | None = None,\n" + "columnwidget(*,\n" + " edit: bauiv1.Widget | None = None,\n" " parent: bauiv1.Widget | None = None,\n" " size: Sequence[float] | None = None,\n" " position: Sequence[float] | None = None,\n" @@ -1364,7 +1368,8 @@ static PyMethodDef PyContainerWidgetDef = { (PyCFunction)PyContainerWidget, // method METH_VARARGS | METH_KEYWORDS, // flags - "containerwidget(edit: bauiv1.Widget | None = None,\n" + "containerwidget(*,\n" + " edit: bauiv1.Widget | None = None,\n" " parent: bauiv1.Widget | None = None,\n" " size: Sequence[float] | None = None,\n" " position: Sequence[float] | None = None,\n" @@ -1704,7 +1709,8 @@ static PyMethodDef PyScrollWidgetDef = { (PyCFunction)PyScrollWidget, // method METH_VARARGS | METH_KEYWORDS, // flags - "scrollwidget(edit: bauiv1.Widget | None = None,\n" + "scrollwidget(*,\n" + " edit: bauiv1.Widget | None = None,\n" " parent: bauiv1.Widget | None = None,\n" " size: Sequence[float] | None = None,\n" " position: Sequence[float] | None = None,\n" @@ -1885,7 +1891,8 @@ static PyMethodDef PyHScrollWidgetDef = { (PyCFunction)PyHScrollWidget, // method METH_VARARGS | METH_KEYWORDS, // flags - "hscrollwidget(edit: bauiv1.Widget | None = None,\n" + "hscrollwidget(*,\n" + " edit: bauiv1.Widget | None = None,\n" " parent: bauiv1.Widget | None = None,\n" " size: Sequence[float] | None = None,\n" " position: Sequence[float] | None = None,\n" @@ -2258,7 +2265,8 @@ static PyMethodDef PyTextWidgetDef = { (PyCFunction)PyTextWidget, // method METH_VARARGS | METH_KEYWORDS, // flags - "textwidget(edit: bauiv1.Widget | None = None,\n" + "textwidget(*,\n" + " edit: bauiv1.Widget | None = None,\n" " parent: bauiv1.Widget | None = None,\n" " size: Sequence[float] | None = None,\n" " position: Sequence[float] | None = None,\n" @@ -2417,7 +2425,8 @@ static PyMethodDef PyWidgetDef = { (PyCFunction)PyWidgetCall, // method METH_VARARGS | METH_KEYWORDS, // flags - "widget(edit: bauiv1.Widget,\n" + "widget(*,\n" + " edit: bauiv1.Widget,\n" " up_widget: bauiv1.Widget | None = None,\n" " down_widget: bauiv1.Widget | None = None,\n" " left_widget: bauiv1.Widget | None = None,\n" diff --git a/src/ballistica/ui_v1/widget/container_widget.cc b/src/ballistica/ui_v1/widget/container_widget.cc index baa3f225..63873e1a 100644 --- a/src/ballistica/ui_v1/widget/container_widget.cc +++ b/src/ballistica/ui_v1/widget/container_widget.cc @@ -697,8 +697,8 @@ auto ContainerWidget::HandleMessage(const base::WidgetMessage& m) -> bool { return claimed; } -auto ContainerWidget::GetMult(millisecs_t current_time, - bool for_glow) const -> float { +auto ContainerWidget::GetMult(millisecs_t current_time, bool for_glow) const + -> float { if (root_selectable_ && selected()) { float m; diff --git a/tools/batools/assetsmakefile.py b/tools/batools/assetsmakefile.py index 75f993a9..0092873c 100755 --- a/tools/batools/assetsmakefile.py +++ b/tools/batools/assetsmakefile.py @@ -29,6 +29,7 @@ def _get_targets( ) -> str: """Generic function to map source extension to dst files.""" # pylint: disable=too-many-locals + # pylint: disable=too-many-positional-arguments src = ASSETS_SRC dst = BUILD_DIR @@ -66,6 +67,7 @@ def _get_py_targets( all_targets: set[str], subset: str, ) -> None: + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-branches # pylint: disable=too-many-locals # pylint: disable=too-many-statements @@ -213,6 +215,7 @@ def _get_py_targets_subset( suffix: str, ) -> str: # pylint: disable=too-many-locals + # pylint: disable=too-many-positional-arguments if subset == 'public_tools': src = 'tools' dst = f'{BUILD_DIR}/ba_data/python' diff --git a/tools/batools/docker.py b/tools/batools/docker.py index 68d6c5d6..70526764 100644 --- a/tools/batools/docker.py +++ b/tools/batools/docker.py @@ -8,6 +8,7 @@ import subprocess def _docker_build( image_name: str, dockerfile_dir: str, + *, cmake_build_type: str | None = None, labels: dict[str, str] | None = None, platform: str | None = None, diff --git a/tools/batools/project/_updater.py b/tools/batools/project/_updater.py index 31959b55..23d058a0 100755 --- a/tools/batools/project/_updater.py +++ b/tools/batools/project/_updater.py @@ -45,6 +45,7 @@ class ProjectUpdater: def __init__( self, projroot: str, + *, check: bool, fix: bool, empty: bool = False, diff --git a/tools/batools/spinoff/_context.py b/tools/batools/spinoff/_context.py index e6f7313c..53faef2d 100644 --- a/tools/batools/spinoff/_context.py +++ b/tools/batools/spinoff/_context.py @@ -62,6 +62,7 @@ class SpinoffContext: src_root: str, dst_root: str, mode: Mode, + *, force: bool = False, verbose: bool = False, print_full_lists: bool = False, @@ -1210,6 +1211,8 @@ class SpinoffContext: dst_path_full: str, key: str, ) -> None: + # pylint: disable=too-many-positional-arguments + # Ick; dst changed. Now the only way we allow # the delete is if we can re-filter its src # and come up with the same dst again @@ -1526,11 +1529,13 @@ class SpinoffContext: dst_path_full: str, display_diff_cmd: str, ) -> None: + # pylint: disable=too-many-positional-arguments + if os.path.isfile(src_path_full) and os.path.isfile(dst_path_full): - # We want to show how this update would change the dst - # file, so we need to compare a filtered version of src - # to the existing dst. For non-filtered src files we - # can just do a direct compare + # We want to show how this update would change the dst file, + # so we need to compare a filtered version of src to the + # existing dst. For non-filtered src files we can just do a + # direct compare delete_file_name: str | None if self._should_filter_src_file(src_path): with tempfile.NamedTemporaryFile('wb', delete=False) as tmpf: @@ -1612,9 +1617,9 @@ class SpinoffContext: # For project-updater to do its thing, we need to provide # filtered source versions of *all* project files which - # might be changing. (Some project files may implicitly generate - # others as part of their own generation so we need all sources - # in place before any generation happens). + # might be changing. (Some project files may implicitly + # generate others as part of their own generation so we need + # all sources in place before any generation happens). for src_path in project_src_paths: self._handle_src_copy_project_updater_register(src_path) @@ -1758,7 +1763,7 @@ class SpinoffContext: src_entity: SrcEntity, is_project_file: bool, ) -> DstEntity: - # del dst_path # Unused. + # pylint: disable=too-many-positional-arguments # If this is a project file, we already fed the filtered # src into our ProjectUpdater instance, so all we do here is @@ -2041,6 +2046,7 @@ class SpinoffContext: dst_entity: DstEntity, dst_exists: bool, ) -> None: + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-branches # pylint: disable=too-many-statements # pylint: disable=too-many-locals diff --git a/tools/batools/xcodeproject.py b/tools/batools/xcodeproject.py index c26042f8..8c6132c7 100644 --- a/tools/batools/xcodeproject.py +++ b/tools/batools/xcodeproject.py @@ -35,6 +35,7 @@ def update_xcode_project( force: bool = False, ) -> str: """Given an xcode project, update it for the current set of files.""" + # pylint: disable=too-many-positional-arguments suffixes = ['.cc', '.h', '.m', '.mm', '.swift'] updater = Updater( @@ -63,8 +64,8 @@ class Updater: existing_data: str, sources: list[str], projname: str, - # has_app_delegate_mm: bool = False, ) -> None: + # pylint: disable=too-many-positional-arguments if not path.endswith('.xcodeproj'): raise RuntimeError(f"Path does not end in .xcodeproj: '{path}'.") @@ -73,7 +74,6 @@ class Updater: self.existing_data = existing_data self.sources = sources self.project = None - # self.has_app_delegate_mm = has_app_delegate_mm # Project name variations. self.pnameu = projname diff --git a/tools/efro/dataclassio/_api.py b/tools/efro/dataclassio/_api.py index 7475cbab..5e7aee34 100644 --- a/tools/efro/dataclassio/_api.py +++ b/tools/efro/dataclassio/_api.py @@ -99,6 +99,7 @@ def dataclass_to_json( def dataclass_from_dict( cls: type[T], values: dict, + *, codec: Codec = Codec.JSON, coerce_to_float: bool = True, allow_unknown_attrs: bool = True, diff --git a/tools/efro/dataclassio/_base.py b/tools/efro/dataclassio/_base.py index 246b04e7..d0743ab4 100644 --- a/tools/efro/dataclassio/_base.py +++ b/tools/efro/dataclassio/_base.py @@ -180,6 +180,7 @@ class IOAttrs: def __init__( self, storagename: str | None = storagename, + *, store_default: bool = store_default, whole_days: bool = whole_days, whole_hours: bool = whole_hours, diff --git a/tools/efro/dataclassio/_inputter.py b/tools/efro/dataclassio/_inputter.py index a9c2f1bb..1fb6ee72 100644 --- a/tools/efro/dataclassio/_inputter.py +++ b/tools/efro/dataclassio/_inputter.py @@ -41,6 +41,7 @@ class _Inputter: def __init__( self, cls: type[Any], + *, codec: Codec, coerce_to_float: bool, allow_unknown_attrs: bool = True, @@ -110,6 +111,7 @@ class _Inputter: ioattrs: IOAttrs | None, ) -> Any: """Convert an assigned value to what a dataclass field expects.""" + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-return-statements # pylint: disable=too-many-branches @@ -413,6 +415,7 @@ class _Inputter: value: Any, ioattrs: IOAttrs | None, ) -> Any: + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-branches # pylint: disable=too-many-locals @@ -533,6 +536,7 @@ class _Inputter: seqtype: type, ioattrs: IOAttrs | None, ) -> Any: + # pylint: disable=too-many-positional-arguments # Because we are json-centric, we expect a list for all sequences. if type(value) is not list: raise TypeError( @@ -582,6 +586,7 @@ class _Inputter: value: Any, ioattrs: IOAttrs | None, ) -> Any: + # pylint: disable=too-many-positional-arguments out: list = [] # Because we are json-centric, we expect a list for all sequences. diff --git a/tools/efro/dataclassio/_outputter.py b/tools/efro/dataclassio/_outputter.py index 5442efae..df6b72ab 100644 --- a/tools/efro/dataclassio/_outputter.py +++ b/tools/efro/dataclassio/_outputter.py @@ -40,6 +40,7 @@ class _Outputter: def __init__( self, obj: Any, + *, create: bool, codec: Codec, coerce_to_float: bool, @@ -192,6 +193,7 @@ class _Outputter: value: Any, ioattrs: IOAttrs | None, ) -> Any: + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-return-statements # pylint: disable=too-many-branches # pylint: disable=too-many-statements @@ -512,6 +514,7 @@ class _Outputter: value: dict, ioattrs: IOAttrs | None, ) -> Any: + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-branches if not isinstance(value, dict): raise TypeError( diff --git a/tools/efro/dataclassio/_prep.py b/tools/efro/dataclassio/_prep.py index 8321dbdc..68bcaa37 100644 --- a/tools/efro/dataclassio/_prep.py +++ b/tools/efro/dataclassio/_prep.py @@ -261,6 +261,7 @@ class PrepSession: recursion_level: int, ) -> None: """Run prep on a dataclass.""" + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-return-statements # pylint: disable=too-many-branches # pylint: disable=too-many-statements diff --git a/tools/efro/debug.py b/tools/efro/debug.py index 01a3f778..6afeb65b 100644 --- a/tools/efro/debug.py +++ b/tools/efro/debug.py @@ -312,6 +312,7 @@ def _desc(obj: Any) -> str: def _printrefs( obj: Any, + *, level: int, max_level: int, exclude_objs: list, diff --git a/tools/efro/log.py b/tools/efro/log.py index 3e1326ca..f681fab9 100644 --- a/tools/efro/log.py +++ b/tools/efro/log.py @@ -126,6 +126,7 @@ class LogHandler(logging.Handler): def __init__( self, + *, path: str | Path | None, echofile: TextIO | None, suppress_non_root_debug: bool, @@ -447,6 +448,7 @@ class LogHandler(logging.Handler): message: str | logging.LogRecord, labels: dict[str, str], ) -> None: + # pylint: disable=too-many-positional-arguments try: # If they passed a raw record here, bake it down to a string. if isinstance(message, logging.LogRecord): @@ -678,6 +680,7 @@ class FileLogEcho: def setup_logging( log_path: str | Path | None, level: LogLevel, + *, suppress_non_root_debug: bool = False, log_stdout_stderr: bool = False, echo_to_stderr: bool = True, @@ -710,7 +713,7 @@ def setup_logging( # won't themselves be intercepted and sent to the logger # which would create an infinite loop. loghandler = LogHandler( - log_path, + path=log_path, echofile=sys.stderr if echo_to_stderr else None, suppress_non_root_debug=suppress_non_root_debug, cache_size_limit=cache_size_limit, diff --git a/tools/efro/message/_module.py b/tools/efro/message/_module.py index 2fa91fa2..db96f3b7 100644 --- a/tools/efro/message/_module.py +++ b/tools/efro/message/_module.py @@ -19,6 +19,7 @@ def create_sender_module( protocol_create_code: str, enable_sync_sends: bool, enable_async_sends: bool, + *, private: bool = False, protocol_module_level_import_code: str | None = None, build_time_protocol_create_code: str | None = None, @@ -61,6 +62,7 @@ def create_receiver_module( basename: str, protocol_create_code: str, is_async: bool, + *, private: bool = False, protocol_module_level_import_code: str | None = None, build_time_protocol_create_code: str | None = None, diff --git a/tools/efro/message/_protocol.py b/tools/efro/message/_protocol.py index 928d1fa7..4e3e1ccd 100644 --- a/tools/efro/message/_protocol.py +++ b/tools/efro/message/_protocol.py @@ -42,6 +42,7 @@ class MessageProtocol: self, message_types: dict[int, type[Message]], response_types: dict[int, type[Response]], + *, forward_communication_errors: bool = False, forward_clean_errors: bool = False, remote_errors_include_stack_traces: bool = False, @@ -414,6 +415,7 @@ class MessageProtocol: protocol_module_level_import_code: str | None = None, ) -> str: """Used by create_sender_module(); do not call directly.""" + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-locals # pylint: disable=too-many-branches import textwrap @@ -531,6 +533,7 @@ class MessageProtocol: ) -> str: """Used by create_receiver_module(); do not call directly.""" # pylint: disable=too-many-locals + # pylint: disable=too-many-positional-arguments import textwrap desc = 'asynchronous' if is_async else 'synchronous' diff --git a/tools/efro/rpc.py b/tools/efro/rpc.py index 9acfab04..e4477cb3 100644 --- a/tools/efro/rpc.py +++ b/tools/efro/rpc.py @@ -180,6 +180,7 @@ class RPCEndpoint: reader: asyncio.StreamReader, writer: asyncio.StreamWriter, label: str, + *, debug_print: bool = False, debug_print_io: bool = False, debug_print_call: Callable[[str], None] | None = None, @@ -426,6 +427,7 @@ class RPCEndpoint: bytes_awaitable: asyncio.Task[bytes], message_id: int, ) -> bytes: + # pylint: disable=too-many-positional-arguments # We need to know their protocol, so if we haven't gotten a handshake # from them yet, just wait. while self._peer_info is None: diff --git a/tools/efro/util.py b/tools/efro/util.py index b01576b8..3c8a7851 100644 --- a/tools/efro/util.py +++ b/tools/efro/util.py @@ -190,6 +190,7 @@ class DirtyBit: self, dirty: bool = False, retry_interval: float = 5.0, + *, use_lock: bool = False, auto_dirty_seconds: float | None = None, min_update_interval: float | None = None, diff --git a/tools/efrotools/code.py b/tools/efrotools/code.py index 57e83275..4449a28d 100644 --- a/tools/efrotools/code.py +++ b/tools/efrotools/code.py @@ -882,6 +882,7 @@ def _run_idea_inspections( Throw an Exception if anything is found or goes wrong. """ + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-locals # pylint: disable=consider-using-with @@ -957,6 +958,7 @@ def _run_idea_inspections_cached( inspectdir: Path | None = None, ) -> None: # pylint: disable=too-many-locals + # pylint: disable=too-many-positional-arguments import hashlib import json diff --git a/tools/efrotools/emacs.py b/tools/efrotools/emacs.py index ffbc7b81..9ee995f0 100644 --- a/tools/efrotools/emacs.py +++ b/tools/efrotools/emacs.py @@ -31,6 +31,7 @@ def py_examine( operation: str, ) -> None: """Given file position info, performs some code inspection.""" + # pylint: disable=too-many-positional-arguments # pylint: disable=too-many-locals # pylint: disable=cyclic-import import astroid diff --git a/tools/efrotools/genwrapper.py b/tools/efrotools/genwrapper.py index 9d1d8bea..6c0cdd09 100644 --- a/tools/efrotools/genwrapper.py +++ b/tools/efrotools/genwrapper.py @@ -42,6 +42,14 @@ if __name__ == '__main__': if public else get_non_public_legal_notice() ) + + # For some reason 'contents' is triggering Constant-name-not-uppercase + # errors only in spinoff projects. + + # pylint: disable=useless-suppression + # pylint: disable=invalid-name + # pylint: enable=useless-suppression + contents = ( f'#!{pybinpath}\n' f'# {legalnotice}\n' diff --git a/tools/efrotools/lazybuild.py b/tools/efrotools/lazybuild.py index f61581dc..e9e29cfe 100644 --- a/tools/efrotools/lazybuild.py +++ b/tools/efrotools/lazybuild.py @@ -48,6 +48,7 @@ class LazyBuildContext: target: str, srcpaths: list[str], command: str, + *, buildlockname: str | None = None, dirfilter: Callable[[str, str], bool] | None = None, filefilter: Callable[[str, str], bool] | None = None, diff --git a/tools/efrotools/message.py b/tools/efrotools/message.py index 113375cf..c5251d9d 100644 --- a/tools/efrotools/message.py +++ b/tools/efrotools/message.py @@ -15,6 +15,7 @@ if TYPE_CHECKING: def standard_message_sender_gen_pcommand( + *, projroot: Path, basename: str, source_module: str, @@ -84,6 +85,7 @@ def standard_message_sender_gen_pcommand( def standard_message_receiver_gen_pcommand( + *, projroot: Path, basename: str, source_module: str, diff --git a/tools/efrotools/util.py b/tools/efrotools/util.py index 72b7bc18..54de68bd 100644 --- a/tools/efrotools/util.py +++ b/tools/efrotools/util.py @@ -25,6 +25,7 @@ def replace_section( begin_marker: str, end_marker: str, replace_text: str = '', + *, keep_markers: bool = False, error_if_missing: bool = True, ) -> str: diff --git a/tools/efrotools/xcodebuild.py b/tools/efrotools/xcodebuild.py index e717076d..48d51973 100644 --- a/tools/efrotools/xcodebuild.py +++ b/tools/efrotools/xcodebuild.py @@ -970,6 +970,7 @@ class XCodeBuild: prefix_unexpected: bool = True, ) -> None: # pylint: disable=too-many-branches + # pylint: disable=too-many-positional-arguments if ignore_line_starts is None: ignore_line_starts = [] if ignore_line_start_tails is None: