Merge pull request #41 from Schmarni-Dev/hand_refactor

Hand refactor

.gitignore

@@ -1,3 +1,4 @@
-/target
-/Cargo.lock
+**/target
+**/Cargo.lock
+**/runtime_libs/arm64-v8a/*
 \.DS_Store

examples/demo/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [lib]
-crate-type = ["lib", "cdylib"]
+crate-type = ["rlib", "cdylib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

examples/demo/Cargo_back.toml

@@ -0,0 +1,24 @@
+[package]
+name = "demo"
+version = "0.1.0"
+edition = "2021"
+
+
+[lib]
+crate-type = ["cdylib", "lib"]
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bevy = { git = "https://github.com/bevyengine/bevy.git" }
+# bevy = "0.11.3"
+# default-features is false because it for some reason complains when trying to statically link openxr
+bevy_oxr = { path = "../../" }
+# bevy_openxr = { git = "https://github.com/Schmarni-Dev/bevy_openxr", default-features = false, branch = "demo"}
+bevy_rapier3d = { git = "https://github.com/devil-ira/bevy_rapier", version = "0.22.0", branch = "bevy-0.12" }
+# bevy_rapier3d = { git = "https://github.com/Schmarni-Dev/bevy_rapier" }
+color-eyre = "0.6.2"
+
+[profile.release]
+lto = "fat"
+codegen-units = 1
+panic = "abort"

examples/demo/Readme.md

@@ -0,0 +1,11 @@
+## setup
+install xbuild ```cargo install --git https://github.com/rust-mobile/xbuild```
+run ```x doctor``` and install all required depencencies
+download the [openxr loader](https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk/) and put it in the runtime_libs/arm64-v8a folder
+
+## how to run
+run ```x devices```
+
+and get the device name that looks something like this ```adb:1WD523S``` (probably a bit longer)
+
+then ```run x run --release```

examples/demo/src/lib.rs

@@ -18,9 +18,9 @@ use bevy_oxr::{
     input::XrInput,
     resources::{XrFrameState, XrInstance, XrSession},
     xr_input::{
-        actions::XrActionSets,
         debug_gizmos::OpenXrDebugRenderer,
-        hand::{HandBone, HandInputDebugRenderer, HandResource, HandsResource, OpenXrHandInput},
+        hands::common::{ HandInputDebugRenderer, HandResource, HandsResource, OpenXrHandInput},
+        hands::HandBone,
         interactions::{
             draw_interaction_gizmos, draw_socket_gizmos, interactions, socket_interactions,
             update_interactable_states, InteractionEvent, Touched, XRDirectInteractor,
@@ -29,7 +29,7 @@ use bevy_oxr::{
         oculus_touch::OculusController,
         prototype_locomotion::{proto_locomotion, PrototypeLocomotionConfig},
         trackers::{OpenXRController, OpenXRLeftController, OpenXRRightController, OpenXRTracker},
-        Hand,
+        Hand, actions::XrActionSets,
     },
     DefaultXrPlugins,
 };