fixed merge conflicts

This commit is contained in:
Schmarni
2023-11-16 03:09:42 +01:00
21 changed files with 2869 additions and 387 deletions

View File

@@ -61,11 +61,9 @@ pub fn initialize_xr_graphics(
{
enabled_extensions.khr_android_create_instance = true;
}
// Horrible hack to get the Handtacking extension Loaded, Replace with good system to load
// any extension at some point
enabled_extensions.ext_hand_tracking =
available_extensions.ext_hand_tracking && enable_hand_tracking;
enabled_extensions.ext_hand_tracking = available_extensions.ext_hand_tracking;
// enabled_extensions.ext_hand_joints_motion_range = available_extensions.ext_hand_joints_motion_range;
let available_layers = xr_entry.enumerate_layers()?;
info!("available xr layers: {:#?}", available_layers);