Update to latest Babylon Native with render threading (#107)

Update BabylonNative to master and fix up usage of graphics, plus remove NativeWindow.

Author: ryantrem

Modules/@babylonjs/react-native/EngineHook.ts

@@ -62,6 +62,11 @@ class DOMException {
 declare const global: any;
 global.atob = base64.decode;
 
+// This global object is part of Babylon Native.
+declare const _native: {
+    graphicsInitializationPromise: Promise<void>;
+}
+
 export function useEngine(): Engine | undefined {
     const [engine, setEngine] = useState<Engine>();
 
@@ -72,6 +77,7 @@ export function useEngine(): Engine | undefined {
         (async () => {
             if (await BabylonModule.initialize() && !disposed)
             {
+                await _native.graphicsInitializationPromise;
                 engine = new NativeEngine();
                 setEngine(engine);
             }

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

@@ -71,7 +71,6 @@ target_link_libraries(BabylonNative
     AndroidExtensions
     Graphics
     JsRuntime
-    NativeWindow
     NativeEngine
     NativeInput
     NativeXr

Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp

@@ -2,7 +2,6 @@
 
 #include <Babylon/Graphics.h>
 #include <Babylon/JsRuntime.h>
-#include <Babylon/Plugins/NativeWindow.h>
 #include <Babylon/Plugins/NativeEngine.h>
 #include <Babylon/Plugins/NativeInput.h>
 #include <Babylon/Plugins/NativeXr.h>
@@ -48,11 +47,10 @@ namespace Babylon
             auto width = static_cast<size_t>(ANativeWindow_getWidth(windowPtr));
             auto height = static_cast<size_t>(ANativeWindow_getHeight(windowPtr));
 
-            m_graphics = Graphics::InitializeFromWindow<void*>(windowPtr, width, height);
+            m_graphics = Graphics::CreateGraphics(reinterpret_cast<void*>(windowPtr), width, height);
             m_graphics->AddToJavaScript(m_env);
 
-            Plugins::NativeEngine::Initialize(m_env);
-            Plugins::NativeWindow::Initialize(m_env, windowPtr, width, height);
+            Plugins::NativeEngine::Initialize(m_env, true);
             Plugins::NativeXr::Initialize(m_env);
 
             Polyfills::Window::Initialize(m_env);
@@ -73,8 +71,8 @@ namespace Babylon
         {
             auto width = static_cast<size_t>(ANativeWindow_getWidth(windowPtr));
             auto height = static_cast<size_t>(ANativeWindow_getHeight(windowPtr));
-            m_graphics->ReinitializeFromWindow<void*>(windowPtr, width, height);
-            Plugins::NativeWindow::Reinitialize(m_env, windowPtr, width, height);
+            m_graphics->UpdateWindow<void*>(windowPtr);
+            m_graphics->UpdateSize(width, height);
         }
 
         void SetPointerButtonState(uint32_t pointerId, uint32_t buttonId, bool isDown, uint32_t x, uint32_t y)

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

@@ -2,7 +2,6 @@
 
 #include <Babylon/Graphics.h>
 #include <Babylon/JsRuntime.h>
-#include <Babylon/Plugins/NativeWindow.h>
 #include <Babylon/Plugins/NativeEngine.h>
 #include <Babylon/Plugins/NativeInput.h>
 #include <Babylon/Plugins/NativeXr.h>
@@ -45,7 +44,7 @@ namespace Babylon
         : m_impl{ std::make_unique<Native::Impl>(jsiRuntime, callInvoker) }
     {
         dispatch_sync(dispatch_get_main_queue(), ^{
-            m_impl->m_graphics = Graphics::InitializeFromWindow<void*>(windowPtr, width, height);
+            m_impl->m_graphics = Graphics::CreateGraphics(reinterpret_cast<void*>(windowPtr), width, height);
         });
 
         m_impl->runtime = &JsRuntime::CreateForJavaScript(m_impl->env, CreateJsRuntimeDispatcher(m_impl->env, jsiRuntime, callInvoker));
@@ -57,8 +56,7 @@ namespace Babylon
         // React Native's implementation, but rather adds a second one scoped to Babylon and used by WebRequest.ts.
         Polyfills::XMLHttpRequest::Initialize(m_impl->env);
 
-        Plugins::NativeWindow::Initialize(m_impl->env, windowPtr, width, height);
-        Plugins::NativeEngine::Initialize(m_impl->env);
+        Plugins::NativeEngine::Initialize(m_impl->env, true);
         Plugins::NativeXr::Initialize(m_impl->env);
 
         m_impl->nativeInput = &Babylon::Plugins::NativeInput::CreateForJavaScript(m_impl->env);
@@ -70,13 +68,13 @@ namespace Babylon
 
     void Native::Refresh(void* windowPtr, size_t width, size_t height)
     {
-        m_impl->m_graphics->ReinitializeFromWindow<void*>(windowPtr, width, height);
-        Plugins::NativeWindow::Reinitialize(m_impl->env, windowPtr, width, height);
+        m_impl->m_graphics->UpdateWindow<void*>(windowPtr);
+        m_impl->m_graphics->UpdateSize(width, height);
     }
 
     void Native::Resize(size_t width, size_t height)
     {
-        Plugins::NativeWindow::UpdateSize(m_impl->env, width, height);
+        m_impl->m_graphics->UpdateSize(width, height);
     }
 
     void Native::SetPointerButtonState(uint32_t pointerId, uint32_t buttonId, bool isDown, uint32_t x, uint32_t y)

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

@@ -43,7 +43,6 @@ target_link_libraries(BabylonNative
     reactnative
     BabylonReactNativeShared
     JsRuntime
-    NativeWindow
     NativeEngine
     NativeInput
     NativeXr

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

@@ -33,7 +33,6 @@ Pod::Spec.new do |s|
                 'napi',
                 'NativeEngine',
                 'NativeInput',
-                'NativeWindow',
                 'NativeXR',
                 'SPIRV',
                 'spirv-cross-core',

Modules/@babylonjs/react-native/submodules/BabylonNative

@@ -94,7 +94,6 @@ Assembled/ios/libs/libWindow.a
 Assembled/ios/libs/libbimg.a
 Assembled/ios/libs/libOGLCompiler.a
 Assembled/ios/libs/libastc.a
-Assembled/ios/libs/libNativeWindow.a
 Assembled/ios/libs/libNativeEngine.a
 Assembled/ios/libs/libNativeXr.a
 Assembled/ios/libs/libspirv-cross-glsl.a

Package/gulpfile.js

@@ -18,7 +18,6 @@ set(PACKAGED_LIBS
     napi
     NativeEngine
     NativeInput
-    NativeWindow
     NativeXr
     SPIRV
     spirv-cross-core