Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucio Rossi <lucio.rossi75@gmail.com>2016-09-22 15:42:21 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-09-26 15:30:42 +0300
commitc0f720c85ee12cd32cd837d6d0006f80b1da36c6 (patch)
treed80af7d7091001d14f2770f3173622de91f8a42a
parentf5ab20ebe69d2da2b10828e0ad6766ce8b066af0 (diff)
Fixes: Snapping functions code cleanupv2.78
-rwxr-xr-xrigify/rig_ui_pitchipoy_template.py50
1 files changed, 4 insertions, 46 deletions
diff --git a/rigify/rig_ui_pitchipoy_template.py b/rigify/rig_ui_pitchipoy_template.py
index 33737f02..f5838b8d 100755
--- a/rigify/rig_ui_pitchipoy_template.py
+++ b/rigify/rig_ui_pitchipoy_template.py
@@ -364,7 +364,7 @@ def ik2fk_arm(obj, fk, ik):
#Correct matrix if handi has IK_follow property
if 'IK_follow' in handi.keys():
- identity = Matrix([[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]])
+
cns = handi.constraints[0]
parent = obj.pose.bones[cns.subtarget]
cns1 = handi.constraints[1]
@@ -372,29 +372,8 @@ def ik2fk_arm(obj, fk, ik):
infl = cns.influence
C = parent.matrix.inverted()
- #A=(obj.matrix_world*parent1.matrix)
- #B=parent1.matrix.inverted()
- #C = obj.pose.bones['torso'].matrix.inverted()
- #D = obj.pose.bones['torso'].matrix_basis.inverted()
- #E = parent1.matrix_basis.inverted()
- #E=E*E
F=parent1.matrix_channel.inverted()
- #start_bone = parent1
- #while (True):
- # if start_bone.parent==None:
- # break
- # E = start_bone.parent.matrix_basis.inverted()*start_bone.parent.matrix_basis.inverted()*E
- # start_bone = start_bone.parent
- #T = C.to_translation()#translation part
- #T = Matrix.Translation((T[0],T[1],T[2],1))
- #T1 = F.to_translation()
- #T = Matrix.Translation((T1[0],T1[1],T1[2],1))
- #R = C.to_quaternion()#Rotation part
- #R1 = F.to_quaternion()
- #S = C.to_scale() #Scale part
- #S1 = F.to_scale()
- #cns_mat = infl*(parent.matrix.inverted()*parent.matrix.inverted() - identity) + identity
- #cns1_mat = (1-infl)*( F*F - identity) + identity
+
C=C*C
F=F*F
G = C.lerp(F,1-infl)
@@ -498,7 +477,7 @@ def ik2fk_leg(obj, fk, ik):
#Correct matrix if footi has IK_follow property
if 'IK_follow' in footi.keys():
- identity = Matrix([[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]])
+
cns = footi.constraints[0]
parent = obj.pose.bones[cns.subtarget]
cns1 = footi.constraints[1]
@@ -506,29 +485,8 @@ def ik2fk_leg(obj, fk, ik):
infl = cns.influence
C = parent.matrix.inverted()
- #A=(obj.matrix_world*parent1.matrix)
- #B=parent1.matrix.inverted()
- #C = obj.pose.bones['torso'].matrix.inverted()
- #D = obj.pose.bones['torso'].matrix_basis.inverted()
- #E = parent1.matrix_basis.inverted()
- #E=E*E
F=parent1.matrix_channel.inverted()
- #start_bone = parent1
- #while (True):
- # if start_bone.parent==None:
- # break
- # E = start_bone.parent.matrix_basis.inverted()*start_bone.parent.matrix_basis.inverted()*E
- # start_bone = start_bone.parent
- #T = C.to_translation()#translation part
- #T = Matrix.Translation((T[0],T[1],T[2],1))
- #T1 = F.to_translation()
- #T = Matrix.Translation((T1[0],T1[1],T1[2],1))
- #R = C.to_quaternion()#Rotation part
- #R1 = F.to_quaternion()
- #S = C.to_scale() #Scale part
- #S1 = F.to_scale()
- #cns_mat = infl*(parent.matrix.inverted()*parent.matrix.inverted() - identity) + identity
- #cns1_mat = (1-infl)*( F*F - identity) + identity
+
C=C*C
F=F*F
G = C.lerp(F,1-infl)