Merge remote-tracking branch 'origin/keypoints' into keypoints

Author: StevenBorkman

com.unity.perception/Runtime/GroundTruth/Labelers/AnimationPoseLabel.cs

@@ -11,9 +11,10 @@ namespace UnityEngine.Perception.GroundTruth
     public class PoseTimestampRecord
     {
         /// <summary>
-        /// The point in the clip that the pose starts, a value from 0 (beginning) to 1 (end)
+        /// The percentage within the clip that the pose starts, a value from 0 (beginning) to 1 (end)
         /// </summary>
-        public float startOffset;
+        [Tooltip("The percentage within the clip that the pose starts, a value from 0 (beginning) to 1 (end)")]
+        public float startOffsetPercent;
         /// <summary>
         /// The label to use for any captures inside of this time period
         /// </summary>
@@ -51,7 +52,7 @@ public string GetPoseAtTime(float time)
             var i = 1;
             for (i = 1; i < timestamps.Count; i++)
             {
-                if (timestamps[i].startOffset > time) break;
+                if (timestamps[i].startOffsetPercent > time) break;
             }
 
             return timestamps[i - 1].poseLabel;

com.unity.perception/Runtime/Randomization/Randomizers/RandomizerExamples/Randomizers/AnimationRandomizer.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Experimental.Perception.Randomization.Parameters;
 using UnityEngine.Experimental.Perception.Randomization.Randomizers.SampleRandomizers.Tags;
@@ -16,8 +15,8 @@ public class AnimationRandomizer : Randomizer
     {
         FloatParameter m_FloatParameter = new FloatParameter{ value = new UniformSampler(0, 1) };
 
-        const string clipName = "PlayerIdle";
-        const string stateName = "Base Layer.RandomState";
+        const string k_ClipName = "PlayerIdle";
+        const string k_StateName = "Base Layer.RandomState";
 
         void RandomizeAnimation(AnimationRandomizerTag tag)
         {
@@ -27,8 +26,8 @@ void RandomizeAnimation(AnimationRandomizerTag tag)
             var overrider = tag.animatorOverrideController;
             if (overrider != null && tag.animationClips.GetCategoryCount() > 0)
             {
-                overrider[clipName] = tag.animationClips.Sample();
-                animator.Play(stateName, 0, m_FloatParameter.Sample());
+                overrider[k_ClipName] = tag.animationClips.Sample();
+                animator.Play(k_StateName, 0, m_FloatParameter.Sample());
             }
         }