Skip to content

Enable native camera plugin #433

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
Aug 2, 2022
Merged

Enable native camera plugin #433

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
fd29120
enable the nativeCamera plugin
CoPrez Jul 22, 2022
21cc259
Merge remote-tracking branch 'origin/master' into enable-native-camer…
CoPrez Jul 22, 2022
635abef
Add native camera changes and BabylonNative update
CoPrez Jul 25, 2022
d25b75a
Update BN to latest
CoPrez Jul 25, 2022
5661738
Adding in some more required file to use NativeCamera
CoPrez Jul 26, 2022
2de9d91
Fix missing semi-colon and extra whitespace
CoPrez Jul 26, 2022
68190ad
Update BN and drop API back to 21
CoPrez Aug 2, 2022
34dcef6
Fixing some missed changes
CoPrez Aug 2, 2022
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
1 change: 1 addition & 0 deletions Apps/PackageTest/0.63.1/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
package="com.packagetest">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA"/>

<application
android:name=".MainApplication"
Expand Down
1 change: 1 addition & 0 deletions Apps/PackageTest/0.64.0/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
package="com.packagetest">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA"/>

<application
android:name=".MainApplication"
Expand Down
1 change: 1 addition & 0 deletions Apps/PackageTest/0.65.0/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
package="com.packagetest">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA"/>

<application
android:name=".MainApplication"
Expand Down
1 change: 1 addition & 0 deletions Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ target_link_libraries(BabylonNative
AndroidExtensions
Graphics
JsRuntime
NativeCamera
NativeCapture
NativeEngine
NativeInput
Expand Down
1 change: 1 addition & 0 deletions Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ target_link_libraries(BabylonNative
jsi
reactnative
JsRuntime
NativeCamera
NativeCapture
NativeEngine
NativeInput
Expand Down
2 changes: 2 additions & 0 deletions Modules/@babylonjs/react-native-iosandroid/react-native-babylon.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Pod::Spec.new do |s|
'pvrtc',
'iqa',
'edtaa3',
'tinyexr',
'BabylonNative',
'bgfx',
'bimg',
Expand All @@ -38,6 +39,7 @@ Pod::Spec.new do |s|
'OSDependent',
'MachineIndependent',
'napi',
'NativeCamera',
'NativeCapture',
'NativeEngine',
'NativeInput',
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative
Open in desktop
Submodule BabylonNative updated 15 files
+1 −1 Apps/Playground/Android/app/src/main/cpp/BabylonNativeJNI.cpp
+0 −3 Plugins/NativeCamera/CMakeLists.txt
+61 −0 Plugins/NativeCamera/Source/Android/CameraWrappers.h
+60 −63 Plugins/NativeCamera/Source/Android/NativeCameraImpl.cpp
+13 −21 Plugins/NativeCamera/Source/Android/NativeCameraImpl.h
+2 −1 Plugins/NativeCamera/Source/Apple/NativeCameraImpl.h
+8 −2 Plugins/NativeCamera/Source/Apple/NativeCameraImpl.mm
+19 −4 Plugins/NativeCamera/Source/NativeVideo.cpp
+3 −0 Plugins/NativeCamera/Source/NativeVideo.h
+1 −1 Plugins/NativeCamera/Source/UWP/NativeCameraImpl.cpp
+2 −1 Plugins/NativeCamera/Source/UWP/NativeCameraImpl.h
+1 −1 Plugins/NativeCamera/Source/Unix/NativeCameraImpl.cpp
+2 −1 Plugins/NativeCamera/Source/Unix/NativeCameraImpl.h
+1 −1 Plugins/NativeCamera/Source/Win32/NativeCameraImpl.cpp
+2 −1 Plugins/NativeCamera/Source/Win32/NativeCameraImpl.h
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 @@ -140,6 +140,7 @@
$(BabylonNativeBuildDir)BabylonNative\Dependencies\UrlLib\$(Configuration);
$(BabylonNativeBuildDir)BabylonNative\Dependencies\xr\$(Configuration);
$(BabylonNativeBuildDir)BabylonNative\Dependencies\xr\Dependencies\OpenXR-SDK\src\loader\$(Configuration);
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeCamera\$(Configuration);
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeCapture\$(Configuration);
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeEngine\$(Configuration);
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeInput\$(Configuration);
Expand Down Expand Up @@ -191,6 +192,7 @@
JsRuntime.lib;
MachineIndependentd.lib;
napi.lib;
NativeCamera.lib;
NativeCapture.lib;
NativeEngine.lib;
NativeInput.lib;
Expand Down Expand Up @@ -252,6 +254,7 @@
JsRuntime.lib;
MachineIndependent.lib;
napi.lib;
NativeCamera.lib;
NativeCapture.lib;
NativeEngine.lib;
NativeInput.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 @@ -33,6 +33,7 @@ target_link_libraries(BabylonNative
Graphics
jsi
JsRuntime
NativeCamera
NativeCapture
NativeEngine
NativeInput
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 @@ -2,6 +2,7 @@

#include <Babylon/Graphics/Device.h>
#include <Babylon/JsRuntime.h>
#include <Babylon/Plugins/NativeCamera.h>
#include <Babylon/Plugins/NativeCapture.h>
#include <Babylon/Plugins/NativeEngine.h>
#include <Babylon/Plugins/NativeInput.h>
Expand Down Expand Up @@ -53,6 +54,7 @@ namespace BabylonNative
m_nativeInput = &Babylon::Plugins::NativeInput::CreateForJavaScript(m_env);
Babylon::Plugins::NativeOptimizations::Initialize(m_env);
Babylon::Plugins::NativeTracing::Initialize(m_env);
Babylon::Plugins::Camera::Initialize(m_env);

// Initialize Babylon Native polyfills
Babylon::Polyfills::Window::Initialize(m_env);
Expand Down
1 change: 1 addition & 0 deletions Package/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Assembled
Assembled-Windows
Assembled-iOSAndroid
Build
node_modules
.gradle
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 @@ -520,6 +520,7 @@ const validateAssemblediOSAndroid = async () => {
'Assembled-iOSAndroid/ios/libs/libJsRuntime.a',
'Assembled-iOSAndroid/ios/libs/libMachineIndependent.a',
'Assembled-iOSAndroid/ios/libs/libnapi.a',
'Assembled-iOSAndroid/ios/libs/libNativeCamera.a',
'Assembled-iOSAndroid/ios/libs/libNativeCapture.a',
'Assembled-iOSAndroid/ios/libs/libNativeEngine.a',
'Assembled-iOSAndroid/ios/libs/libNativeInput.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 @@ -25,6 +25,7 @@ set(PACKAGED_LIBS
OSDependent
MachineIndependent
napi
NativeCamera
NativeCapture
NativeEngine
NativeInput
Expand Down