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.

Sign up for GitHub

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

Jump to bottom

Disable XR server when compiling without 3D #89411

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Disable XR server when compiling without 3D #89411

merged 1 commit into from
Mar 13, 2024

Conversation

aaronfranke
Copy link
Member

@aaronfranke aaronfranke commented Mar 12, 2024 •
edited
Loading

This PR disables XRServer and all XR classes when compiling without 3D. Also, this PR organizes servers/SCsub's SConscript lines by alphabetizing them (except with physics and XR at the bottom). The XR modules already disable themselves when compiling without 3D, but in master the classes are still compiled and referenced by the rendering code, from the main.cpp file, and exposed to scripting.

Note: There is a code order change in register_server_singletons's add_singleton calls. I don't think this will change behavior but please look at this.

@aaronfranke aaronfranke added this to the 4.x milestone Mar 12, 2024
@aaronfranke aaronfranke requested review from a team as code owners March 12, 2024 05:41
@aaronfranke aaronfranke requested review from BastiaanOlij and a team March 12, 2024 05:42
akien-mga
akien-mga reviewed Mar 12, 2024
View reviewed changes
main/main.cpp Outdated Show resolved Hide resolved
dsnopek
dsnopek approved these changes Mar 13, 2024
View reviewed changes
Copy link
Contributor

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested it, but the current version of the PR looks good to me! It seems like a fairly straight-forward disabling of XR, and it doesn't seem like it'd cause any "collateral damage" :-)

@akien-mga akien-mga modified the milestones: 4.x, 4.3 Mar 13, 2024
@akien-mga akien-mga merged commit 1030f1f into godotengine:master Mar 13, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@aaronfranke aaronfranke deleted the disable-3d-xr branch March 13, 2024 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsnopek dsnopek dsnopek approved these changes

@akien-mga akien-mga akien-mga approved these changes

@BastiaanOlij BastiaanOlij Awaiting requested review from BastiaanOlij

Assignees
No one assigned
Labels
enhancement topic:xr
Projects
None yet
Milestone
4.3
Development

Successfully merging this pull request may close these issues.
3 participants
@aaronfranke @akien-mga @dsnopek