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

fixing crash bug

Browse Source
This commit is contained in:
Eric 2023-10-05 07:27:01 -07:00
parent f1eb7ca680
commit a3c4d0e07e
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
6 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
.efrocachemap generated
View File

@ -4056,50 +4056,50 @@
"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": "c1c0394f8ef67f66f3e687302be1bae5",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "bb034b440d7119e6fdfbbf79e7473f22",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "23ead987200b5474e08c0ec0584ffce1",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "a5bd9ad61f73c8e9fb595921278deb7b",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "e359b657fc29d2e6cbf8d535145630ac",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "c2f3a37e6a147817265eca40d2cec4ec",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "322d96f59ae50524b28825123036677d",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "ef808bb9694e6bd7f83a016734c0d80a",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ee0beb547c973797c413a46bef1e1c92",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "1048789848f35cff82c7de97422caf76",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "741c6a2e23cc1c9fb4ae4d71e3ce353d",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "dd2b5da1a59a0ff8bd672feb6fd69da4",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "c8fc022822d28cfc489928d9a29e87c4",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "e1e9d1d6ccbc21dd2a8ea98bc7a0dcf3",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "64747b6f0d8416a8a6a730a1d66ea9fb",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "2adfbda7c4c22d03736db3dca776b2e9",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e96102ef9e23b611fc359f990429317e",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "1e6bb4e9fcdb71ead226351eacaf461b",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "c0cf1456214fbd5aeabff60695ce5f82",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "d28ed224f9b9e0cad81b3a1b8a722c5c",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "757a2a4e9294211fa0018bdc67e0b1c7",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "00df85426f2fd425284d788ad2001163",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "ec7fd15e05dc966ed5fe2dc53082b8dc",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "5a07480211a13748414bccdb33ab50e0",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "cee4f0b1f606e2cd4e0084821803bbda",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "ec670868f9b49d8b300e7c096d45fccd",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "55e11d3f9f2dafbe4a785ad8d53a5191",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "66a165dce9b2576796b61a0190ee2360",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "0973f550afc8dc1a966f0cf34119bdee",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "be55036d49b2aac4f7fb34acda7ae46a",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "0b5b2fcbe365f1465d1eaf6663efddef",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "198ab1ae413439560c94e7e70dccb8e1",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "832d429448bf666876ecc2dfbdce6ac1",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "42a60e06d573fd770bf085d1de1e8426",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "4b3b7f626517f5b83973e23728182fa0",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "b7b82fe0bef26f414f952038982ba94c",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "99156961b81f9849e7055f5e73449735",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "93ae112921fa541badb6844eb913b825",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "08a27186747d3a1fe854014243d39550",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "10ec7da590f68e1cc1a6f9b9ed4abf25",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "c76a8d161dae2b3ec3ae2898803e6387",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "76d9f578bc7395af5ddef379a85e6354",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "48dd3167591df4494852c6c3e9047f1b",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "757a2a4e9294211fa0018bdc67e0b1c7",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "76d9f578bc7395af5ddef379a85e6354",
"build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "48dd3167591df4494852c6c3e9047f1b",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "b8f3d468d46917abf4019df92594742c",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "4a757f9ede607532cd5c8c2589f05bb4",
"build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "9a9e18d3856e343c3ca6ac136a64235a",
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "b8f3d468d46917abf4019df92594742c",
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "4a757f9ede607532cd5c8c2589f05bb4",
"build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "9a9e18d3856e343c3ca6ac136a64235a",
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "d667b00185c20f91f8a4cfca56291431",
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "da8bef9f3989024b8f45b7c27d41ce06",
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "f2f9159cd08054e71ed87db479b18d21",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "d667b00185c20f91f8a4cfca56291431",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "da8bef9f3989024b8f45b7c27d41ce06",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "f2f9159cd08054e71ed87db479b18d21",
"build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "c5be9635152219c67b8e15969802b191",
"build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "dfb64c08a34939df60bae54579cc662c",
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "0c0e93911fda8343f06b76a84b2331a3",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "8b1daae0ffa7a0de9624c645bd4ad71c",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "5414ebd032c5b437f0b6a6ea952667d0",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "0c0e93911fda8343f06b76a84b2331a3",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "7a14948fa1f96abeeac83e7d7f21182c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "578472bcfa184250aeb490d77bd9d63c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "721144d309b981fc9944d127c33bd304",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "da41b51b970e32b772b3f930c84765d3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "7fc9e2da84f6d1787aa9d380d556920a",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "cc3ee167b8f20861f8b804dd01ba206e",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "ac826c9913b4f5ac23982ede5d930b97",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "1457099fc2eed44633b60d0ba6dad9a7",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "c376e54bfa43c7411464c86b7ebbe7d2",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "92509f7dbfdd5628f71a9f5e0453c1de",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "187084265adac8497ebd6f43b82c6a9f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "bf66ac68f2d9deea5f310e3e8a40e4da",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "c570f55f73054b411dbaca428062c3d7",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "0fa9d0afbbe2fb2de1a19a6be66d04d2",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "c08bdaebba8bbbe2a92a6c17b11a8ccc",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "17809e9b9a2e62cb49d952ac41d79a13",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "f8cd3af311ac63147882590123b78318",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "9f71f171464dc004dbaab87e9bb4b03b",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.28 (build 21417, api 8, 2023-10-04)
### 1.7.28 (build 21418, api 8, 2023-10-05)
- 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

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

@ -52,7 +52,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 21417
TARGET_BALLISTICA_BUILD = 21418
TARGET_BALLISTICA_VERSION = '1.7.28'

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

@ -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 = 21417;
const int kEngineBuildNumber = 21418;
const char* kEngineVersion = "1.7.28";
const int kEngineApiVersion = 8;

10
src/ballistica/shared/foundation/object.h
View File

@ -235,10 +235,12 @@ class Object {
// Update: Actually now getting errors that
// having both is ambiguous, so maybe can kill these now?..
// auto operator=(const WeakRef<T>& ref) -> WeakRef<T>& {
// *this = ref.Get();
// return *this;
// }
// Update 2: Oops; we (still?) crash without this.
// re-enabling for now. Need to get to the bottom of this.
auto operator=(const WeakRef<T>& ref) -> WeakRef<T>& {
*this = ref.Get();
return *this;
}
// auto operator==(const WeakRef<T>& ref) -> bool {
// return (Get() == ref.Get());

28
tools/batools/resourcesmakefile.py
View File

@ -255,20 +255,20 @@ class ResourcesMakefileGenerator:
def _add_ios_app_icon(self) -> None:
sizes = [
(20, 2),
(20, 3),
(29, 2),
(29, 3),
(40, 2),
(40, 3),
(60, 2),
(60, 3),
(20, 1),
(29, 1),
(40, 1),
(76, 1),
(76, 2),
(83.5, 2),
# (20, 2),
# (20, 3),
# (29, 2),
# (29, 3),
# (40, 2),
# (40, 3),
# (60, 2),
# (60, 3),
# (20, 1),
# (29, 1),
# (40, 1),
# (76, 1),
# (76, 2),
# (83.5, 2),
(1024, 1),
]
for size in sizes: