diff --git a/.efrocachemap b/.efrocachemap index dae7843d..0628b6b6 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -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/cf/b3/64abb0ccdebfa72916a8ee762b4e", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/57/93/e11f79a8dc058214a6760b3898d0", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e6/c2/b813958185eefaa77223cd2ff53e", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/a5/2e/b3d835ffd3435b7b9e72cf9b9930", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/1c/df/01d7bfaa0cb74c7b53b0c73417db", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/6c/bf/fa6f465f583cb1899d0dcbe11a28", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/2f/c3/d8b851a447dad1f9a06477c6cd5b", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7e/3d/34e9cb37701e84eb773a0d886583", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/4f/ff/e2cdccbd3ada0d69b6959e70a071", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/76/08/6ae049775659b5f942ab1f213549", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/33/e1/ff18af39a66597adab1cdf7a5345", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/60/ff/3472a34d892c5dbc841d97799b15", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/3c/8e/d0216fe8a30fe4f583b89f395954", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/e9/a5/429dd4fd1869b7f43c5c7623d304", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7b/fa/86e36f79023c6ada69a6758a80e7", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e5/15/d2c75f7102103c763bd6dea40c27", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/3c/92/486671bf8e8cc57db875ed7264d3", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/5e/dc/c9c0b407dc89cfdb787b0edf6b8f", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/18/3c/7c3cc0299e586b39f413474d5953", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/bf/93/01882243ada503f7c0ed29ab3516", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/7b/fc/40202144638c394e88af0424ac38", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/bd/fb/9a2813b5a23b727b1b246d5b1a31", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6f/99/9e5c25105d2bc8fd1db0402cdb0f", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8b/4e/f6496d2ccd7a869e4e9d2eb57ee4", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f6/ec/dab1171b1c99587a80e959dddaa5", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/2f/23/0d5dd4dd3dd190a3f81eca6d11f0", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/f3/ec/b238f5118def4ecac3ba4363f389", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b2/d2/307b223ce8182e3c14a982dad7d4", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/08/67/672c0b7edb83bd06f3f08d25c1d1", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/5e/34/7189db32e52d599755bf59587671", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ce/44/dec692802d8023cd48f5f29fa40d", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8d/52/084e0817f587f035017bc2595a8d", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/46/33/1975fe658fc9ffc96b95c0071ecd", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/66/ea/4e901a9ad2ad965bdc773ee3b127", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/2f/54/565f3150df759bffea9dcad21685", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/52/a5/594f6db4b4f0d8d9937bb67d80f6", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0f/86/5228cc1d4a8d2317585028e115f3", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/73/b0/83918095162a68c12bffdb7a4d97", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/12/55/5d5b5a467a1c2ec10c2551465682", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/48/95/a35e7407f5f813cea477dd75130f", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/f4/e7/32cfbd534ac61e626f6c6fbe2b01", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/f3/f8/52577356f2ff5229ed4e5a6764cf", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/60/2b/35acb337afc2d997ffc94d2da757", @@ -4108,14 +4108,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/30/4a/aa281e0eb46722098ec29d7da4f8", "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/0b/e4/a9d278c1bc9a5d731f865ac91a0b", "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/92/f7/8898478ab4ef0a342c727dd64195", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/cb/5f/f1638adbe8eb9984c079b1a61888", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/92/be/7b77cfcfa107c1d33ea845b603c1", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/e9/04/118bc7ad2a64a0f31e11f08d69ff", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/e5/08/35c2f73c14264e15fe436bf4cd5e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/fd/72/dd95f9df72e1785ecd5c4f68786d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/5a/9e/b473defe42a2ee3d8b4349f647d7", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/77/bc/36da2d04f8e04f865c8e3293e74d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/c8/b9/82d868f08eddc94b99e12c772138", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/df/9f/960a5370e02cae685ae3452066f9", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/7d/f7/ba5e3f57b5c6fe96542f61ae21f1", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/34/b3/83428e86252522a10d0c097fc3eb", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/1d/31/12a6e62fc12477b4ed1eb3735b08", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/65/ca/8bd967cebd1836e03117c2b10f5d", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/8c/41/4689d7ca391e92fed73b81e5064c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/7b/a9/f53d5f009e6cc89a265c076bbb51", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/d1/ed/acae7564f9d534d7f78a3a9373ee", "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa", "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/b4/3d/e352190a0e5673d101c0f3ee3ad2", diff --git a/CHANGELOG.md b/CHANGELOG.md index 69540974..3590b6db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.20 (build 21021, api 8, 2023-05-23) +### 1.7.20 (build 21022, api 8, 2023-05-24) - 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 diff --git a/ballisticakit-cmake/CMakeLists.txt b/ballisticakit-cmake/CMakeLists.txt index 8e5a6238..0fd026b4 100644 --- a/ballisticakit-cmake/CMakeLists.txt +++ b/ballisticakit-cmake/CMakeLists.txt @@ -641,8 +641,8 @@ add_executable(ballisticakit ${BA_SRC_ROOT}/ballistica/shared/foundation/exception.h ${BA_SRC_ROOT}/ballistica/shared/foundation/fatal_error.cc ${BA_SRC_ROOT}/ballistica/shared/foundation/fatal_error.h - ${BA_SRC_ROOT}/ballistica/shared/foundation/feature_set_front_end.cc - ${BA_SRC_ROOT}/ballistica/shared/foundation/feature_set_front_end.h + ${BA_SRC_ROOT}/ballistica/shared/foundation/feature_set_native_component.cc + ${BA_SRC_ROOT}/ballistica/shared/foundation/feature_set_native_component.h ${BA_SRC_ROOT}/ballistica/shared/foundation/inline.cc ${BA_SRC_ROOT}/ballistica/shared/foundation/inline.h ${BA_SRC_ROOT}/ballistica/shared/foundation/logging.cc diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj index 8d56979c..09735c75 100644 --- a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj +++ b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj @@ -632,8 +632,8 @@ - - + + diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters index 7c35f19c..25b38c56 100644 --- a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters +++ b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters @@ -1330,10 +1330,10 @@ ballistica\shared\foundation - + ballistica\shared\foundation - + ballistica\shared\foundation diff --git a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj index 693afd11..318f42a0 100644 --- a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj +++ b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj @@ -627,8 +627,8 @@ - - + + diff --git a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters index 7c35f19c..25b38c56 100644 --- a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters +++ b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters @@ -1330,10 +1330,10 @@ ballistica\shared\foundation - + ballistica\shared\foundation - + ballistica\shared\foundation diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 913960dc..e8075868 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -31,7 +31,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21021 +TARGET_BALLISTICA_BUILD = 21022 TARGET_BALLISTICA_VERSION = '1.7.20' _g_env_config: EnvConfig | None = None diff --git a/src/ballistica/base/base.h b/src/ballistica/base/base.h index 0375b08b..a047523d 100644 --- a/src/ballistica/base/base.h +++ b/src/ballistica/base/base.h @@ -7,7 +7,7 @@ #include #include "ballistica/core/support/base_soft.h" -#include "ballistica/shared/foundation/feature_set_front_end.h" +#include "ballistica/shared/foundation/feature_set_native_component.h" // Common header that most everything using our feature-set should include. // It predeclares our feature-set's various types and globals and other diff --git a/src/ballistica/base/support/plus_soft.h b/src/ballistica/base/support/plus_soft.h index c9ff873c..626b3d98 100644 --- a/src/ballistica/base/support/plus_soft.h +++ b/src/ballistica/base/support/plus_soft.h @@ -8,7 +8,7 @@ #include #include "ballistica/shared/ballistica.h" -#include "ballistica/shared/foundation/feature_set_front_end.h" +#include "ballistica/shared/foundation/feature_set_native_component.h" namespace ballistica::base { diff --git a/src/ballistica/classic/classic.h b/src/ballistica/classic/classic.h index cf8dcc26..bca18446 100644 --- a/src/ballistica/classic/classic.h +++ b/src/ballistica/classic/classic.h @@ -3,7 +3,7 @@ #ifndef BALLISTICA_CLASSIC_CLASSIC_H_ #define BALLISTICA_CLASSIC_CLASSIC_H_ -#include "ballistica/shared/foundation/feature_set_front_end.h" +#include "ballistica/shared/foundation/feature_set_native_component.h" // Common header that most everything using our feature-set should include. // It predeclares our feature-set's various types and globals and other diff --git a/src/ballistica/scene_v1/scene_v1.h b/src/ballistica/scene_v1/scene_v1.h index 4f8a421b..e12429a8 100644 --- a/src/ballistica/scene_v1/scene_v1.h +++ b/src/ballistica/scene_v1/scene_v1.h @@ -8,7 +8,7 @@ #include #include "ballistica/shared/ballistica.h" -#include "ballistica/shared/foundation/feature_set_front_end.h" +#include "ballistica/shared/foundation/feature_set_native_component.h" #include "ballistica/shared/python/python_ref.h" // Common header that most everything using our feature-set should include. diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 57fdea84..7acbaf8e 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 = 21021; +const int kEngineBuildNumber = 21022; const char* kEngineVersion = "1.7.20"; auto MonolithicMain(const core::CoreConfig& core_config) -> int { diff --git a/src/ballistica/shared/foundation/feature_set_front_end.cc b/src/ballistica/shared/foundation/feature_set_native_component.cc similarity index 97% rename from src/ballistica/shared/foundation/feature_set_front_end.cc rename to src/ballistica/shared/foundation/feature_set_native_component.cc index fa583050..a601c61c 100644 --- a/src/ballistica/shared/foundation/feature_set_front_end.cc +++ b/src/ballistica/shared/foundation/feature_set_native_component.cc @@ -1,6 +1,6 @@ // Released under the MIT License. See LICENSE for details. -#include "ballistica/shared/foundation/feature_set_front_end.h" +#include "ballistica/shared/foundation/feature_set_native_component.h" #include "ballistica/core/support/base_soft.h" #include "ballistica/shared/python/python.h" diff --git a/src/ballistica/shared/foundation/feature_set_front_end.h b/src/ballistica/shared/foundation/feature_set_native_component.h similarity index 87% rename from src/ballistica/shared/foundation/feature_set_front_end.h rename to src/ballistica/shared/foundation/feature_set_native_component.h index 0d4e8bd5..557f8fa3 100644 --- a/src/ballistica/shared/foundation/feature_set_front_end.h +++ b/src/ballistica/shared/foundation/feature_set_native_component.h @@ -1,7 +1,7 @@ // Released under the MIT License. See LICENSE for details. -#ifndef BALLISTICA_SHARED_FOUNDATION_FEATURE_SET_FRONT_END_H_ -#define BALLISTICA_SHARED_FOUNDATION_FEATURE_SET_FRONT_END_H_ +#ifndef BALLISTICA_SHARED_FOUNDATION_FEATURE_SET_NATIVE_COMPONENT_H_ +#define BALLISTICA_SHARED_FOUNDATION_FEATURE_SET_NATIVE_COMPONENT_H_ #include "ballistica/core/core.h" #include "ballistica/shared/ballistica.h" @@ -43,4 +43,4 @@ class FeatureSetNativeComponent { } // namespace ballistica -#endif // BALLISTICA_SHARED_FOUNDATION_FEATURE_SET_FRONT_END_H_ +#endif // BALLISTICA_SHARED_FOUNDATION_FEATURE_SET_NATIVE_COMPONENT_H_ diff --git a/src/ballistica/template_fs/template_fs.h b/src/ballistica/template_fs/template_fs.h index 2cc77361..afca6fc5 100644 --- a/src/ballistica/template_fs/template_fs.h +++ b/src/ballistica/template_fs/template_fs.h @@ -3,7 +3,7 @@ #ifndef BALLISTICA_TEMPLATE_FS_TEMPLATE_FS_H_ #define BALLISTICA_TEMPLATE_FS_TEMPLATE_FS_H_ -#include "ballistica/shared/foundation/feature_set_front_end.h" +#include "ballistica/shared/foundation/feature_set_native_component.h" // Common header that most everything using our feature-set should include. // It predeclares our feature-set's various types and globals and other diff --git a/src/ballistica/ui_v1/ui_v1.h b/src/ballistica/ui_v1/ui_v1.h index e1170bfa..aedf39d3 100644 --- a/src/ballistica/ui_v1/ui_v1.h +++ b/src/ballistica/ui_v1/ui_v1.h @@ -3,7 +3,7 @@ #ifndef BALLISTICA_UI_V1_UI_V1_H_ #define BALLISTICA_UI_V1_UI_V1_H_ -#include "ballistica/shared/foundation/feature_set_front_end.h" +#include "ballistica/shared/foundation/feature_set_native_component.h" // Common header that most everything using our feature-set should include. // It predeclares our feature-set's various types and globals and other