mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-27 01:13:13 +08:00
testing that gitattributes change
This commit is contained in:
Eric
parent
9fae85ec48
commit
e6f1131b12
40
.efrocachemap
generated
40
.efrocachemap
generated
@ -4072,26 +4072,26 @@
|
||||
"build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/c5/09/4f10b8a21ba87aa5509cff7a164b",
|
||||
"build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/ff/0a/a354984f9c074dab0676ac7e4877",
|
||||
"build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/2a/1c/9ee5db6d1bceca7fa6638fb8abde",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/71/15/57a530b858d86ba9dfa41023effb",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/8e/14/1c68ac731dc3698542ae424d26ee",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/26/55/a4839897d87e4230d7292dd522e5",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/f7/91/11183fa100f6863716f11d1bc15f",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/7a/9b/3f28c4332e749ae260e8c0ad973d",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/d0/51/78348034f076671655b4268471f2",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7f/78/b502c2ebabc76947ea3271857d39",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7e/1b/5de185765be64965dc78c6cd4e65",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ab/f2/a834a306fc65a6d989162f016d15",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/c8/3a/cc813fbcbf3de27e99ffa2c49c83",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/35/a2/938b7e029bdfae20c5871e7612ff",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e1/58/2f21394b48d3ffa1d2db067c5873",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/48/69/e1071029495cc3030b4e97baa959",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/98/3d/e739287bb91e8a3c66143d847c46",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/fb/3a/6e595d81d6a24293c7626ba57620",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/70/22/e4a161772eb81517af6d684c6adf",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/42/6d/89c22399503646a09d17a5ffd265",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/71/3d/4e3b05e2139ddeeaca7a9516d359",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/78/57/b254b253032d31a05850c74a868c",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/2d/89/1a01696f6ed0e8882df9bdce9c40",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/62/e9/b412163b4e092088efa29e550cd4",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/81/fd/c5801cc71a91d20ef7b6b7526f3d",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b3/56/d164cdda04a395651bfc4a3da0c6",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0c/7b/7e10e6a46365b51540bc262a4c43",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/0f/5f/04db76cebd93efe7faab6b4dba39",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f4/6f/aa2b417a9797fe0f11c4f542aeb3",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b4/07/fb400d012c9cc329c3a217852e26",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0f/3c/d1b770ff37a9b53c860362f05400",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/bd/16/c1709db56780f001b5b1bf47317f",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a5/7e/9ceb3f55b731cffbc328ea743491",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/79/15/bcbd5d58fdc570b4b4eb5655ae7f",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c5/54/ec4fd0499ca54baa05cd9bef5c78",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/fe/20/59037de2db9181b1f96be6e7d80a",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/3e/a3/13891776879d294ab560c47e5053",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/73/00/58a11fad57922bfebd07b2dfc5fa",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b2/34/0e687a8fca611ec2caa43bab1170",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/a8/65/5fb5e25457fa8e278b97f01e82e2",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/e2/bf/9389ad3c3b8fee044ce2d5b07432",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/a4/14/3fd19331236afb93ebe295bb328f",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/f1/93/2291e8eb86dc7c0e07b0b60877c6",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/98/32/43c61f1e11520f764158cf0e76d2",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ca/65/cba463f21a8f76c5bbfe27cae124",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/73/20/119211f1700bb5a410cedf4e76f2",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
### 1.7.20 (build 21049, api 8, 2023-06-06)
|
||||
### 1.7.20 (build 21050, api 8, 2023-06-06)
|
||||
|
||||
- This seems like a good time for a `refactoring` release in anticipation of
|
||||
changes coming in 1.8. Basically this means that a lot of things will be
|
||||
|
||||
@ -28,7 +28,7 @@ if TYPE_CHECKING:
|
||||
|
||||
# Build number and version of the ballistica binary we expect to be
|
||||
# using.
|
||||
TARGET_BALLISTICA_BUILD = 21049
|
||||
TARGET_BALLISTICA_BUILD = 21050
|
||||
TARGET_BALLISTICA_VERSION = '1.7.20'
|
||||
|
||||
_g_env_config: EnvConfig | None = None
|
||||
|
||||
@ -27,8 +27,8 @@ auto main(int argc, char** argv) -> int {
|
||||
auto core_config =
|
||||
ballistica::core::CoreConfig::FromCommandLineAndEnv(argc, argv);
|
||||
|
||||
// Arg-parsing may have yielded an error or printed simple output for things
|
||||
// such as '--help', in which case we're done.
|
||||
// Arg-parsing may have yielded an error or printed simple output for
|
||||
// things such as '--help', in which case we're done.
|
||||
if (core_config.immediate_return_code.has_value()) {
|
||||
return *core_config.immediate_return_code;
|
||||
}
|
||||
@ -39,12 +39,13 @@ auto main(int argc, char** argv) -> int {
|
||||
namespace ballistica {
|
||||
|
||||
// These are set automatically via script; don't modify them here.
|
||||
const int kEngineBuildNumber = 21049;
|
||||
const int kEngineBuildNumber = 21050;
|
||||
const char* kEngineVersion = "1.7.20";
|
||||
|
||||
auto MonolithicMain(const core::CoreConfig& core_config) -> int {
|
||||
// This code is meant to be run standalone so won't inherit any feature-set's
|
||||
// globals; we'll need to collect anything we need explicitly.
|
||||
// This code is meant to be run standalone so won't inherit any
|
||||
// feature-set's globals; we'll need to collect anything we need
|
||||
// explicitly.
|
||||
core::CoreFeatureSet* l_core{};
|
||||
core::BaseSoftInterface* l_base{};
|
||||
|
||||
@ -57,15 +58,15 @@ auto MonolithicMain(const core::CoreConfig& core_config) -> int {
|
||||
}
|
||||
}
|
||||
|
||||
// No matter what we're doing, we need the core feature set. Some ballistica
|
||||
// functionality implicitly uses core, so we should always import it first
|
||||
// thing even if we don't explicitly use it.
|
||||
// No matter what we're doing, we need the core feature set. Some
|
||||
// ballistica functionality implicitly uses core, so we should always
|
||||
// import it first thing even if we don't explicitly use it.
|
||||
l_core = core::CoreFeatureSet::Import(&core_config);
|
||||
|
||||
// If a command was passed, simply run it and exit. We want to act simply
|
||||
// as a Python interpreter in that case; we don't do any environment setup
|
||||
// (aside from the bits core does automatically such as making our built
|
||||
// in binary modules available).
|
||||
// If a command was passed, simply run it and exit. We want to act
|
||||
// simply as a Python interpreter in that case; we don't do any
|
||||
// environment setup (aside from the bits core does automatically such
|
||||
// as making our built in binary modules available).
|
||||
if (l_core->core_config().call_command.has_value()) {
|
||||
auto gil{Python::ScopedInterpreterLock()};
|
||||
bool success = PythonCommand(*l_core->core_config().call_command,
|
||||
@ -81,9 +82,9 @@ auto MonolithicMain(const core::CoreConfig& core_config) -> int {
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
// First, set up our environment using our internal paths and whatnot
|
||||
// (essentially the baenv.configure() call). This needs to be done before
|
||||
// any other ba* modules are imported since it may affect where those
|
||||
// modules get loaded from in the first place.
|
||||
// (essentially the baenv.configure() call). This needs to be done
|
||||
// before any other ba* modules are imported since it may affect where
|
||||
// those modules get loaded from in the first place.
|
||||
l_core->python->MonolithicModeBaEnvConfigure();
|
||||
|
||||
// We need the base feature-set to run a full app but we don't have a hard
|
||||
@ -105,20 +106,20 @@ auto MonolithicMain(const core::CoreConfig& core_config) -> int {
|
||||
// Phase 3: "We come to it at last; the great battle of our time."
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
// At this point we unleash the beast and then simply process
|
||||
// events until the app exits (or we return from this function and let the
|
||||
// At this point we unleash the beast and then simply process events
|
||||
// until the app exits (or we return from this function and let the
|
||||
// environment do that part).
|
||||
|
||||
if (l_base->AppManagesEventLoop()) {
|
||||
// In environments where we control the event loop... do that.
|
||||
l_base->RunAppToCompletion();
|
||||
} else {
|
||||
// Under managed environments we now simply return and let the environment
|
||||
// feed us events until the app exits. However, we may need to first
|
||||
// 'prime the pump' here for our main thread event loop. For instance, if
|
||||
// our event loop is driven by frame draws, we may need to manually pump
|
||||
// events until we receive the 'create-screen' message from the logic
|
||||
// thread which gets our frame draws going.
|
||||
// Under managed environments we now simply return and let the
|
||||
// environment feed us events until the app exits. However, we may
|
||||
// need to first 'prime the pump' here for our main thread event loop.
|
||||
// For instance, if our event loop is driven by frame draws, we may
|
||||
// need to manually pump events until we receive the 'create-screen'
|
||||
// message from the logic thread which gets our frame draws going.
|
||||
l_base->PrimeAppMainThreadEventPump();
|
||||
}
|
||||
} catch (const std::exception& exc) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user