Showing the changes to interface/src/ModelPropertiesDialog.cpp (1 of 1046 files). Show all
Unified · Split
| @@ -26,11 +26,11 @@ · 25 unmodified lines | |||
| 26 | #include <OffscreenUi.h> | 26 | #include <OffscreenUi.h> |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | ModelPropertiesDialog::ModelPropertiesDialog(const QVariantHash& originalMapping, | 29 | ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping, |
| 30 | const QString& basePath, const FBXGeometry& geometry) : | 30 | const QString& basePath, const HFMModel& hfmModel) : |
| 31 | _originalMapping(originalMapping), | 31 | _originalMapping(originalMapping), |
| 32 | _basePath(basePath), | 32 | _basePath(basePath), |
| 33 | _geometry(geometry) | 33 | _hfmModel(hfmModel) |
| 34 | { | 34 | { |
| 35 | setWindowTitle("Set Model Properties"); | 35 | setWindowTitle("Set Model Properties"); |
| 36 | 36 | ||
| @@ -85,8 +85,8 @@ QVariantHash ModelPropertiesDialog::getMapping() const { · 48 unmodified lines | |||
| 85 | 85 | ||
| 86 | // update the joint indices | 86 | // update the joint indices |
| 87 | QVariantHash jointIndices; | 87 | QVariantHash jointIndices; |
| 88 | for (int i = 0; i < _geometry.joints.size(); i++) { | 88 | for (int i = 0; i < _hfmModel.joints.size(); i++) { |
| 89 | jointIndices.insert(_geometry.joints.at(i).name, QString::number(i)); | 89 | jointIndices.insert(_hfmModel.joints.at(i).name, QString::number(i)); |
| 90 | } | 90 | } |
| 91 | mapping.insert(JOINT_INDEX_FIELD, jointIndices); | 91 | mapping.insert(JOINT_INDEX_FIELD, jointIndices); |
| 92 | 92 | ||
| @@ -139,7 +139,7 @@ void ModelPropertiesDialog::reset() { · 46 unmodified lines | |||
| 139 | } | 139 | } |
| 140 | foreach (const QVariant& joint, _originalMapping.values(FREE_JOINT_FIELD)) { | 140 | foreach (const QVariant& joint, _originalMapping.values(FREE_JOINT_FIELD)) { |
| 141 | QString jointName = joint.toString(); | 141 | QString jointName = joint.toString(); |
| 142 | if (_geometry.jointIndices.contains(jointName)) { | 142 | if (_hfmModel.jointIndices.contains(jointName)) { |
| 143 | createNewFreeJoint(jointName); | 143 | createNewFreeJoint(jointName); |
| 144 | } | 144 | } |
| 145 | } | 145 | } |
| @@ -195,8 +195,8 @@ QComboBox* ModelPropertiesDialog::createJointBox(bool withNone) const { · 49 unmodified lines | |||
| 195 | if (withNone) { | 195 | if (withNone) { |
| 196 | box->addItem("(none)"); | 196 | box->addItem("(none)"); |
| 197 | } | 197 | } |
| 198 | foreach (const FBXJoint& joint, _geometry.joints) { | 198 | foreach (const HFMJoint& joint, _hfmModel.joints) { |
| 199 | if (joint.isSkeletonJoint || !_geometry.hasSkeletonJoints) { | 199 | if (joint.isSkeletonJoint || !_hfmModel.hasSkeletonJoints) { |
| 200 | box->addItem(joint.name); | 200 | box->addItem(joint.name); |
| 201 | } | 201 | } |
| 202 | } | 202 | } |
| @@ -212,7 +212,7 @@ QDoubleSpinBox* ModelPropertiesDialog::createTranslationBox() const { · 9 unmodified lines | |||
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | void ModelPropertiesDialog::insertJointMapping(QVariantHash& joints, const QString& joint, const QString& name) const { | 214 | void ModelPropertiesDialog::insertJointMapping(QVariantHash& joints, const QString& joint, const QString& name) const { |
| 215 | if (_geometry.jointIndices.contains(name)) { | 215 | if (_hfmModel.jointIndices.contains(name)) { |
| 216 | joints.insert(joint, name); | 216 | joints.insert(joint, name); |
| 217 | } else { | 217 | } else { |
| 218 | joints.remove(joint); | 218 | joints.remove(joint); |