@babylonjs/react-native 0.4.0-alpha.43 → 0.4.0-alpha.47

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@babylonjs/react-native",
     "title": "React Native Babylon",
-    "version": "0.4.0-alpha.43",
+    "version": "0.4.0-alpha.47",
     "description": "Babylon Native integration into React Native",
     "main": "index.js",
     "scripts": {
@@ -28,7 +28,7 @@
         "semver": "^7.3.2"
     },
     "peerDependencies": {
-        "@babylonjs/core": "5.0.0-alpha.60",
+        "@babylonjs/core": "^5.0.0-alpha.65",
         "react": ">=16.13.1",
         "react-native": ">=0.63.1",
         "react-native-permissions": "^2.1.4"
@@ -36,7 +36,7 @@
     "devDependencies": {
         "@babel/core": "^7.8.4",
         "@babel/runtime": "^7.8.4",
-        "@babylonjs/core": "5.0.0-alpha.60",
+        "@babylonjs/core": "5.0.0-alpha.65",
         "@rnw-scripts/eslint-config": "0.1.6",
         "@rnw-scripts/ts-config": "0.1.0",
         "@types/base-64": "^0.1.3",
@@ -50,7 +50,6 @@
         "just-scripts": "^0.44.7",
         "metro-react-native-babel-preset": "^0.56.0",
         "prettier": "1.19.1",
-        "react-test-renderer": "17.0.1",
         "typescript": "^4.3.5"
     }
 }

package/shared/BabylonNative.h

@@ -2,21 +2,45 @@
 
 #include <jsi/jsi.h>
 
-namespace Babylon
+#if defined(__APPLE__)
+#include <MetalKit/MTKView.h>
+#elif defined(ANDROID)
+#include <android/native_window.h>
+#elif WINAPI_FAMILY == WINAPI_FAMILY_APP
+#include <winrt/Windows.UI.Xaml.Controls.h>
+#endif
+
+namespace BabylonNative
 {
+    #if defined(__APPLE__)
+        using WindowType = MTKView*;
+    #elif defined(ANDROID)
+        using WindowType = ANativeWindow*;
+    #elif WINAPI_FAMILY == WINAPI_FAMILY_APP
+        using WindowType = winrt::Windows::UI::Xaml::Controls::SwapChainPanel;
+    #else
+        #error Unsupported platform
+    #endif
+
     using Dispatcher = std::function<void(std::function<void()>)>;
 
     void Initialize(facebook::jsi::Runtime& jsiRuntime, Dispatcher jsDispatcher);
     void Deinitialize();
-    void UpdateView(void* windowPtr, size_t width, size_t height);
+
+    void UpdateView(WindowType window, size_t width, size_t height);
+
     void RenderView();
     void ResetView();
     void SetMouseButtonState(uint32_t buttonId, bool isDown, uint32_t x, uint32_t y);
     void SetMousePosition(uint32_t x, uint32_t y);
     void SetTouchButtonState(uint32_t pointerId, bool isDown, uint32_t x, uint32_t y);
     void SetTouchPosition(uint32_t pointerId, uint32_t x, uint32_t y);
+
     bool IsXRActive();
-    void UpdateXRView(void* windowPtr);
+
+#if defined(__APPLE__) || defined(ANDROID)
+    void UpdateXRView(WindowType window);
+#endif
 
     extern const uint32_t LEFT_MOUSE_BUTTON_ID;
     extern const uint32_t MIDDLE_MOUSE_BUTTON_ID;