mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-27 01:13:13 +08:00
Merge branch 'master' into tournament_entry
This commit is contained in:
TrialTemp
GitHub
commit
7444d42554
78
.efrocachemap
generated
78
.efrocachemap
generated
@ -421,7 +421,7 @@
|
||||
"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": "8409781047f46ca6627eacdfc0b4d3d3",
|
||||
"build/assets/ba_data/data/langdata.json": "be5167b2e025e7542934a7fd2f9549ea",
|
||||
"build/assets/ba_data/data/languages/arabic.json": "2c2915e10124bb8f69206da9c608d57c",
|
||||
"build/assets/ba_data/data/languages/belarussian.json": "09954e550d13d3d9cb5a635a1d32a151",
|
||||
"build/assets/ba_data/data/languages/chinese.json": "bb51b5aa614830c561e8fe2542a9ab8a",
|
||||
@ -430,31 +430,31 @@
|
||||
"build/assets/ba_data/data/languages/czech.json": "15be4fd59895135bad0265f79b362d5b",
|
||||
"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": "0a95fdbc1564161bc7c8b419b0c03651",
|
||||
"build/assets/ba_data/data/languages/english.json": "48fe4c6f97b07420238244309b54a61e",
|
||||
"build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880",
|
||||
"build/assets/ba_data/data/languages/filipino.json": "5226bf247fa1c8f4406360644f3fa15f",
|
||||
"build/assets/ba_data/data/languages/filipino.json": "bf97444c655cb831735b2378edf2273b",
|
||||
"build/assets/ba_data/data/languages/french.json": "917e4174d6f0eb7f00c27fd79cfbb924",
|
||||
"build/assets/ba_data/data/languages/german.json": "450fa41ae264f29a5d1af22143d0d0ad",
|
||||
"build/assets/ba_data/data/languages/gibberish.json": "5533873020e51186beb2f209adbbfb08",
|
||||
"build/assets/ba_data/data/languages/gibberish.json": "a1afce99249645003017ebec50e716fe",
|
||||
"build/assets/ba_data/data/languages/greek.json": "287c0ec437b38772284ef9d3e4fb2fc3",
|
||||
"build/assets/ba_data/data/languages/hindi.json": "90f54663e15d85a163f1848a8e9d8d07",
|
||||
"build/assets/ba_data/data/languages/hungarian.json": "796a290a8c44a1e7635208c2ff5fdc6e",
|
||||
"build/assets/ba_data/data/languages/indonesian.json": "9103845242b572aa8ba48e24f81ddb68",
|
||||
"build/assets/ba_data/data/languages/italian.json": "55c350f8f5039802138ffc1013f14ed3",
|
||||
"build/assets/ba_data/data/languages/italian.json": "6653a2c84646914064f41442aca23d4d",
|
||||
"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": "07eddcf92d3dcc7a745ea74e2b0007c8",
|
||||
"build/assets/ba_data/data/languages/persian.json": "835ea1d84ec197972f7ca3adb945fb88",
|
||||
"build/assets/ba_data/data/languages/polish.json": "9d22c6643c097c4cb268d0d6b6319cd4",
|
||||
"build/assets/ba_data/data/languages/portuguese.json": "a48df1d11a088a1a2e6e3f66627444be",
|
||||
"build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290",
|
||||
"build/assets/ba_data/data/languages/russian.json": "0590f49889616b5279be569dea926e17",
|
||||
"build/assets/ba_data/data/languages/russian.json": "876b41939ee19f81327f4af3500de55a",
|
||||
"build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69",
|
||||
"build/assets/ba_data/data/languages/slovak.json": "c00fb27cf982ffad5a4370ad3b16bd21",
|
||||
"build/assets/ba_data/data/languages/spanish.json": "b2edb923fdca973a16f0efb1acc26a97",
|
||||
"build/assets/ba_data/data/languages/spanish.json": "04ac00160550266f6a0e05e6fcd66d37",
|
||||
"build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac",
|
||||
"build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a",
|
||||
"build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945",
|
||||
"build/assets/ba_data/data/languages/turkish.json": "db71f3776072b7a15ef37b1bb1245795",
|
||||
"build/assets/ba_data/data/languages/turkish.json": "23f1204a85c94e9336fba04ef33f9d18",
|
||||
"build/assets/ba_data/data/languages/ukrainian.json": "3d75d21205c82db34fb1a1b014592747",
|
||||
"build/assets/ba_data/data/languages/venetian.json": "035034e0b4de696a41bf753ab4d0e194",
|
||||
"build/assets/ba_data/data/languages/vietnamese.json": "921cd1e50f60fe3e101f246e172750ba",
|
||||
@ -1368,6 +1368,10 @@
|
||||
"build/assets/ba_data/textures/circleZigZag.pvr": "4b300a401102daa24755c1d156e81ada",
|
||||
"build/assets/ba_data/textures/circleZigZag_preview.png": "409fa44a6f89bc745240ec3107042b49",
|
||||
"build/assets/ba_data/textures/circle_preview.png": "84b94c4bf16e27e9483fe683e4e2f5f7",
|
||||
"build/assets/ba_data/textures/clayStroke.dds": "1ae7ab8d1e212aca724f7313f1b57e61",
|
||||
"build/assets/ba_data/textures/clayStroke.ktx": "8c648180e290a4acfff1196fa358f042",
|
||||
"build/assets/ba_data/textures/clayStroke.pvr": "84c31a1a8ab4ea051a5b6a804dd952df",
|
||||
"build/assets/ba_data/textures/clayStroke_preview.png": "ec248139546f51c007148ef0250a5e0c",
|
||||
"build/assets/ba_data/textures/coin.dds": "e69e7ba8ff87d5ed9ca7c7ab96d13546",
|
||||
"build/assets/ba_data/textures/coin.ktx": "d1de4b2fd4fe028b889ed53a829f9a72",
|
||||
"build/assets/ba_data/textures/coin.pvr": "b8477ed7afdc5e460843e4d8413a2c08",
|
||||
@ -4061,26 +4065,26 @@
|
||||
"build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
|
||||
"build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
|
||||
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "db921cf43e8ebf733712fb5bbc673f66",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "4be0f3a7a88da423847863af41ac9c63",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "7c92d738e7cc724de2ca31cb876224e6",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c2f69ed83f77b602e2a2b2b1c1c78cc6",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "b1c766d4ce567f965c53ff2a4c5c85f4",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "86ebbd9111f8a0fe7905cef7aba1f6db",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "8182f4e00ad579eb4c7be5ec1ddca8cb",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "3d9e0e7ad8706133e61fb7f7127c3ff5",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5f98bf8b11376161a6f2f60900703f8a",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "99d7d247a422eaa46737e3232408e879",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "ffd6ad4dda003e9cd1434aa4a5bc9b09",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "216efc77915b75f39f0f15c2806bfbb9",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "ad9829c065248ee3cde01b6a31deafed",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "3e9e4e1761fd763eb584598fc0a3ad0a",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "7522a6fcac27b2579f9cc0b712ce413b",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0c92e386ab7406da6a719131321bf592",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "608cb03aef4dc547aa7433f83f898911",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "db136c26a3a37611aef68046f2fab62c",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "3edbd652fbc7afe69f60335bab00875a",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "48e5cd932b8c322be18b593508d5c451",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "bc6f8e147e6b4e454309c0bf12fc5a2c",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "8a9af839c16aab4858977db6f1f49959",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "680f20eb7196eb5af1e5e0c02d2dc3f1",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4dce976ca972e5372cfdbf6900241b13",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1ef0d2ce6c640d5392df29b30eb7abb9",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "05e772df81a412b7ddd6f4f42d873c29",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "7534d0ad2beed76f4b8695ad59dd90bd",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b5533d585420379f8a4f2ec22279f6cb",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f8eb314eabf9db196c4e7cff63c72b47",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "62c35652f620e34f0c320978eb591f72",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "69a80b3a49384b77cac2b9ef8258b0ee",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "d4b1ec67c1439828c312dcede83809aa",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "67dc0b11058a7b7cf6208ea795c1da03",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "288acd2edde294904897b3d2bcc94d88",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "5ad834d84fcb860149b096340613d929",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7d9b9c9161bf742e3b832c2e100c767e",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "343e5068337826107d40eaef36e81fa5",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "fd2c882d037f5c7212d5d08e3dacafa3",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "bb9b884d82488f051a785406d8dbf5c9",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "02d92886285684a19c5cf59e66b8f3b3",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
|
||||
@ -4097,14 +4101,14 @@
|
||||
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
|
||||
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f",
|
||||
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "73e6dd8dfba14ad1528d154ec43188c1",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "dfdb92bb0d84c405374e7da63c0eea4d",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "c20a6bd8ea7212f52c291fb6134a9bad",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "0e994a801d91149256f2200f75cf58d6",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "de98295b7373dcf3c31d3cc5a135578b",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "65e5b683dfa92a02909e8182d6b25d6e",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "f1e4e29d76abdb38e92a93f45135d1d8",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "8089cf4b541d14dc38ae71f3d05bde8e",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "ceaca4c52ec11ea05a726d0f61c6c2ef",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "67c820bcbc296e3806504a0c26a3d251",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "ad2ee8752e52ba99f5c8bdf8e8fd368c",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9cd95ef02c5fbe4d7c397899f88e0d46",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "202e5d5c0711310a91836f041177c8a4",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "1ad97b1a5fdff1de4f0fb4be70cf4584",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "767f1b629915507ef4b70f5afcc7a305",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "8021df36d1dccf0ee46eb7d7399ff1ca",
|
||||
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
|
||||
"src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d",
|
||||
"src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f",
|
||||
|
||||
12
CHANGELOG.md
12
CHANGELOG.md
@ -1,4 +1,4 @@
|
||||
### 1.7.33 (build 21778, api 8, 2024-03-13)
|
||||
### 1.7.33 (build 21790, api 8, 2024-03-14)
|
||||
- Stress test input-devices are now a bit smarter; they won't press any buttons
|
||||
while UIs are up (this could cause lots of chaos if it happened).
|
||||
- Added a 'Show Demos When Idle' option in advanced settings. If enabled, the
|
||||
@ -40,11 +40,15 @@
|
||||
EraOSBeta!)
|
||||
- Added a UI for customizing Series Length in Teams and Points-to-Win in FFA
|
||||
(Thanks EraOSBeta!)
|
||||
- Added a 'Practice' button in tournaments, letting you play them free of
|
||||
charge while not submitting scores. (Thanks Temp!)
|
||||
- Implemented HEX code support to the advanced color picker (Thanks 3alTemp!)
|
||||
- Players leaving the game after getting hurt will now grant kills. (Thanks
|
||||
Temp!)
|
||||
- Sphinx based Python documentation generation is now wired up (Thanks
|
||||
Loup-Garou911XD!)
|
||||
- Renaming & overwriting existing profiles is no longer possible (Thanks Temp!)
|
||||
- Cleaned up builds when running under WSL. Things like `make mypy` should now
|
||||
work correctly there, and it should now be possible to build and run either
|
||||
Linux or Windows builds there.
|
||||
|
||||
### 1.7.32 (build 21741, api 8, 2023-12-20)
|
||||
- Fixed a screen message that no one will ever see (Thanks vishal332008?...)
|
||||
@ -71,6 +75,8 @@
|
||||
cleanly however (an `on_app_active_changed()` call in the `AppMode` class).
|
||||
This means that it also applies to other platforms when the app reaches the
|
||||
'inactive' state; for instance when minimizing the window on the SDL build.
|
||||
- Added an `allow_clear_button` arg to bauiv1.textwidget() which can be used to
|
||||
disable the 'X' button that clears editable text widgets.
|
||||
|
||||
### 1.7.31 (build 21727, api 8, 2023-12-17)
|
||||
- Added `bascenev1.get_connection_to_host_info_2()` which is an improved
|
||||
|
||||
122
Makefile
122
Makefile
@ -151,7 +151,7 @@ meta-clean:
|
||||
# few things such as localconfig.json).
|
||||
clean:
|
||||
$(CHECK_CLEAN_SAFETY)
|
||||
rm -rf build # Handle this part ourself; can confuse git.
|
||||
rm -rf build # Kill this ourself; can confuse git if contains other repos.
|
||||
git clean -dfx $(ROOT_CLEAN_IGNORES)
|
||||
|
||||
# Show what clean would delete without actually deleting it.
|
||||
@ -210,37 +210,42 @@ pcommandbatch_speed_test: prereqs
|
||||
|
||||
# Prebuilt binaries for various platforms.
|
||||
|
||||
# WSL is Linux but running under Windows, so it can target either. By default
|
||||
# we want these top level targets (prefab-gui-debug, etc.) to yield native
|
||||
# Windows builds from WSL, but this env var can be set to override that.
|
||||
BA_WSL_TARGETS_WINDOWS ?= 1
|
||||
|
||||
# Assemble & run a gui debug build for this platform.
|
||||
prefab-gui-debug: prefab-gui-debug-build
|
||||
$($(shell $(PCOMMAND) prefab_run_var gui-debug))
|
||||
$($(shell $(WSLU) $(PCOMMAND) prefab_run_var gui-debug))
|
||||
|
||||
# Assemble & run a gui release build for this platform.
|
||||
prefab-gui-release: prefab-gui-release-build
|
||||
$($(shell $(PCOMMAND) prefab_run_var gui-release))
|
||||
$($(shell $(WSLU) $(PCOMMAND) prefab_run_var gui-release))
|
||||
|
||||
# Assemble a debug build for this platform.
|
||||
prefab-gui-debug-build:
|
||||
@$(PCOMMAND) make_prefab gui-debug
|
||||
$(WSLU) $(PCOMMAND) make_prefab gui-debug
|
||||
|
||||
# Assemble a release build for this platform.
|
||||
prefab-gui-release-build:
|
||||
@$(PCOMMAND) make_prefab gui-release
|
||||
$(WSLU) $(PCOMMAND) make_prefab gui-release
|
||||
|
||||
# Assemble & run a server debug build for this platform.
|
||||
prefab-server-debug: prefab-server-debug-build
|
||||
$($(shell $(PCOMMAND) prefab_run_var server-debug))
|
||||
$($(shell $(WSLU) $(PCOMMAND) prefab_run_var server-debug))
|
||||
|
||||
# Assemble & run a server release build for this platform.
|
||||
prefab-server-release: prefab-server-release-build
|
||||
$($(shell $(PCOMMAND) prefab_run_var server-release))
|
||||
$($(shell $(WSLU) $(PCOMMAND) prefab_run_var server-release))
|
||||
|
||||
# Assemble a server debug build for this platform.
|
||||
prefab-server-debug-build:
|
||||
@$(PCOMMAND) make_prefab server-debug
|
||||
$(WSLU) $(PCOMMAND) make_prefab server-debug
|
||||
|
||||
# Assemble a server release build for this platform.
|
||||
prefab-server-release-build:
|
||||
@$(PCOMMAND) make_prefab server-release
|
||||
$(WSLU) $(PCOMMAND) make_prefab server-release
|
||||
|
||||
# Clean all prefab builds.
|
||||
prefab-clean:
|
||||
@ -261,11 +266,11 @@ RUN_PREFAB_MAC_ARM64_GUI_DEBUG = cd build/prefab/full/mac_arm64_gui/debug \
|
||||
|
||||
prefab-mac-x86-64-gui-debug: prefab-mac-x86-64-gui-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform mac_x86_64
|
||||
@$(RUN_PREFAB_MAC_X86_64_GUI_DEBUG)
|
||||
$(RUN_PREFAB_MAC_X86_64_GUI_DEBUG)
|
||||
|
||||
prefab-mac-arm64-gui-debug: prefab-mac-arm64-gui-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform mac_arm64
|
||||
@$(RUN_PREFAB_MAC_ARM64_GUI_DEBUG)
|
||||
$(RUN_PREFAB_MAC_ARM64_GUI_DEBUG)
|
||||
|
||||
prefab-mac-x86-64-gui-debug-build: prereqs assets-cmake \
|
||||
build/prefab/full/mac_x86_64_gui/debug/ballisticakit
|
||||
@ -291,11 +296,11 @@ RUN_PREFAB_MAC_ARM64_GUI_RELEASE = cd build/prefab/full/mac_arm64_gui/release \
|
||||
|
||||
prefab-mac-x86-64-gui-release: prefab-mac-x86-64-gui-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform mac_x86_64
|
||||
@$(RUN_PREFAB_MAC_X86_64_GUI_RELEASE)
|
||||
$(RUN_PREFAB_MAC_X86_64_GUI_RELEASE)
|
||||
|
||||
prefab-mac-arm64-gui-release: prefab-mac-arm64-gui_release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform mac_arm64
|
||||
@$(RUN_PREFAB_MAC_ARM64_GUI_RELEASE)
|
||||
$(RUN_PREFAB_MAC_ARM64_GUI_RELEASE)
|
||||
|
||||
prefab-mac-x86-64-gui-release-build: prereqs assets-cmake \
|
||||
build/prefab/full/mac_x86_64_gui/release/ballisticakit
|
||||
@ -325,7 +330,7 @@ prefab-mac-x86-64-server-debug: prefab-mac-x86-64-server-debug-build
|
||||
|
||||
prefab-mac-arm64-server-debug: prefab-mac-arm64-server-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform mac_arm64
|
||||
@$(RUN_PREFAB_MAC_ARM64_SERVER_DEBUG)
|
||||
$(RUN_PREFAB_MAC_ARM64_SERVER_DEBUG)
|
||||
|
||||
prefab-mac-x86-64-server-debug-build: prereqs assets-server \
|
||||
build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless
|
||||
@ -351,11 +356,11 @@ RUN_PREFAB_MAC_ARM64_SERVER_RELEASE = cd \
|
||||
|
||||
prefab-mac-x86-64-server-release: prefab-mac-x86-64-server-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform mac_x86_64
|
||||
@$(RUN_PREFAB_MAC_X86_64_SERVER_RELEASE)
|
||||
$(RUN_PREFAB_MAC_X86_64_SERVER_RELEASE)
|
||||
|
||||
prefab-mac-arm64-server-release: prefab-mac-arm64-server-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform mac_arm64
|
||||
@$(RUN_PREFAB_MAC_ARM64_SERVER_RELEASE)
|
||||
$(RUN_PREFAB_MAC_ARM64_SERVER_RELEASE)
|
||||
|
||||
prefab-mac-x86-64-server-release-build: prereqs assets-server \
|
||||
build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless
|
||||
@ -382,12 +387,12 @@ RUN_PREFAB_LINUX_ARM64_GUI_DEBUG = cd \
|
||||
build/prefab/full/linux_arm64_gui/debug && ./ballisticakit
|
||||
|
||||
prefab-linux-x86-64-gui-debug: prefab-linux-x86-64-gui-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform linux_x86_64
|
||||
@$(RUN_PREFAB_LINUX_X86_64_GUI_DEBUG)
|
||||
@$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_x86_64
|
||||
$(RUN_PREFAB_LINUX_X86_64_GUI_DEBUG)
|
||||
|
||||
prefab-linux-arm64-gui-debug: prefab-linux-arm64-gui-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform linux_arm64
|
||||
@$(RUN_PREFAB_LINUX_ARM64_GUI_DEBUG)
|
||||
@$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_arm64
|
||||
$(RUN_PREFAB_LINUX_ARM64_GUI_DEBUG)
|
||||
|
||||
prefab-linux-x86-64-gui-debug-build: prereqs assets-cmake \
|
||||
build/prefab/full/linux_x86_64_gui/debug/ballisticakit
|
||||
@ -412,12 +417,12 @@ RUN_PREFAB_LINUX_ARM64_GUI_RELEASE = cd \
|
||||
build/prefab/full/linux_arm64_gui/release && ./ballisticakit
|
||||
|
||||
prefab-linux-x86-64-gui-release: prefab-linux-x86-64-gui-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform linux_x86_64
|
||||
@$(RUN_PREFAB_LINUX_X86_64_GUI_RELEASE)
|
||||
@$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_x86_64
|
||||
$(RUN_PREFAB_LINUX_X86_64_GUI_RELEASE)
|
||||
|
||||
prefab-linux-arm64-gui-release: prefab-linux-arm64-gui-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform linux_arm64
|
||||
@$(RUN_PREFAB_LINUX_ARM64_GUI_RELEASE)
|
||||
@$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_arm64
|
||||
$(RUN_PREFAB_LINUX_ARM64_GUI_RELEASE)
|
||||
|
||||
prefab-linux-x86-64-gui-release-build: prereqs assets-cmake \
|
||||
build/prefab/full/linux_x86_64_gui/release/ballisticakit
|
||||
@ -442,12 +447,12 @@ RUN_PREFAB_LINUX_ARM64_SERVER_DEBUG = cd \
|
||||
build/prefab/full/linux_arm64_server/debug && ./ballisticakit_server
|
||||
|
||||
prefab-linux-x86-64-server-debug: prefab-linux-x86-64-server-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform linux_x86_64
|
||||
@$(RUN_PREFAB_LINUX_X86_64_SERVER_DEBUG)
|
||||
@$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_x86_64
|
||||
$(RUN_PREFAB_LINUX_X86_64_SERVER_DEBUG)
|
||||
|
||||
prefab-linux-arm64-server-debug: prefab-linux-arm64-server-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform linux_arm64
|
||||
@$(RUN_PREFAB_LINUX_ARM64_SERVER_DEBUG)
|
||||
@$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_arm64
|
||||
$(RUN_PREFAB_LINUX_ARM64_SERVER_DEBUG)
|
||||
|
||||
prefab-linux-x86-64-server-debug-build: prereqs assets-server \
|
||||
build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless
|
||||
@ -474,12 +479,12 @@ RUN_PREFAB_LINUX_ARM64_SERVER_RELEASE = cd \
|
||||
build/prefab/full/linux_arm64_server/release && ./ballisticakit_server
|
||||
|
||||
prefab-linux-x86-64-server-release: prefab-linux-x86-64-server-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform linux_x86_64
|
||||
@$(RUN_PREFAB_LINUX_X86_64_SERVER_RELEASE)
|
||||
@$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_x86_64
|
||||
$(RUN_PREFAB_LINUX_X86_64_SERVER_RELEASE)
|
||||
|
||||
prefab-linux-arm64-server-release: prefab-linux-arm64-server-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform linux_arm64
|
||||
@$(RUN_PREFAB_LINUX_ARM64_SERVER_RELEASE)
|
||||
@$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_arm64
|
||||
$(RUN_PREFAB_LINUX_ARM64_SERVER_RELEASE)
|
||||
|
||||
prefab-linux-x86-64-server-release-build: prereqs assets-server \
|
||||
build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless
|
||||
@ -503,8 +508,8 @@ RUN_PREFAB_WINDOWS_X86_GUI_DEBUG = cd build/prefab/full/windows_x86_gui/debug \
|
||||
&& ./BallisticaKit.exe
|
||||
|
||||
prefab-windows-x86-gui-debug: prefab-windows-x86-gui-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(RUN_PREFAB_WINDOWS_X86_GUI_DEBUG)
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
$(RUN_PREFAB_WINDOWS_X86_GUI_DEBUG)
|
||||
|
||||
prefab-windows-x86-gui-debug-build: prereqs assets-windows-$(WINPLAT_X86) \
|
||||
build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe
|
||||
@ -526,8 +531,8 @@ RUN_PREFAB_WINDOWS_X86_GUI_RELEASE = cd \
|
||||
build/prefab/full/windows_x86_gui/release && ./BallisticaKit.exe
|
||||
|
||||
prefab-windows-x86-gui-release: prefab-windows-x86-gui-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(RUN_PREFAB_WINDOWS_X86_GUI_RELEASE)
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
$(RUN_PREFAB_WINDOWS_X86_GUI_RELEASE)
|
||||
|
||||
prefab-windows-x86-gui-release-build: prereqs \
|
||||
assets-windows-$(WINPLAT_X86) \
|
||||
@ -551,8 +556,8 @@ RUN_PREFAB_WINDOWS_X86_SERVER_DEBUG = cd \
|
||||
&& dist/python_d.exe ballisticakit_server.py
|
||||
|
||||
prefab-windows-x86-server-debug: prefab-windows-x86-server-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(RUN_PREFAB_WINDOWS_X86_SERVER_DEBUG)
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
$(RUN_PREFAB_WINDOWS_X86_SERVER_DEBUG)
|
||||
|
||||
prefab-windows-x86-server-debug-build: prereqs \
|
||||
assets-windows-$(WINPLAT_X86) \
|
||||
@ -576,8 +581,8 @@ RUN_PREFAB_WINDOWS_X86_SERVER_RELEASE = cd \
|
||||
&& dist/python.exe -O ballisticakit_server.py
|
||||
|
||||
prefab-windows-x86-server-release: prefab-windows-x86-server-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(RUN_PREFAB_WINDOWS_X86_SERVER_RELEASE)
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
$(RUN_PREFAB_WINDOWS_X86_SERVER_RELEASE)
|
||||
|
||||
prefab-windows-x86-server-release-build: prereqs \
|
||||
assets-windows-$(WINPLAT_X86) \
|
||||
@ -964,66 +969,66 @@ WINDOWS_CONFIGURATION ?= Debug
|
||||
|
||||
# Stage assets and other files so a built binary will run.
|
||||
windows-staging: assets-windows resources meta
|
||||
$(STAGE_BUILD) -win-$(WINPLT) -$(WINCFGLC) build/windows/$(WINCFG)_$(WINPLT)
|
||||
@$(STAGE_BUILD) -win-$(WINPLT) -$(WINCFGLC) build/windows/$(WINCFG)_$(WINPLT)
|
||||
|
||||
# Build and run a debug windows build (from WSL).
|
||||
windows-debug: windows-debug-build
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
build/windows/Debug_Win32/BallisticaKitGeneric.exe
|
||||
|
||||
# Build and run a release windows build (from WSL).
|
||||
windows-release: windows-release-build
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
build/windows/Release_Win32/BallisticaKitGeneric.exe
|
||||
|
||||
# Build a debug windows build (from WSL).
|
||||
windows-debug-build: \
|
||||
windows-debug-build: prereqs \
|
||||
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib \
|
||||
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(PCOMMAND) wsl_build_check_win_drive
|
||||
WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging
|
||||
WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 \
|
||||
$(MAKE) _windows-wsl-build
|
||||
|
||||
# Rebuild a debug windows build (from WSL).
|
||||
windows-debug-rebuild: \
|
||||
windows-debug-rebuild: prereqs \
|
||||
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib \
|
||||
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(PCOMMAND) wsl_build_check_win_drive
|
||||
WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging
|
||||
WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 \
|
||||
$(MAKE) _windows-wsl-rebuild
|
||||
|
||||
# Build a release windows build (from WSL).
|
||||
windows-release-build: \
|
||||
windows-release-build: prereqs \
|
||||
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib \
|
||||
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(PCOMMAND) wsl_build_check_win_drive
|
||||
WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging
|
||||
WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 \
|
||||
$(MAKE) _windows-wsl-build
|
||||
|
||||
# Rebuild a release windows build (from WSL).
|
||||
windows-release-rebuild: \
|
||||
windows-release-rebuild: prereqs \
|
||||
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib \
|
||||
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb
|
||||
@$(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
|
||||
@$(PCOMMAND) wsl_build_check_win_drive
|
||||
WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging
|
||||
WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 \
|
||||
$(MAKE) _windows-wsl-rebuild
|
||||
|
||||
# Remove all non-git-managed files in windows subdir.
|
||||
windows-clean:
|
||||
windows-clean: prereqs
|
||||
@$(CHECK_CLEAN_SAFETY)
|
||||
git clean -dfx ballisticakit-windows
|
||||
rm -rf build/windows $(LAZYBUILDDIR)
|
||||
|
||||
# Show what would be cleaned.
|
||||
windows-clean-list:
|
||||
windows-clean-list: prereqs
|
||||
@$(CHECK_CLEAN_SAFETY)
|
||||
git clean -dnx ballisticakit-windows
|
||||
echo would also remove build/windows $(LAZYBUILDDIR)
|
||||
@ -1145,8 +1150,8 @@ cmake-modular-server-clean:
|
||||
|
||||
# Stage assets for building/running within CLion.
|
||||
clion-staging: assets-cmake resources meta
|
||||
$(STAGE_BUILD) -cmake -debug build/clion_debug
|
||||
$(STAGE_BUILD) -cmake -release build/clion_release
|
||||
@$(STAGE_BUILD) -cmake -debug build/clion_debug
|
||||
@$(STAGE_BUILD) -cmake -release build/clion_release
|
||||
|
||||
# Tell make which of these targets don't represent files.
|
||||
.PHONY: cmake cmake-build cmake-clean cmake-server cmake-server-build \
|
||||
@ -1245,6 +1250,13 @@ _WMSBE_2 = \\Community\\MSBuild\\Current\\Bin\\MSBuild.exe\"
|
||||
_WMSBE_1B = /mnt/c/Program Files/Microsoft Visual Studio/2022
|
||||
_WMSBE_2B = /Community/MSBuild/Current/Bin/MSBuild.exe
|
||||
|
||||
# Sets WSL build type to the user's choice (defaults to Windows).
|
||||
WSLU=BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS)
|
||||
# Sets WSL build type to Linux.
|
||||
WSLL=BA_WSL_TARGETS_WINDOWS=0
|
||||
# Sets WSL build type to Windows.
|
||||
WSLW=BA_WSL_TARGETS_WINDOWS=1
|
||||
|
||||
VISUAL_STUDIO_VERSION = -property:VisualStudioVersion=17
|
||||
WIN_MSBUILD_EXE = $(_WMSBE_1)$(_WMSBE_2)
|
||||
WIN_MSBUILD_EXE_B = "$(_WMSBE_1B)$(_WMSBE_2B)"
|
||||
|
||||
@ -1389,6 +1389,10 @@
|
||||
"ba_data/textures/circleZigZag.pvr",
|
||||
"ba_data/textures/circleZigZag_preview.png",
|
||||
"ba_data/textures/circle_preview.png",
|
||||
"ba_data/textures/clayStroke.dds",
|
||||
"ba_data/textures/clayStroke.ktx",
|
||||
"ba_data/textures/clayStroke.pvr",
|
||||
"ba_data/textures/clayStroke_preview.png",
|
||||
"ba_data/textures/coin.dds",
|
||||
"ba_data/textures/coin.ktx",
|
||||
"ba_data/textures/coin.pvr",
|
||||
|
||||
@ -5697,6 +5697,7 @@ TEX2D_DDS_TARGETS = \
|
||||
$(BUILD_DIR)/ba_data/textures/circleOutlineNoAlpha.dds \
|
||||
$(BUILD_DIR)/ba_data/textures/circleShadow.dds \
|
||||
$(BUILD_DIR)/ba_data/textures/circleZigZag.dds \
|
||||
$(BUILD_DIR)/ba_data/textures/clayStroke.dds \
|
||||
$(BUILD_DIR)/ba_data/textures/coin.dds \
|
||||
$(BUILD_DIR)/ba_data/textures/controllerIcon.dds \
|
||||
$(BUILD_DIR)/ba_data/textures/courtyardLevelColor.dds \
|
||||
@ -6101,6 +6102,7 @@ TEX2D_PVR_TARGETS = \
|
||||
$(BUILD_DIR)/ba_data/textures/circleOutlineNoAlpha.pvr \
|
||||
$(BUILD_DIR)/ba_data/textures/circleShadow.pvr \
|
||||
$(BUILD_DIR)/ba_data/textures/circleZigZag.pvr \
|
||||
$(BUILD_DIR)/ba_data/textures/clayStroke.pvr \
|
||||
$(BUILD_DIR)/ba_data/textures/coin.pvr \
|
||||
$(BUILD_DIR)/ba_data/textures/controllerIcon.pvr \
|
||||
$(BUILD_DIR)/ba_data/textures/courtyardLevelColor.pvr \
|
||||
@ -6505,6 +6507,7 @@ TEX2D_KTX_TARGETS = \
|
||||
$(BUILD_DIR)/ba_data/textures/circleOutlineNoAlpha.ktx \
|
||||
$(BUILD_DIR)/ba_data/textures/circleShadow.ktx \
|
||||
$(BUILD_DIR)/ba_data/textures/circleZigZag.ktx \
|
||||
$(BUILD_DIR)/ba_data/textures/clayStroke.ktx \
|
||||
$(BUILD_DIR)/ba_data/textures/coin.ktx \
|
||||
$(BUILD_DIR)/ba_data/textures/controllerIcon.ktx \
|
||||
$(BUILD_DIR)/ba_data/textures/courtyardLevelColor.ktx \
|
||||
@ -6909,6 +6912,7 @@ TEX2D_PREVIEW_PNG_TARGETS = \
|
||||
$(BUILD_DIR)/ba_data/textures/circleShadow_preview.png \
|
||||
$(BUILD_DIR)/ba_data/textures/circleZigZag_preview.png \
|
||||
$(BUILD_DIR)/ba_data/textures/circle_preview.png \
|
||||
$(BUILD_DIR)/ba_data/textures/clayStroke_preview.png \
|
||||
$(BUILD_DIR)/ba_data/textures/coin_preview.png \
|
||||
$(BUILD_DIR)/ba_data/textures/controllerIcon_preview.png \
|
||||
$(BUILD_DIR)/ba_data/textures/courtyardLevelColor_preview.png \
|
||||
|
||||
@ -52,7 +52,7 @@ if TYPE_CHECKING:
|
||||
|
||||
# Build number and version of the ballistica binary we expect to be
|
||||
# using.
|
||||
TARGET_BALLISTICA_BUILD = 21778
|
||||
TARGET_BALLISTICA_BUILD = 21790
|
||||
TARGET_BALLISTICA_VERSION = '1.7.33'
|
||||
|
||||
|
||||
|
||||
@ -223,10 +223,20 @@ class PlayerSpaz(Spaz):
|
||||
elif isinstance(msg, bs.DieMessage):
|
||||
# Report player deaths to the game.
|
||||
if not self._dead:
|
||||
# Immediate-mode or left-game deaths don't count as 'kills'.
|
||||
killed = (
|
||||
not msg.immediate and msg.how is not bs.DeathType.LEFT_GAME
|
||||
# Was this player killed while being held?
|
||||
was_held = self.held_count > 0 and self.last_player_held_by
|
||||
# Was this player attacked before death?
|
||||
was_attacked_recently = (
|
||||
self.last_player_attacked_by
|
||||
and bs.time() - self.last_attacked_time < 4.0
|
||||
)
|
||||
# Leaving the game doesn't count as a kill *unless*
|
||||
# someone does it intentionally while being attacked.
|
||||
left_game_cleanly = msg.how is bs.DeathType.LEFT_GAME and not (
|
||||
was_held or was_attacked_recently
|
||||
)
|
||||
|
||||
killed = not (msg.immediate or left_game_cleanly)
|
||||
|
||||
activity = self._activity()
|
||||
|
||||
@ -236,7 +246,7 @@ class PlayerSpaz(Spaz):
|
||||
else:
|
||||
# If this player was being held at the time of death,
|
||||
# the holder is the killer.
|
||||
if self.held_count > 0 and self.last_player_held_by:
|
||||
if was_held:
|
||||
killerplayer = self.last_player_held_by
|
||||
else:
|
||||
# Otherwise, if they were attacked by someone in the
|
||||
@ -246,10 +256,7 @@ class PlayerSpaz(Spaz):
|
||||
# all bot kills would register as suicides; need to
|
||||
# change this from last_player_attacked_by to
|
||||
# something like last_actor_attacked_by to fix that.
|
||||
if (
|
||||
self.last_player_attacked_by
|
||||
and bs.time() - self.last_attacked_time < 4.0
|
||||
):
|
||||
if was_attacked_recently:
|
||||
killerplayer = self.last_player_attacked_by
|
||||
else:
|
||||
# ok, call it a suicide unless we're in co-op
|
||||
|
||||
@ -213,6 +213,8 @@ class ColorPickerExact(PopupWindow):
|
||||
self._last_press_time = bui.apptime()
|
||||
self._last_press_color_name: str | None = None
|
||||
self._last_press_increasing: bool | None = None
|
||||
self._hex_timer: bui.AppTimer | None = None
|
||||
self._hex_prev_text: str = '#FFFFFF'
|
||||
self._change_speed = 1.0
|
||||
width = 180.0
|
||||
height = 240.0
|
||||
@ -229,11 +231,26 @@ class ColorPickerExact(PopupWindow):
|
||||
)
|
||||
self._swatch = bui.imagewidget(
|
||||
parent=self.root_widget,
|
||||
position=(width * 0.5 - 50, height - 70),
|
||||
size=(100, 70),
|
||||
texture=bui.gettexture('buttonSquare'),
|
||||
position=(width * 0.5 - 65 + 5, height - 95),
|
||||
size=(130, 115),
|
||||
texture=bui.gettexture('clayStroke'),
|
||||
color=(1, 0, 0),
|
||||
)
|
||||
self._hex_textbox = bui.textwidget(
|
||||
parent=self.root_widget,
|
||||
position=(width * 0.5 - 37.5 + 3, height - 51),
|
||||
max_chars=9,
|
||||
text='#FFFFFF',
|
||||
autoselect=True,
|
||||
size=(75, 30),
|
||||
v_align='center',
|
||||
editable=True,
|
||||
maxwidth=70,
|
||||
allow_clear_button=False,
|
||||
force_internal_editing=True,
|
||||
glow_type='uniform',
|
||||
)
|
||||
|
||||
x = 50
|
||||
y = height - 90
|
||||
self._label_r: bui.Widget
|
||||
@ -288,6 +305,37 @@ class ColorPickerExact(PopupWindow):
|
||||
# color to the delegate, so start doing that.
|
||||
self._update_for_color()
|
||||
|
||||
# Update our HEX stuff!
|
||||
self._update_for_hex()
|
||||
self._hex_timer = bui.AppTimer(0.025, self._update_for_hex, repeat=True)
|
||||
|
||||
def _update_for_hex(self) -> None:
|
||||
"""Update for any HEX or color change."""
|
||||
from typing import cast
|
||||
|
||||
hextext = cast(str, bui.textwidget(query=self._hex_textbox))
|
||||
hexcolor: tuple
|
||||
# Check if our current hex text doesn't match with our old one.
|
||||
# Convert our current hex text into a color if possible.
|
||||
if hextext != self._hex_prev_text:
|
||||
try:
|
||||
hexcolor = hex_to_color(hextext)
|
||||
if len(hexcolor) == 4:
|
||||
r, g, b, a = hexcolor
|
||||
del a # unused
|
||||
else:
|
||||
r, g, b = hexcolor
|
||||
# Replace the color!
|
||||
for i, ch in enumerate((r, g, b)):
|
||||
self._color[i] = max(0.0, min(1.0, ch))
|
||||
self._update_for_color()
|
||||
# Usually, a ValueError will occur if the provided hex
|
||||
# is incomplete, which occurs when in the midst of typing it.
|
||||
except ValueError:
|
||||
pass
|
||||
# Store the current text for our next comparison.
|
||||
self._hex_prev_text = hextext
|
||||
|
||||
# noinspection PyUnresolvedReferences
|
||||
def _update_for_color(self) -> None:
|
||||
if not self.root_widget:
|
||||
@ -303,6 +351,16 @@ class ColorPickerExact(PopupWindow):
|
||||
if self._delegate is not None:
|
||||
self._delegate.color_picker_selected_color(self, self._color)
|
||||
|
||||
# Show the HEX code of this color.
|
||||
r, g, b = self._color
|
||||
hexcode = color_to_hex(r, g, b, None)
|
||||
self._hex_prev_text = hexcode
|
||||
bui.textwidget(
|
||||
edit=self._hex_textbox,
|
||||
text=hexcode,
|
||||
color=color_overlay_func(r, g, b),
|
||||
)
|
||||
|
||||
def _color_change_press(self, color_name: str, increasing: bool) -> None:
|
||||
# If we get rapid-fire presses, eventually start moving faster.
|
||||
current_time = bui.apptime()
|
||||
@ -331,6 +389,8 @@ class ColorPickerExact(PopupWindow):
|
||||
return self._tag
|
||||
|
||||
def _transition_out(self) -> None:
|
||||
# Kill our timer
|
||||
self._hex_timer = None
|
||||
if not self._transitioning_out:
|
||||
self._transitioning_out = True
|
||||
if self._delegate is not None:
|
||||
@ -342,3 +402,102 @@ class ColorPickerExact(PopupWindow):
|
||||
if not self._transitioning_out:
|
||||
bui.getsound('swish').play()
|
||||
self._transition_out()
|
||||
|
||||
|
||||
def hex_to_color(hex_color: str) -> tuple:
|
||||
"""Transforms an RGB / RGBA hex code into an rgb1/rgba1 tuple.
|
||||
|
||||
Args:
|
||||
hex_color (str): The HEX color.
|
||||
Raises:
|
||||
ValueError: If the provided HEX color isn't 6 or 8 characters long.
|
||||
Returns:
|
||||
tuple: The color tuple divided by 255.
|
||||
"""
|
||||
# Remove the '#' from the string if provided.
|
||||
if hex_color.startswith('#'):
|
||||
hex_color = hex_color.lstrip('#')
|
||||
# Check if this has a valid length.
|
||||
hexlength = len(hex_color)
|
||||
if not hexlength in [6, 8]:
|
||||
raise ValueError(f'Invalid HEX color provided: "{hex_color}"')
|
||||
|
||||
# Convert the hex bytes to their true byte form.
|
||||
ar, ag, ab, aa = (
|
||||
(int.from_bytes(bytes.fromhex(hex_color[0:2]))),
|
||||
(int.from_bytes(bytes.fromhex(hex_color[2:4]))),
|
||||
(int.from_bytes(bytes.fromhex(hex_color[4:6]))),
|
||||
(
|
||||
(int.from_bytes(bytes.fromhex(hex_color[6:8])))
|
||||
if hexlength == 8
|
||||
else None
|
||||
),
|
||||
)
|
||||
# Divide all numbers by 255 and return.
|
||||
nr, ng, nb, na = (
|
||||
x / 255 if x is not None else None for x in (ar, ag, ab, aa)
|
||||
)
|
||||
return (nr, ng, nb, na) if aa is not None else (nr, ng, nb)
|
||||
|
||||
|
||||
def color_to_hex(r: float, g: float, b: float, a: float | None = 1.0) -> str:
|
||||
"""Converts an rgb1 tuple to a HEX color code.
|
||||
|
||||
Args:
|
||||
r (float): Red.
|
||||
g (float): Green.
|
||||
b (float): Blue.
|
||||
a (float, optional): Alpha. Defaults to 1.0.
|
||||
|
||||
Returns:
|
||||
str: The hexified rgba values.
|
||||
"""
|
||||
# Turn our rgb1 to rgb255
|
||||
nr, ng, nb, na = [
|
||||
int(min(255, x * 255)) if x is not None else x for x in [r, g, b, a]
|
||||
]
|
||||
# Merge all values into their HEX representation.
|
||||
hex_code = (
|
||||
f'#{nr:02x}{ng:02x}{nb:02x}{na:02x}'
|
||||
if na is not None
|
||||
else f'#{nr:02x}{ng:02x}{nb:02x}'
|
||||
)
|
||||
return hex_code
|
||||
|
||||
|
||||
def color_overlay_func(
|
||||
r: float, g: float, b: float, a: float | None = None
|
||||
) -> tuple:
|
||||
"""I could NOT come up with a better function name.
|
||||
|
||||
Args:
|
||||
r (float): Red.
|
||||
g (float): Green.
|
||||
b (float): Blue.
|
||||
a (float | None, optional): Alpha. Defaults to None.
|
||||
|
||||
Returns:
|
||||
tuple: A brighter color if the provided one is dark,
|
||||
and a darker one if it's darker.
|
||||
"""
|
||||
|
||||
# Calculate the relative luminance using the formula for sRGB
|
||||
# https://www.w3.org/TR/WCAG20/#relativeluminancedef
|
||||
def relative_luminance(color: float) -> Any:
|
||||
if color <= 0.03928:
|
||||
return color / 12.92
|
||||
return ((color + 0.055) / 1.055) ** 2.4
|
||||
|
||||
luminance = (
|
||||
0.2126 * relative_luminance(r)
|
||||
+ 0.7152 * relative_luminance(g)
|
||||
+ 0.0722 * relative_luminance(b)
|
||||
)
|
||||
# Set our color multiplier depending on the provided color's luminance.
|
||||
luminant = 1.65 if luminance < 0.33 else 0.2
|
||||
# Multiply our given numbers, making sure
|
||||
# they don't blend in the original bg.
|
||||
avg = (0.7 - (r + g + b / 3)) + 0.15
|
||||
r, g, b = [max(avg, x * luminant) for x in (r, g, b)]
|
||||
# Include our alpha and ship it!
|
||||
return (r, g, b, a) if a is not None else (r, g, b)
|
||||
|
||||
@ -92,7 +92,7 @@ class ModdingToolsWindow(bui.Window):
|
||||
parent=self._root_widget,
|
||||
position=(0, self._height - 52),
|
||||
size=(self._width, 25),
|
||||
text=bui.Lstr(resource='moddingToolsTitleText'),
|
||||
text=bui.Lstr(resource='settingsWindowAdvanced.moddingToolsText'),
|
||||
color=app.ui_v1.title_color,
|
||||
h_align='center',
|
||||
v_align='top',
|
||||
@ -131,7 +131,7 @@ class ModdingToolsWindow(bui.Window):
|
||||
position=(self._sub_width / 2 - this_button_width / 2, v - 10),
|
||||
size=(this_button_width, 60),
|
||||
autoselect=True,
|
||||
label=bui.Lstr(resource='createUserSystemScriptsText'),
|
||||
label=bui.Lstr(resource='userSystemScriptsCreateText'),
|
||||
text_scale=1.0,
|
||||
on_activate_call=babase.modutils.create_user_system_scripts,
|
||||
)
|
||||
@ -142,7 +142,7 @@ class ModdingToolsWindow(bui.Window):
|
||||
position=(self._sub_width / 2 - this_button_width / 2, v - 10),
|
||||
size=(this_button_width, 60),
|
||||
autoselect=True,
|
||||
label=bui.Lstr(resource='deleteUserSystemScriptsText'),
|
||||
label=bui.Lstr(resource='userSystemScriptsDeleteText'),
|
||||
text_scale=1.0,
|
||||
on_activate_call=lambda: ConfirmWindow(
|
||||
action=babase.modutils.delete_user_system_scripts,
|
||||
@ -154,7 +154,10 @@ class ModdingToolsWindow(bui.Window):
|
||||
parent=self._subcontainer,
|
||||
position=(170, v + 10),
|
||||
size=(0, 0),
|
||||
text=bui.Lstr(value='UI SIZE :'),
|
||||
text=bui.Lstr(
|
||||
value='$(S) :',
|
||||
subs=[('$(S)', bui.Lstr(resource='uiScaleText'))],
|
||||
),
|
||||
color=app.ui_v1.title_color,
|
||||
h_align='center',
|
||||
v_align='center',
|
||||
@ -172,9 +175,9 @@ class ModdingToolsWindow(bui.Window):
|
||||
],
|
||||
choices_display=[
|
||||
bui.Lstr(resource='autoText'),
|
||||
bui.Lstr(resource='smallText'),
|
||||
bui.Lstr(resource='mediumText'),
|
||||
bui.Lstr(resource='largeText'),
|
||||
bui.Lstr(resource='sizeSmallText'),
|
||||
bui.Lstr(resource='sizeMediumText'),
|
||||
bui.Lstr(resource='sizeLargeText'),
|
||||
],
|
||||
current_choice=app.config.get('UI Scale', 'auto'),
|
||||
on_value_change_call=self._set_uiscale,
|
||||
|
||||
@ -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 = 21778;
|
||||
const int kEngineBuildNumber = 21790;
|
||||
const char* kEngineVersion = "1.7.33";
|
||||
const int kEngineApiVersion = 8;
|
||||
|
||||
|
||||
@ -328,7 +328,6 @@ void EventLoop::BootstrapThread_() {
|
||||
assert(!bootstrapped_);
|
||||
assert(g_core);
|
||||
thread_id_ = std::this_thread::get_id();
|
||||
const char* id_string;
|
||||
|
||||
switch (identifier_) {
|
||||
case EventLoopID::kLogic:
|
||||
|
||||
@ -1932,6 +1932,7 @@ static auto PyTextWidget(PyObject* self, PyObject* args,
|
||||
PyObject* query_description_obj = Py_None;
|
||||
PyObject* adapter_finished_obj = Py_None;
|
||||
PyObject* glow_type_obj = Py_None;
|
||||
PyObject* allow_clear_button_obj = Py_None;
|
||||
|
||||
static const char* kwlist[] = {"edit",
|
||||
"parent",
|
||||
@ -1972,9 +1973,10 @@ static auto PyTextWidget(PyObject* self, PyObject* args,
|
||||
"query_description",
|
||||
"adapter_finished",
|
||||
"glow_type",
|
||||
"allow_clear_button",
|
||||
nullptr};
|
||||
if (!PyArg_ParseTupleAndKeywords(
|
||||
args, keywds, "|OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
|
||||
args, keywds, "|OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
|
||||
const_cast<char**>(kwlist), &edit_obj, &parent_obj, &size_obj,
|
||||
&pos_obj, &text_obj, &v_align_obj, &h_align_obj, &editable_obj,
|
||||
&padding_obj, &on_return_press_call_obj, &on_activate_call_obj,
|
||||
@ -1985,7 +1987,8 @@ static auto PyTextWidget(PyObject* self, PyObject* args,
|
||||
&shadow_obj, &autoselect_obj, &rotate_obj, &enabled_obj,
|
||||
&force_internal_editing_obj, &always_show_carat_obj, &big_obj,
|
||||
&extra_touch_border_scale_obj, &res_scale_obj, &query_max_chars_obj,
|
||||
&query_description_obj, &adapter_finished_obj, &glow_type_obj))
|
||||
&query_description_obj, &adapter_finished_obj, &glow_type_obj,
|
||||
&allow_clear_button_obj))
|
||||
return nullptr;
|
||||
|
||||
if (!g_base->CurrentContext().IsEmpty()) {
|
||||
@ -2209,6 +2212,9 @@ static auto PyTextWidget(PyObject* self, PyObject* args,
|
||||
}
|
||||
widget->set_glow_type(glow_type);
|
||||
}
|
||||
if (allow_clear_button_obj != Py_None) {
|
||||
widget->set_allow_clear_button(Python::GetPyBool(allow_clear_button_obj));
|
||||
}
|
||||
|
||||
// If making a new widget, add it at the end.
|
||||
if (edit_obj == Py_None) {
|
||||
@ -2266,7 +2272,8 @@ static PyMethodDef PyTextWidgetDef = {
|
||||
" query_max_chars: bauiv1.Widget | None = None,\n"
|
||||
" query_description: bauiv1.Widget | None = None,\n"
|
||||
" adapter_finished: bool | None = None,\n"
|
||||
" glow_type: str | None = None)\n"
|
||||
" glow_type: str | None = None,\n"
|
||||
" allow_clear_button: bool | None = None)\n"
|
||||
" -> bauiv1.Widget\n"
|
||||
"\n"
|
||||
"Create or edit a text widget.\n"
|
||||
|
||||
@ -30,7 +30,7 @@ TextWidget::TextWidget() {
|
||||
// FIXME - should generalize this to any controller-only situation.
|
||||
if (g_buildconfig.ostype_android()) {
|
||||
if (g_base->input->touch_input() == nullptr) {
|
||||
do_clear_button_ = false;
|
||||
implicit_clear_button_ = false;
|
||||
}
|
||||
}
|
||||
birth_time_millisecs_ =
|
||||
@ -253,7 +253,8 @@ void TextWidget::Draw(base::RenderPass* pass, bool draw_transparent) {
|
||||
|
||||
// Clear button.
|
||||
if (editable() && (IsHierarchySelected() || always_show_carat_)
|
||||
&& !text_raw_.empty() && do_clear_button_) {
|
||||
&& !text_raw_.empty() && implicit_clear_button_
|
||||
&& allow_clear_button_) {
|
||||
base::SimpleComponent c(pass);
|
||||
c.SetTransparent(true);
|
||||
if (clear_pressed_ && clear_mouse_over_) {
|
||||
@ -819,7 +820,8 @@ auto TextWidget::HandleMessage(const base::WidgetMessage& m) -> bool {
|
||||
if (editable() && (IsHierarchySelected() || always_show_carat_)
|
||||
&& !text_raw_.empty() && (x >= width_ - 35)
|
||||
&& (x < width_ + kClearMargin) && (y > -kClearMargin)
|
||||
&& (y < height_ + kClearMargin) && do_clear_button_) {
|
||||
&& (y < height_ + kClearMargin) && implicit_clear_button_
|
||||
&& allow_clear_button_) {
|
||||
clear_pressed_ = clear_mouse_over_ = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -73,6 +73,7 @@ class TextWidget : public Widget {
|
||||
void set_flatness(float flatness) { flatness_ = flatness; }
|
||||
void set_shadow(float shadow) { shadow_ = shadow; }
|
||||
void set_res_scale(float res_scale);
|
||||
void set_allow_clear_button(bool val) { allow_clear_button_ = val; }
|
||||
auto GetTextWidth() -> float;
|
||||
void OnLanguageChange() override;
|
||||
void AdapterFinished();
|
||||
@ -130,7 +131,8 @@ class TextWidget : public Widget {
|
||||
bool selectable_{};
|
||||
bool clear_pressed_{};
|
||||
bool clear_mouse_over_{};
|
||||
bool do_clear_button_{true};
|
||||
bool implicit_clear_button_{true};
|
||||
bool allow_clear_button_{true};
|
||||
int carat_position_{9999};
|
||||
int max_chars_{99999};
|
||||
float res_scale_{1.0f};
|
||||
|
||||
@ -165,11 +165,16 @@ int get_running_server_port_(const struct Context_* ctx,
|
||||
|
||||
cJSON* state_dict = cJSON_Parse(buf);
|
||||
if (!state_dict) {
|
||||
// An un-parseable state file is not a recoverable error; go down hard.
|
||||
// State files are written and then moved into place so we should never
|
||||
// see something like a half-written file.
|
||||
fprintf(stderr,
|
||||
"Error: pcommandbatch client %s_%d (pid %d): failed to parse state "
|
||||
"value.\n",
|
||||
ctx->instance_prefix, ctx->instance_num, ctx->pid);
|
||||
return -1;
|
||||
"Fatal Error: pcommandbatch client %s_%d (pid %d):"
|
||||
" failed to parse state file value of size %zu.\n",
|
||||
ctx->instance_prefix, ctx->instance_num, ctx->pid, amt);
|
||||
fflush(stderr);
|
||||
abort();
|
||||
// return -1;
|
||||
}
|
||||
|
||||
// If results included output, print it.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Released under the MIT License. See LICENSE for details.
|
||||
#
|
||||
"""Utils for wrangling runs of the app.
|
||||
"""Utils for wrangling running the app as part of a build.
|
||||
|
||||
Manages constructing or downloading it as well as running it.
|
||||
"""
|
||||
@ -105,6 +105,9 @@ def acquire_binary(assets: bool, purpose: str) -> str:
|
||||
if os.environ.get('BA_APP_RUN_ENABLE_BUILDS') == '1':
|
||||
# Going the build-it-ourselves route.
|
||||
|
||||
# Don't need any env mods for this path.
|
||||
env = None
|
||||
|
||||
if os.environ.get('BA_APP_RUN_BUILD_HEADLESS') == '1':
|
||||
# User has opted for headless builds.
|
||||
if assets:
|
||||
@ -141,16 +144,23 @@ def acquire_binary(assets: bool, purpose: str) -> str:
|
||||
binary_build_command = ['make', 'cmake-binary']
|
||||
binary_path = 'build/cmake/debug/staged/ballisticakit'
|
||||
else:
|
||||
# Ok; going with prefab headless stuff.
|
||||
# Ok; going with a downloaded prefab headless build.
|
||||
|
||||
# Let the user know how to use their own binaries instead.
|
||||
# By default, prefab build targets on WSL (Linux running on
|
||||
# Windows) will give us Windows builds which won't work right
|
||||
# here. Ask it for Linux builds instead.
|
||||
env = dict(os.environ, BA_WSL_TARGETS_WINDOWS='0')
|
||||
|
||||
# Let the user know how to use their own built binaries instead
|
||||
# if they prefer.
|
||||
note = '\n' + textwrap.fill(
|
||||
'NOTE: You can set env-var BA_APP_RUN_ENABLE_BUILDS=1'
|
||||
f' to use locally-built binaries for {purpose}'
|
||||
' instead of prefab ones. This will properly reflect any changes'
|
||||
' you\'ve made to the C/C++ layer.',
|
||||
f'NOTE: You can set env-var BA_APP_RUN_ENABLE_BUILDS=1'
|
||||
f' to use locally-built binaries for {purpose} instead'
|
||||
f' of prefab ones. This will properly reflect any changes'
|
||||
f' you\'ve made to the C/C++ layer.',
|
||||
80,
|
||||
)
|
||||
|
||||
if assets:
|
||||
print(
|
||||
f'{Clr.SMAG}Fetching prefab binary & assets for'
|
||||
@ -160,6 +170,7 @@ def acquire_binary(assets: bool, purpose: str) -> str:
|
||||
binary_path = (
|
||||
subprocess.run(
|
||||
['tools/pcommand', 'prefab_binary_path', 'server-release'],
|
||||
env=env,
|
||||
check=True,
|
||||
capture_output=True,
|
||||
)
|
||||
@ -176,6 +187,7 @@ def acquire_binary(assets: bool, purpose: str) -> str:
|
||||
binary_path = (
|
||||
subprocess.run(
|
||||
['tools/pcommand', 'prefab_binary_path', 'server-release'],
|
||||
env=env,
|
||||
check=True,
|
||||
capture_output=True,
|
||||
)
|
||||
@ -184,7 +196,7 @@ def acquire_binary(assets: bool, purpose: str) -> str:
|
||||
)
|
||||
binary_build_command = ['make', binary_path]
|
||||
|
||||
subprocess.run(binary_build_command, check=True)
|
||||
subprocess.run(binary_build_command, env=env, check=True)
|
||||
if not os.path.exists(binary_path):
|
||||
raise RuntimeError(
|
||||
f"Binary not found at expected path '{binary_path}'."
|
||||
|
||||
@ -76,6 +76,87 @@ class PrefabTarget(Enum):
|
||||
GUI_RELEASE = 'gui-release'
|
||||
SERVER_RELEASE = 'server-release'
|
||||
|
||||
@property
|
||||
def buildtype(self) -> str:
|
||||
"""Return the build type for this target."""
|
||||
return self.value.split('-')[0]
|
||||
|
||||
@property
|
||||
def buildmode(self) -> str:
|
||||
"""Return the build mode for this target."""
|
||||
return self.value.split('-')[1]
|
||||
|
||||
|
||||
class PrefabPlatform(Enum):
|
||||
"""Distinct os/cpu-arch/etc. combos we support for prefab builds."""
|
||||
|
||||
MAC_X86_64 = 'mac_x86_64'
|
||||
MAC_ARM64 = 'mac_arm64'
|
||||
WINDOWS_X86 = 'windows_x86'
|
||||
LINUX_X86_64 = 'linux_x86_64'
|
||||
LINUX_ARM64 = 'linux_arm64'
|
||||
|
||||
@classmethod
|
||||
def get_current(
|
||||
cls, wsl_targets_windows: bool | None = None
|
||||
) -> PrefabPlatform:
|
||||
"""Get an identifier for the platform running this build.
|
||||
|
||||
Pass a bool `wsl_targets_windows` value to cause WSL to target
|
||||
either native Windows (True) or Linux (False). If this value is
|
||||
not passed, the env var BA_WSL_TARGETS_WINDOWS is used, and if that
|
||||
is not set, the default is False (Linux builds).
|
||||
|
||||
Throws a RuntimeError on unsupported platforms.
|
||||
"""
|
||||
import platform
|
||||
|
||||
if wsl_targets_windows is None:
|
||||
wsl_targets_windows = (
|
||||
os.environ.get('BA_WSL_TARGETS_WINDOWS', '0') == '1'
|
||||
)
|
||||
|
||||
system = platform.system()
|
||||
machine = platform.machine()
|
||||
|
||||
if system == 'Darwin':
|
||||
if machine == 'x86_64':
|
||||
return cls.MAC_X86_64
|
||||
if machine == 'arm64':
|
||||
return cls.MAC_ARM64
|
||||
raise RuntimeError(
|
||||
f'PrefabPlatform.get_current:'
|
||||
f' unsupported mac machine type:'
|
||||
f' {machine}.'
|
||||
)
|
||||
if system == 'Linux':
|
||||
# If it looks like we're in Windows Subsystem for Linux, we may
|
||||
# want to operate on Windows versions.
|
||||
if wsl_targets_windows:
|
||||
if 'microsoft' in platform.uname().release.lower():
|
||||
if machine == 'x86_64':
|
||||
# Currently always targeting 32 bit for prefab stuff.
|
||||
return cls.WINDOWS_X86
|
||||
# TODO: add support for arm windows
|
||||
raise RuntimeError(
|
||||
f'make_prefab: unsupported win machine type: {machine}.'
|
||||
)
|
||||
|
||||
if machine == 'x86_64':
|
||||
return cls.LINUX_X86_64
|
||||
if machine == 'aarch64':
|
||||
return cls.LINUX_ARM64
|
||||
raise RuntimeError(
|
||||
f'PrefabPlatform.get_current:'
|
||||
f' unsupported linux machine type:'
|
||||
f' {machine}.'
|
||||
)
|
||||
raise RuntimeError(
|
||||
f'PrefabPlatform.get_current:'
|
||||
f' unrecognized platform:'
|
||||
f' {platform.system()}.'
|
||||
)
|
||||
|
||||
|
||||
class LazyBuildCategory(Enum):
|
||||
"""Types of sources."""
|
||||
@ -296,49 +377,6 @@ def archive_old_builds(
|
||||
)
|
||||
|
||||
|
||||
def get_current_prefab_platform(wsl_gives_windows: bool = True) -> str:
|
||||
"""Get an identifier for the platform running this build.
|
||||
|
||||
Throws a RuntimeError on unsupported platforms.
|
||||
"""
|
||||
import platform
|
||||
|
||||
system = platform.system()
|
||||
machine = platform.machine()
|
||||
|
||||
if system == 'Darwin':
|
||||
if machine == 'x86_64':
|
||||
return 'mac_x86_64'
|
||||
if machine == 'arm64':
|
||||
return 'mac_arm64'
|
||||
raise RuntimeError(
|
||||
f'make_prefab: unsupported mac machine type:' f' {machine}.'
|
||||
)
|
||||
if system == 'Linux':
|
||||
# If it looks like we're in Windows Subsystem for Linux,
|
||||
# we may want to operate on Windows versions.
|
||||
if wsl_gives_windows:
|
||||
if 'microsoft' in platform.uname().release.lower():
|
||||
if machine == 'x86_64':
|
||||
# Currently always targeting 32 bit for prefab stuff.
|
||||
return 'windows_x86'
|
||||
# TODO: add support for arm windows
|
||||
raise RuntimeError(
|
||||
f'make_prefab: unsupported win machine type: {machine}.'
|
||||
)
|
||||
|
||||
if machine == 'x86_64':
|
||||
return 'linux_x86_64'
|
||||
if machine == 'aarch64':
|
||||
return 'linux_arm64'
|
||||
raise RuntimeError(
|
||||
f'make_prefab: unsupported linux machine type:' f' {machine}.'
|
||||
)
|
||||
raise RuntimeError(
|
||||
f'make_prefab: unrecognized platform:' f' {platform.system()}.'
|
||||
)
|
||||
|
||||
|
||||
def _vstr(nums: Sequence[int]) -> str:
|
||||
return '.'.join(str(i) for i in nums)
|
||||
|
||||
|
||||
@ -487,34 +487,6 @@ def efrocache_get() -> None:
|
||||
pcommand.clientprint(output)
|
||||
|
||||
|
||||
def get_modern_make() -> None:
|
||||
"""Print name of a modern make command."""
|
||||
import platform
|
||||
import subprocess
|
||||
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
# Mac gnu make is outdated (due to newer versions using GPL3 I believe).
|
||||
# so let's return 'gmake' there which will point to homebrew make which
|
||||
# should be up to date.
|
||||
if platform.system() == 'Darwin':
|
||||
if (
|
||||
subprocess.run(
|
||||
['which', 'gmake'], check=False, capture_output=True
|
||||
).returncode
|
||||
!= 0
|
||||
):
|
||||
print(
|
||||
'WARNING: this requires gmake (mac system make is too old).'
|
||||
" Install it with 'brew install make'",
|
||||
file=sys.stderr,
|
||||
flush=True,
|
||||
)
|
||||
print('gmake')
|
||||
else:
|
||||
print('make')
|
||||
|
||||
|
||||
def warm_start_asset_build() -> None:
|
||||
"""Prep asset builds to run faster."""
|
||||
import os
|
||||
@ -608,6 +580,24 @@ def checkenv() -> None:
|
||||
batools.build.checkenv()
|
||||
|
||||
|
||||
def prefab_platform() -> None:
|
||||
"""Print the current prefab-platform value."""
|
||||
from efro.error import CleanError
|
||||
|
||||
from batools.build import PrefabPlatform
|
||||
|
||||
# Platform determination uses env vars; won't work in batch.
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
args = pcommand.get_args()
|
||||
if len(args) != 0:
|
||||
raise CleanError('No arguments expected.')
|
||||
|
||||
current = PrefabPlatform.get_current()
|
||||
|
||||
print(current.value, end='')
|
||||
|
||||
|
||||
def ensure_prefab_platform() -> None:
|
||||
"""Ensure we are running on a particular prefab platform.
|
||||
|
||||
@ -616,50 +606,90 @@ def ensure_prefab_platform() -> None:
|
||||
the prefab platform may be Windows; not Linux. Also, a 64-bit
|
||||
os may be targeting a 32-bit platform.
|
||||
"""
|
||||
import batools.build
|
||||
from efro.error import CleanError
|
||||
|
||||
from batools.build import PrefabPlatform
|
||||
|
||||
# Platform determination uses env vars; won't work in batch.
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
args = pcommand.get_args()
|
||||
if len(args) != 1:
|
||||
raise CleanError('Expected 1 platform name arg.')
|
||||
needed = args[0]
|
||||
current = batools.build.get_current_prefab_platform()
|
||||
if current != needed:
|
||||
options = ', '.join(t.value for t in PrefabPlatform)
|
||||
raise CleanError(
|
||||
f'Incorrect platform: we are {current}, this requires {needed}.'
|
||||
f'Expected 1 PrefabPlatform arg. Options are {options}.'
|
||||
)
|
||||
needed = PrefabPlatform(args[0])
|
||||
current = PrefabPlatform.get_current()
|
||||
if current is not needed:
|
||||
raise CleanError(
|
||||
f'Incorrect platform: we are {current.value},'
|
||||
f' this requires {needed.value}.'
|
||||
)
|
||||
|
||||
|
||||
def prefab_run_var() -> None:
|
||||
"""Print the current platform prefab run target var."""
|
||||
import batools.build
|
||||
from batools.build import PrefabPlatform
|
||||
|
||||
# Platform determination uses env vars; won't work in batch.
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
args = pcommand.get_args()
|
||||
if len(args) != 1:
|
||||
raise RuntimeError('Expected 1 arg.')
|
||||
base = args[0].replace('-', '_').upper()
|
||||
platform = batools.build.get_current_prefab_platform().upper()
|
||||
platform = PrefabPlatform.get_current().value.upper()
|
||||
pcommand.clientprint(f'RUN_PREFAB_{platform}_{base}', end='')
|
||||
|
||||
|
||||
def prefab_binary_path() -> None:
|
||||
"""Print the current platform prefab binary path."""
|
||||
import batools.build
|
||||
"""Print the path to the current prefab binary."""
|
||||
from typing import assert_never
|
||||
|
||||
from efro.error import CleanError
|
||||
|
||||
from batools.build import PrefabPlatform, PrefabTarget
|
||||
|
||||
# Platform determination uses env vars; won't work in batch.
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
if len(sys.argv) != 3:
|
||||
raise RuntimeError('Expected 1 arg.')
|
||||
buildtype, buildmode = sys.argv[2].split('-')
|
||||
platform = batools.build.get_current_prefab_platform()
|
||||
if buildtype == 'gui':
|
||||
binpath = 'ballisticakit'
|
||||
elif buildtype == 'server':
|
||||
binpath = 'dist/ballisticakit_headless'
|
||||
options = ', '.join(t.value for t in PrefabTarget)
|
||||
raise CleanError(f'Expected 1 PrefabTarget arg. Options are {options}.')
|
||||
|
||||
target = PrefabTarget(sys.argv[2])
|
||||
|
||||
buildtype = target.buildtype
|
||||
buildmode = target.buildmode
|
||||
|
||||
platform = PrefabPlatform.get_current()
|
||||
|
||||
if platform is PrefabPlatform.WINDOWS_X86:
|
||||
if buildtype == 'gui':
|
||||
binpath = 'BallisticaKit.exe'
|
||||
elif buildtype == 'server':
|
||||
binpath = 'dist/BallisticaKitHeadless.exe'
|
||||
else:
|
||||
raise ValueError(f"Invalid buildtype '{buildtype}'.")
|
||||
elif (
|
||||
platform is PrefabPlatform.MAC_ARM64
|
||||
or platform is PrefabPlatform.MAC_X86_64
|
||||
or platform is PrefabPlatform.LINUX_ARM64
|
||||
or platform is PrefabPlatform.LINUX_X86_64
|
||||
):
|
||||
if buildtype == 'gui':
|
||||
binpath = 'ballisticakit'
|
||||
elif buildtype == 'server':
|
||||
binpath = 'dist/ballisticakit_headless'
|
||||
else:
|
||||
raise ValueError(f"Invalid buildtype '{buildtype}'.")
|
||||
else:
|
||||
raise ValueError(f"Invalid buildtype '{buildtype}'.")
|
||||
# Make sure we're covering all options.
|
||||
assert_never(platform)
|
||||
|
||||
print(
|
||||
f'build/prefab/full/{platform}_{buildtype}/{buildmode}/{binpath}',
|
||||
f'build/prefab/full/{platform.value}_{buildtype}/{buildmode}/{binpath}',
|
||||
end='',
|
||||
)
|
||||
|
||||
@ -667,20 +697,21 @@ def prefab_binary_path() -> None:
|
||||
def make_prefab() -> None:
|
||||
"""Run prefab builds for the current platform."""
|
||||
import subprocess
|
||||
import batools.build
|
||||
from batools.build import PrefabPlatform, PrefabTarget
|
||||
|
||||
# Platform determination uses env vars; won't work in batch.
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
if len(sys.argv) != 3:
|
||||
raise RuntimeError('Expected one argument')
|
||||
target = batools.build.PrefabTarget(sys.argv[2])
|
||||
platform = batools.build.get_current_prefab_platform()
|
||||
targetstr = PrefabTarget(sys.argv[2]).value
|
||||
platformstr = PrefabPlatform.get_current().value
|
||||
|
||||
# We use dashes instead of underscores in target names.
|
||||
platform = platform.replace('_', '-')
|
||||
platformstr = platformstr.replace('_', '-')
|
||||
try:
|
||||
subprocess.run(
|
||||
['make', f'prefab-{platform}-{target.value}-build'], check=True
|
||||
['make', f'prefab-{platformstr}-{targetstr}-build'], check=True
|
||||
)
|
||||
except (Exception, KeyboardInterrupt) as exc:
|
||||
if str(exc):
|
||||
@ -697,6 +728,7 @@ def lazybuild() -> None:
|
||||
# This command is not a good candidate for batch since it can be
|
||||
# long running and prints various stuff throughout the process.
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
args = pcommand.get_args()
|
||||
|
||||
if len(args) < 3:
|
||||
|
||||
@ -204,7 +204,7 @@ def win_ci_install_prereqs() -> None:
|
||||
|
||||
# We'll need to pull a handful of things out of efrocache for the
|
||||
# build to succeed. Normally this would happen through our Makefile
|
||||
# targets but we can't use them under raw window so we need to just
|
||||
# targets but we can't use them under raw Windows so we need to just
|
||||
# hard-code whatever we need here.
|
||||
lib_dbg_win32 = 'build/prefab/lib/windows/Debug_Win32'
|
||||
needed_targets: set[str] = {
|
||||
@ -256,11 +256,11 @@ def win_ci_binary_build() -> None:
|
||||
|
||||
|
||||
def update_cmake_prefab_lib() -> None:
|
||||
"""Update prefab internal libs for builds."""
|
||||
"""Update prefab internal libs; run as part of a build."""
|
||||
import subprocess
|
||||
import os
|
||||
from efro.error import CleanError
|
||||
import batools.build
|
||||
from batools.build import PrefabPlatform
|
||||
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
@ -275,14 +275,18 @@ def update_cmake_prefab_lib() -> None:
|
||||
raise CleanError(f'Invalid buildtype: {buildtype}')
|
||||
if mode not in {'debug', 'release'}:
|
||||
raise CleanError(f'Invalid mode: {mode}')
|
||||
platform = batools.build.get_current_prefab_platform(
|
||||
wsl_gives_windows=False
|
||||
)
|
||||
suffix = '_server' if buildtype == 'server' else '_gui'
|
||||
target = f'build/prefab/lib/{platform}{suffix}/{mode}/libballisticaplus.a'
|
||||
|
||||
# Build the target and then copy it to dst if it doesn't exist there yet
|
||||
# or the existing one is older than our target.
|
||||
# Our 'cmake' build targets use the Linux side of WSL; not native
|
||||
# Windows.
|
||||
platform = PrefabPlatform.get_current(wsl_targets_windows=False)
|
||||
|
||||
suffix = '_server' if buildtype == 'server' else '_gui'
|
||||
target = (
|
||||
f'build/prefab/lib/{platform.value}{suffix}/{mode}/libballisticaplus.a'
|
||||
)
|
||||
|
||||
# Build the target and then copy it to dst if it doesn't exist there
|
||||
# yet or the existing one is older than our target.
|
||||
subprocess.run(['make', target], check=True)
|
||||
|
||||
libdir = os.path.join(builddir, 'prefablib')
|
||||
@ -431,7 +435,7 @@ def wsl_build_check_win_drive() -> None:
|
||||
!= 0
|
||||
):
|
||||
raise CleanError(
|
||||
'wslpath not found; you must run this from a WSL environment'
|
||||
"'wslpath' not found. This does not seem to be a WSL environment."
|
||||
)
|
||||
|
||||
if os.environ.get('WSL_BUILD_CHECK_WIN_DRIVE_IGNORE') == '1':
|
||||
@ -448,9 +452,12 @@ def wsl_build_check_win_drive() -> None:
|
||||
.strip()
|
||||
)
|
||||
|
||||
# If we're sitting under the linux filesystem, our path
|
||||
# will start with \\wsl$; fail in that case and explain why.
|
||||
if not path.startswith('\\\\wsl$'):
|
||||
# If we're sitting under the linux filesystem, our path will start
|
||||
# with '\\wsl$' or '\\wsl.localhost' or '\\wsl\'; fail in that case
|
||||
# and explain why.
|
||||
if not any(
|
||||
path.startswith(x) for x in ['\\\\wsl$', '\\\\wsl.', '\\\\wsl\\']
|
||||
):
|
||||
return
|
||||
|
||||
def _wrap(txt: str) -> str:
|
||||
@ -475,7 +482,7 @@ def wsl_build_check_win_drive() -> None:
|
||||
'Note that WSL2 filesystem performance'
|
||||
' is poor when accessing'
|
||||
' native Windows drives, so if Visual Studio builds are not'
|
||||
' needed it may be best to keep things'
|
||||
' needed it may be best to keep things here'
|
||||
' on the Linux filesystem.'
|
||||
' This behavior may differ under WSL1 (untested).'
|
||||
),
|
||||
@ -540,3 +547,31 @@ def wsl_path_to_win() -> None:
|
||||
if escape:
|
||||
out = out.replace('\\', '\\\\')
|
||||
print(out, end='')
|
||||
|
||||
|
||||
def get_modern_make() -> None:
|
||||
"""Print name of a modern make command."""
|
||||
import platform
|
||||
import subprocess
|
||||
|
||||
pcommand.disallow_in_batch()
|
||||
|
||||
# Mac gnu make is outdated (due to newer versions using GPL3 I believe).
|
||||
# so let's return 'gmake' there which will point to homebrew make which
|
||||
# should be up to date.
|
||||
if platform.system() == 'Darwin':
|
||||
if (
|
||||
subprocess.run(
|
||||
['which', 'gmake'], check=False, capture_output=True
|
||||
).returncode
|
||||
!= 0
|
||||
):
|
||||
print(
|
||||
'WARNING: this requires gmake (mac system make is too old).'
|
||||
" Install it with 'brew install make'",
|
||||
file=sys.stderr,
|
||||
flush=True,
|
||||
)
|
||||
print('gmake')
|
||||
else:
|
||||
print('make')
|
||||
|
||||
@ -11,6 +11,7 @@ import subprocess
|
||||
from functools import partial
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from efro.terminal import Clr
|
||||
from efrotools import PYVER, extract_arg, extract_flag
|
||||
|
||||
if TYPE_CHECKING:
|
||||
@ -39,6 +40,7 @@ class AssetStager:
|
||||
|
||||
def __init__(self, projroot: str) -> None:
|
||||
self.projroot = projroot
|
||||
self.desc = 'unknown'
|
||||
# We always calc src relative to this script.
|
||||
self.src = f'{self.projroot}/build/assets'
|
||||
self.dst: str | None = None
|
||||
@ -71,6 +73,12 @@ class AssetStager:
|
||||
"""Do the thing."""
|
||||
self._parse_args(args)
|
||||
|
||||
print(
|
||||
f'{Clr.BLU}Staging for {Clr.MAG}{Clr.BLD}{self.desc}{Clr.RST}'
|
||||
f'{Clr.BLU} at {Clr.MAG}{Clr.BLD}{self.dst}'
|
||||
f'{Clr.RST}{Clr.BLU}...{Clr.RST}'
|
||||
)
|
||||
|
||||
# Ok, now for every top level dir in src, come up with a nice single
|
||||
# command to sync the needed subset of it to dst.
|
||||
|
||||
@ -140,22 +148,27 @@ class AssetStager:
|
||||
)
|
||||
|
||||
if platform_arg == '-android':
|
||||
self.desc = 'android'
|
||||
self._parse_android_args(args)
|
||||
elif platform_arg.startswith('-win'):
|
||||
self.desc = 'windows'
|
||||
self._parse_win_args(platform_arg, args)
|
||||
elif platform_arg == '-cmake':
|
||||
self.desc = 'cmake'
|
||||
self.dst = args[-1]
|
||||
self.tex_suffix = '.dds'
|
||||
# Link/copy in a binary *if* builddir is provided.
|
||||
self.include_binary_executable = self.builddir is not None
|
||||
self.executable_name = 'ballisticakit'
|
||||
elif platform_arg == '-cmakemodular':
|
||||
self.desc = 'cmake modular'
|
||||
self.dst = args[-1]
|
||||
self.tex_suffix = '.dds'
|
||||
self.include_python_dylib = True
|
||||
self.include_shell_executable = True
|
||||
self.executable_name = 'ballisticakit'
|
||||
elif platform_arg == '-cmakeserver':
|
||||
self.desc = 'cmake server'
|
||||
self.dst = os.path.join(args[-1], 'dist')
|
||||
self.serverdst = args[-1]
|
||||
self.include_textures = False
|
||||
@ -165,6 +178,7 @@ class AssetStager:
|
||||
self.include_binary_executable = self.builddir is not None
|
||||
self.executable_name = 'ballisticakit_headless'
|
||||
elif platform_arg == '-cmakemodularserver':
|
||||
self.desc = 'cmake modular server'
|
||||
self.dst = os.path.join(args[-1], 'dist')
|
||||
self.serverdst = args[-1]
|
||||
self.include_textures = False
|
||||
@ -175,6 +189,7 @@ class AssetStager:
|
||||
self.executable_name = 'ballisticakit_headless'
|
||||
|
||||
elif platform_arg == '-xcode-mac':
|
||||
self.desc = 'xcode mac'
|
||||
self.src = os.environ['SOURCE_ROOT'] + '/../build/assets'
|
||||
self.dst = (
|
||||
os.environ['TARGET_BUILD_DIR']
|
||||
@ -184,17 +199,8 @@ class AssetStager:
|
||||
self.include_pylib = True
|
||||
self.pylib_src_name = 'pylib-apple'
|
||||
self.tex_suffix = '.dds'
|
||||
elif platform_arg == '-xcode-mac-old':
|
||||
self.src = os.environ['SOURCE_ROOT'] + '/build/assets'
|
||||
self.dst = (
|
||||
os.environ['TARGET_BUILD_DIR']
|
||||
+ '/'
|
||||
+ os.environ['UNLOCALIZED_RESOURCES_FOLDER_PATH']
|
||||
)
|
||||
self.include_pylib = True
|
||||
self.pylib_src_name = 'pylib-apple'
|
||||
self.tex_suffix = '.dds'
|
||||
elif platform_arg == '-xcode-ios':
|
||||
self.desc = 'xcode ios'
|
||||
self.src = os.environ['SOURCE_ROOT'] + '/build/assets'
|
||||
self.dst = (
|
||||
os.environ['TARGET_BUILD_DIR']
|
||||
|
||||
@ -96,13 +96,13 @@ from batools.pcommands import (
|
||||
upper,
|
||||
efrocache_update,
|
||||
efrocache_get,
|
||||
get_modern_make,
|
||||
warm_start_asset_build,
|
||||
gen_docs_pdoc,
|
||||
gen_docs_sphinx,
|
||||
list_pip_reqs,
|
||||
install_pip_reqs,
|
||||
checkenv,
|
||||
prefab_platform,
|
||||
ensure_prefab_platform,
|
||||
prefab_run_var,
|
||||
prefab_binary_path,
|
||||
@ -135,6 +135,7 @@ from batools.pcommands2 import (
|
||||
tests_warm_start,
|
||||
wsl_path_to_win,
|
||||
wsl_build_check_win_drive,
|
||||
get_modern_make,
|
||||
)
|
||||
|
||||
# pylint: enable=unused-import
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user