[Bf-extensions-cvs] [b4adc410] master: Rigify: cleanup PyCharm warnings in legacy face.
Alexander Gavrilov
noreply at git.blender.org
Mon Nov 21 00:24:22 CET 2022
Commit: b4adc4100dd569a8485b5edc658d1629a311d16d
Author: Alexander Gavrilov
Date: Tue Nov 15 16:07:03 2022 +0200
Branches: master
https://developer.blender.org/rBAb4adc4100dd569a8485b5edc658d1629a311d16d
Rigify: cleanup PyCharm warnings in legacy face.
- Pep8 formatting: whitespace style issues, comments, long lines.
- Preserved formatting of a couple of tables through noqa tag.
- Renamed a few local variables for typos, clarity and scope conflicts.
- Commented out a duplicate key in the tweak_copyloc_L table.
- Added assertion in an impossible branch.
This should cause no functionality changes.
===================================================================
M rigify/rigs/faces/super_face.py
===================================================================
diff --git a/rigify/rigs/faces/super_face.py b/rigify/rigs/faces/super_face.py
index 4d062aaf..9c2d709d 100644
--- a/rigify/rigs/faces/super_face.py
+++ b/rigify/rigs/faces/super_face.py
@@ -1,13 +1,17 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-import bpy, re
-from mathutils import Vector
-from ...utils import copy_bone, flip_bone
-from ...utils import org, strip_org, make_deformer_name, connected_children_names, make_mechanism_name
-from ...utils import create_widget
-from ...utils.mechanism import make_property
-from ...utils.layers import ControlLayersOption
-from ..widgets import create_face_widget, create_eye_widget, create_eyes_widget, create_ear_widget, create_jaw_widget, create_teeth_widget
+import bpy
+import re
+
+from mathutils import Vector
+from ...utils import copy_bone, flip_bone
+from ...utils import org, strip_org, make_deformer_name, connected_children_names,\
+ make_mechanism_name
+from ...utils import create_widget
+from ...utils.mechanism import make_property
+from ...utils.layers import ControlLayersOption
+from ..widgets import create_face_widget, create_eye_widget, create_eyes_widget,\
+ create_ear_widget, create_jaw_widget, create_teeth_widget
script = """
@@ -21,13 +25,12 @@ if is_selected(all_controls):
"""
+# noinspection PyPep8Naming,SpellCheckingInspection
class Rig:
def __init__(self, obj, bone_name, params):
self.obj = obj
- b = self.obj.data.bones
-
children = [
"nose", "lip.T.L", "lip.B.L", "jaw", "ear.L", "ear.R", "lip.T.R",
"lip.B.R", "brow.B.L", "lid.T.L", "brow.B.R", "lid.T.R",
@@ -37,17 +40,17 @@ class Rig:
"temple.R"
]
- #create_pose_lib( self.obj )
+ # create_pose_lib( self.obj )
- children = [ org(b) for b in children ]
+ children = [org(b) for b in children]
grand_children = []
for child in children:
- grand_children += connected_children_names( self.obj, child )
+ grand_children += connected_children_names(self.obj, child)
- self.org_bones = [bone_name] + children + grand_children
- self.face_length = obj.data.bones[ self.org_bones[0] ].length
- self.params = params
+ self.org_bones = [bone_name] + children + grand_children
+ self.face_length = obj.data.bones[self.org_bones[0]].length
+ self.params = params
if params.primary_layers_extra:
self.primary_layers = list(params.primary_layers)
@@ -68,16 +71,16 @@ class Rig:
eb['ORG-eye.L'].roll = 0.0
eb['ORG-eye.R'].roll = 0.0
- def symmetrical_split(self, bones):
-
+ @staticmethod
+ def symmetrical_split(bones):
# RE pattern match right or left parts
# match the letter "L" (or "R"), followed by an optional dot (".")
- # and 0 or more digits at the end of the the string
- left_pattern = r'L\.?\d*$'
+ # and 0 or more digits at the end of the string
+ left_pattern = r'L\.?\d*$'
right_pattern = r'R\.?\d*$'
- left = sorted( [ name for name in bones if re.search( left_pattern, name ) ] )
- right = sorted( [ name for name in bones if re.search( right_pattern, name ) ] )
+ left = sorted([name for name in bones if re.search(left_pattern, name)])
+ right = sorted([name for name in bones if re.search(right_pattern, name)])
return left, right
@@ -88,40 +91,39 @@ class Rig:
eb = self.obj.data.edit_bones
def_bones = []
- for org in org_bones:
- if 'face' in org or 'teeth' in org or 'eye' in org:
+
+ for org_name in org_bones:
+ if 'face' in org_name or 'teeth' in org_name or 'eye' in org_name:
continue
- def_name = make_deformer_name( strip_org( org ) )
- def_name = copy_bone( self.obj, org, def_name )
- def_bones.append( def_name )
+ def_name = make_deformer_name(strip_org(org_name))
+ def_name = copy_bone(self.obj, org_name, def_name)
+ def_bones.append(def_name)
eb[def_name].use_connect = False
- eb[def_name].parent = None
+ eb[def_name].parent = None
- brow_top_names = [ bone for bone in def_bones if 'brow.T' in bone ]
- forehead_names = [ bone for bone in def_bones if 'forehead' in bone ]
+ brow_top_names = [bone for bone in def_bones if 'brow.T' in bone]
+ forehead_names = [bone for bone in def_bones if 'forehead' in bone]
- brow_left, brow_right = self.symmetrical_split( brow_top_names )
- forehead_left, forehead_right = self.symmetrical_split( forehead_names )
+ brow_left, brow_right = self.symmetrical_split(brow_top_names)
+ forehead_left, forehead_right = self.symmetrical_split(forehead_names)
- brow_left = brow_left[1:]
+ brow_left = brow_left[1:]
brow_right = brow_right[1:]
brow_left.reverse()
brow_right.reverse()
for browL, browR, foreheadL, foreheadR in zip(
- brow_left, brow_right, forehead_left, forehead_right ):
+ brow_left, brow_right, forehead_left, forehead_right):
eb[foreheadL].tail = eb[browL].head
eb[foreheadR].tail = eb[browR].head
- return { 'all' : def_bones }
+ return {'all': def_bones}
def create_ctrl(self, bones):
- org_bones = self.org_bones
-
- ## create control bones
+ # create control bones
bpy.ops.object.mode_set(mode='EDIT')
eb = self.obj.data.edit_bones
@@ -144,15 +146,15 @@ class Rig:
distance = (eyeL_e.head - eyeR_e.head) * 3
distance = distance.cross((0, 0, 1))
- eyeL_ctrl_e.head += distance
- eyeR_ctrl_e.head += distance
- eyes_ctrl_e.head[:] = ( eyeL_ctrl_e.head + eyeR_ctrl_e.head ) / 2
+ eyeL_ctrl_e.head += distance
+ eyeR_ctrl_e.head += distance
+ eyes_ctrl_e.head[:] = (eyeL_ctrl_e.head + eyeR_ctrl_e.head) / 2
- for bone in [ eyeL_ctrl_e, eyeR_ctrl_e, eyes_ctrl_e ]:
+ for bone in [eyeL_ctrl_e, eyeR_ctrl_e, eyes_ctrl_e]:
# bone.tail[:] = bone.head + Vector( [ 0, 0, eyeL_e.length * 1.35 ] )
bone.tail[:] = bone.head + Vector([0, 0, interpupillary_distance.length * 0.3144])
- ## Widget for transforming the both eyes
+ # Widget for transforming the both eyes
eye_master_names = []
for bone in bones['eyes']:
eye_master = copy_bone(
@@ -161,144 +163,144 @@ class Rig:
'master_' + strip_org(bone)
)
- eye_master_names.append( eye_master )
+ eye_master_names.append(eye_master)
- ## turbo: adding a master nose for transforming the whole nose
+ # turbo: adding a master nose for transforming the whole nose
master_nose = copy_bone(self.obj, 'ORG-nose.004', 'nose_master')
eb[master_nose].tail[:] = \
eb[master_nose].head + Vector([0, self.face_length / -4, 0])
# ears ctrls
- earL_name = strip_org( bones['ears'][0] )
- earR_name = strip_org( bones['ears'][1] )
+ earL_name = strip_org(bones['ears'][0])
+ earR_name = strip_org(bones['ears'][1])
- earL_ctrl_name = copy_bone( self.obj, org( bones['ears'][0] ), earL_name )
- earR_ctrl_name = copy_bone( self.obj, org( bones['ears'][1] ), earR_name )
+ earL_ctrl_name = copy_bone(self.obj, org(bones['ears'][0]), earL_name)
+ earR_ctrl_name = copy_bone(self.obj, org(bones['ears'][1]), earR_name)
# jaw ctrl
- jaw_ctrl_name = strip_org( bones['jaw'][2] ) + '_master'
- jaw_ctrl_name = copy_bone( self.obj, bones['jaw'][2], jaw_ctrl_name )
+ jaw_ctrl_name = strip_org(bones['jaw'][2]) + '_master'
+ jaw_ctrl_name = copy_bone(self.obj, bones['jaw'][2], jaw_ctrl_name)
- jawL_org_e = eb[ bones['jaw'][0] ]
- jawR_org_e = eb[ bones['jaw'][1] ]
- jaw_org_e = eb[ bones['jaw'][2] ]
+ jawL_org_e = eb[bones['jaw'][0]]
+ jawR_org_e = eb[bones['jaw'][1]]
+ # jaw_org_e = eb[bones['jaw'][2]]
- eb[ jaw_ctrl_name ].head[:] = ( jawL_org_e.head + jawR_org_e.head ) / 2
+ eb[jaw_ctrl_name].head[:] = (jawL_org_e.head + jawR_org_e.head) / 2
# teeth ctrls
- teethT_name = strip_org( bones['teeth'][0] )
- teethB_name = strip_org( bones['teeth'][1] )
+ teethT_name = strip_org(bones['teeth'][0])
+ teethB_name = strip_org(bones['teeth'][1])
- teethT_ctrl_name = copy_bone( self.obj, org( bones['teeth'][0] ), teethT_name )
- teethB_ctrl_name = copy_bone( self.obj, org( bones['teeth'][1] ), teethB_name )
+ teethT_ctrl_name = copy_bone(self.obj, org(bones['teeth'][0]), teethT_name)
+ teethB_ctrl_name = copy_bone(self.obj, org(bones['teeth'][1]), teethB_name)
# tongue ctrl
- tongue_org = bones['tongue'].pop()
- tongue_name = strip_org( tongue_org ) + '_master'
+ tongue_org = bones['tongue'].pop()
+ tongue_name = strip_org(tongue_org) + '_master'
- tongue_ctrl_name = copy_bone( self.obj, tongue_org, tongue_name )
+ tongue_ctrl_name = copy_bone(self.obj, tongue_org, tongue_name)
- flip_bone( self.obj, tongue_ctrl_name )
+ flip_bone(self.obj, tongue_ctrl_name)
- ## Assign widgets
- bpy.ops.object.mode_set(mode ='OBJECT')
+ # Assign widgets
+ bpy.ops.object.mode_set(mode='OBJECT')
# Assign each eye widgets
- create_eye_widget( self.obj, eyeL_ctrl_name )
- create_eye_widget( self.obj, eyeR_ctrl_name )
+ create_eye_widget(self.obj, eyeL_ctrl_name)
+ create_eye_widget(self.obj, eyeR_ctrl_name)
# Assign eyes widgets
- create_eyes_widget( self.obj, eyes_ctrl_name )
+ create_eyes_widget(self.obj, eyes_ctrl_name)
# Assign each eye_master widgets
for master in eye_master_names:
create_square_widget(self.obj, master)
# Assign
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list