com.atteneder.gltfast Release 6.10.3

atteneder · atteneder · commit c9133ffdf9cf · 2025-05-22T13:59:05.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.10.3] - 2025-02-21
+
+### Added
+
+### Changed
+
+### Fixed
+- (Import) Morph targets on multi-primitive meshes (where primitives reference identical vertex buffers; fixes [#755](https://github.com/atteneder/glTFast/issues/755)).
+
+### Removed
+
+### Deprecated
+
+### Security
+
 ## [6.10.2] - 2025-02-03
 
 ### Added
@@ -25,12 +40,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - (CI) Ensuring the development documentation and the `Tools` code is checked for code formatting as well.
 - Compilation for `ICodeLogger` implementors by adding a default implementation for `Log` (works for Unity 2021 LTS and newer).
 
-### Removed
-
-### Deprecated
-
-### Security
-
 ## [6.10.1] - 2025-01-09
 
 ### Added
diff --git a/Documentation~/features.md b/Documentation~/features.md
@@ -102,6 +102,7 @@ glTF defines an [extension mechanism][gltf-ext] that allows the base format to b
 | KHR_lights_punctual | ✅ | ✅
 | KHR_materials_anisotropy | | |
 | KHR_materials_clearcoat | ✅ | ✅
+| KHR_materials_diffuse_transmission | | |
 | KHR_materials_dispersion | | |
 | KHR_materials_emissive_strength | | |
 | KHR_materials_ior | [ℹ️][IOR] |
diff --git a/Editor/Scripts/AssemblyInfo.cs.meta b/Editor/Scripts/AssemblyInfo.cs.meta
diff --git a/Runtime/Scripts/DracoMeshGenerator.cs b/Runtime/Scripts/DracoMeshGenerator.cs
@@ -115,7 +115,7 @@ GltfImportBase gltfImport
             vertexIntervals[vertexIntervals.Length-1] = vertexCount;
             m_MorphTargetsGenerator = new MorphTargetsGenerator(
                 vertexCount,
-                vertexIntervals,
+                1,
                 morphTargets.Length,
                 morphTargetNames,
                 morphTargets[0].NORMAL >= 0,
@@ -128,7 +128,7 @@ GltfImportBase gltfImport
                 for (var morphTargetIndex = 0; morphTargetIndex < primitive.targets.Length; morphTargetIndex++)
                 {
                     var target = primitive.targets[morphTargetIndex];
-                    m_MorphTargetsGenerator.AddMorphTarget(subMesh, morphTargetIndex, target);
+                    m_MorphTargetsGenerator.AddMorphTarget( 0, morphTargetIndex, target);
                 }
             }
         }
diff --git a/Runtime/Scripts/Export/Constants.cs b/Runtime/Scripts/Export/Constants.cs
@@ -7,7 +7,7 @@ namespace GLTFast.Export
 {
     static class Constants
     {
-        public const string version = "6.10.2";
+        public const string version = "6.10.3";
 
         internal const string mimeTypePNG = "image/png";
         internal const string mimeTypeJPG = "image/jpeg";
diff --git a/Runtime/Scripts/MeshGenerator.cs b/Runtime/Scripts/MeshGenerator.cs
@@ -174,7 +174,7 @@ GltfImportBase gltfImport
             {
                 m_MorphTargetsGenerator = new MorphTargetsGenerator(
                     m_VertexData.VertexCount,
-                    m_VertexData.VertexIntervals,
+                    m_Primitives.Count,
                     morphTargets.Length,
                     morphTargetNames,
                     hasNormals,
@@ -278,12 +278,15 @@ async Task<Mesh> GenerateMesh(GltfImportBase gltfImport)
                     CalculateIndicesJob(primitive, vertexCount, out m_Indices[subMeshIndex], out var job);
                     tmpList.Add(job);
                 }
-
-                AddMorphTargets(subMeshIndex, primitive, gltfImport.Logger);
             }
 
             if (m_MorphTargetsGenerator != null)
             {
+                for (var subMeshIndex = 0; subMeshIndex < m_Primitives.Count; subMeshIndex++)
+                {
+                    var primitive = m_Primitives[subMeshIndex];
+                    AddMorphTargets(subMeshIndex, primitive, gltfImport.Logger);
+                }
                 tmpList.Add(m_MorphTargetsGenerator.GetJobHandle());
             }
 
@@ -296,11 +299,12 @@ void AddMorphTargets(int subMesh, MeshPrimitiveBase primitive, ICodeLogger logge
         {
             if (m_MorphTargetsGenerator == null)
                 return;
+            var vertexOffset = m_VertexData.VertexIntervals[subMesh];
             for (var morphTargetIndex = 0; morphTargetIndex < primitive.targets.Length; morphTargetIndex++)
             {
                 var morphTarget = primitive.targets[morphTargetIndex];
                 var success = m_MorphTargetsGenerator.AddMorphTarget(
-                    subMesh,
+                    vertexOffset,
                     morphTargetIndex,
                     morphTarget
                 );
diff --git a/Runtime/Scripts/MorphTargetsGenerator.cs b/Runtime/Scripts/MorphTargetsGenerator.cs
@@ -17,7 +17,6 @@ namespace GLTFast
 
     class MorphTargetsGenerator
     {
-        readonly int[] m_VertexIntervals;
         readonly string[] m_MorphTargetNames;
         readonly GltfImportBase m_GltfImport;
 
@@ -26,19 +25,17 @@ class MorphTargetsGenerator
 
         public MorphTargetsGenerator(
             int vertexCount,
-            int[] vertexIntervals,
+            int subMeshCount,
             int morphTargetCount,
             string[] morphTargetNames,
             bool hasNormals,
             bool hasTangents,
             GltfImportBase gltfImport
             )
         {
-            m_VertexIntervals = vertexIntervals;
             m_MorphTargetNames = morphTargetNames;
             m_GltfImport = gltfImport;
 
-            var subMeshCount = vertexIntervals.Length - 1;
             m_Contexts = new MorphTargetGenerator[morphTargetCount];
             for (var i = 0; i < morphTargetCount; i++)
             {
@@ -48,13 +45,12 @@ GltfImportBase gltfImport
         }
 
         public bool AddMorphTarget(
-            int subMesh,
+            int offset,
             int morphTargetIndex,
             MorphTarget morphTarget
             )
         {
             var morphTargetGenerator = m_Contexts[morphTargetIndex];
-            var offset = m_VertexIntervals[subMesh];
             var jobHandle = morphTargetGenerator.ScheduleMorphTargetJobs(
                 morphTarget,
                 offset,
diff --git a/gltfast.patch b/gltfast.patch
diff --git a/gltfast.patch.meta b/gltfast.patch.meta
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.atteneder.gltfast",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "displayName": "glTFast",
   "description": "Use glTFast to import and export glTF 3D files efficiently at runtime or in the Editor",
   "unity": "2020.3",

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ GltfImportBase gltfImport`
`115`	`115`	`vertexIntervals[vertexIntervals.Length-1] = vertexCount;`
`116`	`116`	`m_MorphTargetsGenerator = new MorphTargetsGenerator(`
`117`	`117`	`vertexCount,`
`118`		`- vertexIntervals,`
	`118`	`+ 1,`
`119`	`119`	`morphTargets.Length,`
`120`	`120`	`morphTargetNames,`
`121`	`121`	`morphTargets[0].NORMAL >= 0,`
`@@ -128,7 +128,7 @@ GltfImportBase gltfImport`
`128`	`128`	`for (var morphTargetIndex = 0; morphTargetIndex < primitive.targets.Length; morphTargetIndex++)`
`129`	`129`	`{`
`130`	`130`	`var target = primitive.targets[morphTargetIndex];`
`131`		`- m_MorphTargetsGenerator.AddMorphTarget(subMesh, morphTargetIndex, target);`
	`131`	`+ m_MorphTargetsGenerator.AddMorphTarget( 0, morphTargetIndex, target);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace GLTFast.Export`
`7`	`7`	`{`
`8`	`8`	`static class Constants`
`9`	`9`	`{`
`10`		`- public const string version = "6.10.2";`
	`10`	`+ public const string version = "6.10.3";`
`11`	`11`
`12`	`12`	`internal const string mimeTypePNG = "image/png";`
`13`	`13`	`internal const string mimeTypeJPG = "image/jpeg";`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ GltfImportBase gltfImport`
`174`	`174`	`{`
`175`	`175`	`m_MorphTargetsGenerator = new MorphTargetsGenerator(`
`176`	`176`	`m_VertexData.VertexCount,`
`177`		`- m_VertexData.VertexIntervals,`
	`177`	`+ m_Primitives.Count,`
`178`	`178`	`morphTargets.Length,`
`179`	`179`	`morphTargetNames,`
`180`	`180`	`hasNormals,`
`@@ -278,12 +278,15 @@ async Task<Mesh> GenerateMesh(GltfImportBase gltfImport)`
`278`	`278`	`CalculateIndicesJob(primitive, vertexCount, out m_Indices[subMeshIndex], out var job);`
`279`	`279`	`tmpList.Add(job);`
`280`	`280`	`}`
`281`		`-`
`282`		`- AddMorphTargets(subMeshIndex, primitive, gltfImport.Logger);`
`283`	`281`	`}`
`284`	`282`
`285`	`283`	`if (m_MorphTargetsGenerator != null)`
`286`	`284`	`{`
	`285`	`+ for (var subMeshIndex = 0; subMeshIndex < m_Primitives.Count; subMeshIndex++)`
	`286`	`+ {`
	`287`	`+ var primitive = m_Primitives[subMeshIndex];`
	`288`	`+ AddMorphTargets(subMeshIndex, primitive, gltfImport.Logger);`
	`289`	`+ }`
`287`	`290`	`tmpList.Add(m_MorphTargetsGenerator.GetJobHandle());`
`288`	`291`	`}`
`289`	`292`
`@@ -296,11 +299,12 @@ void AddMorphTargets(int subMesh, MeshPrimitiveBase primitive, ICodeLogger logge`
`296`	`299`	`{`
`297`	`300`	`if (m_MorphTargetsGenerator == null)`
`298`	`301`	`return;`
	`302`	`+ var vertexOffset = m_VertexData.VertexIntervals[subMesh];`
`299`	`303`	`for (var morphTargetIndex = 0; morphTargetIndex < primitive.targets.Length; morphTargetIndex++)`
`300`	`304`	`{`
`301`	`305`	`var morphTarget = primitive.targets[morphTargetIndex];`
`302`	`306`	`var success = m_MorphTargetsGenerator.AddMorphTarget(`
`303`		`- subMesh,`
	`307`	`+ vertexOffset,`
`304`	`308`	`morphTargetIndex,`
`305`	`309`	`morphTarget`
`306`	`310`	`);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ namespace GLTFast`
`17`	`17`
`18`	`18`	`class MorphTargetsGenerator`
`19`	`19`	`{`
`20`		`- readonly int[] m_VertexIntervals;`
`21`	`20`	`readonly string[] m_MorphTargetNames;`
`22`	`21`	`readonly GltfImportBase m_GltfImport;`
`23`	`22`
`@@ -26,19 +25,17 @@ class MorphTargetsGenerator`
`26`	`25`
`27`	`26`	`public MorphTargetsGenerator(`
`28`	`27`	`int vertexCount,`
`29`		`- int[] vertexIntervals,`
	`28`	`+ int subMeshCount,`
`30`	`29`	`int morphTargetCount,`
`31`	`30`	`string[] morphTargetNames,`
`32`	`31`	`bool hasNormals,`
`33`	`32`	`bool hasTangents,`
`34`	`33`	`GltfImportBase gltfImport`
`35`	`34`	`)`
`36`	`35`	`{`
`37`		`- m_VertexIntervals = vertexIntervals;`
`38`	`36`	`m_MorphTargetNames = morphTargetNames;`
`39`	`37`	`m_GltfImport = gltfImport;`
`40`	`38`
`41`		`- var subMeshCount = vertexIntervals.Length - 1;`
`42`	`39`	`m_Contexts = new MorphTargetGenerator[morphTargetCount];`
`43`	`40`	`for (var i = 0; i < morphTargetCount; i++)`
`44`	`41`	`{`
`@@ -48,13 +45,12 @@ GltfImportBase gltfImport`
`48`	`45`	`}`
`49`	`46`
`50`	`47`	`public bool AddMorphTarget(`
`51`		`- int subMesh,`
	`48`	`+ int offset,`
`52`	`49`	`int morphTargetIndex,`
`53`	`50`	`MorphTarget morphTarget`
`54`	`51`	`)`
`55`	`52`	`{`
`56`	`53`	`var morphTargetGenerator = m_Contexts[morphTargetIndex];`
`57`		`- var offset = m_VertexIntervals[subMesh];`
`58`	`54`	`var jobHandle = morphTargetGenerator.ScheduleMorphTargetJobs(`
`59`	`55`	`morphTarget,`
`60`	`56`	`offset,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.atteneder.gltfast",`
`3`		`- "version": "6.10.2",`
	`3`	`+ "version": "6.10.3",`
`4`	`4`	`"displayName": "glTFast",`
`5`	`5`	`"description": "Use glTFast to import and export glTF 3D files efficiently at runtime or in the Editor",`
`6`	`6`	`"unity": "2020.3",`