Added animation loop time setting

Siccity · Nov 14, 2020 · 703b004 · 703b004
1 parent 695ab4d
commit 703b004
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 10 deletions.
diff --git a/Scripts/Editor/GLBImporter.cs b/Scripts/Editor/GLBImporter.cs
@@ -11,7 +11,7 @@ public override void OnImportAsset(AssetImportContext ctx) {
 			if (importSettings == null) importSettings = new ImportSettings();
 			GameObject root = Importer.LoadFromFile(ctx.assetPath, importSettings, out animations, Format.GLB);
 			// Save asset
-			GLTFAssetUtility.SaveToAsset(root, animations, ctx, importSettings.generateLightmapUVs);
+			GLTFAssetUtility.SaveToAsset(root, animations, ctx, importSettings);
 		}
 	}
 }
diff --git a/Scripts/Editor/GLTFAssetUtility.cs b/Scripts/Editor/GLTFAssetUtility.cs
@@ -7,7 +7,7 @@
 namespace Siccity.GLTFUtility {
 	/// <summary> Contains methods for saving a gameobject as an asset </summary>
 	public static class GLTFAssetUtility {
-		public static void SaveToAsset(GameObject root, AnimationClip[] animations, AssetImportContext ctx, bool generateLightmapUVs) {
+		public static void SaveToAsset(GameObject root, AnimationClip[] animations, AssetImportContext ctx, ImportSettings settings) {
 #if UNITY_2018_2_OR_NEWER
 			ctx.AddObjectToAsset("main", root);
 			ctx.SetMainObject(root);
@@ -17,9 +17,9 @@ public static void SaveToAsset(GameObject root, AnimationClip[] animations, Asse
 			MeshRenderer[] renderers = root.GetComponentsInChildren<MeshRenderer>(true);
 			SkinnedMeshRenderer[] skinnedRenderers = root.GetComponentsInChildren<SkinnedMeshRenderer>(true);
 			MeshFilter[] filters = root.GetComponentsInChildren<MeshFilter>(true);
-			AddMeshes(filters, skinnedRenderers, ctx, generateLightmapUVs);
+			AddMeshes(filters, skinnedRenderers, ctx, settings.generateLightmapUVs);
 			AddMaterials(renderers, skinnedRenderers, ctx);
-			AddAnimations(animations, ctx);
+			AddAnimations(animations, ctx, settings.animationSettings);
 		}
 
 		public static void AddMeshes(MeshFilter[] filters, SkinnedMeshRenderer[] skinnedRenderers, AssetImportContext ctx, bool generateLightmapUVs) {
@@ -39,8 +39,16 @@ public static void AddMeshes(MeshFilter[] filters, SkinnedMeshRenderer[] skinned
 			}
 		}
 
-		public static void AddAnimations(AnimationClip[] animations, AssetImportContext ctx) {
+		public static void AddAnimations(AnimationClip[] animations, AssetImportContext ctx, AnimationSettings settings) {
 			if (animations == null) return;
+
+			// Editor-only animation settings
+			foreach (AnimationClip clip in animations) {
+				AnimationClipSettings clipSettings = AnimationUtility.GetAnimationClipSettings(clip);
+				clipSettings.loopTime = settings.looping;
+				AnimationUtility.SetAnimationClipSettings(clip, clipSettings);
+			}
+
 			HashSet<AnimationClip> visitedAnimations = new HashSet<AnimationClip>();
 			for (int i = 0; i < animations.Length; i++) {
 				AnimationClip clip = animations[i];

diff --git a/Scripts/Editor/GLTFImporter.cs b/Scripts/Editor/GLTFImporter.cs
@@ -1,4 +1,5 @@
-using UnityEditor.Experimental.AssetImporters;
+using UnityEditor;
+using UnityEditor.Experimental.AssetImporters;
 using UnityEngine;
 
 namespace Siccity.GLTFUtility {
@@ -12,8 +13,9 @@ public override void OnImportAsset(AssetImportContext ctx) {
 			AnimationClip[] animations;
 			if (importSettings == null) importSettings = new ImportSettings();
 			GameObject root = Importer.LoadFromFile(ctx.assetPath, importSettings, out animations, Format.GLTF);
+
 			// Save asset
-			GLTFAssetUtility.SaveToAsset(root, animations, ctx, importSettings.generateLightmapUVs);
+			GLTFAssetUtility.SaveToAsset(root, animations, ctx, importSettings);
 		}
 	}
 }
diff --git a/Scripts/Settings/AnimationSettings.cs b/Scripts/Settings/AnimationSettings.cs
@@ -0,0 +1,11 @@
+using System;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace Siccity.GLTFUtility {
+	/// <summary> Defines how animations are imported </summary>
+	[Serializable]
+	public class AnimationSettings {
+		public bool looping;
+	}
+}
diff --git a/Scripts/Settings/AnimationSettings.cs.meta b/Scripts/Settings/AnimationSettings.cs.meta
diff --git a/Scripts/Settings/ImportSettings.cs b/Scripts/Settings/ImportSettings.cs
@@ -11,6 +11,7 @@ public class ImportSettings {
 		public bool materials = true;
 		[FormerlySerializedAs("shaders")]
 		public ShaderSettings shaderOverrides = new ShaderSettings();
+		public AnimationSettings animationSettings = new AnimationSettings();
 		public bool useLegacyClips;
 		public bool generateLightmapUVs;
 

diff --git a/Scripts/Spec/GLTFAnimation.cs b/Scripts/Spec/GLTFAnimation.cs
@@ -56,9 +56,7 @@ public ImportResult Import(GLTFAccessor.ImportResult[] accessors, GLTFNode.Impor
 			result.clip = new AnimationClip();
 			result.clip.name = name;
 
-			if (importSettings.useLegacyClips) {
-				result.clip.legacy = true;
-			}
+			result.clip.legacy = importSettings.useLegacyClips;
 
 			for (int i = 0; i < channels.Length; i++) {
 				Channel channel = channels[i];