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

Merge pull request #12 from raffaeleragni/main

Browse Source 
use upstream bevy main + cargo fix
This commit is contained in:
piper
2023-09-26 15:28:55 -05:00
committed by GitHub
parent 65fbffaae7 3a68b64a4c
commit a360473eb3
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@@ -10,7 +10,7 @@ linked = ["openxr/linked", "openxr/static"]
[dependencies] [dependencies]
anyhow = "1.0.75" anyhow = "1.0.75"
ash = "0.37.3" 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"] } openxr = { version = "0.17.1", features = ["mint"] }
mint = "0.5.9" mint = "0.5.9"
wgpu = "0.16.0" wgpu = "0.16.0"
@@ -18,7 +18,7 @@ wgpu-core = { version = "0.16.0", features = ["vulkan"] }
wgpu-hal = "0.16.0" wgpu-hal = "0.16.0"
[dev-dependencies] [dev-dependencies]
bevy = { git = "https://github.com/awtterpip/bevy", rev = "98f3b8ae207deb440f7255b3d900e7e01b6df0cb" } bevy = { git = "https://github.com/bevyengine/bevy.git" }
color-eyre = "0.6.2" color-eyre = "0.6.2"
[[example]] [[example]]

4
src/lib.rs
View File

@@ -13,7 +13,7 @@ use bevy::prelude::*;
use bevy::render::camera::{ManualTextureView, ManualTextureViewHandle, ManualTextureViews}; use bevy::render::camera::{ManualTextureView, ManualTextureViewHandle, ManualTextureViews};
use bevy::render::pipelined_rendering::PipelinedRenderingPlugin; use bevy::render::pipelined_rendering::PipelinedRenderingPlugin;
use bevy::render::renderer::{render_system, RenderInstance}; 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::render::{Render, RenderApp, RenderPlugin, RenderSet};
use bevy::window::{PresentMode, PrimaryWindow, RawHandleWrapper}; use bevy::window::{PresentMode, PrimaryWindow, RawHandleWrapper};
use input::XrInput; use input::XrInput;
@@ -97,7 +97,7 @@ impl Plugin for OpenXrPlugin {
)); ));
app.insert_resource(ActionSets(vec![])); app.insert_resource(ActionSets(vec![]));
app.add_plugins(RenderPlugin { app.add_plugins(RenderPlugin {
render_settings: RenderSettings::Manual( render_creation: RenderCreation::Manual(
device, device,
queue, queue,
adapter_info, adapter_info,

2
src/xr_input/debug_gizmos.rs
View File

@@ -206,7 +206,7 @@ fn draw_hand_gizmo(
let face_quat = controller_quat.mul_quat(face_quat_offset); let face_quat = controller_quat.mul_quat(face_quat_offset);
let face_quat_normal = face_quat.mul_vec3(Vec3::Z); let face_quat_normal = face_quat.mul_vec3(Vec3::Z);
let squeeze = controller.squeeze(Hand::Right); let _squeeze = controller.squeeze(Hand::Right);
//info!("{:?}", squeeze); //info!("{:?}", squeeze);
//grip //grip
gizmos.rect( gizmos.rect(

2
src/xr_input/trackers.rs
View File

@@ -22,7 +22,7 @@ pub struct OpenXRRightController;
pub struct OpenXRController; pub struct OpenXRController;
pub fn adopt_open_xr_trackers( pub fn adopt_open_xr_trackers(
query: Query<(Entity), Added<OpenXRTracker>>, query: Query<Entity, Added<OpenXRTracker>>,
mut commands: Commands, mut commands: Commands,
tracking_root_query: Query<(Entity, With<OpenXRTrackingRoot>)>, tracking_root_query: Query<(Entity, With<OpenXRTrackingRoot>)>,
) { ) {