Showing the changes to interface/src/ModelUploader.cpp (1 of 1 file). Show all
Unified · Split
| @@ -196,39 +196,56 @@ bool ModelUploader::zip() { · 195 unmodified lines | |||
| 196 | // mixamo blendshapes | 196 | // mixamo blendshapes |
| 197 | if (!mapping.contains(BLENDSHAPE_FIELD) && geometry.applicationName == "mixamo.com") { | 197 | if (!mapping.contains(BLENDSHAPE_FIELD) && geometry.applicationName == "mixamo.com") { |
| 198 | QVariantHash blendshapes; | 198 | QVariantHash blendshapes; |
| 199 | blendshapes.insert("EyeBlink_L", QVariantList() << "Blink_Left" << 1.0); | 199 | blendshapes.insertMulti("BrowsD_L", QVariantList() << "BrowsDown_Left" << 1.0); |
| 200 | blendshapes.insert("EyeBlink_R", QVariantList() << "Blink_Right" << 1.0); | 200 | blendshapes.insertMulti("BrowsD_R", QVariantList() << "BrowsDown_Right" << 1.0); |
| 201 | blendshapes.insert("EyeSquint_L", QVariantList() << "Squint_Left" << 1.0); | 201 | blendshapes.insertMulti("BrowsU_C", QVariantList() << "BrowsUp_Left" << 1.0); |
| 202 | blendshapes.insert("EyeSquint_R", QVariantList() << "Squint_Right" << 1.0); | 202 | blendshapes.insertMulti("BrowsU_C", QVariantList() << "BrowsUp_Right" << 1.0); |
| 203 | blendshapes.insert("EyeOpen_L", QVariantList() << "EyesWide_Left" << 1.0); | 203 | blendshapes.insertMulti("BrowsU_L", QVariantList() << "BrowsUp_Left" << 1.0); |
| 204 | blendshapes.insert("EyeOpen_R", QVariantList() << "EyesWide_Right" << 1.0); | 204 | blendshapes.insertMulti("BrowsU_R", QVariantList() << "BrowsUp_Right" << 1.0); |
| 205 | blendshapes.insert("BrowsD_L", QVariantList() << "BrowsDown_Left" << 1.0); | 205 | blendshapes.insertMulti("ChinLowerRaise", QVariantList() << "Jaw_Up" << 1.0); |
| 206 | blendshapes.insert("BrowsD_R", QVariantList() << "BrowsDown_Right" << 1.0); | 206 | blendshapes.insertMulti("ChinUpperRaise", QVariantList() << "UpperLipUp_Left" << 0.5); |
| 207 | blendshapes.insert("BrowsU_L", QVariantList() << "BrowsUp_Left" << 1.0); | 207 | blendshapes.insertMulti("ChinUpperRaise", QVariantList() << "UpperLipUp_Right" << 0.5); |
| 208 | blendshapes.insert("BrowsU_R", QVariantList() << "BrowsUp_Right" << 1.0); | 208 | blendshapes.insertMulti("EyeBlink_L", QVariantList() << "Blink_Left" << 1.0); |
| 209 | blendshapes.insert("JawFwd", QVariantList() << "JawForeward" << 1.0); | 209 | blendshapes.insertMulti("EyeBlink_R", QVariantList() << "Blink_Right" << 1.0); |
| 210 | blendshapes.insert("JawOpen", QVariantList() << "Jaw_Down" << 1.0); | 210 | blendshapes.insertMulti("EyeOpen_L", QVariantList() << "EyesWide_Left" << 1.0); |
| 211 | blendshapes.insert("JawLeft", QVariantList() << "Jaw_Left" << 1.0); | 211 | blendshapes.insertMulti("EyeOpen_R", QVariantList() << "EyesWide_Right" << 1.0); |
| 212 | blendshapes.insert("JawRight", QVariantList() << "Jaw_Right" << 1.0); | 212 | blendshapes.insertMulti("EyeSquint_L", QVariantList() << "Squint_Left" << 1.0); |
| 213 | blendshapes.insert("JawChew", QVariantList() << "Jaw_Up" << 1.0); | 213 | blendshapes.insertMulti("EyeSquint_R", QVariantList() << "Squint_Right" << 1.0); |
| 214 | blendshapes.insert("MouthLeft", QVariantList() << "Midmouth_Left" << 1.0); | 214 | blendshapes.insertMulti("JawFwd", QVariantList() << "JawForeward" << 1.0); |
| 215 | blendshapes.insert("MouthRight", QVariantList() << "Midmouth_Right" << 1.0); | 215 | blendshapes.insertMulti("JawLeft", QVariantList() << "JawRotateY_Left" << 0.5); |
| 216 | blendshapes.insert("MouthFrown_L", QVariantList() << "Frown_Left" << 1.0); | 216 | blendshapes.insertMulti("JawOpen", QVariantList() << "MouthOpen" << 0.7); |
| 217 | blendshapes.insert("MouthFrown_R", QVariantList() << "Frown_Right" << 1.0); | 217 | blendshapes.insertMulti("JawRight", QVariantList() << "Jaw_Right" << 1.0); |
| 218 | blendshapes.insert("MouthSmile_L", QVariantList() << "Smile_Left" << 1.0); | 218 | blendshapes.insertMulti("LipsFunnel", QVariantList() << "JawForeward" << 0.39); |
| 219 | blendshapes.insert("MouthSmile_R", QVariantList() << "Smile_Right" << 1.0); | 219 | blendshapes.insertMulti("LipsFunnel", QVariantList() << "Jaw_Down" << 0.36); |
| 220 | blendshapes.insert("LipsUpperUp", QVariantList() << "UpperLipUp_Left" << 0.5); | 220 | blendshapes.insertMulti("LipsFunnel", QVariantList() << "MouthNarrow_Left" << 1.0); |
| 221 | blendshapes.insertMulti("LipsUpperUp", QVariantList() << "UpperLipUp_Right" << 0.5); | 221 | blendshapes.insertMulti("LipsFunnel", QVariantList() << "MouthNarrow_Right" << 1.0); |
| 222 | blendshapes.insert("Puff", QVariantList() << "CheekPuff_Left" << 0.5); | 222 | blendshapes.insertMulti("LipsFunnel", QVariantList() << "MouthWhistle_NarrowAdjust_Left" << 0.5); |
| 223 | blendshapes.insertMulti("Puff", QVariantList() << "CheekPuff_Right" << 0.5); | 223 | blendshapes.insertMulti("LipsFunnel", QVariantList() << "MouthWhistle_NarrowAdjust_Right" << 0.5); |
| 224 | blendshapes.insert("Sneer", QVariantList() << "NoseScrunch_Left" << 0.5); | 224 | blendshapes.insertMulti("LipsFunnel", QVariantList() << "TongueUp" << 1.0); |
| 225 | blendshapes.insertMulti("Sneer", QVariantList() << "NoseScrunch_Right" << 0.5); | 225 | blendshapes.insertMulti("LipsLowerClose", QVariantList() << "LowerLipIn" << 1.0); |
| 226 | blendshapes.insert("CheekSquint_L", QVariantList() << "Squint_Left" << 1.0); | 226 | blendshapes.insertMulti("LipsLowerDown", QVariantList() << "LowerLipDown_Left" << 0.7); |
| 227 | blendshapes.insert("CheekSquint_R", QVariantList() << "Squint_Right" << 1.0); | 227 | blendshapes.insertMulti("LipsLowerDown", QVariantList() << "LowerLipDown_Right" << 0.7); |
| 228 | blendshapes.insert("LipsPucker", QVariantList() << "MouthNarrow_Left" << 0.5); | 228 | blendshapes.insertMulti("LipsLowerOpen", QVariantList() << "LowerLipOut" << 1.0); |
| 229 | blendshapes.insertMulti("LipsPucker", QVariantList() << "MouthNarrow_Right" << 0.5); | 229 | blendshapes.insertMulti("LipsPucker", QVariantList() << "MouthNarrow_Left" << 1.0); |
| 230 | blendshapes.insert("LipsLowerDown", QVariantList() << "LowerLipDown_Left" << 0.5); | 230 | blendshapes.insertMulti("LipsPucker", QVariantList() << "MouthNarrow_Right" << 1.0); |
| 231 | blendshapes.insertMulti("LipsLowerDown", QVariantList() << "LowerLipDown_Right" << 0.5); | 231 | blendshapes.insertMulti("LipsUpperClose", QVariantList() << "UpperLipIn" << 1.0); |
| 232 | blendshapes.insertMulti("LipsUpperOpen", QVariantList() << "UpperLipOut" << 1.0); | ||
| 233 | blendshapes.insertMulti("LipsUpperUp", QVariantList() << "UpperLipUp_Left" << 0.7); | ||
| 234 | blendshapes.insertMulti("LipsUpperUp", QVariantList() << "UpperLipUp_Right" << 0.7); | ||
| 235 | blendshapes.insertMulti("MouthDimple_L", QVariantList() << "Smile_Left" << 0.25); | ||
| 236 | blendshapes.insertMulti("MouthDimple_R", QVariantList() << "Smile_Right" << 0.25); | ||
| 237 | blendshapes.insertMulti("MouthFrown_L", QVariantList() << "Frown_Left" << 1.0); | ||
| 238 | blendshapes.insertMulti("MouthFrown_R", QVariantList() << "Frown_Right" << 1.0); | ||
| 239 | blendshapes.insertMulti("MouthLeft", QVariantList() << "Midmouth_Left" << 1.0); | ||
| 240 | blendshapes.insertMulti("MouthRight", QVariantList() << "Midmouth_Right" << 1.0); | ||
| 241 | blendshapes.insertMulti("MouthSmile_L", QVariantList() << "Smile_Left" << 1.0); | ||
| 242 | blendshapes.insertMulti("MouthSmile_R", QVariantList() << "Smile_Right" << 1.0); | ||
| 243 | blendshapes.insertMulti("Puff", QVariantList() << "CheekPuff_Left" << 1.0); | ||
| 244 | blendshapes.insertMulti("Puff", QVariantList() << "CheekPuff_Right" << 1.0); | ||
| 245 | blendshapes.insertMulti("Sneer", QVariantList() << "NoseScrunch_Left" << 0.75); | ||
| 246 | blendshapes.insertMulti("Sneer", QVariantList() << "NoseScrunch_Right" << 0.75); | ||
| 247 | blendshapes.insertMulti("Sneer", QVariantList() << "Squint_Left" << 0.5); | ||
| 248 | blendshapes.insertMulti("Sneer", QVariantList() << "Squint_Right" << 0.5); | ||
| 232 | mapping.insert(BLENDSHAPE_FIELD, blendshapes); | 249 | mapping.insert(BLENDSHAPE_FIELD, blendshapes); |
| 233 | } | 250 | } |
| 234 | 251 | ||