From 6d5c1fa00f39aaf5ae68acde41430c41d514f3e0 Mon Sep 17 00:00:00 2001 From: Jay Christy Date: Sun, 24 Sep 2023 15:33:40 -0400 Subject: [PATCH] lite cleaning --- examples/xr.rs | 11 +---------- src/xr_input/debug_gizmos.rs | 2 +- src/xr_input/mod.rs | 6 ++---- src/xr_input/trackers.rs | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/examples/xr.rs b/examples/xr.rs index 344b8b24..548fe152 100644 --- a/examples/xr.rs +++ b/examples/xr.rs @@ -1,20 +1,11 @@ -use std::f32::consts::PI; -use std::time::Duration; - use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin}; -use bevy::prelude::Gizmos; use bevy::prelude::*; use bevy::transform::components::Transform; -use bevy_openxr::input::XrInput; -use bevy_openxr::resources::{XrFrameState, XrInstance, XrSession, XrViews}; use bevy_openxr::xr_input::debug_gizmos::OpenXrDebugRenderer; -use bevy_openxr::xr_input::oculus_touch::OculusController; use bevy_openxr::xr_input::prototype_locomotion::{proto_locomotion, PrototypeLocomotionConfig}; use bevy_openxr::xr_input::trackers::{ - adopt_open_xr_trackers, OpenXRController, OpenXRLeftController, OpenXRRightController, - OpenXRTracker, OpenXRTrackingRoot, + OpenXRController, OpenXRLeftController, OpenXRRightController, OpenXRTracker, }; -use bevy_openxr::xr_input::{Hand, QuatConv, Vec3Conv}; use bevy_openxr::DefaultXrPlugins; fn main() { diff --git a/src/xr_input/debug_gizmos.rs b/src/xr_input/debug_gizmos.rs index 5724bc67..5d7432e8 100644 --- a/src/xr_input/debug_gizmos.rs +++ b/src/xr_input/debug_gizmos.rs @@ -10,7 +10,7 @@ use crate::{ use crate::xr_input::{ oculus_touch::{OculusController, OculusControllerRef}, - Hand, QuatConv, Vec3Conv, + Hand, }; use super::trackers::{OpenXRLeftController, OpenXRRightController, OpenXRTrackingRoot}; diff --git a/src/xr_input/mod.rs b/src/xr_input/mod.rs index 05a04636..55e7c562 100644 --- a/src/xr_input/mod.rs +++ b/src/xr_input/mod.rs @@ -12,13 +12,11 @@ use crate::xr_input::oculus_touch::{setup_oculus_controller, ActionSets}; use crate::xr_input::xr_camera::{xr_camera_head_sync, Eye, XRProjection, XrCameraBundle}; use bevy::app::{App, PostUpdate, Startup}; use bevy::log::warn; -use bevy::prelude::{ - default, Commands, Component, Plugin, PreUpdate, Quat, Res, SpatialBundle, Update, Vec3, -}; use bevy::prelude::{BuildChildren, IntoSystemConfigs}; +use bevy::prelude::{Commands, Plugin, PreUpdate, Quat, Res, SpatialBundle, Update, Vec3}; use bevy::render::camera::CameraProjectionPlugin; use bevy::render::view::{update_frusta, VisibilitySystems}; -use bevy::transform::{TransformBundle, TransformSystem}; +use bevy::transform::TransformSystem; use self::trackers::{ adopt_open_xr_trackers, update_open_xr_controllers, OpenXRLeftEye, OpenXRRightEye, diff --git a/src/xr_input/trackers.rs b/src/xr_input/trackers.rs index 5da4541c..f33e6ee5 100644 --- a/src/xr_input/trackers.rs +++ b/src/xr_input/trackers.rs @@ -1,4 +1,4 @@ -use bevy::prelude::{info, Added, BuildChildren, Commands, Component, Entity, Query, With, Res, Transform, Without}; +use bevy::prelude::{Added, BuildChildren, Commands, Entity, Query, With, Res, Transform, Without, Component, info}; use crate::{resources::{XrFrameState, XrInstance, XrSession}, input::XrInput};