diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-12 09:25:23 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-12 09:25:23 +0200 |
commit | ea9ad8d6a1fdb7a9cf03854be5aa7f12620321ab (patch) | |
tree | 84488822d06fe23a28870ad5a4d9381184cc8ff4 /modules/openxr/scene/openxr_composition_layer_quad.cpp | |
parent | f8fbb860f553e9ff384e97a4ec4904ee0039e491 (diff) | |
parent | 3afa26834a072ca1a9bcc53e0e1b9d6467b74ed2 (diff) | |
download | redot-engine-ea9ad8d6a1fdb7a9cf03854be5aa7f12620321ab.tar.gz |
Merge pull request #96185 from dsnopek/openxr-composition-layer-android-surface
OpenXR: Support composition layers based on Android surfaces
Diffstat (limited to 'modules/openxr/scene/openxr_composition_layer_quad.cpp')
-rw-r--r-- | modules/openxr/scene/openxr_composition_layer_quad.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/modules/openxr/scene/openxr_composition_layer_quad.cpp b/modules/openxr/scene/openxr_composition_layer_quad.cpp index 21919496d6..4a00fd371e 100644 --- a/modules/openxr/scene/openxr_composition_layer_quad.cpp +++ b/modules/openxr/scene/openxr_composition_layer_quad.cpp @@ -38,18 +38,8 @@ #include "scene/main/viewport.h" #include "scene/resources/3d/primitive_meshes.h" -OpenXRCompositionLayerQuad::OpenXRCompositionLayerQuad() { - composition_layer = { - XR_TYPE_COMPOSITION_LAYER_QUAD, // type - nullptr, // next - 0, // layerFlags - XR_NULL_HANDLE, // space - XR_EYE_VISIBILITY_BOTH, // eyeVisibility - {}, // subImage - { { 0, 0, 0, 0 }, { 0, 0, 0 } }, // pose - { (float)quad_size.x, (float)quad_size.y }, // size - }; - openxr_layer_provider = memnew(OpenXRViewportCompositionLayerProvider((XrCompositionLayerBaseHeader *)&composition_layer)); +OpenXRCompositionLayerQuad::OpenXRCompositionLayerQuad() : + OpenXRCompositionLayer((XrCompositionLayerBaseHeader *)&composition_layer) { XRServer::get_singleton()->connect("reference_frame_changed", callable_mp(this, &OpenXRCompositionLayerQuad::update_transform)); } |