Skip to content

Update BabylonNative and Babylon.js to 5.0.0-alpha.37 #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 18, 2021
Merged

Update BabylonNative and Babylon.js to 5.0.0-alpha.37 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
140a8b6
Update BabylonNative, and bump Babylon.js
Alex-MSFT Aug 16, 2021
7a75200
Add fix for CreateRenderTargetTexture
Alex-MSFT Aug 17, 2021
5bf3b5f
Add comment referencing BabylonNative issue.
Alex-MSFT Aug 18, 2021
88328f8
Update PackageTest
Alex-MSFT Aug 18, 2021
edf9d8f
Add back missing ^ from @babylonjs/loaders dependency in Playground app
Alex-MSFT Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Apps/PackageTest/0.63.1/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Apps/PackageTest/0.63.1/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@babylonjs/core": "^5.0.0-alpha.34",
"@babylonjs/core": "^5.0.0-alpha.37",
"@babylonjs/react-native": "file:../../../Package/Assembled/babylonjs-react-native-0.0.1.tgz",
"react": "16.13.1",
"react-native": "0.63.1",
Expand Down
2 changes: 1 addition & 1 deletion Apps/PackageTest/0.64.0/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@babylonjs/core": "^5.0.0-alpha.30",
"@babylonjs/core": "^5.0.0-alpha.37",
"@babylonjs/react-native": "file:../../../Package/Assembled/babylonjs-react-native-0.0.1.tgz",
"@babylonjs/react-native-windows": "file:../../../Package/Assembled-Windows/babylonjs-react-native-windows-0.0.1.tgz",
"react": "^17.0.1",
Expand Down
6 changes: 3 additions & 3 deletions Apps/Playground/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,17 +467,17 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: cde416483dac037923206447da6e1454df403714
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
FBReactNativeSpec: 5d6dbb11432863ed5cd10461d91baf60af966217
FBReactNativeSpec: 41c2862d3cf2b290d1e02d6e871a482e2979677b
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
Permission-Camera: 358081c7b8210849958af181ce9ddeb11932aa82
Expand Down
22 changes: 11 additions & 11 deletions Apps/Playground/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Apps/Playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"iosCmake": "node scripts/tools.js iosCMake"
},
"dependencies": {
"@babylonjs/core": "^5.0.0-alpha.34",
"@babylonjs/loaders": "^5.0.0-alpha.34",
"@babylonjs/core": "^5.0.0-alpha.37",
"@babylonjs/loaders": "^5.0.0-alpha.37",
"@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native",
"@babylonjs/react-native-windows": "file:../../Modules/@babylonjs/react-native-windows",
"@react-native-community/slider": "4.0.0-rc.3",
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native-windows/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"licenseFilename": "LICENSE",
"readmeFilename": "README.md",
"peerDependencies": {
"@babylonjs/core": "^5.0.0-alpha.34",
"@babylonjs/core": "^5.0.0-alpha.37",
"@babylonjs/react-native":"version",
"react": "^17.0.1",
"react-native": "^0.64.0",
Expand Down
14 changes: 13 additions & 1 deletion Modules/@babylonjs/react-native/EngineHook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react';
import { Platform } from 'react-native';
import { PERMISSIONS, check, request } from 'react-native-permissions';
import { Engine, WebXRSessionManager, WebXRExperienceHelper, Color4 } from '@babylonjs/core';
import { Engine, WebXRSessionManager, WebXRExperienceHelper, Color4, RenderTargetTexture, ThinEngine } from '@babylonjs/core';
import { ReactNativeEngine } from './ReactNativeEngine';
import './VersionValidation';
import * as base64 from 'base-64';
Expand Down Expand Up @@ -80,6 +80,18 @@ if (Platform.OS === "android" || Platform.OS === "ios") {
});
return sessionManager;
};

// TODO: https://github.com/BabylonJS/BabylonNative/issues/871
// Workaround to skip clearing render target texture back buffer for XR RTTs.
const originalCreateRenderTargetTexture: (...args: any[]) => RenderTargetTexture = (WebXRSessionManager.prototype as any)._createRenderTargetTexture;
(WebXRSessionManager.prototype as any)._createRenderTargetTexture = function (...args: any[]): RenderTargetTexture {
const renderTargetTexture = originalCreateRenderTargetTexture.apply(this, args);
renderTargetTexture.onClearObservable.add((engine: ThinEngine) => {
engine.clear(renderTargetTexture.clearColor, false, true, true);
});

return renderTargetTexture;
};
} else if (Platform.OS === "windows") {
const originalEnterXRAsync: (...args: any[]) => Promise<WebXRSessionManager> = WebXRExperienceHelper.prototype.enterXRAsync;
WebXRExperienceHelper.prototype.enterXRAsync = async function (...args: any[]): Promise<WebXRSessionManager> {
Expand Down
12 changes: 6 additions & 6 deletions Modules/@babylonjs/react-native/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Modules/@babylonjs/react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"semver": "^7.3.2"
},
"peerDependencies": {
"@babylonjs/core": "^5.0.0-alpha.34",
"@babylonjs/core": "^5.0.0-alpha.37",
"react": ">=16.13.1",
"react-native": ">=0.63.1",
"react-native-permissions": "^2.1.4"
},
"devDependencies": {
"@babel/core": "^7.8.4",
"@babel/runtime": "^7.8.4",
"@babylonjs/core": "^5.0.0-alpha.34",
"@babylonjs/core": "^5.0.0-alpha.37",
"@rnw-scripts/eslint-config": "0.1.6",
"@rnw-scripts/ts-config": "0.1.0",
"@types/base-64": "^0.1.3",
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native/submodules/BabylonNative
Open in desktop
Submodule BabylonNative updated 38 files
+25 −12 Apps/UnitTests/CMakeLists.txt
+51 −0 Apps/UnitTests/Scripts/tests.js
+38 −20 Apps/UnitTests/UnitTests.cpp
+ − Apps/ValidationTests/ReferenceImages/KernelBlur.png
+ − Apps/ValidationTests/ReferenceImages/edges.png
+ − Apps/ValidationTests/ReferenceImages/fresnel.png
+ − Apps/ValidationTests/ReferenceImages/glTFAlphaBlend.png
+ − Apps/ValidationTests/ReferenceImages/glTFSheen.png
+ − Apps/ValidationTests/ReferenceImages/glowlayerandlods.png
+ − Apps/ValidationTests/ReferenceImages/gltfAnimationNode.png
+ − Apps/ValidationTests/ReferenceImages/gltfAnimationNodeMisc.png
+ − Apps/ValidationTests/ReferenceImages/gltfExtensionKhrMaterialsSpecular.png
+ − Apps/ValidationTests/ReferenceImages/gltfExtensionKhrMaterialsVariants.png
+ − Apps/ValidationTests/ReferenceImages/gltfExtensionKhrTextureTransform.png
+ − Apps/ValidationTests/ReferenceImages/gltfMaterialMixed.png
+ − Apps/ValidationTests/ReferenceImages/gltfMaterialSpecularGlossiness0.png
+ − Apps/ValidationTests/ReferenceImages/gltfMaterialSpecularGlossiness1.png
+ − Apps/ValidationTests/ReferenceImages/gltfMeshPrimitiveAttribute.png
+ − Apps/ValidationTests/ReferenceImages/gltfMeshPrimitiveVertexColor.png
+ − Apps/ValidationTests/ReferenceImages/gltfNodeAttribute1.png
+ − Apps/ValidationTests/ReferenceImages/gltfTextureSampler0.png
+ − Apps/ValidationTests/ReferenceImages/gltfTextureSampler1.png
+ − Apps/ValidationTests/ReferenceImages/gltfUnlit.png
+ − Apps/ValidationTests/ReferenceImages/instancedBones.png
+ − Apps/ValidationTests/ReferenceImages/nested_BBG.png
+ − Apps/ValidationTests/ReferenceImages/outline.png
+ − Apps/ValidationTests/ReferenceImages/spherepanel.png
+ − Apps/ValidationTests/ReferenceImages/visibility.png
+62 −62 Apps/ValidationTests/Scripts/config.json
+1 −1 Apps/ValidationTests/Scripts/validation_native.js
+4 −4 Apps/package.json
+10 −0 Documentation/Polyfills.md
+171 −151 Plugins/NativeEngine/Source/NativeEngine.cpp
+27 −6 Polyfills/Canvas/Source/Context.cpp
+2 −0 Polyfills/Canvas/readme.md
+15 −0 Polyfills/Console/readme.md
+5 −0 Polyfills/Window/readme.md
+16 −0 Polyfills/XMLHttpRequest/readme.md