asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #45444 from dsnopek/webxr-master-mono

Browse source 
Support mono devices in WebXR
This commit is contained in:
Rémi Verschelde 2021-01-27 21:11:31 +01:00 committed by GitHub
commit 9d3a9b3e7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/webxr/godot_webxr.h
View file

@ -61,6 +61,7 @@ extern void godot_webxr_initialize(
GodotWebXRSimpleEventCallback p_on_simple_event); GodotWebXRSimpleEventCallback p_on_simple_event);
extern void godot_webxr_uninitialize(); extern void godot_webxr_uninitialize();
extern int godot_webxr_get_view_count();
extern int *godot_webxr_get_render_targetsize(); extern int *godot_webxr_get_render_targetsize();
extern float *godot_webxr_get_transform_for_eye(int p_eye); extern float *godot_webxr_get_transform_for_eye(int p_eye);
extern float *godot_webxr_get_projection_for_eye(int p_eye); extern float *godot_webxr_get_projection_for_eye(int p_eye);

9
modules/webxr/native/library_godot_webxr.js
View file

@ -394,6 +394,15 @@ const GodotWebXR = {
GodotWebXR.pauseResumeMainLoop(); GodotWebXR.pauseResumeMainLoop();
}, },
godot_webxr_get_view_count__proxy: 'sync',
godot_webxr_get_view_count__sig: 'i',
godot_webxr_get_view_count: function () {
if (!GodotWebXR.session || !GodotWebXR.pose) {
return 0;
}
return GodotWebXR.pose.views.length;
},
godot_webxr_get_render_targetsize__proxy: 'sync', godot_webxr_get_render_targetsize__proxy: 'sync',
godot_webxr_get_render_targetsize__sig: 'i', godot_webxr_get_render_targetsize__sig: 'i',
godot_webxr_get_render_targetsize: function () { godot_webxr_get_render_targetsize: function () {

5
modules/webxr/webxr_interface_js.cpp
View file

@ -197,12 +197,11 @@ StringName WebXRInterfaceJS::get_name() const {
}; };
int WebXRInterfaceJS::get_capabilities() const { int WebXRInterfaceJS::get_capabilities() const {
return XRInterface::XR_STEREO; return XRInterface::XR_STEREO | XRInterface::XR_MONO;
}; };
bool WebXRInterfaceJS::is_stereo() { bool WebXRInterfaceJS::is_stereo() {
// @todo WebXR can be mono! So, how do we know? Count the views in the frame? return godot_webxr_get_view_count() == 2;
return true;
}; };
bool WebXRInterfaceJS::is_initialized() const { bool WebXRInterfaceJS::is_initialized() const {