Avii/bevy_oxr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed things to bevy_oxr instead of bevy_openxr and made the android example part of the workspace

Browse Source
This commit is contained in:
MalekiRe
2023-11-06 15:55:36 -08:00
parent 0e6ae62033
commit 52ffa2fdc8
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@@ -1,5 +1,5 @@
[package] [package]
name = "bevy_openxr" name = "bevy_oxr"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
@@ -7,6 +7,9 @@ edition = "2021"
default = ["openxr/mint", "linked"] default = ["openxr/mint", "linked"]
linked = ["openxr/linked"] linked = ["openxr/linked"]
[workspace]
members = [ "examples/android" ]
[dependencies] [dependencies]
anyhow = "1.0.75" anyhow = "1.0.75"
ash = "0.37.3" ash = "0.37.3"

2
examples/android/Cargo.toml
View File

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

8
examples/android/src/lib.rs
View File

@@ -1,12 +1,12 @@
use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin}; use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin};
use bevy::prelude::*; use bevy::prelude::*;
use bevy::transform::components::Transform; use bevy::transform::components::Transform;
use bevy_openxr::xr_input::debug_gizmos::OpenXrDebugRenderer; use bevy_oxr::xr_input::debug_gizmos::OpenXrDebugRenderer;
use bevy_openxr::xr_input::prototype_locomotion::{proto_locomotion, PrototypeLocomotionConfig}; use bevy_oxr::xr_input::prototype_locomotion::{proto_locomotion, PrototypeLocomotionConfig};
use bevy_openxr::xr_input::trackers::{ use bevy_oxr::xr_input::trackers::{
OpenXRController, OpenXRLeftController, OpenXRRightController, OpenXRTracker, OpenXRController, OpenXRLeftController, OpenXRRightController, OpenXRTracker,
}; };
use bevy_openxr::DefaultXrPlugins; use bevy_oxr::DefaultXrPlugins;
#[bevy_main] #[bevy_main]
fn main() { fn main() {

18
examples/xr.rs
View File

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