added import options: import BlendShape Names

KhronosGroup · Sep 12, 2023 · 1d78e17 · 1d78e17
1 parent d8e9909
commit 1d78e17
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/Editor/Scripts/GLTFImporter.cs b/Editor/Scripts/GLTFImporter.cs
@@ -89,6 +89,8 @@ private static void EnsureShadersAreLoaded()
         [SerializeField] internal bool _generateColliders = false;
         [SerializeField] internal bool _swapUvs = false;
         [SerializeField] internal bool _generateLightmapUVs = false;
+	    [Tooltip("When false, the index of the BlendShape is used as name.")]
+        [SerializeField] internal bool _importBlendShapeNames = true;
         [SerializeField] internal GLTFImporterNormals _importNormals = GLTFImporterNormals.Import;
         [SerializeField] internal GLTFImporterNormals _importTangents = GLTFImporterNormals.Import;
         [SerializeField] internal AnimationMethod _importAnimations = AnimationMethod.Mecanim;
@@ -797,7 +799,8 @@ private static void UpdateColorSpace()
 			    ImportContext = context,
 			    SwapUVs = _swapUvs,
 			    ImportNormals = _importNormals,
-			    ImportTangents = _importTangents
+			    ImportTangents = _importTangents,
+			    ImportBlendShapeNames = _importBlendShapeNames
 		    };
 
 		    using (var stream = File.OpenRead(projectFilePath))

diff --git a/Editor/Scripts/GLTFImporterInspector.cs b/Editor/Scripts/GLTFImporterInspector.cs
@@ -77,6 +77,8 @@ private void ModelInspectorGUI()
 			EditorGUILayout.LabelField("Meshes", EditorStyles.boldLabel);
 			EditorGUILayout.PropertyField(serializedObject.FindProperty(nameof(GLTFImporter._readWriteEnabled)), new GUIContent("Read/Write"));
 			EditorGUILayout.PropertyField(serializedObject.FindProperty(nameof(GLTFImporter._generateColliders)));
+			EditorGUILayout.PropertyField(serializedObject.FindProperty(nameof(GLTFImporter._importBlendShapeNames)));
+
 			EditorGUILayout.Separator();
 
 			EditorGUILayout.LabelField("Geometry", EditorStyles.boldLabel);

diff --git a/Runtime/Scripts/GLTFSceneImporter.cs b/Runtime/Scripts/GLTFSceneImporter.cs
@@ -44,6 +44,7 @@ public class ImportOptions
 		public bool SwapUVs = false;
 		public GLTFImporterNormals ImportNormals = GLTFImporterNormals.Import;
 		public GLTFImporterNormals ImportTangents = GLTFImporterNormals.Import;
+		public bool ImportBlendShapeNames = true;
 
 #if UNITY_EDITOR
 		public GLTFImportContext ImportContext = new GLTFImportContext(null, new List<GltfImportPluginContext>());

diff --git a/Runtime/Scripts/SceneImporter/ImporterAnimation.cs b/Runtime/Scripts/SceneImporter/ImporterAnimation.cs
@@ -311,7 +311,7 @@ protected async Task<AnimationClip> ConstructClip(Transform root, int animationI
 							var targetNames = prim.TargetNames;
 							propertyNames = new string[targetCount];
 							for (var i = 0; i < targetCount; i++)
-								propertyNames[i] = "blendShape." + (targetNames != null ? targetNames[i] : ("Morphtarget" + i));
+								propertyNames[i] = _options.ImportBlendShapeNames ? ("blendShape." + (targetNames != null ? targetNames[i] : ("Morphtarget" + i))) : i.ToString();
 
 							var frameFloats = new float[targetCount];
 

diff --git a/Runtime/Scripts/SceneImporter/ImporterMeshes.cs b/Runtime/Scripts/SceneImporter/ImporterMeshes.cs
@@ -511,7 +511,7 @@ private void AddBlendShapesToMesh(UnityMeshData unityMeshData, int meshIndex, Me
 				var firstPrim = _gltfRoot.Meshes[meshIndex].Primitives[0];
 				for (int i = 0; i < firstPrim.Targets.Count; i++)
 				{
-					var targetName = firstPrim.TargetNames != null ? firstPrim.TargetNames[i] : $"Morphtarget{i}";
+					var targetName = _options.ImportBlendShapeNames ? (firstPrim.TargetNames != null ? firstPrim.TargetNames[i] : $"Morphtarget{i}") : i.ToString();
 					mesh.AddBlendShapeFrame(targetName, 1f,
 						unityMeshData.MorphTargetVertices[i],
 						unityMeshData.MorphTargetNormals != null ? unityMeshData.MorphTargetNormals[i] : null,