Enable native camera plugin (#433)

* enable the nativeCamera plugin
BabylonJS · Aug 2, 2022 · 410290d · 410290d
1 parent 1ed3e5b
commit 410290d
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 1 deletion.
diff --git a/Apps/PackageTest/0.63.1/android/app/src/main/AndroidManifest.xml b/Apps/PackageTest/0.63.1/android/app/src/main/AndroidManifest.xml
@@ -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"

diff --git a/Apps/PackageTest/0.64.0/android/app/src/main/AndroidManifest.xml b/Apps/PackageTest/0.64.0/android/app/src/main/AndroidManifest.xml
@@ -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"

diff --git a/Apps/PackageTest/0.65.0/android/app/src/main/AndroidManifest.xml b/Apps/PackageTest/0.65.0/android/app/src/main/AndroidManifest.xml
@@ -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"

diff --git a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt
@@ -74,6 +74,7 @@ target_link_libraries(BabylonNative
     AndroidExtensions
     Graphics
     JsRuntime
+    NativeCamera
     NativeCapture
     NativeEngine
     NativeInput

diff --git a/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt
@@ -46,6 +46,7 @@ target_link_libraries(BabylonNative
     jsi
     reactnative
     JsRuntime
+    NativeCamera
     NativeCapture
     NativeEngine
     NativeInput

diff --git a/Modules/@babylonjs/react-native-iosandroid/react-native-babylon.podspec b/Modules/@babylonjs/react-native-iosandroid/react-native-babylon.podspec
@@ -25,6 +25,7 @@ Pod::Spec.new do |s|
                 'pvrtc',
                 'iqa',
                 'edtaa3',
+                'tinyexr',
                 'BabylonNative',
                 'bgfx',
                 'bimg',
@@ -38,6 +39,7 @@ Pod::Spec.new do |s|
                 'OSDependent',
                 'MachineIndependent',
                 'napi',
+                'NativeCamera',
                 'NativeCapture',
                 'NativeEngine',
                 'NativeInput',

diff --git a/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative b/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative
diff --git a/...les/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/...les/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
@@ -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);
@@ -191,6 +192,7 @@
         JsRuntime.lib;
         MachineIndependentd.lib;
         napi.lib;
+        NativeCamera.lib;
         NativeCapture.lib;
         NativeEngine.lib;
         NativeInput.lib;
@@ -252,6 +254,7 @@
         JsRuntime.lib;
         MachineIndependent.lib;
         napi.lib;
+        NativeCamera.lib;
         NativeCapture.lib;
         NativeEngine.lib;
         NativeInput.lib;

diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt
@@ -33,6 +33,7 @@ target_link_libraries(BabylonNative
     Graphics
     jsi
     JsRuntime
+    NativeCamera
     NativeCapture
     NativeEngine
     NativeInput

diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp
@@ -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>
@@ -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);

diff --git a/Package/.gitignore b/Package/.gitignore
@@ -1,5 +1,6 @@
 Assembled
 Assembled-Windows
+Assembled-iOSAndroid
 Build
 node_modules
 .gradle
diff --git a/Package/gulpfile.js b/Package/gulpfile.js
@@ -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',

diff --git a/Package/iOS/CMakeLists.txt b/Package/iOS/CMakeLists.txt
@@ -25,6 +25,7 @@ set(PACKAGED_LIBS
     OSDependent
     MachineIndependent
     napi
+    NativeCamera
     NativeCapture
     NativeEngine
     NativeInput
+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