changed things to bevy_oxr instead of bevy_openxr and made the androi…

…d example part of the workspace
awtterpip · Nov 6, 2023 · 52ffa2f · 52ffa2f
1 parent 0e6ae62
commit 52ffa2f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,15 @@
 [package]
-name = "bevy_openxr"
+name = "bevy_oxr"
 version = "0.1.0"
 edition = "2021"
 
 [features]
 default = ["openxr/mint", "linked"]
 linked = ["openxr/linked"]
 
+[workspace]
+members = [ "examples/android" ]
+
 [dependencies]
 anyhow = "1.0.75"
 ash = "0.37.3"

diff --git a/examples/android/Cargo.toml b/examples/android/Cargo.toml
@@ -29,7 +29,7 @@ target_sdk_version = 32
 # label = "Bevy Example"
 
 [dependencies]
-bevy_openxr = { path = "../..", default-features = false }
+bevy_oxr = { path = "../..", default-features = false }
 bevy = "0.12"
 openxr = { git = "https://github.com/Ralith/openxrs", features = ["mint"] }
 

diff --git a/examples/android/src/lib.rs b/examples/android/src/lib.rs
@@ -1,12 +1,12 @@
 use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin};
 use bevy::prelude::*;
 use bevy::transform::components::Transform;
-use bevy_openxr::xr_input::debug_gizmos::OpenXrDebugRenderer;
-use bevy_openxr::xr_input::prototype_locomotion::{proto_locomotion, PrototypeLocomotionConfig};
-use bevy_openxr::xr_input::trackers::{
+use bevy_oxr::xr_input::debug_gizmos::OpenXrDebugRenderer;
+use bevy_oxr::xr_input::prototype_locomotion::{proto_locomotion, PrototypeLocomotionConfig};
+use bevy_oxr::xr_input::trackers::{
  OpenXRController, OpenXRLeftController, OpenXRRightController, OpenXRTracker,
 };
-use bevy_openxr::DefaultXrPlugins;
+use bevy_oxr::DefaultXrPlugins;
 
 #[bevy_main]
 fn main() {

diff --git a/examples/xr.rs b/examples/xr.rs
@@ -4,22 +4,22 @@ use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin};
 
 use bevy::prelude::*;
 use bevy::transform::components::Transform;
-use bevy_openxr::input::XrInput;
-use bevy_openxr::resources::{XrFrameState, XrInstance, XrSession};
+use bevy_oxr::input::XrInput;
+use bevy_oxr::resources::{XrFrameState, XrInstance, XrSession};
 
-use bevy_openxr::xr_input::hand::{OpenXrHandInput, HandInputDebugRenderer};
-use bevy_openxr::xr_input::interactions::{
+use bevy_oxr::xr_input::hand::{OpenXrHandInput, HandInputDebugRenderer};
+use bevy_oxr::xr_input::interactions::{
  draw_interaction_gizmos, draw_socket_gizmos, interactions, socket_interactions,
  update_interactable_states, InteractionEvent, Touched, XRDirectInteractor, XRInteractable,
  XRInteractableState, XRInteractorState, XRRayInteractor, XRSocketInteractor,
 };
-use bevy_openxr::xr_input::oculus_touch::OculusController;
-use bevy_openxr::xr_input::prototype_locomotion::{proto_locomotion, PrototypeLocomotionConfig};
-use bevy_openxr::xr_input::trackers::{
+use bevy_oxr::xr_input::oculus_touch::OculusController;
+use bevy_oxr::xr_input::prototype_locomotion::{proto_locomotion, PrototypeLocomotionConfig};
+use bevy_oxr::xr_input::trackers::{
  AimPose, OpenXRController, OpenXRLeftController, OpenXRRightController, OpenXRTracker,
 };
-use bevy_openxr::xr_input::Hand;
-use bevy_openxr::DefaultXrPlugins;
+use bevy_oxr::xr_input::Hand;
+use bevy_oxr::DefaultXrPlugins;
 
 fn main() {
  color_eyre::install().unwrap();