Gltf Importer

.gitignore

@@ -154,3 +154,5 @@ fastlane/report.xml
 fastlane/screenshots
 *.user
 project.lock.json
+/hooks
+/lfs/objects

build/Stride.sln

@@ -335,6 +335,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.Command
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Engine.NoAssets.Tests.Windows", "..\sources\engine\Stride.Engine.NoAssets.Tests\Stride.Engine.NoAssets.Tests.Windows.csproj", "{1C94168A-3C0D-4C6B-883B-91627D2EF3A1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Importer.Gltf", "..\sources\tools\Stride.Importer.Gltf\Stride.Importer.Gltf.csproj", "{69CA1F59-5735-403C-8009-2CE282C72DE6}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\sources\shared\Stride.NuGetResolver\Stride.NuGetResolver.projitems*{00b72ed7-00e9-47f7-868d-8162027cd068}*SharedItemsImports = 13
@@ -1527,6 +1529,18 @@ Global
 		{1C94168A-3C0D-4C6B-883B-91627D2EF3A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1C94168A-3C0D-4C6B-883B-91627D2EF3A1}.Release|Win32.ActiveCfg = Release|Any CPU
 		{1C94168A-3C0D-4C6B-883B-91627D2EF3A1}.Release|Win32.Build.0 = Release|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Debug|Win32.Build.0 = Debug|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Release|Win32.ActiveCfg = Release|Any CPU
+		{69CA1F59-5735-403C-8009-2CE282C72DE6}.Release|Win32.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1654,6 +1668,7 @@ Global
 		{7FA381C8-8EBE-4515-969D-01369CC47D0E} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{83E4E436-659A-4D82-90DD-0DC67BE38D17} = {E4508D15-6503-4A29-ADC4-27B3A5E99545}
 		{1C94168A-3C0D-4C6B-883B-91627D2EF3A1} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
+		{69CA1F59-5735-403C-8009-2CE282C72DE6} = {6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}

sources/engine/Stride.Assets.Models/AssimpAssetImporter.cs

@@ -20,7 +20,7 @@ static AssimpAssetImporter()
         }
 
         // Supported file extensions for this importer
-        internal const string FileExtensions = ".dae;.3ds;.gltf;.glb;.obj;.blend;.x;.md2;.md3;.dxf;.ply;.stl;.stp";
+        internal const string FileExtensions = ".dae;.3ds;.obj;.blend;.x;.md2;.md3;.dxf;.ply;.stl;.stp";
 
         private static readonly Guid Uid = new Guid("30243FC0-CEC7-4433-977E-95DCA29D846E");
 

sources/engine/Stride.Assets.Models/GltfAssetImporter.cs

@@ -0,0 +1,47 @@
+// Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using Stride.Core.Assets;
+using Stride.Core;
+using Stride.Core.Diagnostics;
+using Stride.Core.IO;
+using Stride.Animations;
+using Stride.Assets.Textures;
+using Stride.Importer.Common;
+using Stride.Importer.Gltf;
+using System.Linq;
+
+namespace Stride.Assets.Models
+{
+    public class GltfAssetImporter : ModelAssetImporter
+    {
+
+        // Supported file extensions for this importer
+        internal const string FileExtensions = ".gltf;.glb;";
+
+        private static readonly Guid Uid = new Guid("A5A08530-4856-4EB7-91F8-B0A148B3A627");
+
+        public override Guid Id => Uid;
+
+        public override string Description => "Gltf importer used for creating entities, 3D Models or animations assets";
+
+        public override string SupportedFileExtensions => FileExtensions;
+
+        /// <inheritdoc/>
+        public override EntityInfo GetEntityInfo(UFile localPath, Logger logger, AssetImporterParameters importParameters)
+        {
+
+            return GltfMeshParser.ExtractEntityInfo(SharpGLTF.Schema2.ModelRoot.Load(localPath.FullPath), localPath);
+        }
+
+        /// <inheritdoc/>
+        public override void GetAnimationDuration(UFile localPath, Logger logger, AssetImporterParameters importParameters, out TimeSpan startTime, out TimeSpan endTime)
+        {
+            var gltfFile = SharpGLTF.Schema2.ModelRoot.Load(localPath);
+            endTime = GltfMeshParser.GetAnimationDuration(gltfFile);
+            startTime = CompressedTimeSpan.Zero;
+        }
+
+    }
+}

sources/engine/Stride.Assets.Models/ImportGltfCommand.cs

@@ -0,0 +1,66 @@
+// Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using Stride.Core.BuildEngine;
+using Stride.Core.Serialization.Contents;
+using Stride.Animations;
+using Stride.Rendering;
+using Stride.Importer.Gltf;
+
+namespace Stride.Assets.Models
+{
+    [Description("Import GLTF")]
+    public class ImportGltfCommand : ImportModelCommand
+    {
+        private static string[] supportedExtensions = GltfAssetImporter.FileExtensions.Split(';');
+
+        /// <inheritdoc/>
+        public override string Title { get { string title = "Import GLTF "; try { title += Path.GetFileName(SourcePath) ?? "[File]"; } catch { title += "[INVALID PATH]"; } return title; } }
+
+        public static bool IsSupportingExtensions(string ext)
+        {
+            if (string.IsNullOrEmpty(ext))
+                return false;
+
+            var extToLower = ext.ToLowerInvariant();
+
+            return supportedExtensions.Any(supExt => supExt.Equals(extToLower));
+        }
+
+        protected override Model LoadModel(ICommandContext commandContext, ContentManager contentManager)
+        {
+            var model = GltfMeshParser.LoadGltf(SourcePath);
+            var sceneData = GltfMeshParser.LoadFirstModel(model);
+            return sceneData;
+        }
+
+        protected override Dictionary<string, AnimationClip> LoadAnimation(ICommandContext commandContext, ContentManager contentManager, out TimeSpan duration)
+        {
+            var file = SharpGLTF.Schema2.ModelRoot.Load(SourcePath);
+            var sceneData = GltfMeshParser.ConvertAnimations(file,SourcePath.GetFileNameWithoutExtension());
+            duration = GltfMeshParser.GetAnimationDuration(file);
+            return sceneData;
+        }
+
+        protected override Skeleton LoadSkeleton(ICommandContext commandContext, ContentManager contentManager)
+        {
+            var file = SharpGLTF.Schema2.ModelRoot.Load(SourcePath);
+            var sceneData = GltfAnimationParser.ConvertSkeleton(file);
+            return sceneData;
+        }
+
+        public override bool ShouldSpawnNewProcess()
+        {
+            return true;
+        }
+
+        public override string ToString()
+        {
+            return "Import GLTF " + base.ToString();
+        }
+    }
+}

sources/engine/Stride.Assets.Models/ImportModelCommand.Animation.cs

@@ -26,6 +26,13 @@ public partial class ImportModelCommand
 
         private unsafe object ExportAnimation(ICommandContext commandContext, ContentManager contentManager, bool failOnEmptyAnimation)
         {
+            // Gltf case 
+            if (commandContext.CurrentCommand.Title.ToLower().Contains("gltf"))
+            {
+                var ts = TimeSpan.FromSeconds(1);
+                return LoadAnimation(commandContext, contentManager, out ts);
+            }
+
             // Read from model file
             var modelSkeleton = LoadSkeleton(commandContext, contentManager); // we get model skeleton to compare it to real skeleton we need to map to
             AdjustSkeleton(modelSkeleton);
@@ -42,7 +49,7 @@ private unsafe object ExportAnimation(ICommandContext commandContext, ContentMan
             {
                 foreach (var animationCurve in clip.Value.Curves)
                 {
-                    animationCurve.ShiftKeys(startTime);
+                    animationCurve?.ShiftKeys(startTime);
                 }
             }
 
@@ -76,6 +83,10 @@ private unsafe object ExportAnimation(ICommandContext commandContext, ContentMan
                             {
                                 animationClip.AddCurve($"[TransformComponent.Key]." + channelName.Replace("Transform.", string.Empty), curve);
                             }
+                            else if(channelName.StartsWith("[TransformComponent.Key]"))
+                            {
+                                animationClip.AddCurve(channelName, curve);
+                            }
 
                             // Also apply Camera curves
                             // TODO: Add some other curves?
@@ -140,13 +151,13 @@ private unsafe object ExportAnimation(ICommandContext commandContext, ContentMan
                             foreach (var node in nodesToMerge)
                             {
                                 if (node.Item3 != null)
-                                foreach (var curve in node.Item3.Clip.Curves)
-                                {
-                                    foreach (CompressedTimeSpan time in curve.Keys)
+                                    foreach (var curve in node.Item3.Clip.Curves)
                                     {
-                                        animationKeysSet.Add(time);
+                                        foreach (CompressedTimeSpan time in curve.Keys)
+                                        {
+                                            animationKeysSet.Add(time);
+                                        }
                                     }
-                                }
                             }
 
                             // Sort key times
@@ -170,7 +181,7 @@ private unsafe object ExportAnimation(ICommandContext commandContext, ContentMan
                                 foreach (var node in nodesToMerge)
                                 {
                                     // Needs to be an array in order for it to be modified by the UpdateEngine, otherwise it would get passed by value
-                                    var modelNodeDefinitions = new ModelNodeDefinition[1] {node.Item1};
+                                    var modelNodeDefinitions = new ModelNodeDefinition[1] { node.Item1 };
 
                                     if (node.Item2 != null && node.Item3 != null)
                                     {

sources/engine/Stride.Assets.Models/ImportModelCommand.cs

@@ -28,6 +28,8 @@ public abstract partial class ImportModelCommand : SingleFileImportCommand
 
         public static ImportModelCommand Create(string extension)
         {
+            if (ImportGltfCommand.IsSupportingExtensions(extension))
+                return new ImportGltfCommand();
             if (ImportFbxCommand.IsSupportingExtensions(extension))
                 return new ImportFbxCommand();
             if (ImportAssimpCommand.IsSupportingExtensions(extension))
@@ -90,8 +92,17 @@ protected override async Task<ResultStatus> DoCommandOverride(ICommandContext co
                     commandContext.Logger.Error($"Failed to import file {ContextAsString}.");
                     return ResultStatus.Failed;
                 }
+                if (exportedObject is Dictionary<string, AnimationClip>)
+                {
+                    var exportedObjects = exportedObject as Dictionary<string, AnimationClip>;
+                    foreach (var obj in exportedObjects)
+                        assetManager.Save(obj.Key, obj.Value);
+                }
+                else
+                {
+                    assetManager.Save(Location, exportedObject);
+                }
 
-                assetManager.Save(Location, exportedObject);
 
                 commandContext.Logger.Verbose($"The {ContextAsString} has been successfully imported.");
 
@@ -130,7 +141,7 @@ private Matrix CombineMatricesFromNodeIndices(ModelNodeTransformation[] nodes, i
 
             return result;
         }
-        
+
         protected abstract Model LoadModel(ICommandContext commandContext, ContentManager contentManager);
 
         protected abstract Dictionary<string, AnimationClip> LoadAnimation(ICommandContext commandContext, ContentManager contentManager, out TimeSpan duration);
@@ -172,7 +183,7 @@ private static bool CompareParameters(Model model, Mesh baseMesh, Mesh newMesh)
                 return false;
             return IsSubsetOf(localParams, newMesh.Parameters) && IsSubsetOf(newMesh.Parameters, localParams);
         }
-        
+
         /// <summary>
         /// Compares the shadow options between the two meshes.
         /// </summary>

sources/engine/Stride.Assets.Models/ModelAssetImporter.cs

@@ -100,8 +100,8 @@ public override IEnumerable<AssetItem> Import(UFile localPath, AssetImporterPara
             {
                 TimeSpan startTime, endTime;
                 GetAnimationDuration(localPath, importParameters.Logger, importParameters, out startTime, out endTime);
-
-                ImportAnimation(rawAssetReferences, localPath, entityInfo.AnimationNodes, isImportingModel, skeletonAsset, startTime, endTime);
+                bool isGltfAsset = localPath.GetFileExtension().ToLower().Contains("glb") || localPath.GetFileExtension().ToLower().Contains("gltf");
+                ImportAnimation(rawAssetReferences, localPath, isGltfAsset ? entityInfo.AnimationNames : entityInfo.AnimationNodes, isImportingModel, isGltfAsset, skeletonAsset, startTime, endTime);
             }
 
             // 4. Materials
@@ -141,20 +141,44 @@ private static AssetItem ImportSkeleton(List<AssetItem> assetReferences, UFile a
             return assetItem;
         }
 
-        private static void ImportAnimation(List<AssetItem> assetReferences, UFile localPath, List<string> animationNodes, bool shouldPostFixName, AssetItem skeletonAsset, TimeSpan animationStartTime, TimeSpan animationEndTime)
+        private static void ImportAnimation(List<AssetItem> assetReferences, UFile localPath, List<string> animationNodes, bool shouldPostFixName, bool isGltfAsset, AssetItem skeletonAsset, TimeSpan animationStartTime, TimeSpan animationEndTime)
         {
             if (animationNodes != null && animationNodes.Count > 0)
             {
-                var assetSource = localPath;
+                if (isGltfAsset)
+                {
+                    // Animation nodes in GLTF correspond to animations inside the gltf files, not the bone names in fbx files.
+                    foreach (var anim in animationNodes)
+                    {
+                        var assetSource = localPath;
+
+                        var asset = new AnimationAsset { Source = assetSource, AnimationTimeMaximum = animationEndTime, AnimationTimeMinimum = animationStartTime };
+                        string animUrl = anim + "_Animation";
+
+                        if (skeletonAsset != null)
+                            asset.Skeleton = AttachedReferenceManager.CreateProxyObject<Skeleton>(skeletonAsset.Id, skeletonAsset.Location);
 
-                var asset = new AnimationAsset { Source = assetSource, AnimationTimeMaximum = animationEndTime, AnimationTimeMinimum = animationStartTime };
-                var animUrl = localPath.GetFileNameWithoutExtension() + (shouldPostFixName ? " Animation" : "");
+                        assetReferences.Add(new AssetItem(animUrl, asset));
+                    }
+
+                }
+                else
+                {
 
-                if (skeletonAsset != null)
-                    asset.Skeleton = AttachedReferenceManager.CreateProxyObject<Skeleton>(skeletonAsset.Id, skeletonAsset.Location);
+                    var assetSource = localPath;
 
-                assetReferences.Add(new AssetItem(animUrl, asset));
+                    var asset = new AnimationAsset { Source = assetSource, AnimationTimeMaximum = animationEndTime, AnimationTimeMinimum = animationStartTime };
+                    var animUrl = localPath.GetFileNameWithoutExtension() + (shouldPostFixName ? " Animation" : "");
+
+                    if (skeletonAsset != null)
+                        asset.Skeleton = AttachedReferenceManager.CreateProxyObject<Skeleton>(skeletonAsset.Id, skeletonAsset.Location);
+
+                    assetReferences.Add(new AssetItem(animUrl, asset));
+
+                }
             }
+
+
         }
 
         private static void ImportModel(List<AssetItem> assetReferences, UFile assetSource, UFile localPath, EntityInfo entityInfo, bool shouldPostFixName, AssetItem skeletonAsset)
@@ -190,7 +214,7 @@ private static void ImportModel(List<AssetItem> assetReferences, UFile assetSour
             if (skeletonAsset != null)
                 asset.Skeleton = AttachedReferenceManager.CreateProxyObject<Skeleton>(skeletonAsset.Id, skeletonAsset.Location);
 
-            var modelUrl = new UFile(localPath.GetFileNameWithoutExtension() + (shouldPostFixName?" Model": ""));
+            var modelUrl = new UFile(localPath.GetFileNameWithoutExtension() + (shouldPostFixName ? " Model" : ""));
             var assetItem = new AssetItem(modelUrl, asset);
             assetReferences.Add(assetItem);
         }
@@ -269,7 +293,7 @@ private static void AdjustForTransparency(MaterialAsset material)
             //        var isTransparent = false;
             //        if (material.Parameters.ContainsKey(MaterialParameters.HasTransparency))
             //            isTransparent = (bool)material.Parameters[MaterialParameters.HasTransparency];
-                    
+
             //        if (!isTransparent)
             //        {
             //            // remove the diffuse node

sources/engine/Stride.Assets.Models/Stride.Assets.Models.csproj

@@ -18,6 +18,7 @@
     <ProjectReference Include="..\..\tools\Stride.Importer.Assimp\Stride.Importer.Assimp.vcxproj" PrivateAssets="All" />
     <ProjectReference Include="..\..\tools\Stride.Importer.Common\Stride.Importer.Common.vcxproj" PrivateAssets="All" />
     <ProjectReference Include="..\..\tools\Stride.Importer.FBX\Stride.Importer.FBX.vcxproj" PrivateAssets="All" />
+    <ProjectReference Include="..\..\tools\Stride.Importer.Gltf\Stride.Importer.Gltf.csproj" />
     <ProjectReference Include="..\Stride.Assets\Stride.Assets.csproj" />
   </ItemGroup>
   <ItemGroup>

sources/tools/Stride.Importer.Common/Stride.Importer.Common.cpp

@@ -61,6 +61,7 @@ public ref class EntityInfo
 	List<String^>^ AnimationNodes;
 	List<MeshParameters^>^ Models;
 	List<NodeInfo^>^ Nodes;
+	List<String^>^ AnimationNames;
 };
 
 public ref class MeshMaterials