[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1636] trunk/py/scripts/addons/rigify: Rigify works again! Yay!

[Nathan Vegdahl]

Revision: 1636
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1636
Author:   cessen
Date:     2011-02-21 20:29:27 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
Rigify works again!  Yay!
Just required some misc updates due to python API changes.

Modified Paths:
--------------
    trunk/py/scripts/addons/rigify/README
    trunk/py/scripts/addons/rigify/__init__.py
    trunk/py/scripts/addons/rigify/rigs/biped/arm/ik.py
    trunk/py/scripts/addons/rigify/rigs/biped/leg/__init__.py
    trunk/py/scripts/addons/rigify/rigs/biped/leg/fk.py
    trunk/py/scripts/addons/rigify/rigs/biped/leg/ik.py

Modified: trunk/py/scripts/addons/rigify/README
===================================================================
--- trunk/py/scripts/addons/rigify/README	2011-02-21 20:11:49 UTC (rev 1635)
+++ trunk/py/scripts/addons/rigify/README	2011-02-21 20:29:27 UTC (rev 1636)
@@ -2,7 +2,7 @@
 ------------
 Rigify is an auto-rigging system based on a "building blocks" paradigm.  The
 user can create a rig by putting together any combination of rig types, in any
-confguration that they want.
+configuration that they want.
 
 A rig type is something like "biped arm" or "spine" or "finger".
 

Modified: trunk/py/scripts/addons/rigify/__init__.py
===================================================================
--- trunk/py/scripts/addons/rigify/__init__.py	2011-02-21 20:11:49 UTC (rev 1635)
+++ trunk/py/scripts/addons/rigify/__init__.py	2011-02-21 20:29:27 UTC (rev 1636)
@@ -116,14 +116,7 @@
     name = bpy.props.StringProperty()
 
 
-for rig in rig_list:
-    r = utils.get_rig_type(rig).Rig
-    try:
-        r.add_parameters(RigifyParameters)
-    except AttributeError:
-        pass
 
-
 ##### REGISTER #####
 
 def register():
@@ -141,6 +134,13 @@
     IDStore.rigify_types = bpy.props.CollectionProperty(type=RigifyName)
     IDStore.rigify_active_type = bpy.props.IntProperty(name="Rigify Active Type", description="The selected rig type.")
 
+    # Add rig parameters
+    for rig in rig_list:
+        r = utils.get_rig_type(rig).Rig
+        try:
+            r.add_parameters(RigifyParameters)
+        except AttributeError:
+            pass
 
 def unregister():
     del bpy.types.PoseBone.rigify_type

Modified: trunk/py/scripts/addons/rigify/rigs/biped/arm/ik.py
===================================================================
--- trunk/py/scripts/addons/rigify/rigs/biped/arm/ik.py	2011-02-21 20:11:49 UTC (rev 1635)
+++ trunk/py/scripts/addons/rigify/rigs/biped/arm/ik.py	2011-02-21 20:29:27 UTC (rev 1636)
@@ -158,9 +158,9 @@
         vispole_e.tail = vispole_e.head + Vector((0, 0, v1.length / 32))
 
         # Determine the pole offset value
-        plane = (farm_e.tail - uarm_e.head).normalize()
-        vec1 = uarm_e.x_axis.normalize()
-        vec2 = (pole_e.head - uarm_e.head).normalize()
+        plane = (farm_e.tail - uarm_e.head).normalized()
+        vec1 = uarm_e.x_axis.normalized()
+        vec2 = (pole_e.head - uarm_e.head).normalized()
         pole_offset = angle_on_plane(plane, vec1, vec2)
 
         # Object mode, get pose bones

Modified: trunk/py/scripts/addons/rigify/rigs/biped/leg/__init__.py
===================================================================
--- trunk/py/scripts/addons/rigify/rigs/biped/leg/__init__.py	2011-02-21 20:11:49 UTC (rev 1635)
+++ trunk/py/scripts/addons/rigify/rigs/biped/leg/__init__.py	2011-02-21 20:29:27 UTC (rev 1636)
@@ -78,6 +78,7 @@
         group.separate_ik_layers = bpy.props.BoolProperty(name="Separate IK Control Layers:", default=False, description="Enable putting the ik controls on a separate layer from the fk controls.")
         group.ik_layers = bpy.props.BoolVectorProperty(size=32, description="Layers for the ik controls to be on.")
 
+        print("Adding thigh twist.")
         group.use_thigh_twist = bpy.props.BoolProperty(name="Thigh Twist", default=True, description="Generate the dual-bone twist setup for the thigh.")
         group.use_shin_twist = bpy.props.BoolProperty(name="Shin Twist", default=True, description="Generate the dual-bone twist setup for the shin.")
 

Modified: trunk/py/scripts/addons/rigify/rigs/biped/leg/fk.py
===================================================================
--- trunk/py/scripts/addons/rigify/rigs/biped/leg/fk.py	2011-02-21 20:11:49 UTC (rev 1635)
+++ trunk/py/scripts/addons/rigify/rigs/biped/leg/fk.py	2011-02-21 20:29:27 UTC (rev 1636)
@@ -141,7 +141,7 @@
 
         # Positioning
         vec = Vector(eb[self.org_bones[3]].vector)
-        vec = vec.normalize()
+        vec.normalize()
         foot_e.tail = foot_e.head + (vec * foot_e.length)
         foot_e.roll = eb[self.org_bones[3]].roll
 

Modified: trunk/py/scripts/addons/rigify/rigs/biped/leg/ik.py
===================================================================
--- trunk/py/scripts/addons/rigify/rigs/biped/leg/ik.py	2011-02-21 20:11:49 UTC (rev 1635)
+++ trunk/py/scripts/addons/rigify/rigs/biped/leg/ik.py	2011-02-21 20:29:27 UTC (rev 1636)
@@ -221,7 +221,7 @@
 
         # Positioning
         vec = Vector(toe_e.vector)
-        vec = vec.normalize()
+        vec.normalize()
         foot_e.tail = foot_e.head + (vec * foot_e.length)
         foot_e.roll = toe_e.roll
 
@@ -281,9 +281,9 @@
         foot_ik_target_e.tail = Vector(org_foot_e.tail)
 
         # Determine the pole offset value
-        plane = (shin_e.tail - thigh_e.head).normalize()
-        vec1 = thigh_e.x_axis.normalize()
-        vec2 = (pole_e.head - thigh_e.head).normalize()
+        plane = (shin_e.tail - thigh_e.head).normalized()
+        vec1 = thigh_e.x_axis.normalized()
+        vec2 = (pole_e.head - thigh_e.head).normalized()
         pole_offset = angle_on_plane(plane, vec1, vec2)
 
         # Object mode, get pose bones