Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SkeletonModification2DLookAt with negative scales #83330

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −23
Open

Fix SkeletonModification2DLookAt with negative scales #83330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 18 additions & 23 deletions scene/resources/skeleton_modification_2d_lookat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,37 +141,32 @@ void SkeletonModification2DLookAt::_execute(float p_delta) {
return;
}

Transform2D operation_transform = operation_bone->get_global_transform();
Transform2D target_trans = target_node_reference->get_global_transform();
real_t angle_to_target = operation_bone->get_angle_to(target_node_reference->get_global_position());

// Look at the target!
operation_transform = operation_transform.looking_at(target_trans.get_origin());
// Apply whatever scale it had prior to looking_at
operation_transform.set_scale(operation_bone->get_global_scale());

// Account for the direction the bone faces in:
operation_transform.set_rotation(operation_transform.get_rotation() - operation_bone->get_bone_angle());
// Account for the direction the bone faces in
angle_to_target -= operation_bone->get_bone_angle();

// Apply additional rotation
operation_transform.set_rotation(operation_transform.get_rotation() + additional_rotation);

// Apply constraints in globalspace:
if (enable_constraint && !constraint_in_localspace) {
operation_transform.set_rotation(clamp_angle(operation_transform.get_rotation(), constraint_angle_min, constraint_angle_max, constraint_angle_invert));
}
angle_to_target += additional_rotation;

// Convert from a global transform to a local transform via the Bone2D node
operation_bone->set_global_transform(operation_transform);
operation_transform = operation_bone->get_transform();
if (enable_constraint) {
real_t new_angle = angle_to_target;

// Apply constraints in localspace:
if (enable_constraint && constraint_in_localspace) {
operation_transform.set_rotation(clamp_angle(operation_transform.get_rotation(), constraint_angle_min, constraint_angle_max, constraint_angle_invert));
if (constraint_in_localspace) {
new_angle += operation_bone->get_rotation();
new_angle = clamp_angle(new_angle, constraint_angle_min, constraint_angle_max, constraint_angle_invert);
operation_bone->set_rotation(new_angle);
} else {
new_angle += operation_bone->get_global_rotation();
new_angle = clamp_angle(new_angle, constraint_angle_min, constraint_angle_max, constraint_angle_invert);
operation_bone->set_global_rotation(new_angle);
}
} else {
operation_bone->rotate(angle_to_target);
}

// Set the local pose override, and to make sure child bones are also updated, set the transform of the bone.
stack->skeleton->set_bone_local_pose_override(bone_idx, operation_transform, stack->strength, true);
operation_bone->set_transform(operation_transform);
stack->skeleton->set_bone_local_pose_override(bone_idx, operation_bone->get_transform(), stack->strength, true);
}

void SkeletonModification2DLookAt::_setup_modification(SkeletonModificationStack2D *p_stack) {
Expand Down