From a2ff9ab87262811cd9c09acb8d351f0e4bc87dfa Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 22 Oct 2023 11:25:01 -0700 Subject: [PATCH] langs and polishing --- .efrocachemap | 66 ++++++++++++++--------------- CHANGELOG.md | 8 +++- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- tools/efrotools/pcommands.py | 21 +++++++-- tools/pcommand | 1 + 6 files changed, 60 insertions(+), 40 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 6554ee30..b7a571d2 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,10 +421,10 @@ "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": "35edefb8290f4fb38c5e3e70395fc449", + "build/assets/ba_data/data/langdata.json": "2a2c4783fddc4b24d07b4ce0d8a74393", "build/assets/ba_data/data/languages/arabic.json": "295c559911fa251f401f8cdcad91c226", "build/assets/ba_data/data/languages/belarussian.json": "e151808b6b4f6dc159cf55ee62adad3c", - "build/assets/ba_data/data/languages/chinese.json": "b0d4e874ba8d22c8fd0d7a0eaaf96ac9", + "build/assets/ba_data/data/languages/chinese.json": "0a9d9534e7329d1e886adae6fdc007c4", "build/assets/ba_data/data/languages/chinesetraditional.json": "f858da49be0a5374157c627857751078", "build/assets/ba_data/data/languages/croatian.json": "766532c67af5bd0144c2d63cab0516fa", "build/assets/ba_data/data/languages/czech.json": "93c5fe0d884d95435da6c675f64e30e0", @@ -432,7 +432,7 @@ "build/assets/ba_data/data/languages/dutch.json": "22b44a33bf81142ba2befad14eb5746e", "build/assets/ba_data/data/languages/english.json": "6fb6ec37e79064edb4b8864eabdd024d", "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", - "build/assets/ba_data/data/languages/filipino.json": "347f38524816691170d266708fe25894", + "build/assets/ba_data/data/languages/filipino.json": "2efdfb879135b196a272dd47fc2039a2", "build/assets/ba_data/data/languages/french.json": "4e218dcd488fa63e7db5b4da2261b9e1", "build/assets/ba_data/data/languages/german.json": "450fa41ae264f29a5d1af22143d0d0ad", "build/assets/ba_data/data/languages/gibberish.json": "63c6212c774622346f3ad0d87ff31e80", @@ -444,7 +444,7 @@ "build/assets/ba_data/data/languages/korean.json": "ca1122a9ee551da3f75ae632012bd0e2", "build/assets/ba_data/data/languages/malay.json": "832562ce997fc70704b9234c95fb2e38", "build/assets/ba_data/data/languages/persian.json": "a391d80ff58ea22926499e4b19d2c0d0", - "build/assets/ba_data/data/languages/polish.json": "e1a1a801851924748ad38fa68216439a", + "build/assets/ba_data/data/languages/polish.json": "7a4a6cb882cf90dad32e6607215525bf", "build/assets/ba_data/data/languages/portuguese.json": "51e362956f89da3eec980f587c092253", "build/assets/ba_data/data/languages/romanian.json": "aeebdd54f65939c2facc6ac50c117826", "build/assets/ba_data/data/languages/russian.json": "561504cca28eb3204ac194950029e565", @@ -454,7 +454,7 @@ "build/assets/ba_data/data/languages/swedish.json": "77d671f10613291ebf9c71da66f18a18", "build/assets/ba_data/data/languages/tamil.json": "65ab7798d637fa62a703750179eeb723", "build/assets/ba_data/data/languages/thai.json": "33f63753c9af9a5b238d229a0bf23fbc", - "build/assets/ba_data/data/languages/turkish.json": "42318070b817663f671d78a9c8f3019c", + "build/assets/ba_data/data/languages/turkish.json": "776d1a0c9ef2333a9110d93558ab19e2", "build/assets/ba_data/data/languages/ukrainian.json": "f72eb51abfbbb56e27866895d7e947d2", "build/assets/ba_data/data/languages/venetian.json": "9fe1a58d9e5dfb00f31ce3b2eb9993f4", "build/assets/ba_data/data/languages/vietnamese.json": "921cd1e50f60fe3e101f246e172750ba", @@ -4056,26 +4056,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": "8944236c082e32b7efc83fdd1d2bb430", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "7d78e977704b352be09dc49ae159c0ac", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "1c587e1330b55458dfc200f08bf6e6fc", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "b9f429f8cbc3961dde9bae4344ec74f5", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "91876ba2b9041ac6b6fbfcdc058342dd", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "8c2dd693f97a910a70e82efdeff1b9d4", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "590edd47cf70f08866b9ced6c46751f1", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "e0ddb169dce06925d6b3fbde8a2cda45", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "8bc979f113254f1329d0219809bca9f1", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "674d3495c9b3483d712673219383888d", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "c219bdcb9d0897650b72708ba3a17e5e", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c2a9c82807644a4676dae69630ff8237", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "aa12830328b2c64b8d4970197ba5c49f", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "8569f2c15b113f206846152a49dbcd6d", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "49b7f50beed3e8c5abfd7f6faa4d7b90", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "78fbc9b9503b30231b9effd281322829", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "c88f1beb143dd3306b556b5490e8b381", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "110bf4b9e5c99d4b354ace22272e902e", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "9d62f0c0fed46365b203728079580085", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "c2ccf9cec0af9b12620eb74237647583", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "ad13d636bcb25150044a7644846b8a09", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "7c5df955611590ef491bf614fbd60179", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "ae38bd212ae64b51482a2ccb9c1cbfd3", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "d0bcee2dd5567719aa35667c5206dffc", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "eb3cd4f86175afcf8ffa2749afa32fa3", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "6b86ba36c3719773008feaa6cdc0d0f8", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "877c9ae4532fef809a3dcbd8ffea343c", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "7df313c48c87460f56fa837502965088", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "bc40bb549d26437fb8679c1e9d088272", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "47aa08cb9f5e660023f0f3c0e4ffd65e", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "bbb0a8383d6ce1ca887190ea49223f4f", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7dd91e3407d49981c1c975d4f01ac205", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "c87883aa2f832e792e945fd9208d712a", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "fea8fd84d8c060f2f82f402902b8c54e", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "0a454a8be47f37231655761d15e3f7e5", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "4c79db3a882eb0b8b225a8df0339b1cc", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "43b9ef321f8e80da29ddb19a760dbd77", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "6f891004f2f07c452dea29bd53f29d30", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "bf7a1ce0e7a2015d538406c6f6df761c", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "cf213dce81901a67c9970b3befdaa320", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "473e7e6c0cf90b9e6ac653552b18f68d", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "4e11b895cbf2e1339cf34bc06c54a4ea", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "473e7e6c0cf90b9e6ac653552b18f68d", @@ -4092,14 +4092,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "48c4873dae2344c1d4092a1d85dab424", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "abcede4e60fa8877f18e66e086fb7387", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "48c4873dae2344c1d4092a1d85dab424", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "235ff7a30762e89fce4142e4150d46a4", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "e13e823133fcdcf8409ee8978892162b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "0388a3c7a202c13466d20d2e45d7645e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a1fb2d14a0876f5759dc825c10723b17", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "5eb03f1247c6cd2e0bc75a4e459712f6", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "4d49ef90fbde5813d4b9dd22f0f8c55b", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "2782be4d66289e98fa93076e953d4488", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "f3b6ea4d34a50620e26f6d4ef6ddad17", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "6149911c660a9864b651cc1a8e50eec1", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "57cef68ab703ba819bd0fbe9e4b1c331", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "a47bab28b86c7cefce891b8e5c8b687a", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "d68ebb1139363d711b044de65e17b204", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "ea1349137f64f3d662b9a95278ca4c02", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "c8731ff226716cee3d1e46027ead1cfe", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "4ee6b633a99c5bcbea4f5dee5bda186e", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "2c3bd4952b30d88247229ad309f73092", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "28323912b56ec07701eda3d41a6a4101", "src/ballistica/base/mgen/pyembed/binding_base.inc": "6df0f34207346d89a72924249ddd4706", diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e8b2b13..46e6c34d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.28 (build 21489, api 8, 2023-10-21) +### 1.7.28 (build 21491, api 8, 2023-10-22) - Massively cleaned up code related to rendering and window systems (OpenGL, SDL, etc). This code had been growing into a nasty tangle for 15 years @@ -148,6 +148,12 @@ result in fewer ugly pops and warning messages when the app is quit. - Tidied up some keyboard shortcuts to be more platform-appropriate. For example, toggling fullscreen on Windows is now Alt+Enter or F11. +- Fancy rebuilt Mac build should now automatically sync its frame rate to the + display its running on (using CVDisplayLinks, not VSync). +- Mac build is now relying solely on Apple's Game Controller Framework, which + seems pretty awesome these days. It should support most stuff SDL does and + with less configuring involved. Please holler if you come across something + that doesn't work. ### 1.7.27 (build 21282, api 8, 2023-08-30) diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 3c8ce180..0d19c817 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 = 21489 +TARGET_BALLISTICA_BUILD = 21491 TARGET_BALLISTICA_VERSION = '1.7.28' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 6580892d..8a23ce50 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 = 21489; +const int kEngineBuildNumber = 21491; const char* kEngineVersion = "1.7.28"; const int kEngineApiVersion = 8; diff --git a/tools/efrotools/pcommands.py b/tools/efrotools/pcommands.py index 207befb0..52e9440c 100644 --- a/tools/efrotools/pcommands.py +++ b/tools/efrotools/pcommands.py @@ -98,10 +98,8 @@ def xcodebuild() -> None: XCodeBuild(projroot=str(pcommand.PROJROOT), args=sys.argv[2:]).run() -def xcoderun() -> None: - """Run an xcode build in the terminal.""" +def _xcodepath(executable: bool) -> str: import os - import subprocess from efro.error import CleanError from efrotools.xcodebuild import project_build_path @@ -114,12 +112,27 @@ def xcoderun() -> None: project_path = os.path.abspath(sys.argv[2]) scheme = sys.argv[3] configuration = sys.argv[4] - path = project_build_path( + return project_build_path( projroot=str(pcommand.PROJROOT), project_path=project_path, scheme=scheme, configuration=configuration, + executable=executable, ) + + +def xcodeshow() -> None: + """Open folder containing xcode build in the finder.""" + import subprocess + + subprocess.run(['open', _xcodepath(executable=False)], check=True) + + +def xcoderun() -> None: + """Run an xcode build in the terminal.""" + import subprocess + + path = _xcodepath(executable=True) subprocess.run(path, check=True) diff --git a/tools/pcommand b/tools/pcommand index fb5b2e4c..5cd05df5 100755 --- a/tools/pcommand +++ b/tools/pcommand @@ -52,6 +52,7 @@ from efrotools.pcommands import ( try_repeat, xcodebuild, xcoderun, + xcodeshow, tweak_empty_py_files, make_ensure, make_target_debug,