From 3a68b64a4cd5740ad0f6bbfe6fb89b129ba09c38 Mon Sep 17 00:00:00 2001
From: Raffaele Ragni <raffaele.ragni@gmail.com>
Date: Tue, 26 Sep 2023 22:19:05 +0200
Subject: [PATCH] use upstream main

---
 Cargo.toml                   | 4 ++--
 src/lib.rs                   | 4 ++--
 src/xr_input/debug_gizmos.rs | 2 +-
 src/xr_input/trackers.rs     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e6973e2f..82181d24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ linked = ["openxr/linked", "openxr/static"]
 [dependencies]
 anyhow = "1.0.75"
 ash = "0.37.3"
-bevy = { git = "https://github.com/awtterpip/bevy", rev = "98f3b8ae207deb440f7255b3d900e7e01b6df0cb" }
+bevy = { git = "https://github.com/bevyengine/bevy.git" }
 openxr = { version = "0.17.1", features = ["mint"] }
 mint = "0.5.9"
 wgpu = "0.16.0"
@@ -18,7 +18,7 @@ wgpu-core = { version = "0.16.0", features = ["vulkan"] }
 wgpu-hal = "0.16.0"
 
 [dev-dependencies]
-bevy = { git = "https://github.com/awtterpip/bevy", rev = "98f3b8ae207deb440f7255b3d900e7e01b6df0cb" }
+bevy = { git = "https://github.com/bevyengine/bevy.git" }
 color-eyre = "0.6.2"
 
 [[example]]
diff --git a/src/lib.rs b/src/lib.rs
index c0b21218..e5ed7487 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,7 +13,7 @@ use bevy::prelude::*;
 use bevy::render::camera::{ManualTextureView, ManualTextureViewHandle, ManualTextureViews};
 use bevy::render::pipelined_rendering::PipelinedRenderingPlugin;
 use bevy::render::renderer::{render_system, RenderInstance};
-use bevy::render::settings::RenderSettings;
+use bevy::render::settings::RenderCreation;
 use bevy::render::{Render, RenderApp, RenderPlugin, RenderSet};
 use bevy::window::{PresentMode, PrimaryWindow, RawHandleWrapper};
 use input::XrInput;
@@ -97,7 +97,7 @@ impl Plugin for OpenXrPlugin {
         ));
         app.insert_resource(ActionSets(vec![]));
         app.add_plugins(RenderPlugin {
-            render_settings: RenderSettings::Manual(
+            render_creation: RenderCreation::Manual(
                 device,
                 queue,
                 adapter_info,
diff --git a/src/xr_input/debug_gizmos.rs b/src/xr_input/debug_gizmos.rs
index 5d7432e8..c8659e29 100644
--- a/src/xr_input/debug_gizmos.rs
+++ b/src/xr_input/debug_gizmos.rs
@@ -206,7 +206,7 @@ fn draw_hand_gizmo(
             let face_quat = controller_quat.mul_quat(face_quat_offset);
             let face_quat_normal = face_quat.mul_vec3(Vec3::Z);
 
-            let squeeze = controller.squeeze(Hand::Right);
+            let _squeeze = controller.squeeze(Hand::Right);
             //info!("{:?}", squeeze);
             //grip
             gizmos.rect(
diff --git a/src/xr_input/trackers.rs b/src/xr_input/trackers.rs
index f33e6ee5..cbf79ddd 100644
--- a/src/xr_input/trackers.rs
+++ b/src/xr_input/trackers.rs
@@ -22,7 +22,7 @@ pub struct OpenXRRightController;
 pub struct OpenXRController;
 
 pub fn adopt_open_xr_trackers(
-    query: Query<(Entity), Added<OpenXRTracker>>,
+    query: Query<Entity, Added<OpenXRTracker>>,
     mut commands: Commands,
     tracking_root_query: Query<(Entity, With<OpenXRTrackingRoot>)>,
 ) {