breakingspell/DamnSimplePoseLibrary
1
0
Fork 0
Code Issues 5 Pull Requests 1 Releases Wiki Activity

Merge pull request 'More bone rotation cases' (#17) from bone-rotation into develop

Browse Source 
Reviewed-on: #17
This commit is contained in:
Blazer Silving
2025-01-19 12:10:16 -06:00
parent 5ffe61e81d 486b23b378
commit be06439bc0
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common.py
View File

@ -94,11 +94,7 @@ def setKeyframesFromBones(context, arm_object, new_marker):
if bone.bone.select or none_selected == True: if bone.bone.select or none_selected == True:
bone_name = bone.name bone_name = bone.name
if bone.rotation_mode == "XYZ": if bone.rotation_mode in ("XYZ", "XZY", "YXZ", "YZX", "ZXY", "ZYX"):
rot_mode = "rotation_euler"
elif bone.rotation_mode == "YZX":
rot_mode = "rotation_euler"
elif bone.rotation_mode == "ZXY":
rot_mode = "rotation_euler" rot_mode = "rotation_euler"
elif bone.rotation_mode == "QUATERNION": elif bone.rotation_mode == "QUATERNION":
rot_mode = "rotation_quaternion" rot_mode = "rotation_quaternion"
@ -162,11 +158,7 @@ def setBonesfromKeyframes(context, arm_object, active_marker):
if findKeyframe(context, bone, active_marker.frame) is None: if findKeyframe(context, bone, active_marker.frame) is None:
continue continue
if bone.rotation_mode == "XYZ": if bone.rotation_mode in ("XYZ", "XZY", "YXZ", "YZX", "ZXY", "ZYX"):
rot_mode = "rotation_euler"
elif bone.rotation_mode == "YZX":
rot_mode = "rotation_euler"
elif bone.rotation_mode == "ZXY":
rot_mode = "rotation_euler" rot_mode = "rotation_euler"
elif bone.rotation_mode == "QUATERNION": elif bone.rotation_mode == "QUATERNION":
rot_mode = "rotation_quaternion" rot_mode = "rotation_quaternion"
@ -191,21 +183,9 @@ def setBonesfromKeyframes(context, arm_object, active_marker):
scl_z = findFcurve(context, bone_name, "scale", 2) or 1.0 scl_z = findFcurve(context, bone_name, "scale", 2) or 1.0
bone.location = mathutils.Vector((loc_x, loc_y, loc_z)) bone.location = mathutils.Vector((loc_x, loc_y, loc_z))
if bone.rotation_mode == "XYZ": if rot_mode == "rotation_euler":
bone.rotation_euler = mathutils.Euler( bone.rotation_euler = mathutils.Euler(
(rot_x, rot_y, rot_z)) (rot_x, rot_y, rot_z))
elif bone.rotation_mode == "YZX":
bone.rotation_euler = mathutils.Euler(
(rot_x, rot_y, rot_z))
elif bone.rotation_mode == "ZXY":
bone.rotation_euler = mathutils.Euler(
(rot_z, rot_x, rot_y))
elif bone.rotation_mode == "YXZ":
bone.rotation_euler = mathutils.Euler(
(rot_y, rot_x, rot_z))
elif bone.rotation_mode == "XZY":
bone.rotation_euler = mathutils.Euler(
(rot_x, rot_z, rot_y))
elif rot_mode == "rotation_quaternion": elif rot_mode == "rotation_quaternion":
bone.rotation_quaternion = mathutils.Quaternion( bone.rotation_quaternion = mathutils.Quaternion(
(rot_w, rot_x, rot_y, rot_z)) (rot_w, rot_x, rot_y, rot_z))