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

updates

Browse Source
This commit is contained in:
Jay Christy
2023-11-06 23:39:37 -05:00
parent 566377de2a
commit 242759eca2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -20,7 +20,7 @@ wgpu-hal = "0.17.1"
[dev-dependencies] [dev-dependencies]
bevy = "0.12" bevy = "0.12"
color-eyre = "0.6.2" color-eyre = "0.6.2"
bevy_rapier3d = { git = "https://github.com/alexichepura/bevy_rapier", version = "0.22.0", branch = "bevy-012"} bevy_rapier3d = { git = "https://github.com/devil-ira/bevy_rapier", branch = "bevy-0.12" }
[[example]] [[example]]
name = "xr" name = "xr"

14
examples/demo/src/main.rs
View File

@@ -1,4 +1,4 @@
use std::{f32::consts::PI, ops::Mul}; use std::{f32::consts::PI, ops::Mul, time::Duration};
use bevy::{ use bevy::{
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin}, diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
@@ -6,12 +6,12 @@ use bevy::{
log::info, log::info,
prelude::{ prelude::{
default, shape, App, Assets, Color, Commands, Component, Entity, Event, EventReader, default, shape, App, Assets, Color, Commands, Component, Entity, Event, EventReader,
EventWriter, FixedTime, FixedUpdate, GlobalTransform, IntoSystemConfigs, EventWriter, FixedUpdate, GlobalTransform, IntoSystemConfigs,
IntoSystemSetConfigs, Mesh, PbrBundle, PostUpdate, Quat, Query, Res, ResMut, Resource, IntoSystemSetConfigs, Mesh, PbrBundle, PostUpdate, Quat, Query, Res, ResMut, Resource,
Schedule, SpatialBundle, StandardMaterial, Startup, Transform, Update, Vec3, With, Without, Schedule, SpatialBundle, StandardMaterial, Startup, Transform, Update, Vec3, With, Without,
World, Vec3Swizzles, World, Vec3Swizzles,
}, },
time::{Time, Timer}, time::{Time, Timer, Fixed},
transform::TransformSystem, transform::TransformSystem,
}; };
use bevy_openxr::{ use bevy_openxr::{
@@ -129,7 +129,7 @@ fn main() {
.in_set(PhysicsSet::Writeback), .in_set(PhysicsSet::Writeback),
)); ));
app.add_schedule(physics_schedule) // configure our fixed timestep schedule to run at the rate we want app.add_schedule(physics_schedule) // configure our fixed timestep schedule to run at the rate we want
.insert_resource(FixedTime::new_from_secs(FIXED_TIMESTEP)) .insert_resource(Time::<Fixed>::from_duration(Duration::from_secs_f32(FIXED_TIMESTEP)))
.add_systems(FixedUpdate, run_physics_schedule) .add_systems(FixedUpdate, run_physics_schedule)
.add_systems(Startup, configure_physics); .add_systems(Startup, configure_physics);
app.run(); app.run();
@@ -328,7 +328,7 @@ fn update_physics_hands(
&mut Velocity, &mut Velocity,
)>, )>,
hand_query: Query<(&Transform, &HandBone, &Hand, Without<PhysicsHandBone>)>, hand_query: Query<(&Transform, &HandBone, &Hand, Without<PhysicsHandBone>)>,
time: Res<FixedTime>, time: Res<Time>,
) { ) {
let matching = MatchingType::VelocityMatching; let matching = MatchingType::VelocityMatching;
//sanity check do we even have hands? //sanity check do we even have hands?
@@ -370,7 +370,7 @@ fn update_physics_hands(
//calculate position difference //calculate position difference
let diff = (start_components.unwrap().0.translation let diff = (start_components.unwrap().0.translation
- bone.0.translation) - bone.0.translation)
/ time.period.as_secs_f32(); / time.delta_seconds();
bone.5.linvel = diff; bone.5.linvel = diff;
//calculate angular velocity? //calculate angular velocity?
let why = direction.xy(); let why = direction.xy();
@@ -378,7 +378,7 @@ fn update_physics_hands(
let ang: Vec3 = why_god( let ang: Vec3 = why_god(
bone.0.rotation, bone.0.rotation,
desired_forward, desired_forward,
time.period.as_secs_f32(), time.delta_seconds(),
); );
if *bone.2 == PhysicsHandBone::IndexIntermediate && *bone.4 == Hand::Right { if *bone.2 == PhysicsHandBone::IndexIntermediate && *bone.4 == Hand::Right {
info!("{}", ang); info!("{}", ang);