rodolphe
/
godot-ultraleap-plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small simplification in variable names in digit

This commit is contained in:
rodolpheh 2023-12-05 22:19:45 +00:00
parent 6eec3f4b66
commit aba413f6c3
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/digit.cpp
View File

@ -127,11 +127,11 @@ void UltraleapDigit::_bind_methods() {
}
void UltraleapDigit::fill_digit_data(Ref<UltraleapDigit> ul_digit, LEAP_DIGIT* digit, FingerType type, Transform3D root, Transform3D rigging_transform) {
if (ul_digit->metacarpal_ref == NULL) {
ul_digit->metacarpal_ref = Ref<UltraleapBone>(memnew(UltraleapBone));
ul_digit->proximal_ref = Ref<UltraleapBone>(memnew(UltraleapBone));
ul_digit->intermediate_ref = Ref<UltraleapBone>(memnew(UltraleapBone));
ul_digit->distal_ref = Ref<UltraleapBone>(memnew(UltraleapBone));
if (ul_digit->metacarpal == NULL) {
ul_digit->metacarpal.instantiate();
ul_digit->proximal.instantiate();
ul_digit->intermediate.instantiate();
ul_digit->distal.instantiate();
}
ul_digit->is_extended = digit->is_extended == 1;
@ -139,16 +139,16 @@ void UltraleapDigit::fill_digit_data(Ref<UltraleapDigit> ul_digit, LEAP_DIGIT* d
// We need some extra logic here because the metacarpal doesn't exist in Ultraleap's hand data
if (type == UltraleapDigit::FingerType::Thumb) {
UltraleapBone::fill_bone_data(ul_digit->proximal_ref, root, &digit->proximal, UltraleapBone::BoneType::Proximal, rigging_transform);
UltraleapBone::fill_bone_data(ul_digit->proximal, root, &digit->proximal, UltraleapBone::BoneType::Proximal, rigging_transform);
// Still filling it out but shouldn't be used
UltraleapBone::fill_bone_data(ul_digit->metacarpal_ref, root, &digit->metacarpal, UltraleapBone::BoneType::Metacarpal, rigging_transform);
UltraleapBone::fill_bone_data(ul_digit->metacarpal, root, &digit->metacarpal, UltraleapBone::BoneType::Metacarpal, rigging_transform);
}
else {
UltraleapBone::fill_bone_data(ul_digit->metacarpal_ref, root, &digit->metacarpal, UltraleapBone::BoneType::Metacarpal, rigging_transform);
UltraleapBone::fill_bone_data(ul_digit->proximal_ref, ul_digit->metacarpal_ref, &digit->proximal, UltraleapBone::BoneType::Proximal, rigging_transform);
UltraleapBone::fill_bone_data(ul_digit->metacarpal, root, &digit->metacarpal, UltraleapBone::BoneType::Metacarpal, rigging_transform);
UltraleapBone::fill_bone_data(ul_digit->proximal, ul_digit->metacarpal, &digit->proximal, UltraleapBone::BoneType::Proximal, rigging_transform);
}
UltraleapBone::fill_bone_data(ul_digit->intermediate_ref, ul_digit->proximal_ref, &digit->intermediate, UltraleapBone::BoneType::Intermediate, rigging_transform);
UltraleapBone::fill_bone_data(ul_digit->distal_ref, ul_digit->intermediate_ref, &digit->distal, UltraleapBone::BoneType::Distal, rigging_transform);
UltraleapBone::fill_bone_data(ul_digit->intermediate, ul_digit->proximal, &digit->intermediate, UltraleapBone::BoneType::Intermediate, rigging_transform);
UltraleapBone::fill_bone_data(ul_digit->distal, ul_digit->intermediate, &digit->distal, UltraleapBone::BoneType::Distal, rigging_transform);
}

32
src/digit.h
View File

@ -39,17 +39,17 @@ public:
FingerType get_type() { return type; }
void set_type(FingerType value) { type = value; }
Ref<UltraleapBone> get_metacarpal() { return metacarpal_ref; }
void set_metacarpal(Ref<UltraleapBone> value) { metacarpal_ref = value; }
Ref<UltraleapBone> get_metacarpal() { return metacarpal; }
void set_metacarpal(Ref<UltraleapBone> value) { metacarpal = value; }
Ref<UltraleapBone> get_proximal() { return proximal_ref; }
void set_proximal(Ref<UltraleapBone> value) { proximal_ref = value; }
Ref<UltraleapBone> get_proximal() { return proximal; }
void set_proximal(Ref<UltraleapBone> value) { proximal = value; }
Ref<UltraleapBone> get_intermediate() { return intermediate_ref; }
void set_intermediate(Ref<UltraleapBone> value) { intermediate_ref = value; }
Ref<UltraleapBone> get_intermediate() { return intermediate; }
void set_intermediate(Ref<UltraleapBone> value) { intermediate = value; }
Ref<UltraleapBone> get_distal() { return distal_ref; }
void set_distal(Ref<UltraleapBone> value) { distal_ref = value; }
Ref<UltraleapBone> get_distal() { return distal; }
void set_distal(Ref<UltraleapBone> value) { distal = value; }
bool get_is_extended() { return is_extended; }
void set_is_extended(bool value) { is_extended = value; }
@ -59,10 +59,10 @@ public:
bones = Array();
}
if (bones.size() == 0) {
bones.append(metacarpal_ref);
bones.append(proximal_ref);
bones.append(intermediate_ref);
bones.append(distal_ref);
bones.append(metacarpal);
bones.append(proximal);
bones.append(intermediate);
bones.append(distal);
}
return bones;
}
@ -72,10 +72,10 @@ protected:
static void _bind_methods();
private:
Ref<UltraleapBone> metacarpal_ref;
Ref<UltraleapBone> proximal_ref;
Ref<UltraleapBone> intermediate_ref;
Ref<UltraleapBone> distal_ref;
Ref<UltraleapBone> metacarpal;
Ref<UltraleapBone> proximal;
Ref<UltraleapBone> intermediate;
Ref<UltraleapBone> distal;
Array bones;
};