Merge pull request #68528 from BastiaanOlij/openxr_actionmap_changes

Various fixes for OpenXR action map meta data and editing

5 files changed, 0 insertions, 56 deletions

diff --git a/modules/openxr/extensions/openxr_extension_wrapper.h b/modules/openxr/extensions/openxr_extension_wrapper.h
index 77b52ab355..eed969d628 100644
--- a/modules/openxr/extensions/openxr_extension_wrapper.h
+++ b/modules/openxr/extensions/openxr_extension_wrapper.h
@@ -89,11 +89,6 @@ public:
 		return false;
 	}
 
-	// Return false if this extension is responsible for this path but the path is not enabled
-	virtual bool is_path_supported(const String &p_path) {
-		return true;
-	}
-
 	OpenXRExtensionWrapper(OpenXRAPI *p_openxr_api) { openxr_api = p_openxr_api; };
 	virtual ~OpenXRExtensionWrapper() = default;
 };
diff --git a/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp b/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
index 29208efb20..302acf4e30 100644
--- a/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
+++ b/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
@@ -65,38 +65,3 @@ bool OpenXRHTCViveTrackerExtension::on_event_polled(const XrEventDataBuffer &eve
 		} break;
 	}
 }
-
-bool OpenXRHTCViveTrackerExtension::is_path_supported(const String &p_path) {
-	if (p_path == "/interaction_profiles/htc/vive_tracker_htcx") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/handheld_object") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/left_foot") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/right_foot") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/left_shoulder") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/right_shoulder") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/left_elbow") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/right_elbow") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/left_knee") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/right_knee") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/waist") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/chest") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/camera") {
-		return available;
-	} else if (p_path == "/user/vive_tracker_htcx/role/keyboard") {
-		return available;
-	}
-
-	// Not a path under this extensions control, so we return true;
-	return true;
-}
diff --git a/modules/openxr/extensions/openxr_htc_vive_tracker_extension.h b/modules/openxr/extensions/openxr_htc_vive_tracker_extension.h
index ab8e8535f1..376af35e37 100644
--- a/modules/openxr/extensions/openxr_htc_vive_tracker_extension.h
+++ b/modules/openxr/extensions/openxr_htc_vive_tracker_extension.h
@@ -43,7 +43,6 @@ public:
 	bool is_available();
 
 	virtual bool on_event_polled(const XrEventDataBuffer &event) override;
-	virtual bool is_path_supported(const String &p_path) override;
 
 private:
 	static OpenXRHTCViveTrackerExtension *singleton;
diff --git a/modules/openxr/extensions/openxr_palm_pose_extension.cpp b/modules/openxr/extensions/openxr_palm_pose_extension.cpp
index fd3b8f50fe..8f87aaea7f 100644
--- a/modules/openxr/extensions/openxr_palm_pose_extension.cpp
+++ b/modules/openxr/extensions/openxr_palm_pose_extension.cpp
@@ -51,16 +51,3 @@ OpenXRPalmPoseExtension::~OpenXRPalmPoseExtension() {
 bool OpenXRPalmPoseExtension::is_available() {
 	return available;
 }
-
-bool OpenXRPalmPoseExtension::is_path_supported(const String &p_path) {
-	if (p_path == "/user/hand/left/input/palm_ext/pose") {
-		return available;
-	}
-
-	if (p_path == "/user/hand/right/input/palm_ext/pose") {
-		return available;
-	}
-
-	// Not a path under this extensions control, so we return true;
-	return true;
-}
diff --git a/modules/openxr/extensions/openxr_palm_pose_extension.h b/modules/openxr/extensions/openxr_palm_pose_extension.h
index a7ef83c5d5..a63c57eb51 100644
--- a/modules/openxr/extensions/openxr_palm_pose_extension.h
+++ b/modules/openxr/extensions/openxr_palm_pose_extension.h
@@ -42,8 +42,6 @@ public:
 
 	bool is_available();
 
-	virtual bool is_path_supported(const String &p_path) override;
-
 private:
 	static OpenXRPalmPoseExtension *singleton;