From 6061559dc2fd57d8538d2bb14a2fb6b88c536587 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Tue, 5 Jan 2021 11:32:44 -0800 Subject: [PATCH 1/4] Update BabylonNative to fix engine dispose after entering an XR session. Still need the corresponding B.JS change. --- Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 31968d582..041fc4cb3 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 31968d582cbb4efd834100ba990d07601fa0d10c +Subproject commit 041fc4cb398a8c686cf78ccd398a10b14c664986 From 785a1300749a84f3ee0dafebaa6b935ff4e2a6f2 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Thu, 7 Jan 2021 11:52:44 -0800 Subject: [PATCH 2/4] Update BabylonNative --- Apps/PackageTest/package.json | 2 +- Apps/Playground/package-lock.json | 28 +++++++++---------- Apps/Playground/package.json | 4 +-- .../react-native/submodules/BabylonNative | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Apps/PackageTest/package.json b/Apps/PackageTest/package.json index 8b8c74a59..cac3193d9 100644 --- a/Apps/PackageTest/package.json +++ b/Apps/PackageTest/package.json @@ -10,7 +10,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@babylonjs/core": "^4.2.0", + "@babylonjs/core": "^5.0.0-alpha.6", "@babylonjs/react-native": "file:../../Package/Assembled/babylonjs-react-native-0.0.1.tgz", "react": "16.13.1", "react-native": "0.63.1", diff --git a/Apps/Playground/package-lock.json b/Apps/Playground/package-lock.json index 25ecc688d..bcc5d4ad5 100644 --- a/Apps/Playground/package-lock.json +++ b/Apps/Playground/package-lock.json @@ -864,20 +864,20 @@ } }, "@babylonjs/core": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-4.2.0.tgz", - "integrity": "sha512-sZQigPvMDc0pcgwlKvTF5gsMzGwT8gelQIOyxELrohdFu12pHGhIr61+yVxxq9tpCdzyYD9kS8LM0w2y+5ypkg==", + "version": "5.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.6.tgz", + "integrity": "sha512-7Tg/MByT6nUHpV5TjVj1xHsmnbrk1hGMk/jKCui6bydR6YaGrkE0yoLAmJXX5ALGXhhKLIDj+qg3QHWVFsi1lA==", "requires": { "tslib": ">=1.10.0" } }, "@babylonjs/loaders": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-4.2.0.tgz", - "integrity": "sha512-feCmp4I+suBNLko3wGFNZpDg1Bqt9NxEuhKZ+epmaIWSqKEQAMhDvdehcq9vETTVKULkzRGZdDrZmEX0weG80g==", + "version": "5.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-5.0.0-alpha.6.tgz", + "integrity": "sha512-mnUkcA2a4Mdo484q7ckw+QxPYM8mfMaZjfSyt4YjwUxXRdOvbQUPyk/ZojrQjXajEFdzpxhqEU5Iu5CZr01w1A==", "requires": { - "@babylonjs/core": "4.2.0", - "babylonjs-gltf2interface": "4.2.0", + "@babylonjs/core": "5.0.0-alpha.6", + "babylonjs-gltf2interface": "5.0.0-alpha.6", "tslib": ">=1.10.0" } }, @@ -3306,9 +3306,9 @@ } }, "babylonjs-gltf2interface": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-4.2.0.tgz", - "integrity": "sha512-Fn/ThxwZWP9kEAqk+9FX9CAeF4ah/I0/8wzAZR8MQuYqlYpEfM+E/IztJ+4LoOOxQYMWNs5lgj8OXSkX0tqc4g==" + "version": "5.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-5.0.0-alpha.6.tgz", + "integrity": "sha512-rlsNUn+/anLusgeYwgiRmgo2KtTDA8HmaXTbaAesUHp4lSQfmCmWyl1SpTdGgBeBeG2ZVD9mOrSVamBc+L7YyA==" }, "balanced-match": { "version": "1.0.0", @@ -11542,9 +11542,9 @@ } }, "tslib": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", - "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" }, "tsutils": { "version": "3.17.1", diff --git a/Apps/Playground/package.json b/Apps/Playground/package.json index b15a0e8de..e5329778c 100644 --- a/Apps/Playground/package.json +++ b/Apps/Playground/package.json @@ -10,8 +10,8 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@babylonjs/core": "^4.2.0", - "@babylonjs/loaders": "^4.2.0", + "@babylonjs/core": "^5.0.0-alpha.6", + "@babylonjs/loaders": "^5.0.0-alpha.6", "@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native", "@react-native-community/slider": "^2.0.9", "logkitty": "^0.7.1", diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 041fc4cb3..e228c93b6 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 041fc4cb398a8c686cf78ccd398a10b14c664986 +Subproject commit e228c93b6ea21efe1588437c85d08f3050f92b40 From 6c1018aec9462df8d22d3f142cd0d40d8abca919 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Thu, 7 Jan 2021 13:10:26 -0800 Subject: [PATCH 3/4] Update packagetest package-lock.json --- Apps/PackageTest/package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Apps/PackageTest/package-lock.json b/Apps/PackageTest/package-lock.json index f927ec02b..606a0c784 100644 --- a/Apps/PackageTest/package-lock.json +++ b/Apps/PackageTest/package-lock.json @@ -908,16 +908,16 @@ } }, "@babylonjs/core": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-4.2.0.tgz", - "integrity": "sha512-sZQigPvMDc0pcgwlKvTF5gsMzGwT8gelQIOyxELrohdFu12pHGhIr61+yVxxq9tpCdzyYD9kS8LM0w2y+5ypkg==", + "version": "5.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.6.tgz", + "integrity": "sha512-7Tg/MByT6nUHpV5TjVj1xHsmnbrk1hGMk/jKCui6bydR6YaGrkE0yoLAmJXX5ALGXhhKLIDj+qg3QHWVFsi1lA==", "requires": { "tslib": ">=1.10.0" } }, "@babylonjs/react-native": { "version": "file:../../Package/Assembled/babylonjs-react-native-0.0.1.tgz", - "integrity": "sha512-Ni+H1eU+2ln+o4YnRNGVVogDKqYjEjSCfP93hSA3UeM9jrnk0giWZujtmBl8bz6NMczPaW3S3R5God6ZY5EVyg==", + "integrity": "sha512-WQ73fJAZ5AeNxQ5T12MYmmLHXieozUjiQIDXmULslsIOnc1FIhGGySubSDbLlqJzD78vbDl0bs4tmK35RZg1bQ==", "requires": { "base-64": "^0.1.0" } From ca7b45a288afa500463821bb275eda9427513326 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Thu, 7 Jan 2021 13:51:48 -0800 Subject: [PATCH 4/4] Update peer dependency for Babylon.js to 5.0.0-alpha.6 --- Modules/@babylonjs/react-native/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/package.json b/Modules/@babylonjs/react-native/package.json index 3e9f997e2..8fcfe1b38 100644 --- a/Modules/@babylonjs/react-native/package.json +++ b/Modules/@babylonjs/react-native/package.json @@ -27,7 +27,7 @@ "base-64": "^0.1.0" }, "peerDependencies": { - "@babylonjs/core": "^4.2.0", + "@babylonjs/core": "^5.0.0-alpha.6", "react": "^16.13.1", "react-native": "^0.63.1", "react-native-permissions": "^2.1.4"