diff --git a/.efrocachemap b/.efrocachemap index 231e23a9..62b7c7dd 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -430,12 +430,12 @@ "build/assets/ba_data/data/languages/czech.json": "93c5fe0d884d95435da6c675f64e30e0", "build/assets/ba_data/data/languages/danish.json": "3fd69080783d5c9dcc0af737f02b6f1e", "build/assets/ba_data/data/languages/dutch.json": "22b44a33bf81142ba2befad14eb5746e", - "build/assets/ba_data/data/languages/english.json": "2fa464db3fe6bffa16a50c18dfbdc1a6", + "build/assets/ba_data/data/languages/english.json": "fe32cbe79483153db283e363da039a7a", "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", "build/assets/ba_data/data/languages/filipino.json": "afbda3adf14555e1567ee63c32e340e7", "build/assets/ba_data/data/languages/french.json": "49ff6d211537b8003b8241438dca661d", "build/assets/ba_data/data/languages/german.json": "450fa41ae264f29a5d1af22143d0d0ad", - "build/assets/ba_data/data/languages/gibberish.json": "1ade258922bcee1544c9c6015eeb8324", + "build/assets/ba_data/data/languages/gibberish.json": "00a9f70bccdfa407043e69a42e5b944c", "build/assets/ba_data/data/languages/greek.json": "287c0ec437b38772284ef9d3e4fb2fc3", "build/assets/ba_data/data/languages/hindi.json": "8ea0c58a44a24edb131d0e53b074d1f6", "build/assets/ba_data/data/languages/hungarian.json": "796a290a8c44a1e7635208c2ff5fdc6e", @@ -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": "6b30c7563c501435ee9c9d7584124a3d", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "cde906637ab2fd52c7c6752d20c8e5a1", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "fa4c9dddd31d0ae5b5537a70415679b4", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "0ea542deeb3be561b45805e31fff618d", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "09ca80b37e18c24e705e33409fb14cf7", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "057150cf0c86920df2ceba78a0413e15", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "8b9db0a31ad3186b24bf57700285b7ed", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "1252e817e42616e35357e4aa7f30c1f3", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "0fa88240fcf21fb4a8030212731c5c47", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "8fca31f8837dfb689b9c2b8ee0529fab", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "15f7e176817e7b509567764b98ef8a1a", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ac68b0113512aaa47d91a3a585124181", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "f5caed9be4b5f59aa4a4bffb6d2ba7d7", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "578bdfea257f3913c82fa200c858197a", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "a2fea38fdebf4c687249758c63cae3c7", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "866c89a141e141340de210cb5b6025d6", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e79d9be3f30cd6aee49ca99cb246a1fd", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "1ea429286200a9db50aa91233c61d13a", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "eb37b75b93f6faa872b270d6e88c3a18", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "c330e1a356877ead65e039dfb59f46ab", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "a2c1b1a31a42a24e5f2188983ff97c0e", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "8d146105a6df3376ec2f575401f29ec2", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "5e0e63f5fea108212bfb35c4fdc05dd2", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "85797e98f9a21f168a986b7eb3219688", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "95bc2213d2fb30e8248ddf06764a3663", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "f09d7055120d50f37b605ff3a4cbf61d", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "8f23de3825b9e9cf6ed4715125aeb956", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f7b88875b37a39db57d77bebb05f822f", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "0b719dc609de364814299a5baa9a5b0b", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "07aa53835bdd2d2a4113d61a89a7da1d", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "1a1c4db580157e38effe4b81c35aca52", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "1e44d0a7160d442b1eb4d348952b0d06", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a85fcf6a12483bde66559dbdce88b730", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "d53e31771fe31615c66bd0d1e1292b2f", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "e1804380d5ebec56f8f0af2e2547316e", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d9665cdf870247b6d8e9475419b04038", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "0cac36823713816d03a6922b96cecd0a", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "bd741122315ced7b703de1fed2d372cd", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f11edd5da3ce1a3e804bfc61b7ca9c1e", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "3d647f5f63b3ac3900903cf72496cef2", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "f812111f1eb4ea76e99558305ce3980f", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "c16c1b360b27850f1ac4d3dc55194b0a", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "f812111f1eb4ea76e99558305ce3980f", @@ -4092,14 +4092,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "380d456bc409849174a36c5d2f61aa1b", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "4fae9b286a6d1c5c729c49c483c1422a", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "380d456bc409849174a36c5d2f61aa1b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "8cba13ddabc6c29b7360483d35e83b4c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "9f3a011a47e4b924af06bf22d12eeedd", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "63272196776f495960f4a837d93e1bd5", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9944dc011d9efc9525e728277c278d29", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "a768ba2d0cc92b4e8a6362bd49cf0a1e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "67b3ba3f7e7bb1b38f03ea28792ffab5", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "763663746aa11e24970ac1de4c579310", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "8b3169ff64c31243ba401703d95ae0e0", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "93f75d31841fe18d6bc66681c99b05a1", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "cd6500ab076fa3bdff92fc8b65bc1d64", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "0dcde1146f11e4cfd3d609f4330f7a9a", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "663e6ed62de0f857fd9a4de57067dbd3", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "ae28db2f400d3b778d4a011a72339757", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "3b13cdbaf70cf43d0a14b7a2dd744945", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "54798340a1dfedaa9052aeee180e28ff", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "18b635d88c074261a3be4f45e8244340", "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": "72bfed2cce8ff19741989dec28302f3f", diff --git a/CHANGELOG.md b/CHANGELOG.md index 3aacb4ae..650440be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.28 (build 21581, api 8, 2023-11-09) +### 1.7.28 (build 21583, api 8, 2023-11-09) - 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 diff --git a/src/assets/ba_data/python/babase/_accountv2.py b/src/assets/ba_data/python/babase/_accountv2.py index ab76ae1c..d1baa52d 100644 --- a/src/assets/ba_data/python/babase/_accountv2.py +++ b/src/assets/ba_data/python/babase/_accountv2.py @@ -427,16 +427,6 @@ class AccountV2Handle: workspaceid: str | None logins: dict[LoginType, str] - # def __init__(self) -> None: - - # self.workspacename: str | None = None - # self.workspaceid: str | None = None - - # # Login types and their display-names associated with this account. - # self.logins: dict[LoginType, str] = {} - - # self.accountid: str = - def __enter__(self) -> None: """Support for "with" statement. diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index b16645ca..c784b9a5 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 = 21581 +TARGET_BALLISTICA_BUILD = 21583 TARGET_BALLISTICA_VERSION = '1.7.28' diff --git a/src/assets/ba_data/python/bauiv1lib/account/settings.py b/src/assets/ba_data/python/bauiv1lib/account/settings.py index 94502e91..52d9a7e9 100644 --- a/src/assets/ba_data/python/bauiv1lib/account/settings.py +++ b/src/assets/ba_data/python/bauiv1lib/account/settings.py @@ -231,6 +231,8 @@ class AccountSettingsWindow(bui.Window): plus = bui.app.plus assert plus is not None + via_lines: list[str] = [] + primary_v2_account = plus.accounts.primary v1_state = plus.get_v1_account_state() @@ -259,6 +261,40 @@ class AccountSettingsWindow(bui.Window): show_signed_in_as = self._v1_signed_in signed_in_as_space = 95.0 + # To reduce confusion about the whole V2 account situation for + # people used to seeing their Google Play Games or Game Center + # account name and icon and whatnot, let's show those underneath + # the V2 tag to help communicate that they are in fact logged in + # through that account. + via_space = 25.0 + if show_signed_in_as and bui.app.plus is not None: + primary_account = bui.app.plus.accounts.primary + if primary_account is not None: + # Show Google Play Games account name if the current account + # has such a login attached. + lname = primary_account.logins.get(LoginType.GPGS) + if lname is not None: + icontxt = bui.charstr( + bui.SpecialChar.GOOGLE_PLAY_GAMES_LOGO + ) + via_lines.append(f'{icontxt}{lname}') + + # Show Game Center account name if the current account + # has such a login attached. + lname = primary_account.logins.get(LoginType.GAME_CENTER) + if lname is not None: + icontxt = bui.charstr(bui.SpecialChar.GAME_CENTER_LOGO) + via_lines.append(f'{icontxt}{lname}') + + # TEMP TESTING + if bool(False): + icontxt = bui.charstr(bui.SpecialChar.GAME_CENTER_LOGO) + via_lines.append(f'{icontxt}FloofDibble') + icontxt = bui.charstr( + bui.SpecialChar.GOOGLE_PLAY_GAMES_LOGO + ) + via_lines.append(f'{icontxt}StinkBobble') + show_sign_in_benefits = not self._v1_signed_in sign_in_benefits_space = 80.0 @@ -366,6 +402,7 @@ class AccountSettingsWindow(bui.Window): self._sub_height = 60.0 if show_signed_in_as: self._sub_height += signed_in_as_space + self._sub_height += via_space * len(via_lines) if show_signing_in_text: self._sub_height += signing_in_text_space if show_google_play_sign_in_button: @@ -485,6 +522,54 @@ class AccountSettingsWindow(bui.Window): v -= signed_in_as_space * 0.4 + for via in via_lines: + v -= via_space * 0.1 + sscale = 0.7 + swidth = ( + bui.get_string_width(via, suppress_warning=True) * sscale + ) + bui.textwidget( + parent=self._subcontainer, + position=(self._sub_width * 0.5, v), + size=(0, 0), + text=via, + scale=sscale, + color=(0.6, 0.6, 0.6), + flatness=1.0, + shadow=0.0, + h_align='center', + v_align='center', + ) + bui.textwidget( + parent=self._subcontainer, + position=(self._sub_width * 0.5 - swidth * 0.5 - 5, v), + size=(0, 0), + text=bui.Lstr( + value='(${VIA}', + subs=[('${VIA}', bui.Lstr(resource='viaText'))], + ), + scale=0.6, + color=(0.4, 0.6, 0.4, 0.5), + flatness=1.0, + shadow=0.0, + h_align='right', + v_align='center', + ) + bui.textwidget( + parent=self._subcontainer, + position=(self._sub_width * 0.5 + swidth * 0.5 + 10, v), + size=(0, 0), + text=')', + scale=0.6, + color=(0.4, 0.6, 0.4, 0.5), + flatness=1.0, + shadow=0.0, + h_align='right', + v_align='center', + ) + + v -= via_space * 0.9 + else: self._account_name_text = None self._account_name_what_is_text = None diff --git a/src/ballistica/base/graphics/gl/renderer_gl.cc b/src/ballistica/base/graphics/gl/renderer_gl.cc index b20b6e0f..c24db341 100644 --- a/src/ballistica/base/graphics/gl/renderer_gl.cc +++ b/src/ballistica/base/graphics/gl/renderer_gl.cc @@ -185,9 +185,11 @@ void RendererGL::CheckGLCapabilities_() { basestr = "OpenGL"; } - Log(LogLevel::kInfo, std::string("Using ") + basestr + " (vendor: " + vendor - + ", renderer: " + renderer - + ", version: " + version_str + ")."); + if (g_buildconfig.debug_build()) { + Log(LogLevel::kInfo, std::string("Using ") + basestr + " (vendor: " + vendor + + ", renderer: " + renderer + + ", version: " + version_str + ")."); + } // Build a vector of extensions. Newer GLs give us extensions as lists // already, but on older ones we may need to break a single string apart diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 66ae5776..40022420 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 = 21581; +const int kEngineBuildNumber = 21583; const char* kEngineVersion = "1.7.28"; const int kEngineApiVersion = 8;