mirror of
https://github.com/Redot-Engine/redot-engine.git
synced 2025-12-06 07:17:42 -05:00
OpenXR: Clean-up OpenXRExtensionWrapper by removing multiple inheritance and deprecating OpenXRExtensionWrapperExtension
This commit is contained in:
@@ -31,7 +31,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "action_map/openxr_action.h"
|
||||
#include "extensions/openxr_composition_layer_provider.h"
|
||||
#include "extensions/openxr_extension_wrapper.h"
|
||||
#include "util.h"
|
||||
|
||||
@@ -94,7 +93,7 @@ private:
|
||||
Vector<CharString> enabled_extensions;
|
||||
|
||||
// composition layer providers
|
||||
Vector<OpenXRCompositionLayerProvider *> composition_layer_providers;
|
||||
Vector<OpenXRExtensionWrapper *> composition_layer_providers;
|
||||
|
||||
// projection views extensions
|
||||
Vector<OpenXRExtensionWrapper *> projection_views_extensions;
|
||||
@@ -577,8 +576,8 @@ public:
|
||||
XRPose::TrackingConfidence get_action_pose(RID p_action, RID p_tracker, Transform3D &r_transform, Vector3 &r_linear_velocity, Vector3 &r_angular_velocity);
|
||||
bool trigger_haptic_pulse(RID p_action, RID p_tracker, float p_frequency, float p_amplitude, XrDuration p_duration_ns);
|
||||
|
||||
void register_composition_layer_provider(OpenXRCompositionLayerProvider *provider);
|
||||
void unregister_composition_layer_provider(OpenXRCompositionLayerProvider *provider);
|
||||
void register_composition_layer_provider(OpenXRExtensionWrapper *p_extension);
|
||||
void unregister_composition_layer_provider(OpenXRExtensionWrapper *p_extension);
|
||||
|
||||
void register_projection_views_extension(OpenXRExtensionWrapper *p_extension);
|
||||
void unregister_projection_views_extension(OpenXRExtensionWrapper *p_extension);
|
||||
|
||||
Reference in New Issue
Block a user