Skip to content

Commit f0c6bf5

Browse files
authored
Update BabylonNative and Babylon.js to 5.0.0-alpha.37 (#276)
* Update BabylonNative, and bump Babylon.js * Add fix for CreateRenderTargetTexture * Add comment referencing BabylonNative issue. * Update PackageTest * Add back missing ^ from @babylonjs/loaders dependency in Playground app
1 parent b90a56e commit f0c6bf5

File tree

11 files changed

+48
-36
lines changed

11 files changed

+48
-36
lines changed

Apps/PackageTest/0.63.1/package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Apps/PackageTest/0.63.1/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
1111
},
1212
"dependencies": {
13-
"@babylonjs/core": "^5.0.0-alpha.34",
13+
"@babylonjs/core": "^5.0.0-alpha.37",
1414
"@babylonjs/react-native": "file:../../../Package/Assembled/babylonjs-react-native-0.0.1.tgz",
1515
"react": "16.13.1",
1616
"react-native": "0.63.1",

Apps/PackageTest/0.64.0/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
1313
},
1414
"dependencies": {
15-
"@babylonjs/core": "^5.0.0-alpha.30",
15+
"@babylonjs/core": "^5.0.0-alpha.37",
1616
"@babylonjs/react-native": "file:../../../Package/Assembled/babylonjs-react-native-0.0.1.tgz",
1717
"@babylonjs/react-native-windows": "file:../../../Package/Assembled-Windows/babylonjs-react-native-windows-0.0.1.tgz",
1818
"react": "^17.0.1",

Apps/Playground/ios/Podfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -467,17 +467,17 @@ EXTERNAL SOURCES:
467467
SPEC CHECKSUMS:
468468
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
469469
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
470-
DoubleConversion: cde416483dac037923206447da6e1454df403714
470+
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
471471
FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
472-
FBReactNativeSpec: 5d6dbb11432863ed5cd10461d91baf60af966217
472+
FBReactNativeSpec: 41c2862d3cf2b290d1e02d6e871a482e2979677b
473473
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
474474
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
475475
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
476476
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
477477
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
478478
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
479479
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
480-
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
480+
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
481481
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
482482
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
483483
Permission-Camera: 358081c7b8210849958af181ce9ddeb11932aa82

Apps/Playground/package-lock.json

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Apps/Playground/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"iosCmake": "node scripts/tools.js iosCMake"
1515
},
1616
"dependencies": {
17-
"@babylonjs/core": "^5.0.0-alpha.34",
18-
"@babylonjs/loaders": "^5.0.0-alpha.34",
17+
"@babylonjs/core": "^5.0.0-alpha.37",
18+
"@babylonjs/loaders": "^5.0.0-alpha.37",
1919
"@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native",
2020
"@babylonjs/react-native-windows": "file:../../Modules/@babylonjs/react-native-windows",
2121
"@react-native-community/slider": "4.0.0-rc.3",

Modules/@babylonjs/react-native-windows/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"licenseFilename": "LICENSE",
2525
"readmeFilename": "README.md",
2626
"peerDependencies": {
27-
"@babylonjs/core": "^5.0.0-alpha.34",
27+
"@babylonjs/core": "^5.0.0-alpha.37",
2828
"@babylonjs/react-native":"version",
2929
"react": "^17.0.1",
3030
"react-native": "^0.64.0",

Modules/@babylonjs/react-native/EngineHook.ts

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useEffect, useState } from 'react';
22
import { Platform } from 'react-native';
33
import { PERMISSIONS, check, request } from 'react-native-permissions';
4-
import { Engine, WebXRSessionManager, WebXRExperienceHelper, Color4 } from '@babylonjs/core';
4+
import { Engine, WebXRSessionManager, WebXRExperienceHelper, Color4, RenderTargetTexture, ThinEngine } from '@babylonjs/core';
55
import { ReactNativeEngine } from './ReactNativeEngine';
66
import './VersionValidation';
77
import * as base64 from 'base-64';
@@ -80,6 +80,18 @@ if (Platform.OS === "android" || Platform.OS === "ios") {
8080
});
8181
return sessionManager;
8282
};
83+
84+
// TODO: https://github.com/BabylonJS/BabylonNative/issues/871
85+
// Workaround to skip clearing render target texture back buffer for XR RTTs.
86+
const originalCreateRenderTargetTexture: (...args: any[]) => RenderTargetTexture = (WebXRSessionManager.prototype as any)._createRenderTargetTexture;
87+
(WebXRSessionManager.prototype as any)._createRenderTargetTexture = function (...args: any[]): RenderTargetTexture {
88+
const renderTargetTexture = originalCreateRenderTargetTexture.apply(this, args);
89+
renderTargetTexture.onClearObservable.add((engine: ThinEngine) => {
90+
engine.clear(renderTargetTexture.clearColor, false, true, true);
91+
});
92+
93+
return renderTargetTexture;
94+
};
8395
} else if (Platform.OS === "windows") {
8496
const originalEnterXRAsync: (...args: any[]) => Promise<WebXRSessionManager> = WebXRExperienceHelper.prototype.enterXRAsync;
8597
WebXRExperienceHelper.prototype.enterXRAsync = async function (...args: any[]): Promise<WebXRSessionManager> {

Modules/@babylonjs/react-native/package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Modules/@babylonjs/react-native/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
"semver": "^7.3.2"
2929
},
3030
"peerDependencies": {
31-
"@babylonjs/core": "^5.0.0-alpha.34",
31+
"@babylonjs/core": "^5.0.0-alpha.37",
3232
"react": ">=16.13.1",
3333
"react-native": ">=0.63.1",
3434
"react-native-permissions": "^2.1.4"
3535
},
3636
"devDependencies": {
3737
"@babel/core": "^7.8.4",
3838
"@babel/runtime": "^7.8.4",
39-
"@babylonjs/core": "^5.0.0-alpha.34",
39+
"@babylonjs/core": "^5.0.0-alpha.37",
4040
"@rnw-scripts/eslint-config": "0.1.6",
4141
"@rnw-scripts/ts-config": "0.1.0",
4242
"@types/base-64": "^0.1.3",
Submodule BabylonNative updated 38 files

0 commit comments

Comments
 (0)