[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28427] branches/render25/release/scripts/ modules: rigify update for modified api
Campbell Barton
ideasman42 at gmail.com
Mon Apr 26 09:53:45 CEST 2010
Revision: 28427
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28427
Author: campbellbarton
Date: 2010-04-26 09:53:44 +0200 (Mon, 26 Apr 2010)
Log Message:
-----------
rigify update for modified api
Modified Paths:
--------------
branches/render25/release/scripts/modules/rigify/arm_biped.py
branches/render25/release/scripts/modules/rigify/eye_balls.py
branches/render25/release/scripts/modules/rigify/eye_lid.py
branches/render25/release/scripts/modules/rigify/leg_biped.py
branches/render25/release/scripts/modules/rigify/leg_quadruped.py
branches/render25/release/scripts/modules/rigify/mouth.py
branches/render25/release/scripts/modules/rigify/neck_flex.py
branches/render25/release/scripts/modules/rigify/palm_curl.py
branches/render25/release/scripts/modules/rigify/spine_pivot_flex.py
branches/render25/release/scripts/modules/rigify/tongue.py
branches/render25/release/scripts/modules/rigify_utils.py
Modified: branches/render25/release/scripts/modules/rigify/arm_biped.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/arm_biped.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/arm_biped.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -192,7 +192,7 @@
# shoulder is used as a hinge
fk_chain.rename("shoulder", "MCH-%s_hinge" % base_names[mt.arm])
- fk_chain.shoulder_e.translate(Vector(0.0, fk_chain.shoulder_e.length / 2, 0.0))
+ fk_chain.shoulder_e.translate(Vector((0.0, fk_chain.shoulder_e.length / 2, 0.0)))
# upper arm constrains to this.
ex.socket_e = copy_bone_simple(arm, mt.arm, "MCH-%s_socket" % base_names[mt.arm])
Modified: branches/render25/release/scripts/modules/rigify/eye_balls.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/eye_balls.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/eye_balls.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -217,7 +217,7 @@
eyes += ["ORG-"+name]
# Get the average position of the eyes
- center = Vector(0,0,0)
+ center = Vector((0, 0, 0))
for eye in eyes:
center += eb[eye].head
if len(eyes) != 0:
Modified: branches/render25/release/scripts/modules/rigify/eye_lid.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/eye_lid.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/eye_lid.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -299,14 +299,15 @@
lid8 = copy_bone_simple(obj.data, definitions[9], base_names[definitions[9]]).name
size = eb[lid1].length
- eb[lid1].tail = eb[lid1].head + Vector(0,size,0)
- eb[lid2].tail = eb[lid2].head + Vector(0,size,0)
- eb[lid3].tail = eb[lid3].head + Vector(0,size,0)
- eb[lid4].tail = eb[lid4].head + Vector(0,size,0)
- eb[lid5].tail = eb[lid5].head + Vector(0,size,0)
- eb[lid6].tail = eb[lid6].head + Vector(0,size,0)
- eb[lid7].tail = eb[lid7].head + Vector(0,size,0)
- eb[lid8].tail = eb[lid8].head + Vector(0,size,0)
+ size_y = Vector(0.0, size, 0.0)
+ eb[lid1].tail = eb[lid1].head + size_y
+ eb[lid2].tail = eb[lid2].head + size_y
+ eb[lid3].tail = eb[lid3].head + size_y
+ eb[lid4].tail = eb[lid4].head + size_y
+ eb[lid5].tail = eb[lid5].head + size_y
+ eb[lid6].tail = eb[lid6].head + size_y
+ eb[lid7].tail = eb[lid7].head + size_y
+ eb[lid8].tail = eb[lid8].head + size_y
eb[lid1].roll = 0
eb[lid2].roll = 0
Modified: branches/render25/release/scripts/modules/rigify/leg_biped.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/leg_biped.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/leg_biped.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -201,7 +201,7 @@
ik.knee_target_e.local_location = False
# roll the bone to point up... could also point in the same direction as ik.foot_roll
- # ik.foot_roll_02_e.matrix * Vector(0.0, 0.0, 1.0) # ACK!, no rest matrix in editmode
+ # ik.foot_roll_02_e.matrix * Vector((0.0, 0.0, 1.0)) # ACK!, no rest matrix in editmode
ik.foot_roll_01_e.align_roll((0.0, 0.0, -1.0))
bpy.ops.object.mode_set(mode='OBJECT')
@@ -298,7 +298,7 @@
ex.thigh_socket_e = copy_bone_simple(arm, mt_chain.thigh, "MCH-%s_socket" % base_names[mt_chain.thigh], parent=True)
ex.thigh_socket = ex.thigh_socket_e.name
- ex.thigh_socket_e.tail = ex.thigh_socket_e.head + Vector(0.0, 0.0, ex.thigh_socket_e.length / 4.0)
+ ex.thigh_socket_e.tail = ex.thigh_socket_e.head + Vector((0.0, 0.0, ex.thigh_socket_e.length / 4.0))
ex.thigh_hinge_e = copy_bone_simple(arm, mt.hips, "MCH-%s_hinge" % base_names[mt_chain.thigh], parent=False)
ex.thigh_hinge = ex.thigh_hinge_e.name
Modified: branches/render25/release/scripts/modules/rigify/leg_quadruped.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/leg_quadruped.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/leg_quadruped.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -160,7 +160,7 @@
ik.foot_roll_e.parent = ik_chain.foot_e
ik.foot_roll_e.head -= mt_chain.toe_e.vector.normalize() * mt_chain.foot_e.length
ik.foot_roll_e.tail = ik.foot_roll_e.head - (mt_chain.foot_e.vector.normalize() * mt_chain.toe_e.length)
- ik.foot_roll_e.align_roll(mt_chain.foot_e.matrix.rotation_part() * Vector(0.0, 0.0, -1.0))
+ ik.foot_roll_e.align_roll(mt_chain.foot_e.matrix.rotation_part() * Vector((0.0, 0.0, -1.0)))
# MCH-foot
ik.foot_roll_01_e = copy_bone_simple(arm, mt_chain.foot, "MCH-" + base_names[mt_chain.foot])
Modified: branches/render25/release/scripts/modules/rigify/mouth.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/mouth.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/mouth.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -173,7 +173,7 @@
jopen1 = copy_bone_simple(obj.data, jaw, "MCH-"+base_names[jaw]+".track1", parent=True).name
eb[jopen1].connected = False
eb[jopen1].head = eb[jaw].tail
- eb[jopen1].tail = eb[jopen1].head + Vector(0, 0, eb[jaw].length/4)
+ eb[jopen1].tail = eb[jopen1].head + Vector((0, 0, eb[jaw].length/4))
jopen2 = copy_bone_simple(obj.data, jopen1, "MCH-"+base_names[jaw]+".track2").name
eb[jopen2].parent = eb[jaw]
@@ -427,7 +427,7 @@
# Jaw open tracker
jopent = copy_bone_simple(obj.data, jaw_e.name, "MCH-"+base_names[jaw_e.name]+".track", parent=True).name
eb[jopent].connected = False
- eb[jopent].tail = jaw_e.tail + Vector(0,0,jaw_e.length)
+ eb[jopent].tail = jaw_e.tail + Vector((0.0, 0.0, jaw_e.length))
eb[jopent].head = jaw_e.tail
bpy.ops.object.mode_set(mode='OBJECT')
Modified: branches/render25/release/scripts/modules/rigify/neck_flex.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/neck_flex.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/neck_flex.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -176,7 +176,7 @@
ex.neck_socket_e.connected = False
ex.neck_socket_e.parent = mt.body_e
ex.neck_socket_e.head = mt.head_e.head
- ex.neck_socket_e.tail = mt.head_e.head - Vector(0.0, neck_chain_segment_length / 2.0, 0.0)
+ ex.neck_socket_e.tail = mt.head_e.head - Vector((0.0, neck_chain_segment_length / 2.0, 0.0))
ex.neck_socket_e.roll = 0.0
Modified: branches/render25/release/scripts/modules/rigify/palm_curl.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/palm_curl.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/palm_curl.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -254,7 +254,7 @@
child_pbone_02 = obj.pose.bones[children[1]].bone
rel_vec = child_pbone_01.head - child_pbone_02.head
- x_vec = child_pbone_01.matrix.rotation_part() * Vector(1.0, 0.0, 0.0)
+ x_vec = child_pbone_01.matrix.rotation_part() * Vector((1.0, 0.0, 0.0))
return degrees(rel_vec.angle(x_vec)) > 90.0
Modified: branches/render25/release/scripts/modules/rigify/spine_pivot_flex.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/spine_pivot_flex.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/spine_pivot_flex.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -177,11 +177,11 @@
# copy the pelvis, offset to make MCH-spine_rotate and MCH-ribcage_hinge
ex.ribcage_hinge_e = copy_bone_simple(arm, mt.pelvis, "MCH-%s_hinge" % base_names[mt.ribcage])
ex.ribcage_hinge = ex.ribcage_hinge_e.name
- ex.ribcage_hinge_e.translate(Vector(0.0, spine_chain_segment_length / 4.0, 0.0))
+ ex.ribcage_hinge_e.translate(Vector((0.0, spine_chain_segment_length / 4.0, 0.0)))
ex.spine_rotate_e = copy_bone_simple(arm, mt.ribcage, "MCH-%s_rotate" % spine_chain_basename)
ex.spine_rotate = ex.spine_rotate_e.name
- ex.spine_rotate_e.translate(Vector(0.0, spine_chain_segment_length / 2.0, 0.0))
+ ex.spine_rotate_e.translate(Vector((0.0, spine_chain_segment_length / 2.0, 0.0)))
ex.spine_rotate_e.connected = False
ex.spine_rotate_e.parent = ex.pelvis_copy_e
Modified: branches/render25/release/scripts/modules/rigify/tongue.py
===================================================================
--- branches/render25/release/scripts/modules/rigify/tongue.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify/tongue.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -179,7 +179,7 @@
ex.neck_socket_e.connected = False
ex.neck_socket_e.parent = mt.body_e
ex.neck_socket_e.head = mt.head_e.head
- ex.neck_socket_e.tail = mt.head_e.head - Vector(0.0, neck_chain_segment_length / 2.0, 0.0)
+ ex.neck_socket_e.tail = mt.head_e.head - Vector((0.0, neck_chain_segment_length / 2.0, 0.0))
ex.neck_socket_e.roll = 0.0
Modified: branches/render25/release/scripts/modules/rigify_utils.py
===================================================================
--- branches/render25/release/scripts/modules/rigify_utils.py 2010-04-26 07:26:21 UTC (rev 28426)
+++ branches/render25/release/scripts/modules/rigify_utils.py 2010-04-26 07:53:44 UTC (rev 28427)
@@ -204,12 +204,12 @@
offset.length = distance
elif mode == 'ZAVERAGE':
# between both bones Z axis
- z_axis_a = base_ebone.matrix.copy().rotation_part() * Vector(0.0, 0.0, -1.0)
- z_axis_b = parent_ebone.matrix.copy().rotation_part() * Vector(0.0, 0.0, -1.0)
+ z_axis_a = base_ebone.matrix.copy().rotation_part() * Vector((0.0, 0.0, -1.0))
+ z_axis_b = parent_ebone.matrix.copy().rotation_part() * Vector((0.0, 0.0, -1.0))
offset = (z_axis_a + z_axis_b).normalize() * distance
else:
# preset axis
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list