Skip to content

Support interacting with ARKit XR system in external native modules #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisfromwork merged 8 commits into from
Jul 20, 2021
Merged

Support interacting with ARKit XR system in external native modules #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
981210e
add ios helper functions
Jul 19, 2021
5bf368b
update bn
Jul 19, 2021
95c329e
update babylon native dependencies
Jul 20, 2021
de94ac7
update BabylonNative dependencies
Jul 20, 2021
806fb46
remove unneeded file
Jul 20, 2021
a3c957b
Merge branch 'master' of https://github.com/BabylonJS/BabylonReactNat…
Jul 20, 2021
da5433d
update babylonnative
Jul 20, 2021
f0f09ad
update to correct commit
Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions Modules/@babylonjs/react-native/shared/XrAnchorHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,47 @@ namespace Babylon::Plugins::NativeXr
}
#endif
#endif

#if __has_include("IXrContextARKit.h")
#include "IXrContextARKit.h"
#if __has_include("jsi/jsi.h")
Copy link
Copy Markdown
Contributor

@rgerd rgerd Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels like something that should be handled at the CMake level (like we do with AppRuntime* etc) instead of doing compile-time if's

Copy link
Copy Markdown
Contributor Author

@chrisfromwork chrisfromwork Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these files can be referenced by anyone independent of whether they use cmake

namespace Babylon::Plugins::NativeXr
{
bool TryGetNativeAnchor(facebook::jsi::Runtime& jsiRuntime, facebook::jsi::Value& jsAnchor, ARAnchor*& nativeAnchor)
Copy link
Copy Markdown
Contributor

@rgerd rgerd Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I prefer to use reference to pointer, but I feel like the pattern in OpenXR/Vulkan/D3D is usually to do pointer to pointer. Idk which is actually better, just wanted to point it out

Copy link
Copy Markdown
Contributor

@rgerd rgerd Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, without looking too hard I think the first two references could be const all the way down

Copy link
Copy Markdown
Contributor Author

@chrisfromwork chrisfromwork Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree on switching things that aren't getting set to constants. I think that a reference to a pointer is more legible than a double pointer personally.

Copy link
Copy Markdown
Contributor Author

@chrisfromwork chrisfromwork Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am going to leave things as they are for now. jsiRuntime.global() isn't marked as a const operation so we can get away with handing around a const jsiRuntime here.

{
nativeAnchor = nullptr;
uintptr_t nativeAnchorPtr{reinterpret_cast<uintptr_t>(nullptr)};
Copy link
Copy Markdown
Contributor

@rgerd rgerd Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could use auto here

Copy link
Copy Markdown
Contributor Author

@chrisfromwork chrisfromwork Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

going to leave as uintptr_t to stay consistent with rest of file/avoid editing the rest of the file.

if (TryGetNativeAnchor(jsiRuntime, jsAnchor, nativeAnchorPtr))
{
nativeAnchor = reinterpret_cast<ARAnchor*>(nativeAnchorPtr);
return true;
}

return false;
}
}
#endif
#if __has_include("napi/env.h")
namespace Babylon::Plugins::NativeXr
{
bool TryGetNativeAnchor(Napi::Env env, Napi::Value anchor, ARAnchor*& nativeAnchor)
{
nativeAnchor = nullptr;
uintptr_t nativeAnchorPtr{reinterpret_cast<uintptr_t>(nullptr)};
if (TryGetNativeAnchor(env, anchor, nativeAnchorPtr))
{
nativeAnchor = reinterpret_cast<ARAnchor*>(nativeAnchorPtr);
return true;
}

return false;
}

bool TryDeclareNativeAnchor(Napi::Env env, const Napi::Value& session, ARAnchor* nativeAnchor, Napi::Value& xrAnchor)
{
uintptr_t nativeAnchorPtr{reinterpret_cast<uintptr_t>(nativeAnchor)};
return TryDeclareNativeAnchor(env, session, nativeAnchorPtr, xrAnchor);
}
}
#endif
#endif
38 changes: 38 additions & 0 deletions Modules/@babylonjs/react-native/shared/XrContextHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,41 @@ namespace Babylon::Plugins::NativeXr
}
#endif
#endif

#if __has_include("IXrContextARKit.h")
#include "IXrContextARKit.h"
#if __has_include("jsi/jsi.h")
namespace Babylon::Plugins::NativeXr
{
bool TryGetXrContext(facebook::jsi::Runtime& jsiRuntime, IXrContextARKit*& xrContext)
{
xrContext = nullptr;
uintptr_t nativePtr{reinterpret_cast<uintptr_t>(nullptr)};
if (TryGetXrContext(jsiRuntime, "ARKit", nativePtr))
{
xrContext = reinterpret_cast<IXrContextARKit*>(nativePtr);
return true;
}

return false;
}
}
#endif
#if __has_include("napi/env.h")
namespace Babylon::Plugins::NativeXr
{
bool TryGetXrContext(Napi::Env env, IXrContextARKit*& xrContext)
{
xrContext = nullptr;
uintptr_t nativePtr{reinterpret_cast<uintptr_t>(nullptr)};
if (TryGetXrContext(env, "ARKit", nativePtr))
{
xrContext = reinterpret_cast<IXrContextARKit*>(nativePtr);
return true;
}

return false;
}
}
#endif
#endif
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native/submodules/BabylonNative
Open in desktop
Submodule BabylonNative updated 24 files
+62 −0 Apps/Playground/Scripts/experience.js
+9 −6 Apps/Playground/Win32/App.cpp
+0 −2 Core/Graphics/CMakeLists.txt
+73 −58 Core/Graphics/Source/FrameBuffer.cpp
+28 −30 Core/Graphics/Source/FrameBuffer.h
+0 −77 Core/Graphics/Source/FrameBufferManager.cpp
+0 −37 Core/Graphics/Source/FrameBufferManager.h
+6 −36 Core/Graphics/Source/GraphicsImpl.cpp
+4 −7 Core/Graphics/Source/GraphicsImpl.h
+1 −0 Dependencies/xr/CMakeLists.txt
+2 −0 Dependencies/xr/Source/ARCore/XR.cpp
+10 −0 Dependencies/xr/Source/ARKit/Include/IXrContextARKit.h
+377 −55 Dependencies/xr/Source/ARKit/XR.mm
+84 −94 Dependencies/xr/Source/OpenXR/XR.cpp
+1 −0 Plugins/NativeEngine/CMakeLists.txt
+48 −17 Plugins/NativeEngine/Source/NativeEngine.cpp
+4 −0 Plugins/NativeEngine/Source/NativeEngine.h
+49 −0 Plugins/NativeEngine/Source/PerFrameValue.h
+10 −6 Plugins/NativeXr/Source/NativeXr.cpp
+6 −13 Polyfills/Canvas/Source/Canvas.cpp
+2 −2 Polyfills/Canvas/Source/Canvas.h
+4 −2 Polyfills/Canvas/Source/Context.cpp
+9 −7 Polyfills/Canvas/Source/nanovg_babylon.cpp
+1 −0 Polyfills/Canvas/Source/nanovg_babylon.h