Skip to content
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.

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

Properly load multiple action sets in XR #80419

Merged
merged 1 commit into from
Aug 18, 2023

Conversation

Faolan-Rad
Copy link
Contributor

@Faolan-Rad Faolan-Rad commented Aug 8, 2023

This pull request addresses an issue where Godot was unable to correctly load multiple action sets. Previously, only the first action set was loaded, and any subsequent attempts would result in an error, indicating that the action sets were already loaded.

This fix ensures that multiple action sets can be loaded without errors

@AThousandShips

This comment was marked as outdated.

@Faolan-Rad
Copy link
Contributor Author

issues

@AThousandShips AThousandShips added this to the 4.x milestone Aug 8, 2023
@AThousandShips AThousandShips requested a review from a team August 8, 2023 15:20
@Faolan-Rad Faolan-Rad force-pushed the fix-multi_actionsets branch from 28aaff3 to 0cd8b93 Compare August 8, 2023 15:23
modules/openxr/openxr_api.cpp Outdated Show resolved Hide resolved
modules/openxr/openxr_api.h Outdated Show resolved Hide resolved
@YuriSizov YuriSizov requested a review from BastiaanOlij August 8, 2023 15:28
@YuriSizov YuriSizov changed the title Bug Fix: Properly Load Multiple Action Sets in Godot Properly load multiple action sets in XR Aug 8, 2023
@Faolan-Rad
Copy link
Contributor Author

This should be a complete fix for the bug unless I missed something.

@Faolan-Rad Faolan-Rad force-pushed the fix-multi_actionsets branch from 0cd8b93 to 182d51a Compare August 8, 2023 15:37
@YuriSizov
Copy link
Contributor

Please amend the commit message to be closer to the project's preferred style. The current title of the PR is a good option. We don't prefix commits/PR titles with Fix: or anything like that, and there is no need to capitalize every word.

@BastiaanOlij
Copy link
Contributor

I'm going to double check this with OpenXR because it should be possible to attach action sets one at a time, it shouldn't clear previously attached action sets...

@BastiaanOlij
Copy link
Contributor

No, I'm definately wrong, I don't know if this was a restriction added after I build this or if it is something else but:

The runtime must return XR_ERROR_ACTIONSETS_ALREADY_ATTACHED if [xrAttachSessionActionSets (https://registry.khronos.org/OpenXR/specs/1.0/man/html/xrAttachSessionActionSets.html) is called more than once for a given session.

in https://registry.khronos.org/OpenXR/specs/1.0/man/html/xrAttachSessionActionSets.html

@Faolan-Rad Faolan-Rad force-pushed the fix-multi_actionsets branch from 688b1de to a60cf6e Compare August 10, 2023 01:37
@m4gr3d m4gr3d modified the milestones: 4.x, 4.2 Aug 18, 2023
@akien-mga akien-mga merged commit 8a02cd0 into godotengine:master Aug 18, 2023
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Multiple OpenXR Action Sets in Godot does not work
7 participants