Skip to content

Commit 410290d

Browse files
authored
Enable native camera plugin (#433)
* enable the nativeCamera plugin
1 parent 1ed3e5b commit 410290d

File tree

13 files changed

+17
-1
lines changed

13 files changed

+17
-1
lines changed

Apps/PackageTest/0.63.1/android/app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package="com.packagetest">
33

44
<uses-permission android:name="android.permission.INTERNET" />
5+
<uses-permission android:name="android.permission.CAMERA"/>
56

67
<application
78
android:name=".MainApplication"

Apps/PackageTest/0.64.0/android/app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package="com.packagetest">
33

44
<uses-permission android:name="android.permission.INTERNET" />
5+
<uses-permission android:name="android.permission.CAMERA"/>
56

67
<application
78
android:name=".MainApplication"

Apps/PackageTest/0.65.0/android/app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package="com.packagetest">
33

44
<uses-permission android:name="android.permission.INTERNET" />
5+
<uses-permission android:name="android.permission.CAMERA"/>
56

67
<application
78
android:name=".MainApplication"

Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ target_link_libraries(BabylonNative
7474
AndroidExtensions
7575
Graphics
7676
JsRuntime
77+
NativeCamera
7778
NativeCapture
7879
NativeEngine
7980
NativeInput

Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ target_link_libraries(BabylonNative
4646
jsi
4747
reactnative
4848
JsRuntime
49+
NativeCamera
4950
NativeCapture
5051
NativeEngine
5152
NativeInput

Modules/@babylonjs/react-native-iosandroid/react-native-babylon.podspec

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Pod::Spec.new do |s|
2525
'pvrtc',
2626
'iqa',
2727
'edtaa3',
28+
'tinyexr',
2829
'BabylonNative',
2930
'bgfx',
3031
'bimg',
@@ -38,6 +39,7 @@ Pod::Spec.new do |s|
3839
'OSDependent',
3940
'MachineIndependent',
4041
'napi',
42+
'NativeCamera',
4143
'NativeCapture',
4244
'NativeEngine',
4345
'NativeInput',

Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj

+3
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
$(BabylonNativeBuildDir)BabylonNative\Dependencies\UrlLib\$(Configuration);
141141
$(BabylonNativeBuildDir)BabylonNative\Dependencies\xr\$(Configuration);
142142
$(BabylonNativeBuildDir)BabylonNative\Dependencies\xr\Dependencies\OpenXR-SDK\src\loader\$(Configuration);
143+
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeCamera\$(Configuration);
143144
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeCapture\$(Configuration);
144145
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeEngine\$(Configuration);
145146
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeInput\$(Configuration);
@@ -191,6 +192,7 @@
191192
JsRuntime.lib;
192193
MachineIndependentd.lib;
193194
napi.lib;
195+
NativeCamera.lib;
194196
NativeCapture.lib;
195197
NativeEngine.lib;
196198
NativeInput.lib;
@@ -252,6 +254,7 @@
252254
JsRuntime.lib;
253255
MachineIndependent.lib;
254256
napi.lib;
257+
NativeCamera.lib;
255258
NativeCapture.lib;
256259
NativeEngine.lib;
257260
NativeInput.lib;

Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ target_link_libraries(BabylonNative
3333
Graphics
3434
jsi
3535
JsRuntime
36+
NativeCamera
3637
NativeCapture
3738
NativeEngine
3839
NativeInput

Modules/@babylonjs/react-native/shared/BabylonNative.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <Babylon/Graphics/Device.h>
44
#include <Babylon/JsRuntime.h>
5+
#include <Babylon/Plugins/NativeCamera.h>
56
#include <Babylon/Plugins/NativeCapture.h>
67
#include <Babylon/Plugins/NativeEngine.h>
78
#include <Babylon/Plugins/NativeInput.h>
@@ -53,6 +54,7 @@ namespace BabylonNative
5354
m_nativeInput = &Babylon::Plugins::NativeInput::CreateForJavaScript(m_env);
5455
Babylon::Plugins::NativeOptimizations::Initialize(m_env);
5556
Babylon::Plugins::NativeTracing::Initialize(m_env);
57+
Babylon::Plugins::Camera::Initialize(m_env);
5658

5759
// Initialize Babylon Native polyfills
5860
Babylon::Polyfills::Window::Initialize(m_env);

Package/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Assembled
22
Assembled-Windows
3+
Assembled-iOSAndroid
34
Build
45
node_modules
56
.gradle

Package/gulpfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ const validateAssemblediOSAndroid = async () => {
520520
'Assembled-iOSAndroid/ios/libs/libJsRuntime.a',
521521
'Assembled-iOSAndroid/ios/libs/libMachineIndependent.a',
522522
'Assembled-iOSAndroid/ios/libs/libnapi.a',
523+
'Assembled-iOSAndroid/ios/libs/libNativeCamera.a',
523524
'Assembled-iOSAndroid/ios/libs/libNativeCapture.a',
524525
'Assembled-iOSAndroid/ios/libs/libNativeEngine.a',
525526
'Assembled-iOSAndroid/ios/libs/libNativeInput.a',

Package/iOS/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ set(PACKAGED_LIBS
2525
OSDependent
2626
MachineIndependent
2727
napi
28+
NativeCamera
2829
NativeCapture
2930
NativeEngine
3031
NativeInput

0 commit comments

Comments
 (0)