From 718a0736f5c00117826100f089425eeda100c35f Mon Sep 17 00:00:00 2001 From: Sergio Ricardo Zebetto Masson Date: Mon, 7 Mar 2022 13:04:14 -0300 Subject: [PATCH 1/2] Replaced Babylon::Graphics by Babylon::Graphics::Device --- .../android/src/main/cpp/BabylonNativeInterop.cpp | 2 +- .../@babylonjs/react-native/shared/BabylonNative.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp b/Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp index 9b55c9c06..e065dc6d3 100644 --- a/Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp +++ b/Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include #include diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp index 4e6bce990..b896e3883 100644 --- a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp +++ b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp @@ -1,6 +1,6 @@ #include "BabylonNative.h" -#include +#include #include #include #include @@ -22,8 +22,8 @@ namespace BabylonNative namespace { Dispatcher g_inlineDispatcher{ [](const std::function& func) { func(); } }; - std::unique_ptr g_graphics{}; - std::unique_ptr g_update{}; + std::unique_ptr g_graphics{}; + std::unique_ptr g_update{}; std::unique_ptr g_nativeCanvas{}; } @@ -73,15 +73,15 @@ namespace BabylonNative void UpdateView(WindowType window, size_t width, size_t height) { - Babylon::WindowConfiguration windowConfig{}; + Babylon::Graphics::WindowConfiguration windowConfig{}; windowConfig.Window = window; windowConfig.Width = width; windowConfig.Height = height; if (!g_graphics) { - g_graphics = Babylon::Graphics::CreateGraphics(windowConfig); - g_update = std::make_unique(g_graphics->GetUpdate("update")); + g_graphics = Babylon::Graphics::Device::Create(windowConfig); + g_update = std::make_unique(g_graphics->GetUpdate("update")); } else { From d667622ff0a37fd25c052abc0849b2a01a4756d1 Mon Sep 17 00:00:00 2001 From: Sergio Ricardo Zebetto Masson Date: Fri, 1 Apr 2022 12:14:00 -0300 Subject: [PATCH 2/2] Updated Babylon Native submodule --- .../@babylonjs/react-native-iosandroid/submodules/BabylonNative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative b/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative index 55b26dd26..18044bf2e 160000 --- a/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 55b26dd26f289b826d9cb352766b8177b21f2398 +Subproject commit 18044bf2e1efa16a92606f8e0a9e4b26968a5ee0