Updated Oculus controller to use the
This commit is contained in:
14
src/lib.rs
14
src/lib.rs
@@ -6,7 +6,6 @@ pub mod xr_input;
|
||||
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use crate::xr_input::oculus_touch::ActionSets;
|
||||
use bevy::app::PluginGroupBuilder;
|
||||
use bevy::ecs::system::SystemState;
|
||||
use bevy::prelude::*;
|
||||
@@ -97,7 +96,7 @@ impl Plugin for OpenXrPlugin {
|
||||
views,
|
||||
frame_state,
|
||||
));
|
||||
app.insert_resource(ActionSets(vec![]));
|
||||
// app.insert_resource(ActionSets(vec![]));
|
||||
app.add_plugins(RenderPlugin {
|
||||
render_creation: RenderCreation::Manual(
|
||||
device,
|
||||
@@ -132,7 +131,7 @@ impl Plugin for OpenXrPlugin {
|
||||
frame_state,
|
||||
) = future_renderer_resources.0.lock().unwrap().take().unwrap();
|
||||
|
||||
let action_sets = app.world.resource::<ActionSets>().clone();
|
||||
// let action_sets = app.world.resource::<ActionSets>().clone();
|
||||
|
||||
app.insert_resource(xr_instance.clone())
|
||||
.insert_resource(session.clone())
|
||||
@@ -144,9 +143,10 @@ impl Plugin for OpenXrPlugin {
|
||||
.insert_resource(swapchain.clone())
|
||||
.insert_resource(input.clone())
|
||||
.insert_resource(views.clone())
|
||||
.insert_resource(frame_state.clone())
|
||||
.insert_resource(action_sets.clone());
|
||||
.insert_resource(frame_state.clone());
|
||||
// .insert_resource(action_sets.clone());
|
||||
let hands = xr_instance.exts().ext_hand_tracking.is_some();
|
||||
let hands = false;
|
||||
if hands {
|
||||
app.insert_resource(HandTrackingTracker::new(&session).unwrap());
|
||||
app.insert_resource(HandInputSource::OpenXr);
|
||||
@@ -183,8 +183,8 @@ impl Plugin for OpenXrPlugin {
|
||||
.insert_resource(swapchain)
|
||||
.insert_resource(input)
|
||||
.insert_resource(views)
|
||||
.insert_resource(frame_state)
|
||||
.insert_resource(action_sets);
|
||||
.insert_resource(frame_state);
|
||||
// .insert_resource(action_sets);
|
||||
|
||||
render_app.add_systems(
|
||||
Render,
|
||||
|
||||
Reference in New Issue
Block a user