EPIC_legs flip/twist issue and EPIC_arm tangent scale not 0.0 Fixes #99

mgear-dev · Dec 14, 2022 · 09628b5 · 09628b5
1 parent 552850c
commit 09628b5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/release/scripts/mgear/shifter_epic_components/EPIC_arm_01/__init__.py b/release/scripts/mgear/shifter_epic_components/EPIC_arm_01/__init__.py
@@ -1001,10 +1001,10 @@ def addOperators(self):
         attribute.setRotOrder(self.tws2_rot, "XYZ")
         pm.connectAttr(dm_node + ".outputRotate", self.tws2_rot + ".rotate")
 
-        self.tws0_rot.setAttr("sx", 0.001)
-        self.tws2_rot.setAttr("sx", 0.001)
+        self.tws0_rot.setAttr("sx", 0.000001)
+        self.tws2_rot.setAttr("sx", 0.000001)
 
-        add_node = node.createAddNode(self.roundness_att, 0.0)
+        add_node = node.createAddNode(self.roundness_att, 0.000001)
         pm.connectAttr(add_node + ".output", self.tws1_rot.attr("sx"))
 
         pm.connectAttr(self.armpit_roll_att, self.tws0_rot + ".rotateX")

diff --git a/release/scripts/mgear/shifter_epic_components/EPIC_leg_01/__init__.py b/release/scripts/mgear/shifter_epic_components/EPIC_leg_01/__init__.py
@@ -297,9 +297,14 @@ def addObjects(self):
         )
 
         # tws_ref
-        t = transform.getRotationFromAxis(
-            datatypes.Vector(0, -1, 0), self.normal, "xz", self.negate
-        )
+        if self.up_axis == "y":
+            t = transform.getRotationFromAxis(
+                datatypes.Vector(0, -1, 0), self.normal, "xz", self.negate
+            )
+        else:
+            t = transform.getRotationFromAxis(
+                datatypes.Vector(0, 0, -1), self.normal, "xz", self.negate
+            )
         t = transform.setMatrixPosition(t, self.guide.pos["ankle"])
 
         # addind an npo parent transform to fix flip in Maya 2018.2
@@ -774,10 +779,10 @@ def addOperators(self):
 
         applyop.oriCns(ori_ref, self.tws0_loc, maintainOffset=True)
 
-        self.tws0_loc.setAttr("sx", 0.001)
-        self.tws2_loc.setAttr("sx", 0.001)
+        self.tws0_loc.setAttr("sx", 0.000001)
+        self.tws2_loc.setAttr("sx", 0.000001)
 
-        add_node = node.createAddNode(self.roundness_att, 0.0)
+        add_node = node.createAddNode(self.roundness_att, 0.000001)
         pm.connectAttr(add_node + ".output", self.tws1_rot.attr("sx"))
 
         # Volume -------------------------------------------

diff --git a/release/scripts/mgear/shifter_epic_components/EPIC_mannequin_arm_01/__init__.py b/release/scripts/mgear/shifter_epic_components/EPIC_mannequin_arm_01/__init__.py
@@ -1004,7 +1004,7 @@ def addOperators(self):
         self.tws0_rot.setAttr("sx", 0.001)
         self.tws2_rot.setAttr("sx", 0.001)
 
-        add_node = node.createAddNode(self.roundness_att, 0.0)
+        add_node = node.createAddNode(self.roundness_att, 0.00001)
         pm.connectAttr(add_node + ".output", self.tws1_rot.attr("sx"))
 
         pm.connectAttr(self.armpit_roll_att, self.tws0_rot + ".rotateX")

diff --git a/release/scripts/mgear/shifter_epic_components/EPIC_mannequin_leg_01/__init__.py b/release/scripts/mgear/shifter_epic_components/EPIC_mannequin_leg_01/__init__.py
@@ -308,9 +308,14 @@ def addObjects(self):
         )
 
         # tws_ref
-        t = transform.getRotationFromAxis(
-            datatypes.Vector(0, -1, 0), self.normal, "xz", self.negate
-        )
+        if self.up_axis == "y":
+            t = transform.getRotationFromAxis(
+                datatypes.Vector(0, -1, 0), self.normal, "xz", self.negate
+            )
+        else:
+            t = transform.getRotationFromAxis(
+                datatypes.Vector(0, 0, -1), self.normal, "xz", self.negate
+            )
         t = transform.setMatrixPosition(t, self.guide.pos["ankle"])
 
         # addind an npo parent transform to fix flip in Maya 2018.2
@@ -776,10 +781,10 @@ def addOperators(self):
 
         applyop.oriCns(ori_ref, self.tws0_loc, maintainOffset=True)
 
-        self.tws0_loc.setAttr("sx", 0.001)
-        self.tws2_loc.setAttr("sx", 0.001)
+        self.tws0_loc.setAttr("sx", 0.000001)
+        self.tws2_loc.setAttr("sx", 0.000001)
 
-        add_node = node.createAddNode(self.roundness_att, 0.0)
+        add_node = node.createAddNode(self.roundness_att, 0.000001)
         pm.connectAttr(add_node + ".output", self.tws1_rot.attr("sx"))
 
         # Volume -------------------------------------------