Merge pull request #12 from raffaeleragni/main
use upstream bevy main + cargo fix
This commit is contained in:
@@ -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]]
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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>)>,
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user