Skip to content

Commit e955578

Browse files
miquelcamposmiquelcampos
committed
Shifter foot: Toes do not scale together with the fk foot fixes mgear-dev#320 
1 parent 0b5a45d commit e955578

3 files changed

Lines changed: 37 additions & 50 deletions

File tree

‎release/scripts/mgear/shifter_classic_components/foot_bk_01/__init__.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,7 @@ def connect_leg_2jnt_01(self):
443443
pm.parent(self.root, self.parent_comp.ik_ctl)
444444
pm.parent(self.parent_comp.ik_ref, self.bk_ctl[-1])
445445
pm.parent(self.parent_comp.match_fk2, self.bk_ctl[-1])
446-
pm.parentConstraint(
447-
self.parent_comp.tws2_rot, self.fk_ref, maintainOffset=True
448-
)
446+
pm.parent(self.fk_ref, self.parent_comp.tws2_rot)
449447

450448
# add message connections to parent component.
451449
# this connection will be used to track the ctl relation when IK/FK

‎release/scripts/mgear/shifter_epic_components/EPIC_arm_02/settingsUI.py‎

Lines changed: 35 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
# -*- coding: utf-8 -*-
2-
3-
# Form implementation generated from reading ui file 'C:/datawork/repo/mgear4/release/scripts/mgear/shifter_epic_components/EPIC_arm_02/settingsUI.ui',
4-
# licensing of 'C:/datawork/repo/mgear4/release/scripts/mgear/shifter_epic_components/EPIC_arm_02/settingsUI.ui' applies.
5-
#
6-
# Created: Fri Nov 29 10:25:46 2024
7-
# by: pyside2-uic running on PySide2 5.12.5
8-
#
9-
# WARNING! All changes made in this file will be lost!
10-
11-
from PySide2 import QtCore, QtGui, QtWidgets
1+
from mgear.core import pyqt
2+
QtGui, QtCore, QtWidgets, wrapInstance = pyqt.qt_import()
123

134
class Ui_Form(object):
145
def setupUi(self, Form):
@@ -215,37 +206,37 @@ def setupUi(self, Form):
215206
QtCore.QMetaObject.connectSlotsByName(Form)
216207

217208
def retranslateUi(self, Form):
218-
Form.setWindowTitle(QtWidgets.QApplication.translate("Form", "Form", None, -1))
219-
self.ikfk_label.setText(QtWidgets.QApplication.translate("Form", "FK/IK Blend", None, -1))
220-
self.maxStretch_label.setText(QtWidgets.QApplication.translate("Form", "Max Stretch", None, -1))
221-
self.divisions_label.setText(QtWidgets.QApplication.translate("Form", "Divisions", None, -1))
222-
self.leafJoints_checkBox.setText(QtWidgets.QApplication.translate("Form", "Leaf Joints", None, -1))
223-
self.ikTR_checkBox.setText(QtWidgets.QApplication.translate("Form", "IK separated Trans and Rot ctl", None, -1))
224-
self.mirrorIK_checkBox.setToolTip(QtWidgets.QApplication.translate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
225-
self.mirrorIK_checkBox.setStatusTip(QtWidgets.QApplication.translate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
226-
self.mirrorIK_checkBox.setWhatsThis(QtWidgets.QApplication.translate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
227-
self.mirrorIK_checkBox.setText(QtWidgets.QApplication.translate("Form", "Mirror IK Ctl axis behaviour", None, -1))
228-
self.mirrorMid_checkBox.setToolTip(QtWidgets.QApplication.translate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
229-
self.mirrorMid_checkBox.setStatusTip(QtWidgets.QApplication.translate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
230-
self.mirrorMid_checkBox.setWhatsThis(QtWidgets.QApplication.translate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
231-
self.mirrorMid_checkBox.setText(QtWidgets.QApplication.translate("Form", "Mirror Mid Ctl and UPV axis behaviour", None, -1))
232-
self.useBlade_checkBox.setToolTip(QtWidgets.QApplication.translate("Form", "<html><head/><body><p>If checked, will use a blade to control the wrist joint orientation. This doesn\'t affect the controls that are align with the arm plane.</p></body></html>", None, -1))
233-
self.useBlade_checkBox.setText(QtWidgets.QApplication.translate("Form", "Use Wrist Blade to orient wrist joint", None, -1))
234-
self.TPoseRest_checkBox.setToolTip(QtWidgets.QApplication.translate("Form", "<html><head/><body><p>If checked, the Rest pose for controls will be in T Pose</p></body></html>", None, -1))
235-
self.TPoseRest_checkBox.setStatusTip(QtWidgets.QApplication.translate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
236-
self.TPoseRest_checkBox.setWhatsThis(QtWidgets.QApplication.translate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
237-
self.TPoseRest_checkBox.setText(QtWidgets.QApplication.translate("Form", "Rest T Pose", None, -1))
238-
self.squashStretchProfile_pushButton.setText(QtWidgets.QApplication.translate("Form", "Squash and Stretch Profile", None, -1))
239-
self.ikRefArray_groupBox.setTitle(QtWidgets.QApplication.translate("Form", "IK Reference Array", None, -1))
240-
self.ikRefArray_copyRef_pushButton.setText(QtWidgets.QApplication.translate("Form", "Copy from UpV Ref", None, -1))
241-
self.ikRefArrayAdd_pushButton.setText(QtWidgets.QApplication.translate("Form", "<<", None, -1))
242-
self.ikRefArrayRemove_pushButton.setText(QtWidgets.QApplication.translate("Form", ">>", None, -1))
243-
self.upvRefArray_groupBox.setTitle(QtWidgets.QApplication.translate("Form", "UpV Reference Array", None, -1))
244-
self.upvRefArray_copyRef_pushButton.setText(QtWidgets.QApplication.translate("Form", "Copy from IK Ref", None, -1))
245-
self.upvRefArrayAdd_pushButton.setText(QtWidgets.QApplication.translate("Form", "<<", None, -1))
246-
self.upvRefArrayRemove_pushButton.setText(QtWidgets.QApplication.translate("Form", ">>", None, -1))
247-
self.pinRefArray_groupBox.setTitle(QtWidgets.QApplication.translate("Form", "Pin Elbow Reference Array", None, -1))
248-
self.pinRefArray_copyRef_pushButton.setText(QtWidgets.QApplication.translate("Form", "Copy from IK Ref", None, -1))
249-
self.pinRefArrayAdd_pushButton.setText(QtWidgets.QApplication.translate("Form", "<<", None, -1))
250-
self.pinRefArrayRemove_pushButton.setText(QtWidgets.QApplication.translate("Form", ">>", None, -1))
209+
Form.setWindowTitle(pyqt.fakeTranslate("Form", "Form", None, -1))
210+
self.ikfk_label.setText(pyqt.fakeTranslate("Form", "FK/IK Blend", None, -1))
211+
self.maxStretch_label.setText(pyqt.fakeTranslate("Form", "Max Stretch", None, -1))
212+
self.divisions_label.setText(pyqt.fakeTranslate("Form", "Divisions", None, -1))
213+
self.leafJoints_checkBox.setText(pyqt.fakeTranslate("Form", "Leaf Joints", None, -1))
214+
self.ikTR_checkBox.setText(pyqt.fakeTranslate("Form", "IK separated Trans and Rot ctl", None, -1))
215+
self.mirrorIK_checkBox.setToolTip(pyqt.fakeTranslate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
216+
self.mirrorIK_checkBox.setStatusTip(pyqt.fakeTranslate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
217+
self.mirrorIK_checkBox.setWhatsThis(pyqt.fakeTranslate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
218+
self.mirrorIK_checkBox.setText(pyqt.fakeTranslate("Form", "Mirror IK Ctl axis behaviour", None, -1))
219+
self.mirrorMid_checkBox.setToolTip(pyqt.fakeTranslate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
220+
self.mirrorMid_checkBox.setStatusTip(pyqt.fakeTranslate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
221+
self.mirrorMid_checkBox.setWhatsThis(pyqt.fakeTranslate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
222+
self.mirrorMid_checkBox.setText(pyqt.fakeTranslate("Form", "Mirror Mid Ctl and UPV axis behaviour", None, -1))
223+
self.useBlade_checkBox.setToolTip(pyqt.fakeTranslate("Form", "<html><head/><body><p>If checked, will use a blade to control the wrist joint orientation. This doesn\'t affect the controls that are align with the arm plane.</p></body></html>", None, -1))
224+
self.useBlade_checkBox.setText(pyqt.fakeTranslate("Form", "Use Wrist Blade to orient wrist joint", None, -1))
225+
self.TPoseRest_checkBox.setToolTip(pyqt.fakeTranslate("Form", "<html><head/><body><p>If checked, the Rest pose for controls will be in T Pose</p></body></html>", None, -1))
226+
self.TPoseRest_checkBox.setStatusTip(pyqt.fakeTranslate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
227+
self.TPoseRest_checkBox.setWhatsThis(pyqt.fakeTranslate("Form", "This option set the axis of the mid CTL (elbow) and the up vector control to move in a mirror behaviour ", None, -1))
228+
self.TPoseRest_checkBox.setText(pyqt.fakeTranslate("Form", "Rest T Pose", None, -1))
229+
self.squashStretchProfile_pushButton.setText(pyqt.fakeTranslate("Form", "Squash and Stretch Profile", None, -1))
230+
self.ikRefArray_groupBox.setTitle(pyqt.fakeTranslate("Form", "IK Reference Array", None, -1))
231+
self.ikRefArray_copyRef_pushButton.setText(pyqt.fakeTranslate("Form", "Copy from UpV Ref", None, -1))
232+
self.ikRefArrayAdd_pushButton.setText(pyqt.fakeTranslate("Form", "<<", None, -1))
233+
self.ikRefArrayRemove_pushButton.setText(pyqt.fakeTranslate("Form", ">>", None, -1))
234+
self.upvRefArray_groupBox.setTitle(pyqt.fakeTranslate("Form", "UpV Reference Array", None, -1))
235+
self.upvRefArray_copyRef_pushButton.setText(pyqt.fakeTranslate("Form", "Copy from IK Ref", None, -1))
236+
self.upvRefArrayAdd_pushButton.setText(pyqt.fakeTranslate("Form", "<<", None, -1))
237+
self.upvRefArrayRemove_pushButton.setText(pyqt.fakeTranslate("Form", ">>", None, -1))
238+
self.pinRefArray_groupBox.setTitle(pyqt.fakeTranslate("Form", "Pin Elbow Reference Array", None, -1))
239+
self.pinRefArray_copyRef_pushButton.setText(pyqt.fakeTranslate("Form", "Copy from IK Ref", None, -1))
240+
self.pinRefArrayAdd_pushButton.setText(pyqt.fakeTranslate("Form", "<<", None, -1))
241+
self.pinRefArrayRemove_pushButton.setText(pyqt.fakeTranslate("Form", ">>", None, -1))
251242

‎release/scripts/mgear/shifter_epic_components/EPIC_foot_01/__init__.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,7 @@ def connect_leg_2jnt_01(self):
467467
pm.parent(self.root, self.parent_comp.ik_ctl)
468468
pm.parent(self.parent_comp.ik_ref, self.bk_ctl[-1])
469469
pm.parent(self.parent_comp.match_fk2, self.bk_ctl[-1])
470-
pm.parentConstraint(
471-
self.parent_comp.tws2_rot, self.fk_ref, maintainOffset=True
472-
)
470+
pm.parent(self.fk_ref, self.parent_comp.tws2_rot)
473471

474472
# add message connections to parent component.
475473
# this connection will be used to track the ctl relation when IK/FK

0 commit comments

Comments
 (0)