RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-19 13:25:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wired up v2account logging

Browse Source
This commit is contained in:
Eric 2024-10-21 13:07:25 -07:00
parent fed9361608
commit 9c54a3a8b1
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
10 changed files with 50 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
.efrocachemap generated
View File

@ -4096,56 +4096,56 @@
"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": "da152308175876e12d1fd61b7038df02",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "7e93d9c9e287ec35b2f8a86c7a57fc7b",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "13a4f65de29759e0c4c7588b2f4c85dd",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "7133d473ee6490f9fce7b8916fee5b9a",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "b93a977c538d97c47e01aae0a4af4d66",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "885c9d46ba5142534fc905c775739aaa",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b66549fb209759b77c8a7d54c2637f26",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "810ca7396139727250ba091563532933",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "df466982e60d1db932bf4738b93b009b",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "cc42edf60167c47a80b4ad1b390a5831",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "2fdcb711ee0a961c8f58f3ec2798404f",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "f91a21a33133cdbede42253fb8d1811a",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "851a87095ec605adbfb2c8c4b6d8b6fc",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "5a066d510cd9754fb62dd387f1fb027a",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "515b49ddd02f301d63d63598aee051b0",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "cfc6054e31108d5243f3b8ee615a1885",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "d45d89d9dcd23d48aeacb17eb5b7c657",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "d078987a105f68090bba9fa7162f134b",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "730e6a3047bcd498b4579e1c9909d1e4",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "7db95793400c71f121f238846a256813",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "b33ff0f1a8fb45c0446be12bb8ba2f2c",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "6b2ad709be9bcacffd39fb5dd5080fb0",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "b33ff0f1a8fb45c0446be12bb8ba2f2c",
"build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "6b2ad709be9bcacffd39fb5dd5080fb0",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "509b9ffddb42fc7f6db08ee019a42566",
"build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "7a2ee758ec32e5da19714bca2b72e7f6",
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "509b9ffddb42fc7f6db08ee019a42566",
"build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "7a2ee758ec32e5da19714bca2b72e7f6",
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "e4d747889c70c91519e773242904ecbd",
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "7045f94dc595d1dfbfd129b02112f47d",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "e4d747889c70c91519e773242904ecbd",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "7045f94dc595d1dfbfd129b02112f47d",
"build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "7bdfe08cd93eb25bd9a001ceb47d1877",
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "aa35e18a975a33a4ac9608f90ba118e9",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "6b12eddf630f4652755aa4d3d5e380e3",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "aa35e18a975a33a4ac9608f90ba118e9",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "4f872ff45ddeb2b3056489292da46f52",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "0d0e44d50344f795c07185e6d4f9ec81",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "49d2caef81494124cb85992aba6f4a22",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9e9f00e74bec9c9947ad2842db2ec8e9",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "0a5b580a87a3dd32a49670a02e3680a2",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "64c8b74f91155d496ab0359e44e356dc",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "56b287a0de1750bbe7a2a1616521202b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "7fc0d651ab677f4af41cf9051649eab5",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "a598766836cd0ea28a1943b5dfa2cf48",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "2c7d6f8355451598be474d7ea7461ac4",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "f738c276faf69ac6b23b46a0e00e66cc",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4f917646e3626fd49943b2f681e8bc27",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "2d044a28fd391fcf6e2c807c0fe51cbf",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "6974a7ba1384719ff3f34c5eacc6a2a4",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "382cf2436d7c488a6a20758e3d3c1f2b",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "ee990132a12cca7877c341399b7b8deb",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "27a952ea3647eca2b7ef0395409aa676",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "c181d7b07f9120502b3a88c949e99e3c",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "6530013d13781cb7f29a107df54f362c",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c18fec69637b72f98a617cb22f0f0df7",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "04b70eb5f8f6bb0e07a4f3025903bda6",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "ad9ef6d83fa478ee9d1a40f61ca38730",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "f43917836334f3bc0277cbff0503878c",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0dcf8315c0b8cc2da817e80d0577197b",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "3812999bfbc14ec860e49317c69aeb64",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "59da09b01e23f080569ee0e59483479c",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e0992d0954ba8d3a74d332f535676cde",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "aa5256e587f4b93bc1ef988308a84113",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "51e81607756f0dca35b4aad4a183e82f",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "1e18027d82990576b97b02dc4bb0fb01",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "51e81607756f0dca35b4aad4a183e82f",
"build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "1e18027d82990576b97b02dc4bb0fb01",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "b791b77e04bd1459487ced079b8875d8",
"build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "8863c430ff6c2a11670c655ba35ccfc4",
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "b791b77e04bd1459487ced079b8875d8",
"build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "8863c430ff6c2a11670c655ba35ccfc4",
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "8e6da834224087d2b773ddc8890c768e",
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "a6f99bc0b4a5bcfdbe56941845622777",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "8e6da834224087d2b773ddc8890c768e",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "a6f99bc0b4a5bcfdbe56941845622777",
"build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "a79716311cc136c207d979ad2a6b6e98",
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "e602fad2ea96f7d026f3f8c20773e931",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "bc134f0972102db689dffd422ac97621",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "e602fad2ea96f7d026f3f8c20773e931",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "de9a96c4f76bb7c44329b95d8666a87d",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "7f746ad4356d533c12838b7ac9305ba1",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "33893747ea446f83a87f144ee8965799",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e4d6245e0f25579ddc99c7aba78141d5",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "a686e191d9d3a7d36a62f101a823b08c",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "048e8dd6a7f783479ebb3ad3bfa92c65",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "a8fcea1b40352e73fc3b7ad87820c06b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "264f656b3cc167f4bfe797f4a579b0f5",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d",
"src/ballistica/base/mgen/pyembed/binding_base_app.inc": "f0f9dc33ecd4ef7a384f131d62c96c97",
"src/ballistica/classic/mgen/pyembed/binding_classic.inc": "3ceb412513963f0818ab39c58bf292e3",
"src/ballistica/core/mgen/pyembed/binding_core.inc": "ef193d5aff7c59395693c66f134b3b94",
"src/ballistica/core/mgen/pyembed/binding_core.inc": "3afbd58f56fd04bdd6fc2aa7ae166275",
"src/ballistica/core/mgen/pyembed/env.inc": "f015d726b44d2922112fc14d9f146d8b",
"src/ballistica/core/mgen/python_modules_monolithic.h": "fb967ed1c7db0c77d8deb4f00a7103c5",
"src/ballistica/scene_v1/mgen/pyembed/binding_scene_v1.inc": "c25b263f2a31fb5ebe057db07d144879",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22049, api 9, 2024-10-21)
### 1.7.37 (build 22052, api 9, 2024-10-21)
- Bumping api version to 9. As you'll see below, there's some UI changes that
will require a bit of work for any UI mods to adapt to. If your mods don't
touch UI stuff at all you can simply bump your api version and call it a day.

2
src/assets/ba_data/python/baenv.py
View File

@ -53,7 +53,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 22049
TARGET_BALLISTICA_BUILD = 22052
TARGET_BALLISTICA_VERSION = '1.7.37'

3
src/ballistica/base/base.cc
View File

@ -181,8 +181,7 @@ auto BaseFeatureSet::GetV2AccountID() -> std::optional<std::string> {
}
return result.ValueAsString();
} else {
Log(LogName::kBaAccount, LogLevel::kError,
"GetV2AccountID() py call errored.");
Log(LogName::kBa, LogLevel::kError, "GetV2AccountID() py call errored.");
return {};
}
}

2
src/ballistica/classic/classic.cc
View File

@ -151,7 +151,7 @@ auto ClassicFeatureSet::GetV1AccountLoginStateString() -> std::string {
out = "signing_in";
break;
default:
Log(LogName::kBaAccount, LogLevel::kError,
Log(LogName::kBa, LogLevel::kError,
"Unknown V1LoginState '" + std::to_string(static_cast<int>(state))
+ "'");
out = "signed_out";

7
src/ballistica/core/python/core_python.cc
View File

@ -187,8 +187,6 @@ void CorePython::EnablePythonLoggingCalls() {
assert(objs().Exists(ObjID::kLoggerRootLogCall));
assert(objs().Exists(ObjID::kLoggerBa));
assert(objs().Exists(ObjID::kLoggerBaLogCall));
assert(objs().Exists(ObjID::kLoggerBaAccount));
assert(objs().Exists(ObjID::kLoggerBaAccountLogCall));
assert(objs().Exists(ObjID::kLoggerBaAudio));
assert(objs().Exists(ObjID::kLoggerBaAudioLogCall));
assert(objs().Exists(ObjID::kLoggerBaGraphics));
@ -260,7 +258,6 @@ void CorePython::UpdateInternalLoggerLevels(LogLevel* log_levels) {
std::pair<LogName, ObjID> pairs[] = {
{LogName::kRoot, ObjID::kLoggerRoot},
{LogName::kBa, ObjID::kLoggerBa},
{LogName::kBaAccount, ObjID::kLoggerBaAccount},
{LogName::kBaAudio, ObjID::kLoggerBaAudio},
{LogName::kBaGraphics, ObjID::kLoggerBaGraphics},
{LogName::kBaLifecycle, ObjID::kLoggerBaLifecycle},
@ -434,10 +431,6 @@ void CorePython::LoggingCall(LogName logname, LogLevel loglevel,
logcallobj = ObjID::kLoggerBaLogCall;
handled = true;
break;
case LogName::kBaAccount:
logcallobj = ObjID::kLoggerBaAccountLogCall;
handled = true;
break;
case LogName::kBaAudio:
logcallobj = ObjID::kLoggerBaAudioLogCall;
handled = true;

2
src/ballistica/core/python/core_python.h
View File

@ -34,8 +34,6 @@ class CorePython {
kLoggerRootLogCall,
kLoggerBa,
kLoggerBaLogCall,
kLoggerBaAccount,
kLoggerBaAccountLogCall,
kLoggerBaAudio,
kLoggerBaAudioLogCall,
kLoggerBaGraphics,

2
src/ballistica/shared/ballistica.cc
View File

@ -40,7 +40,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica {
// These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 22049;
const int kEngineBuildNumber = 22052;
const char* kEngineVersion = "1.7.37";
const int kEngineApiVersion = 9;

1
src/ballistica/shared/foundation/types.h
View File

@ -287,7 +287,6 @@ enum class PyExcType : uint8_t {
enum class LogName : uint8_t {
kRoot,
kBa,
kBaAccount,
kBaLifecycle,
kBaAudio,
kBaGraphics,

2
src/meta/bacoremeta/pyembed/binding_core.py
View File

@ -27,8 +27,6 @@ values = [
logging.getLogger('root').log, # kLoggerRootLogCall
logging.getLogger('ba'), # kLoggerBa
logging.getLogger('ba').log, # kLoggerBaLogCall
logging.getLogger('ba.account'), # kLoggerBaAccount
logging.getLogger('ba.account').log, # kLoggerBaAccountLogCall
logging.getLogger('ba.audio'), # kLoggerBaAudio
logging.getLogger('ba.audio').log, # kLoggerBaAudioLogCall
logging.getLogger('ba.graphics'), # kLoggerBaGraphics