Skip to content

Update XrContextHelperOpenXR.h to obtain native extension from the global navigator object #185

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
merged 10 commits into from
Apr 6, 2021
Merged

Update XrContextHelperOpenXR.h to obtain native extension from the global navigator object #185

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
48c3dca
move to custom branch
Mar 25, 2021
c7a00f3
obtain xr context off of navigator
Mar 29, 2021
9f52486
merge master into babylonnative
Mar 29, 2021
91189f6
Merge branch 'master' of https://github.com/BabylonJS/BabylonReactNat…
Mar 29, 2021
84dec0e
address review comments
Mar 29, 2021
13b071f
move to most recent commit
Mar 29, 2021
6e01bc6
move to most recent babylonnative commit
Apr 5, 2021
b84c3e1
Merge branch 'master' of https://github.com/BabylonJS/BabylonReactNat…
Apr 5, 2021
ac9fa57
Merge branch 'master' of https://github.com/BabylonJS/BabylonReactNat…
Apr 5, 2021
e9f25e1
Merge branch 'master' of https://github.com/BabylonJS/BabylonReactNat…
Apr 6, 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
23 changes: 17 additions & 6 deletions Modules/@babylonjs/react-native-windows/windows/include/XrContextHelperOpenXR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,29 @@

namespace BabylonReactNative
{
bool TryGetXrContext(facebook::jsi::Runtime& jsiRuntime, const facebook::jsi::Value& xrSession, IXrContextOpenXR*& xrContext)
bool TryGetXrContext(facebook::jsi::Runtime& jsiRuntime, IXrContextOpenXR*& xrContext)
{
xrContext = nullptr;
if (!xrSession.isObject() ||
!xrSession.asObject(jsiRuntime).hasProperty(jsiRuntime, "nativeXrContext") ||
!xrSession.asObject(jsiRuntime).hasProperty(jsiRuntime, "nativeXrContextType") ||
xrSession.asObject(jsiRuntime).getProperty(jsiRuntime, "nativeXrContextType").asString(jsiRuntime).utf8(jsiRuntime) != "OpenXR")
if (!jsiRuntime.global().hasProperty(jsiRuntime, "navigator"))
{
return false;
}

auto nativeExtensionPtr = static_cast<uintptr_t>(xrSession.asObject(jsiRuntime).getProperty(jsiRuntime, "nativeXrContext").asNumber());
auto navigator{ jsiRuntime.global().getProperty(jsiRuntime, "navigator").asObject(jsiRuntime) };
if (!navigator.hasProperty(jsiRuntime, "xr"))
{
return false;
}

auto nativeXr{ navigator.getProperty(jsiRuntime, "xr").asObject(jsiRuntime) };
if (!nativeXr.hasProperty(jsiRuntime, "nativeXrContext") ||
!nativeXr.hasProperty(jsiRuntime, "nativeXrContextType") ||
nativeXr.getProperty(jsiRuntime, "nativeXrContextType").asString(jsiRuntime).utf8(jsiRuntime) != "OpenXR")
{
return false;
}

auto nativeExtensionPtr = static_cast<uintptr_t>(nativeXr.getProperty(jsiRuntime, "nativeXrContext").asNumber());
xrContext = reinterpret_cast<IXrContextOpenXR*>(nativeExtensionPtr);
return true;
}
Expand Down