fix Quaternion/Vector4 mismatch, fix nullref in key access

KhronosGroup · Oct 19, 2022 · 0404941 · 0404941
1 parent 15b31c9
commit 0404941
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneExporter/ExporterAnimation.cs b/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneExporter/ExporterAnimation.cs
@@ -823,7 +823,7 @@ private bool BakePropertyAnimation(PropertyCurve prop, float length, float bakin
 				if (i == nbSamples - 1) t = length;
 
 				for (var k = 0; k < curveCount; k++)
-					while (keyframes[k][keyframeIndex[k]].time < t)
+					while (keyframeIndex[k] < keyframes[k].Length - 1 && keyframes[k][keyframeIndex[k]].time < t)
 						keyframeIndex[k]++;
 
 				var isConstant = false;

diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneExporter/ExporterAnimationPointer.cs b/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneExporter/ExporterAnimationPointer.cs
@@ -46,7 +46,7 @@ public void AddAnimationData(Object animatedObject, string propertyName, GLTFAni
 
 			// TODO should skip property switches that are not supported without KHR_animation_pointer
 			// TODO should probably start with the transform check below and stop afterwards if KHR_animation_pointer is off
-			
+
 			// if (!settings.UseAnimationPointer)
 			// {
 			// 	Debug.LogWarning("Trying to export arbitrary animation (" + propertyName + ") - this requires KHR_animation_pointer", animatedObject);

diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/Timeline/GLTFRecorder.cs b/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/Timeline/GLTFRecorder.cs
@@ -100,7 +100,7 @@ public AnimationData(Transform tr, double time, bool zeroScale = false, bool rec
 					exportPlans.Add(new ExportPlan("rotation", typeof(Quaternion), x => x, (tr, _) =>
 					{
 						var q = tr.localRotation;
-						return new Vector4(q.x, q.y, q.z, q.w);
+						return new Quaternion(q.x, q.y, q.z, q.w);
 					}));
 					exportPlans.Add(new ExportPlan("scale", typeof(Vector3), x => x, (tr, _) => tr.localScale));