Dotts/Papay-Shooter
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Feat/14 movement overhaul #20

Merged
Dotts merged 86 commits from feat/14-movement-overhaul into main 2026-07-17 10:44:23 -07:00
Conversation 0 Commits 86 Files Changed 92
+8 -4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 35decd65b3 - Show all commits
characters/skinned_player_model.gd
+8 -4
View File
@@ -545,7 +545,7 @@ func _process(delta: float) -> void:
func _apply_procedural_animation(data: Dictionary, time: float) -> void: func _apply_procedural_animation(data: Dictionary, time: float) -> void:
## Applies procedural animation data to the skeleton at the given time. ## Applies procedural animation data to the skeleton at the given time.
## Uses linear interpolation between keyframe values. ## Uses global pose override to set bone transforms relative to their rest pose.
if not skeleton: if not skeleton:
return return
var tracks = data["tracks"] var tracks = data["tracks"]
@@ -577,9 +577,13 @@ func _apply_procedural_animation(data: Dictionary, time: float) -> void:
if prev_kf.has("rot") and next_kf.has("rot"): if prev_kf.has("rot") and next_kf.has("rot"):
var rot: Vector3 = lerp(prev_kf["rot"], next_kf["rot"], t) var rot: Vector3 = lerp(prev_kf["rot"], next_kf["rot"], t)
# Convert euler angles to Quaternion for set_bone_pose_rotation # Get the bone's rest global pose
var quat = Quaternion.from_euler(rot) var rest_global = skeleton.get_bone_global_pose(bone_idx)
skeleton.set_bone_pose_rotation(bone_idx, quat) # Apply rotation offset around world axes (pre-multiply)
# For locomotion: X = forward/back swing, Y = twist, Z = lateral
var world_basis = Basis(Quaternion.from_euler(rot))
var new_global = Transform3D(world_basis * rest_global.basis, rest_global.origin)
skeleton.set_bone_global_pose_override(bone_idx, new_global, 1.0, true)
elif prev_kf.has("pos") and next_kf.has("pos"): elif prev_kf.has("pos") and next_kf.has("pos"):
var pos: Vector3 = lerp(prev_kf["pos"], next_kf["pos"], t) var pos: Vector3 = lerp(prev_kf["pos"], next_kf["pos"], t)
skeleton.set_bone_pose_position(bone_idx, pos) skeleton.set_bone_pose_position(bone_idx, pos)