Skip to content

Commit 0247349

Browse files
BABYLON_NATIVE_DISABLE_WEBMIN (#707)
* Prepare for BABYLON_NATIVE_DISABLE_WEBMIN * metal-cpp * typo * metal layer * namespace * metal cpp lib path * repo update
1 parent 7d56095 commit 0247349

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ items = ['/shared/BabylonNative/Repo/Polyfills/Canvas',
2323
'/shared/BabylonNative/Repo/Plugins/ShaderCompiler',
2424
'/shared/BabylonNative/Repo/Core/Graphics',
2525
'/shared/BabylonNative/Repo/Dependencies/xr',
26+
'/shared/BabylonNative/Repo/Dependencies',
2627
'/_deps/bgfx.cmake-build/cmake/bgfx',
2728
'/_deps/bgfx.cmake-build/cmake/bimg',
2829
'/_deps/bgfx.cmake-build/cmake/bx',
@@ -103,6 +104,7 @@ Pod::Spec.new do |s|
103104
'ShaderCache',
104105
'ShaderCompiler',
105106
'webp',
107+
'metal-cpp',
106108
'sharpyuv']
107109

108110
if ENV['BABYLON_NATIVE_PLUGIN_NATIVECAMERA'] != '0'

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@ namespace BabylonNative
8383

8484
void UpdateView(WindowType window, size_t width, size_t height)
8585
{
86+
#if defined(__APPLE__)
87+
m_graphicsConfig.Window = (Babylon::Graphics::WindowT)window.layer;
88+
#else
8689
m_graphicsConfig.Window = window;
90+
#endif
8791
m_graphicsConfig.Width = width;
8892
m_graphicsConfig.Height = height;
8993
UpdateGraphicsConfiguration();

Modules/@babylonjs/react-native/shared/BabylonNative/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set(BABYLON_NATIVE_BUILD_APPS OFF)
33
set(BABYLON_NATIVE_INSTALL OFF)
44
set(BABYLON_NATIVE_PLUGIN_TESTUTILS OFF)
55
set(BABYLON_NATIVE_USE_WINDOWS_APP_SDK OFF)
6+
set(BABYLON_NATIVE_DISABLE_WEBMIN ON)
67
set(FETCHCONTENT_SOURCE_DIR_BGFX.CMAKE "${CMAKE_CURRENT_SOURCE_DIR}/deps/bgfx.cmake-src")
78
set(FETCHCONTENT_SOURCE_DIR_ARCANA.CPP "${CMAKE_CURRENT_SOURCE_DIR}/deps/arcana.cpp-src")
89
set(FETCHCONTENT_SOURCE_DIR_CMAKEEXTENSIONS "${CMAKE_CURRENT_SOURCE_DIR}/deps/cmakeextensions-src")
@@ -16,5 +17,6 @@ set(FETCHCONTENT_SOURCE_DIR_IOS-CMAKE "${CMAKE_CURRENT_SOURCE_DIR}/deps/ios-cmak
1617
set(FETCHCONTENT_SOURCE_DIR_ARCORE-ANDROID-SDK "${CMAKE_CURRENT_SOURCE_DIR}/deps/arcore-android-sdk-src")
1718
set(FETCHCONTENT_SOURCE_DIR_ANDROIDEXTENSIONS "${CMAKE_CURRENT_SOURCE_DIR}/deps/androidextensions-src")
1819
set(FETCHCONTENT_SOURCE_DIR_GSL "${CMAKE_CURRENT_SOURCE_DIR}/deps/gsl-src")
20+
set(FETCHCONTENT_SOURCE_DIR_METAL-CPP "${CMAKE_CURRENT_SOURCE_DIR}/deps/metal-cpp-src")
1921

2022
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Repo)

Package/gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ const createPackage = async () => {
230230
exec('npm pack', 'Assembled');
231231
};
232232

233-
const COMMIT_ID = '9a50d722d493524e1b315dd48fed6b0ed6d062c8';
233+
const COMMIT_ID = '3ccba7a6f741705ce611819aefacbbb8062393e7';
234234
const ZIP_URL = `https://github.com/BabylonJS/BabylonNative/archive/${COMMIT_ID}.zip`;
235235
const TARGET_DIR = path.resolve(__dirname, '../Modules/@babylonjs/react-native/shared/BabylonNative');
236236
const ZIP_PATH = path.join(TARGET_DIR, `${COMMIT_ID}.zip`);

0 commit comments

Comments
 (0)