Skip to content

Add NativeOptimizations plugin #263

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 8 commits into from
Jul 23, 2021
Merged

Add NativeOptimizations plugin #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b7ccc4c
Add NativeOptimizations lib
ryantrem Jul 14, 2021
2181dd0
Update BabylonNative
ryantrem Jul 14, 2021
8a59d24
Merge master
ryantrem Jul 14, 2021
1af7d39
Add NativeOptimizations to Windows
ryantrem Jul 14, 2021
331d4fe
Merge master and update BabylonNative to master
ryantrem Jul 22, 2021
15c0c47
Add libNativeOptimizations.a to gulpfile.js package validation list
ryantrem Jul 22, 2021
a311761
Update Babylon.js to latest
ryantrem Jul 23, 2021
4708fcf
Update BabylonNative to master
ryantrem Jul 23, 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
10 changes: 5 additions & 5 deletions Apps/PackageTest/0.63.1/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ PODS:
- glog (0.3.5)
- libevent (2.1.12)
- OpenSSL-Universal (1.1.180)
- Permission-Camera (2.1.5):
- Permission-Camera (2.2.2):
- RNPermissions
- RCTRequired (0.63.1)
- RCTTypeSafety (0.63.1):
Expand Down Expand Up @@ -298,8 +298,8 @@ PODS:
- React-Core (= 0.63.1)
- React-cxxreact (= 0.63.1)
- React-jsi (= 0.63.1)
- RNPermissions (2.1.5):
- React
- RNPermissions (2.2.2):
- React-Core
- Yoga (1.14.0)
- YogaKit (1.18.1):
- Yoga (~> 1.14)
Expand Down Expand Up @@ -449,7 +449,7 @@ SPEC CHECKSUMS:
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
Permission-Camera: 53d46bd722aea28d796e20f05fb3cbe6cde6ccb6
Permission-Camera: 375576c57ea625c88137d2cc52ba6dfeb21db036
RCTRequired: d9b1a9e6fa097744ca3ede59f86a35096df7202b
RCTTypeSafety: c227cd061983e9e964115afbc4e8730d6a6f1395
React: 86e972a20967ee4137aa19dc48319405927c2e94
Expand All @@ -471,7 +471,7 @@ SPEC CHECKSUMS:
React-RCTText: 4f95d322b7e6da72817284abf8a2cdcec18b9cd8
React-RCTVibration: f3a9123c244f35c40d3c9f3ec3f0b9e5717bb292
ReactCommon: 2905859f84a94a381bb0d8dd3921ccb1a0047cb8
RNPermissions: 1888705aebcc81714efa5dbff94351e4388ae012
RNPermissions: 067727df624665d4a6c8e2cffcc172ba608b96ed
Yoga: d5bd05a2b6b94c52323745c2c2b64557c8c66f64
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

Expand Down
8 changes: 4 additions & 4 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.30",
"@babylonjs/core": "^5.0.0-alpha.34",
"@babylonjs/react-native": "file:../../../Package/Assembled/babylonjs-react-native-0.0.1.tgz",
"react": "16.13.1",
"react-native": "0.63.1",
Expand Down
8 changes: 4 additions & 4 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: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
DoubleConversion: cde416483dac037923206447da6e1454df403714
FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
FBReactNativeSpec: 4cf6a7ec72a62c59d9d0cc5b558e55c462203506
FBReactNativeSpec: 5d6dbb11432863ed5cd10461d91baf60af966217
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
Permission-Camera: 358081c7b8210849958af181ce9ddeb11932aa82
Expand All @@ -492,7 +492,7 @@ SPEC CHECKSUMS:
React-jsi: 5de8204706bd872b78ea646aee5d2561ca1214b6
React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9
React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9
react-native-babylon: 858ff09e82f9c3de4f17d66e90d6ca08dd480bb4
react-native-babylon: 55ec3f5e14b0baa1ae5978334b8faa58842abe68
react-native-slider: e45c8376012e5ace012e5eef62e9c85c68e50a0f
React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675
React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a
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.30",
"@babylonjs/loaders": "^5.0.0-alpha.30",
"@babylonjs/core": "^5.0.0-alpha.34",
"@babylonjs/loaders": "^5.0.0-alpha.34",
"@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.30",
"@babylonjs/core": "^5.0.0-alpha.34",
"@babylonjs/react-native":"version",
"react": "^17.0.1",
"react-native": "^0.64.0",
Expand Down
3 changes: 3 additions & 0 deletions ...les/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
$(BabylonNativeBuildDir)\Plugins\NativeCapture\$(Configuration);
$(BabylonNativeBuildDir)\Plugins\NativeEngine\$(Configuration);
$(BabylonNativeBuildDir)\Plugins\NativeInput\$(Configuration);
$(BabylonNativeBuildDir)\Plugins\NativeOptimizations\$(Configuration);
$(BabylonNativeBuildDir)\Plugins\NativeXr\$(Configuration);
$(BabylonNativeBuildDir)\Polyfills\Window\$(Configuration);
$(BabylonNativeBuildDir)\Polyfills\XMLHttpRequest\$(Configuration);
Expand Down Expand Up @@ -191,6 +192,7 @@
NativeCapture.lib;
NativeEngine.lib;
NativeInput.lib;
NativeOptimizations.lib;
NativeXr.lib;
nvtt.lib;
OGLCompilerd.lib;
Expand Down Expand Up @@ -248,6 +250,7 @@
NativeCapture.lib;
NativeEngine.lib;
NativeInput.lib;
NativeOptimizations.lib;
NativeXr.lib;
nvtt.lib;
OGLCompiler.lib;
Expand Down
1 change: 1 addition & 0 deletions Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ target_link_libraries(BabylonNative
NativeCapture
NativeEngine
NativeInput
NativeOptimizations
NativeXr
Window
XMLHttpRequest
Expand Down
1 change: 1 addition & 0 deletions Modules/@babylonjs/react-native/android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ target_link_libraries(BabylonNative
NativeCapture
NativeEngine
NativeInput
NativeOptimizations
NativeXr
Window
XMLHttpRequest
Expand Down
1 change: 1 addition & 0 deletions Modules/@babylonjs/react-native/ios/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ target_link_libraries(BabylonNative
NativeCapture
NativeEngine
NativeInput
NativeOptimizations
NativeXr
Window
XMLHttpRequest
Expand Down
6 changes: 3 additions & 3 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.30",
"@babylonjs/core": "^5.0.0-alpha.34",
"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.30",
"@babylonjs/core": "^5.0.0-alpha.34",
"@rnw-scripts/eslint-config": "0.1.6",
"@rnw-scripts/ts-config": "0.1.0",
"@types/base-64": "^0.1.3",
Expand Down
1 change: 1 addition & 0 deletions Modules/@babylonjs/react-native/react-native-babylon.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Pod::Spec.new do |s|
'NativeCapture',
'NativeEngine',
'NativeInput',
'NativeOptimizations',
'NativeXR',
'SPIRV',
'spirv-cross-core',
Expand Down
2 changes: 2 additions & 0 deletions Modules/@babylonjs/react-native/shared/BabylonNative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <Babylon/Plugins/NativeCapture.h>
#include <Babylon/Plugins/NativeEngine.h>
#include <Babylon/Plugins/NativeInput.h>
#include <Babylon/Plugins/NativeOptimizations.h>
#include <Babylon/Plugins/NativeXr.h>
#include <Babylon/Polyfills/Window.h>
#include <Babylon/Polyfills/XMLHttpRequest.h>
Expand Down Expand Up @@ -47,6 +48,7 @@ namespace Babylon
m_nativeXr->SetSessionStateChangedCallback([isXRActive{ m_isXRActive }](bool isSessionActive) { *isXRActive = isSessionActive; });
Plugins::NativeCapture::Initialize(m_env);
m_nativeInput = &Plugins::NativeInput::CreateForJavaScript(m_env);
Plugins::NativeOptimizations::Initialize(m_env);

// Initialize Babylon Native polyfills
Polyfills::Window::Initialize(m_env);
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native/submodules/BabylonNative
Open in desktop
Submodule BabylonNative updated 27 files
+1 −0 Apps/Playground/Android/app/CMakeLists.txt
+2 −0 Apps/Playground/Android/app/src/main/cpp/BabylonNativeJNI.cpp
+1 −0 Apps/Playground/CMakeLists.txt
+3 −0 Apps/Playground/UWP/App.cpp
+3 −0 Apps/Playground/Win32/App.cpp
+3 −0 Apps/Playground/X11/App.cpp
+3 −0 Apps/Playground/iOS/LibNativeBridge.mm
+3 −0 Apps/Playground/macOS/ViewController.mm
+1 −0 Apps/ValidationTests/Android/app/CMakeLists.txt
+3 −0 Apps/ValidationTests/Android/app/src/main/cpp/BabylonNativeJNI.cpp
+1 −0 Apps/ValidationTests/CMakeLists.txt
+3 −0 Apps/ValidationTests/UWP/App.cpp
+3 −0 Apps/ValidationTests/Win32/App.cpp
+2 −0 Apps/ValidationTests/X11/App.cpp
+3 −0 Apps/ValidationTests/iOS/LibNativeBridge.mm
+3 −0 Apps/ValidationTests/macOS/ViewController.mm
+20 −94 Apps/package-lock.json
+4 −4 Apps/package.json
+8 −4 Dependencies/UrlLib/Source/Windows/UrlRequest.cpp
+2 −0 Plugins/CMakeLists.txt
+20 −0 Plugins/NativeOptimizations/CMakeLists.txt
+8 −0 Plugins/NativeOptimizations/Include/Babylon/Plugins/NativeOptimizations.h
+202 −0 Plugins/NativeOptimizations/Source/NativeOptimizations.cpp
+2 −0 Polyfills/Canvas/CMakeLists.txt
+2 −0 Polyfills/Canvas/Source/Canvas.cpp
+77 −0 Polyfills/Canvas/Source/Image.cpp
+34 −0 Polyfills/Canvas/Source/Image.h
1 change: 1 addition & 0 deletions Package/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ const validate = async () => {
'Assembled/ios/libs/libNativeCapture.a',
'Assembled/ios/libs/libNativeEngine.a',
'Assembled/ios/libs/libNativeInput.a',
'Assembled/ios/libs/libNativeOptimizations.a',
'Assembled/ios/libs/libNativeXr.a',
'Assembled/ios/libs/libOGLCompiler.a',
'Assembled/ios/libs/libOSDependent.a',
Expand Down
1 change: 1 addition & 0 deletions Package/iOS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ set(PACKAGED_LIBS
NativeCapture
NativeEngine
NativeInput
NativeOptimizations
NativeXr
SPIRV
spirv-cross-core
Expand Down