Skip to content

Commit

Permalink
Resolve rebase conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stermere
Stermere committed Nov 30, 2024
1 parent 52d64ac commit df842a1
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 32 deletions.
1 change: 0 additions & 1 deletion server/core/src/main/java/dev/slimevr/filtering/QuaternionMovingAverage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class QuaternionMovingAverage(
private val fpsTimer = if (VRServer.instanceInitialized) VRServer.instance.fpsTimer else NanoTimer()
private var frameCounter = 0
private var lastAmt = 0f
var filteredQuaternion = IDENTITY

init {
// amount should range from 0 to 1.
Expand Down
60 changes: 30 additions & 30 deletions server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,36 +67,36 @@ class HumanSkeleton(
val rightHandBone = Bone(BoneType.RIGHT_HAND, Constraint(ConstraintType.TWIST_SWING, 120f, 120f))

// Finger bones
val leftThumbMetacarpalBone = Bone(BoneType.LEFT_THUMB_METACARPAL)
val leftThumbProximalBone = Bone(BoneType.LEFT_THUMB_PROXIMAL)
val leftThumbDistalBone = Bone(BoneType.LEFT_THUMB_DISTAL)
val leftIndexProximalBone = Bone(BoneType.LEFT_INDEX_PROXIMAL)
val leftIndexIntermediateBone = Bone(BoneType.LEFT_INDEX_INTERMEDIATE)
val leftIndexDistalBone = Bone(BoneType.LEFT_INDEX_DISTAL)
val leftMiddleProximalBone = Bone(BoneType.LEFT_MIDDLE_PROXIMAL)
val leftMiddleIntermediateBone = Bone(BoneType.LEFT_MIDDLE_INTERMEDIATE)
val leftMiddleDistalBone = Bone(BoneType.LEFT_MIDDLE_DISTAL)
val leftRingProximalBone = Bone(BoneType.LEFT_RING_PROXIMAL)
val leftRingIntermediateBone = Bone(BoneType.LEFT_RING_INTERMEDIATE)
val leftRingDistalBone = Bone(BoneType.LEFT_RING_DISTAL)
val leftLittleProximalBone = Bone(BoneType.LEFT_LITTLE_PROXIMAL)
val leftLittleIntermediateBone = Bone(BoneType.LEFT_LITTLE_INTERMEDIATE)
val leftLittleDistalBone = Bone(BoneType.LEFT_LITTLE_DISTAL)
val rightThumbMetacarpalBone = Bone(BoneType.RIGHT_THUMB_METACARPAL)
val rightThumbProximalBone = Bone(BoneType.RIGHT_THUMB_PROXIMAL)
val rightThumbDistalBone = Bone(BoneType.RIGHT_THUMB_DISTAL)
val rightIndexProximalBone = Bone(BoneType.RIGHT_INDEX_PROXIMAL)
val rightIndexIntermediateBone = Bone(BoneType.RIGHT_INDEX_INTERMEDIATE)
val rightIndexDistalBone = Bone(BoneType.RIGHT_INDEX_DISTAL)
val rightMiddleProximalBone = Bone(BoneType.RIGHT_MIDDLE_PROXIMAL)
val rightMiddleIntermediateBone = Bone(BoneType.RIGHT_MIDDLE_INTERMEDIATE)
val rightMiddleDistalBone = Bone(BoneType.RIGHT_MIDDLE_DISTAL)
val rightRingProximalBone = Bone(BoneType.RIGHT_RING_PROXIMAL)
val rightRingIntermediateBone = Bone(BoneType.RIGHT_RING_INTERMEDIATE)
val rightRingDistalBone = Bone(BoneType.RIGHT_RING_DISTAL)
val rightLittleProximalBone = Bone(BoneType.RIGHT_LITTLE_PROXIMAL)
val rightLittleIntermediateBone = Bone(BoneType.RIGHT_LITTLE_INTERMEDIATE)
val rightLittleDistalBone = Bone(BoneType.RIGHT_LITTLE_DISTAL)
val leftThumbMetacarpalBone = Bone(BoneType.LEFT_THUMB_METACARPAL, Constraint(ConstraintType.COMPLETE))
val leftThumbProximalBone = Bone(BoneType.LEFT_THUMB_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val leftThumbDistalBone = Bone(BoneType.LEFT_THUMB_DISTAL, Constraint(ConstraintType.COMPLETE))
val leftIndexProximalBone = Bone(BoneType.LEFT_INDEX_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val leftIndexIntermediateBone = Bone(BoneType.LEFT_INDEX_INTERMEDIATE, Constraint(ConstraintType.COMPLETE))
val leftIndexDistalBone = Bone(BoneType.LEFT_INDEX_DISTAL, Constraint(ConstraintType.COMPLETE))
val leftMiddleProximalBone = Bone(BoneType.LEFT_MIDDLE_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val leftMiddleIntermediateBone = Bone(BoneType.LEFT_MIDDLE_INTERMEDIATE, Constraint(ConstraintType.COMPLETE))
val leftMiddleDistalBone = Bone(BoneType.LEFT_MIDDLE_DISTAL, Constraint(ConstraintType.COMPLETE))
val leftRingProximalBone = Bone(BoneType.LEFT_RING_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val leftRingIntermediateBone = Bone(BoneType.LEFT_RING_INTERMEDIATE, Constraint(ConstraintType.COMPLETE))
val leftRingDistalBone = Bone(BoneType.LEFT_RING_DISTAL, Constraint(ConstraintType.COMPLETE))
val leftLittleProximalBone = Bone(BoneType.LEFT_LITTLE_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val leftLittleIntermediateBone = Bone(BoneType.LEFT_LITTLE_INTERMEDIATE, Constraint(ConstraintType.COMPLETE))
val leftLittleDistalBone = Bone(BoneType.LEFT_LITTLE_DISTAL, Constraint(ConstraintType.COMPLETE))
val rightThumbMetacarpalBone = Bone(BoneType.RIGHT_THUMB_METACARPAL, Constraint(ConstraintType.COMPLETE))
val rightThumbProximalBone = Bone(BoneType.RIGHT_THUMB_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val rightThumbDistalBone = Bone(BoneType.RIGHT_THUMB_DISTAL, Constraint(ConstraintType.COMPLETE))
val rightIndexProximalBone = Bone(BoneType.RIGHT_INDEX_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val rightIndexIntermediateBone = Bone(BoneType.RIGHT_INDEX_INTERMEDIATE, Constraint(ConstraintType.COMPLETE))
val rightIndexDistalBone = Bone(BoneType.RIGHT_INDEX_DISTAL, Constraint(ConstraintType.COMPLETE))
val rightMiddleProximalBone = Bone(BoneType.RIGHT_MIDDLE_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val rightMiddleIntermediateBone = Bone(BoneType.RIGHT_MIDDLE_INTERMEDIATE, Constraint(ConstraintType.COMPLETE))
val rightMiddleDistalBone = Bone(BoneType.RIGHT_MIDDLE_DISTAL, Constraint(ConstraintType.COMPLETE))
val rightRingProximalBone = Bone(BoneType.RIGHT_RING_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val rightRingIntermediateBone = Bone(BoneType.RIGHT_RING_INTERMEDIATE, Constraint(ConstraintType.COMPLETE))
val rightRingDistalBone = Bone(BoneType.RIGHT_RING_DISTAL, Constraint(ConstraintType.COMPLETE))
val rightLittleProximalBone = Bone(BoneType.RIGHT_LITTLE_PROXIMAL, Constraint(ConstraintType.COMPLETE))
val rightLittleIntermediateBone = Bone(BoneType.RIGHT_LITTLE_INTERMEDIATE, Constraint(ConstraintType.COMPLETE))
val rightLittleDistalBone = Bone(BoneType.RIGHT_LITTLE_DISTAL, Constraint(ConstraintType.COMPLETE))

// Tracker bones
val headTrackerBone = Bone(BoneType.HEAD_TRACKER, Constraint(ConstraintType.COMPLETE))
Expand Down
2 changes: 1 addition & 1 deletion solarxr-protocol
Submodule solarxr-protocol updated 36 files
+1 −1 lib/flatbuffers
+142 −16 protocol/cpp/include/solarxr_protocol/generated/all_generated.h
+9 −1 protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfo.java
+6 −0 protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfoT.java
+5 −5 protocol/java/src/solarxr_protocol/datatypes/BodyPart.java
+28 −0 protocol/java/src/solarxr_protocol/datatypes/hardware_info/TrackerDataType.java
+13 −4 protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java
+6 −0 protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java
+13 −4 protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java
+6 −0 protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java
+63 −0 protocol/java/src/solarxr_protocol/rpc/YawCorrectionSettings.java
+28 −0 protocol/java/src/solarxr_protocol/rpc/YawCorrectionSettingsT.java
+11 −1 protocol/kotlin/src/solarxr_protocol/data_feed/tracker/TrackerInfo.kt
+5 −5 protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt
+27 −0 protocol/kotlin/src/solarxr_protocol/datatypes/hardware_info/TrackerDataType.kt
+15 −3 protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt
+15 −3 protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt
+58 −0 protocol/kotlin/src/solarxr_protocol/rpc/YawCorrectionSettings.kt
+4 −0 protocol/rust/src/generated/mod.rs
+18 −0 protocol/rust/src/generated/solarxr_protocol/data_feed/tracker/tracker_info_generated.rs
+10 −10 protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs
+104 −0 protocol/rust/src/generated/solarxr_protocol/datatypes/hardware_info/tracker_data_type_generated.rs
+17 −0 protocol/rust/src/generated/solarxr_protocol/rpc/change_settings_request_generated.rs
+17 −0 protocol/rust/src/generated/solarxr_protocol/rpc/settings_response_generated.rs
+125 −0 protocol/rust/src/generated/solarxr_protocol/rpc/yaw_correction_settings_generated.rs
+2 −0 protocol/typescript/src/all_generated.ts
+20 −3 protocol/typescript/src/solarxr-protocol/data-feed/tracker/tracker-info.ts
+4 −4 protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts
+21 −0 protocol/typescript/src/solarxr-protocol/datatypes/hardware-info/tracker-data-type.ts
+18 −3 protocol/typescript/src/solarxr-protocol/rpc/change-settings-request.ts
+18 −3 protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts
+86 −0 protocol/typescript/src/solarxr-protocol/rpc/yaw-correction-settings.ts
+3 −0 schema/data_feed/tracker.fbs
+4 −4 schema/datatypes/datatypes.fbs
+9 −1 schema/datatypes/hardware_info.fbs
+7 −0 schema/rpc.fbs

0 comments on commit df842a1

Please sign in to comment.