From 539753790a385e978698ec21dcffd72d56ef8ffa Mon Sep 17 00:00:00 2001 From: Jay Christy Date: Mon, 9 Oct 2023 00:19:43 -0400 Subject: [PATCH] mass rename --- examples/xr.rs | 210 ++++++++++++++++++++++++------------------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/examples/xr.rs b/examples/xr.rs index ad738a9..d47b6f8 100644 --- a/examples/xr.rs +++ b/examples/xr.rs @@ -4,7 +4,7 @@ use std::f32::consts::PI; use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin}; use bevy::transform::components::Transform; -use bevy::{prelude::*}; +use bevy::prelude::*; use bevy_openxr::input::XrInput; use bevy_openxr::resources::{XrFrameState, XrInstance, XrSession}; @@ -92,32 +92,32 @@ fn setup( pub fn spawn_hand_entities(mut commands: Commands) { let hands = [Hand::Left, Hand::Right]; let bones = [ - HandBone::PALM, - HandBone::WRIST, - HandBone::THUMB_METACARPAL, - HandBone::THUMB_PROXIMAL, - HandBone::THUMB_DISTAL, - HandBone::THUMB_TIP, - HandBone::INDEX_METACARPAL, - HandBone::INDEX_PROXIMAL, - HandBone::INDEX_INTERMEDIATE, - HandBone::INDEX_DISTAL, - HandBone::INDEX_TIP, - HandBone::MIDDLE_METACARPAL, - HandBone::MIDDLE_PROXIMAL, - HandBone::MIDDLE_INTERMEDIATE, - HandBone::MIDDLE_DISTAL, - HandBone::MIDDLE_TIP, - HandBone::RING_METACARPAL, - HandBone::RING_PROXIMAL, - HandBone::RING_INTERMEDIATE, - HandBone::RING_DISTAL, - HandBone::RING_TIP, - HandBone::LITTLE_METACARPAL, - HandBone::LITTLE_PROXIMAL, - HandBone::LITTLE_INTERMEDIATE, - HandBone::LITTLE_DISTAL, - HandBone::LITTLE_TIP, + HandBone::Palm, + HandBone::Wrist, + HandBone::ThumbMetacarpal, + HandBone::ThumbProximal, + HandBone::ThumbDistal, + HandBone::ThumbTip, + HandBone::IndexMetacarpal, + HandBone::IndexProximal, + HandBone::IndexIntermediate, + HandBone::IndexDistal, + HandBone::IndexTip, + HandBone::MiddleMetacarpal, + HandBone::MiddleProximal, + HandBone::MiddleIntermediate, + HandBone::MiddleDistal, + HandBone::MiddleTip, + HandBone::RingMetacarpal, + HandBone::RingProximal, + HandBone::RingIntermediate, + HandBone::RingDistal, + HandBone::RingTip, + HandBone::LittleMetacarpal, + HandBone::LittleProximal, + HandBone::LittleIntermediate, + HandBone::LittleDistal, + HandBone::LittleTip, ]; for hand in hands.iter() { @@ -282,32 +282,32 @@ fn update_emulated_hand_skeletons( #[derive(Component, Debug, Clone, Copy)] pub enum HandBone { - PALM, - WRIST, - THUMB_METACARPAL, - THUMB_PROXIMAL, - THUMB_DISTAL, - THUMB_TIP, - INDEX_METACARPAL, - INDEX_PROXIMAL, - INDEX_INTERMEDIATE, - INDEX_DISTAL, - INDEX_TIP, - MIDDLE_METACARPAL, - MIDDLE_PROXIMAL, - MIDDLE_INTERMEDIATE, - MIDDLE_DISTAL, - MIDDLE_TIP, - RING_METACARPAL, - RING_PROXIMAL, - RING_INTERMEDIATE, - RING_DISTAL, - RING_TIP, - LITTLE_METACARPAL, - LITTLE_PROXIMAL, - LITTLE_INTERMEDIATE, - LITTLE_DISTAL, - LITTLE_TIP, + Palm, + Wrist, + ThumbMetacarpal, + ThumbProximal, + ThumbDistal, + ThumbTip, + IndexMetacarpal, + IndexProximal, + IndexIntermediate, + IndexDistal, + IndexTip, + MiddleMetacarpal, + MiddleProximal, + MiddleIntermediate, + MiddleDistal, + MiddleTip, + RingMetacarpal, + RingProximal, + RingIntermediate, + RingDistal, + RingTip, + LittleMetacarpal, + LittleProximal, + LittleIntermediate, + LittleDistal, + LittleTip, } #[derive(Clone, Copy)] @@ -415,32 +415,32 @@ fn draw_hand_entities(mut gizmos: Gizmos, query: Query<(&Transform, &HandBone)>) fn get_bone_gizmo_style(hand_bone: &HandBone) -> (f32, Color) { match hand_bone { - HandBone::PALM => (0.01, Color::WHITE), - HandBone::WRIST => (0.01, Color::GRAY), - HandBone::THUMB_METACARPAL => (0.01, Color::RED), - HandBone::THUMB_PROXIMAL => (0.008, Color::RED), - HandBone::THUMB_DISTAL => (0.006, Color::RED), - HandBone::THUMB_TIP => (0.004, Color::RED), - HandBone::INDEX_METACARPAL => (0.01, Color::ORANGE), - HandBone::INDEX_PROXIMAL => (0.008, Color::ORANGE), - HandBone::INDEX_INTERMEDIATE => (0.006, Color::ORANGE), - HandBone::INDEX_DISTAL => (0.004, Color::ORANGE), - HandBone::INDEX_TIP => (0.002, Color::ORANGE), - HandBone::MIDDLE_METACARPAL => (0.01, Color::YELLOW), - HandBone::MIDDLE_PROXIMAL => (0.008, Color::YELLOW), - HandBone::MIDDLE_INTERMEDIATE => (0.006, Color::YELLOW), - HandBone::MIDDLE_DISTAL => (0.004, Color::YELLOW), - HandBone::MIDDLE_TIP => (0.002, Color::YELLOW), - HandBone::RING_METACARPAL => (0.01, Color::GREEN), - HandBone::RING_PROXIMAL => (0.008, Color::GREEN), - HandBone::RING_INTERMEDIATE => (0.006, Color::GREEN), - HandBone::RING_DISTAL => (0.004, Color::GREEN), - HandBone::RING_TIP => (0.002, Color::GREEN), - HandBone::LITTLE_METACARPAL => (0.01, Color::BLUE), - HandBone::LITTLE_PROXIMAL => (0.008, Color::BLUE), - HandBone::LITTLE_INTERMEDIATE => (0.006, Color::BLUE), - HandBone::LITTLE_DISTAL => (0.004, Color::BLUE), - HandBone::LITTLE_TIP => (0.002, Color::BLUE), + HandBone::Palm => (0.01, Color::WHITE), + HandBone::Wrist => (0.01, Color::GRAY), + HandBone::ThumbMetacarpal => (0.01, Color::RED), + HandBone::ThumbProximal => (0.008, Color::RED), + HandBone::ThumbDistal => (0.006, Color::RED), + HandBone::ThumbTip => (0.004, Color::RED), + HandBone::IndexMetacarpal => (0.01, Color::ORANGE), + HandBone::IndexProximal => (0.008, Color::ORANGE), + HandBone::IndexIntermediate => (0.006, Color::ORANGE), + HandBone::IndexDistal => (0.004, Color::ORANGE), + HandBone::IndexTip => (0.002, Color::ORANGE), + HandBone::MiddleMetacarpal => (0.01, Color::YELLOW), + HandBone::MiddleProximal => (0.008, Color::YELLOW), + HandBone::MiddleIntermediate => (0.006, Color::YELLOW), + HandBone::MiddleDistal => (0.004, Color::YELLOW), + HandBone::MiddleTip => (0.002, Color::YELLOW), + HandBone::RingMetacarpal => (0.01, Color::GREEN), + HandBone::RingProximal => (0.008, Color::GREEN), + HandBone::RingIntermediate => (0.006, Color::GREEN), + HandBone::RingDistal => (0.004, Color::GREEN), + HandBone::RingTip => (0.002, Color::GREEN), + HandBone::LittleMetacarpal => (0.01, Color::BLUE), + HandBone::LittleProximal => (0.008, Color::BLUE), + HandBone::LittleIntermediate => (0.006, Color::BLUE), + HandBone::LittleDistal => (0.004, Color::BLUE), + HandBone::LittleTip => (0.002, Color::BLUE), } } @@ -747,32 +747,32 @@ fn update_hand_bones_emulated( fn match_index(handbone: &HandBone) -> HandJoint { match handbone { - HandBone::PALM => HandJoint::PALM, - HandBone::WRIST => HandJoint::WRIST, - HandBone::THUMB_METACARPAL => HandJoint::THUMB_METACARPAL, - HandBone::THUMB_PROXIMAL => HandJoint::THUMB_PROXIMAL, - HandBone::THUMB_DISTAL => HandJoint::THUMB_DISTAL, - HandBone::THUMB_TIP => HandJoint::THUMB_TIP, - HandBone::INDEX_METACARPAL => HandJoint::INDEX_METACARPAL, - HandBone::INDEX_PROXIMAL => HandJoint::INDEX_PROXIMAL, - HandBone::INDEX_INTERMEDIATE => HandJoint::INDEX_INTERMEDIATE, - HandBone::INDEX_DISTAL => HandJoint::INDEX_DISTAL, - HandBone::INDEX_TIP => HandJoint::INDEX_TIP, - HandBone::MIDDLE_METACARPAL => HandJoint::MIDDLE_METACARPAL, - HandBone::MIDDLE_PROXIMAL => HandJoint::MIDDLE_PROXIMAL, - HandBone::MIDDLE_INTERMEDIATE => HandJoint::MIDDLE_INTERMEDIATE, - HandBone::MIDDLE_DISTAL => HandJoint::MIDDLE_DISTAL, - HandBone::MIDDLE_TIP => HandJoint::MIDDLE_TIP, - HandBone::RING_METACARPAL => HandJoint::RING_METACARPAL, - HandBone::RING_PROXIMAL => HandJoint::RING_PROXIMAL, - HandBone::RING_INTERMEDIATE => HandJoint::RING_INTERMEDIATE, - HandBone::RING_DISTAL => HandJoint::RING_DISTAL, - HandBone::RING_TIP => HandJoint::RING_TIP, - HandBone::LITTLE_METACARPAL => HandJoint::LITTLE_METACARPAL, - HandBone::LITTLE_PROXIMAL => HandJoint::LITTLE_PROXIMAL, - HandBone::LITTLE_INTERMEDIATE => HandJoint::LITTLE_INTERMEDIATE, - HandBone::LITTLE_DISTAL => HandJoint::LITTLE_DISTAL, - HandBone::LITTLE_TIP => HandJoint::LITTLE_TIP, + HandBone::Palm => HandJoint::PALM, + HandBone::Wrist => HandJoint::WRIST, + HandBone::ThumbMetacarpal => HandJoint::THUMB_METACARPAL, + HandBone::ThumbProximal => HandJoint::THUMB_PROXIMAL, + HandBone::ThumbDistal => HandJoint::THUMB_DISTAL, + HandBone::ThumbTip => HandJoint::THUMB_TIP, + HandBone::IndexMetacarpal => HandJoint::INDEX_METACARPAL, + HandBone::IndexProximal => HandJoint::INDEX_PROXIMAL, + HandBone::IndexIntermediate => HandJoint::INDEX_INTERMEDIATE, + HandBone::IndexDistal => HandJoint::INDEX_DISTAL, + HandBone::IndexTip => HandJoint::INDEX_TIP, + HandBone::MiddleMetacarpal => HandJoint::MIDDLE_METACARPAL, + HandBone::MiddleProximal => HandJoint::MIDDLE_PROXIMAL, + HandBone::MiddleIntermediate => HandJoint::MIDDLE_INTERMEDIATE, + HandBone::MiddleDistal => HandJoint::MIDDLE_DISTAL, + HandBone::MiddleTip => HandJoint::MIDDLE_TIP, + HandBone::RingMetacarpal => HandJoint::RING_METACARPAL, + HandBone::RingProximal => HandJoint::RING_PROXIMAL, + HandBone::RingIntermediate => HandJoint::RING_INTERMEDIATE, + HandBone::RingDistal => HandJoint::RING_DISTAL, + HandBone::RingTip => HandJoint::RING_TIP, + HandBone::LittleMetacarpal => HandJoint::LITTLE_METACARPAL, + HandBone::LittleProximal => HandJoint::LITTLE_PROXIMAL, + HandBone::LittleIntermediate => HandJoint::LITTLE_INTERMEDIATE, + HandBone::LittleDistal => HandJoint::LITTLE_DISTAL, + HandBone::LittleTip => HandJoint::LITTLE_TIP, } }