Skip to content

Commit

Permalink
Update Babylon.js and Babylon Native to the latest (#110)
Browse files Browse the repository at this point in the history
  • Loading branch information
ryantrem authored Nov 5, 2020
1 parent e209e5f commit ef431d7
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
6 changes: 3 additions & 3 deletions Apps/PackageTest/package-lock.json

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/package.json
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": "^4.2.0-beta.19",
"@babylonjs/core": "^4.2.0-rc.2",
"@babylonjs/react-native": "file:../../Package/Assembled/babylonjs-react-native-0.0.1.tgz",
"react": "16.13.1",
"react-native": "0.63.1",
Expand Down
22 changes: 11 additions & 11 deletions Apps/Playground/package-lock.json

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
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@babylonjs/core": "^4.2.0-beta.19",
"@babylonjs/loaders": "^4.2.0-beta.19",
"@babylonjs/core": "^4.2.0-rc.2",
"@babylonjs/loaders": "^4.2.0-rc.2",
"@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native",
"@react-native-community/slider": "^2.0.9",
"logkitty": "^0.7.1",
Expand Down
3 changes: 2 additions & 1 deletion Modules/@babylonjs/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"base-64": "^0.1.0"
},
"peerDependencies": {
"@babylonjs/core": "^4.2.0-beta.19",
"@babylonjs/core": "^4.2.0-rc.2",
"react": "^16.13.1",
"react-native": "^0.63.1",
"react-native-permissions": "^2.1.4"
Expand All @@ -37,6 +37,7 @@
"@types/jest": "^25.2.1",
"@types/react": "^16.9.32",
"@types/react-native": "^0.63.1",
"@types/react-native-permissions": "^2.0.0",
"@types/react-test-renderer": "^16.9.2",
"typescript": "^3.8.3"
}
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native/submodules/BabylonNative
Submodule BabylonNative updated 32 files
+6 −4 .github/workflows/nightly.yml
+17,459 −0 Apps/BabylonScripts/babylon.gui.js
+1 −0 Apps/Playground/Android/app/src/main/cpp/BabylonNativeJNI.cpp
+2 −0 Apps/Playground/CMakeLists.txt
+1 −0 Apps/Playground/UWP/App.cpp
+1 −0 Apps/Playground/Win32/App.cpp
+1 −0 Apps/Playground/X11/App.cpp
+1 −0 Apps/Playground/iOS/LibNativeBridge.mm
+1 −0 Apps/Playground/macOS/ViewController.mm
+2 −1 Apps/ValidationTests/CMakeLists.txt
+6 −0 Apps/ValidationTests/Win32/App.cpp
+1 −0 Apps/ValidationTests/X11/App.cpp
+1 −0 Apps/ValidationTests/macOS/ViewController.mm
+14 −0 Dependencies/AndroidExtensions/Include/AndroidExtensions/JavaWrappers.h
+45 −3 Dependencies/AndroidExtensions/Source/JavaWrappers.cpp
+66 −56 Dependencies/UrlLib/Source/Android/UrlRequest.cpp
+24 −12 Dependencies/UrlLib/Source/Apple/UrlRequest.mm
+ Documentation/Images/faq/msvc_arm64.png
+ Documentation/Images/faq/msvc_debugJS.png
+53 −0 Documentation/faq.md
+10 −9 Plugins/NativeEngine/Source/NativeEngine.cpp
+3 −3 Plugins/NativeEngine/Source/NativeEngine.h
+3 −24 Plugins/NativeEngine/Source/ShaderCompilerCommon.cpp
+3 −0 Plugins/NativeEngine/Source/ShaderCompilerCommon.h
+6 −3 Plugins/NativeEngine/Source/ShaderCompilerD3D.cpp
+6 −5 Plugins/NativeEngine/Source/ShaderCompilerMetal.cpp
+6 −5 Plugins/NativeEngine/Source/ShaderCompilerOpenGL.cpp
+73 −25 Plugins/NativeEngine/Source/ShaderCompilerTraversers.cpp
+11 −10 Plugins/NativeEngine/Source/ShaderCompilerTraversers.h
+7 −1 Polyfills/XMLHttpRequest/Source/XMLHttpRequest.cpp
+2 −0 README.md
+59 −8 azure-pipelines.yml

0 comments on commit ef431d7

Please sign in to comment.