Merge pull request #387 from leapmotion/Release-CoreAsset-4.1.3

Release core asset 4.1.3

Author: Amarcolina

Assets/LeapMotion/Scripts/Algorithms.meta

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Leap.Unity{
+namespace Leap.Unity {
   /// <summary>
   /// Time-step independent exponential smoothing.
   /// </summary>
@@ -13,31 +13,19 @@ public class SmoothedFloat {
     public float delay = 0f; // Mean delay
     public bool reset = true; // Reset on Next Update
 
-    public float average_dt = 0f;
-
-    public void SetBlend(float blend, float deltaTime = 1f)
-    {
+    public void SetBlend(float blend, float deltaTime = 1f) {
       delay = deltaTime * blend / (1f - blend);
     }
-  
-    public float Update(float input, float deltaTime = 1f)
-    {
-      if (deltaTime > 0f &&
-          !reset) {
+
+    public float Update(float input, float deltaTime = 1f) {
+      if (deltaTime > 0f && !reset) {
         float alpha = delay / deltaTime;
-        float blend =  alpha / (1f + alpha);
+        float blend = alpha / (1f + alpha);
         // NOTE: If delay -> 0 then blend -> 0,
         // reducing the filter to this.value = value.
         // NOTE: If deltaTime -> 0 blend -> 1,
         // so the change in the filtered value will be suppressed
-        var newValue = Mathf.Lerp(this.value, input, 1f - blend);
-        
-        var new_dt = Mathf.Abs(newValue - value);
-        if (average_dt * 10 < newValue - value)
-          Debug.Log("Average dt was excessive!");
-
-        average_dt = Mathf.Lerp(average_dt, new_dt, 1f - blend);
-        value = newValue;
+        value = Mathf.Lerp(value, input, 1f - blend);
       } else {
         value = input;
         reset = false;

Assets/LeapMotion/Scripts/Algorithms/Editor.meta

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Leap.Unity{
+namespace Leap.Unity {
   /// <summary>
   /// Time-step independent exponential smoothing.
   /// </summary>
@@ -12,18 +12,15 @@ public class SmoothedQuaternion {
     public Quaternion value = Quaternion.identity; // Filtered value
     public float delay = 0f; // Mean delay
     public bool reset = true; // Reset on Next Update
-    
-    public void SetBlend(float blend, float deltaTime = 1f)
-    {
+
+    public void SetBlend(float blend, float deltaTime = 1f) {
       delay = deltaTime * blend / (1f - blend);
     }
-  
-    public Quaternion Update(Quaternion input, float deltaTime = 1f)
-    {
-      if (deltaTime > 0f &&
-          !reset) {
+
+    public Quaternion Update(Quaternion input, float deltaTime = 1f) {
+      if (deltaTime > 0f && !reset) {
         float alpha = delay / deltaTime;
-        float blend =  alpha / (1f + alpha);
+        float blend = alpha / (1f + alpha);
         // NOTE: If delay -> 0 then blend -> 0,
         // reducing the filter to this.value = value.
         // NOTE: If deltaTime -> 0 blend -> 1,

Assets/LeapMotionModules/RealtimeGraph/Scripts/Editor/Tests.meta Assets/LeapMotion/Scripts/Algorithms/Editor/Tests.meta

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Leap.Unity{
+namespace Leap.Unity {
   /// <summary>
   /// Time-step independent exponential smoothing.
   /// </summary>
@@ -12,18 +12,15 @@ public class SmoothedVector3 {
     public Vector3 value = Vector3.zero; // Filtered value
     public float delay = 0f; // Mean delay
     public bool reset = true; // Reset on Next Update
-    
-    public void SetBlend(float blend, float deltaTime = 1f)
-    {
+
+    public void SetBlend(float blend, float deltaTime = 1f) {
       delay = deltaTime * blend / (1f - blend);
     }
-  
-    public Vector3 Update(Vector3 input, float deltaTime = 1f)
-    {
-      if (deltaTime > 0f &&
-          !reset) {
+
+    public Vector3 Update(Vector3 input, float deltaTime = 1f) {
+      if (deltaTime > 0f && !reset) {
         float alpha = delay / deltaTime;
-        float blend =  alpha / (1f + alpha);
+        float blend = alpha / (1f + alpha);
         // NOTE: If delay -> 0 then blend -> 0,
         // reducing the filter to this.value = value.
         // NOTE: If deltaTime -> 0 blend -> 1,

Assets/LeapMotionModules/RealtimeGraph/Scripts/Editor/Tests/SlidingMaxTest.cs Assets/LeapMotion/Scripts/Algorithms/Editor/Tests/SlidingMaxTest.cs

@@ -10,24 +10,24 @@
 
 namespace Leap.Unity {
   /** 
-   * HandPool holds a pool of IHandModels and makes HandRepresentations 
+   * HandPool holds a pool of IHandModels and makes HandProxys 
    * when given a Leap Hand and a model type of graphics or physics.
-   * When a HandRepresentation is created, an IHandModel is removed from the pool.
-   * When a HandRepresentation is finished, its IHandModel is returned to the pool.
+   * When a HandProxy is created, an IHandModel is removed from the pool.
+   * When a HandProxy is finished, its IHandModel is returned to the pool.
    */
   public class HandPool :
     HandFactory {
     [SerializeField]
     private List<ModelGroup> ModelPool;
-    private List<HandRepresentation> activeHandReps = new List<HandRepresentation>();
+    private List<HandProxy> activeHandReps = new List<HandProxy>();
 
     private Dictionary<IHandModel, ModelGroup> modelGroupMapping = new Dictionary<IHandModel, ModelGroup>();
-    private Dictionary<IHandModel, HandRepresentation> modelToHandRepMapping = new Dictionary<IHandModel, HandRepresentation>();
+    private Dictionary<IHandModel, HandProxy> modelToHandRepMapping = new Dictionary<IHandModel, HandProxy>();
 
     /**
      * ModelGroup contains a left/right pair of IHandModel's 
-     * @param modelList The IHandModels available for use by HandRepresentations
-     * @param modelsCheckedOut The IHandModels currently in use by active HandRepresentations
+     * @param modelList The IHandModels available for use by HandProxys
+     * @param modelsCheckedOut The IHandModels currently in use by active HandProxys
      * @param IsEnabled determines whether the ModelGroup is active at app Start(), though ModelGroup's are controlled with the EnableGroup() & DisableGroup methods.
      * @param CanDuplicate Allows a IHandModels in the ModelGroup to be cloned at runtime if a suitable IHandModel isn't available.
      */
@@ -53,9 +53,7 @@ public class ModelGroup {
        * If not, one can be cloned*/
       public IHandModel TryGetModel(Chirality chirality, ModelType modelType) {
         for (int i = 0; i < modelList.Count; i++) {
-          if (modelList[i].HandModelType == modelType
-            && modelList[i].Handedness == chirality
-            || modelList[i].Handedness == Chirality.Either) {
+          if (modelList[i].HandModelType == modelType && modelList[i].Handedness == chirality) {
             IHandModel model = modelList[i];
             modelList.RemoveAt(i);
             modelsCheckedOut.Add(model);
@@ -64,9 +62,7 @@ public IHandModel TryGetModel(Chirality chirality, ModelType modelType) {
         }
         if (CanDuplicate) {
           for (int i = 0; i < modelsCheckedOut.Count; i++) {
-            if (modelsCheckedOut[i].HandModelType == modelType
-              && modelsCheckedOut[i].Handedness == chirality
-              || modelsCheckedOut[i].Handedness == Chirality.Either) {
+            if (modelsCheckedOut[i].HandModelType == modelType && modelsCheckedOut[i].Handedness == chirality) {
               IHandModel modelToSpawn = modelsCheckedOut[i];
               IHandModel spawnedModel = GameObject.Instantiate(modelToSpawn);
               spawnedModel.transform.parent = _handPool.transform;
@@ -87,10 +83,34 @@ public void ReturnToGroup(IHandModel model) {
     public void ReturnToPool(IHandModel model) {
       ModelGroup modelGroup;
       bool groupFound = modelGroupMapping.TryGetValue(model, out modelGroup);
-      modelGroup.ReturnToGroup(model);
       Assert.IsTrue(groupFound);
+      //First see if there is another active representation that can use this model
+      for (int i = 0; i < activeHandReps.Count; i++) {
+        HandProxy rep = activeHandReps[i];
+        if (rep.RepChirality == model.Handedness && rep.RepType == model.HandModelType) {
+          bool modelFromGroupFound = false;
+          if (rep.handModels != null) {
+            //And that represention does not contain a model from this model's modelGroup
+            for (int j = 0; j < modelGroup.modelsCheckedOut.Count; j++) {
+              IHandModel modelToCompare = modelGroup.modelsCheckedOut[j];
+              for (int k = 0; k < rep.handModels.Count; k++) {
+                if (rep.handModels[k] == modelToCompare) {
+                  modelFromGroupFound = true;
+                }
+              }
+            }
+          }
+          if (!modelFromGroupFound) {
+            rep.AddModel(model);
+            modelToHandRepMapping[model] = rep;
+            return;
+          }
+        }
+      }
+      //Otherwise return to pool
+      modelGroup.ReturnToGroup(model);
     }
-    public void RemoveHandRepresentation(HandRepresentation handRep) {
+    public void RemoveHandRepresentation(HandProxy handRep) {
       activeHandReps.Remove(handRep);
     }
     /** Popuates the ModelPool with the contents of the ModelCollection */
@@ -104,8 +124,7 @@ void Start() {
           GameObject spawnedGO = GameObject.Instantiate(modelToSpawn.gameObject);
           leftModel = spawnedGO.GetComponent<IHandModel>();
           leftModel.transform.parent = transform;
-        }
-        else {
+        } else {
           leftModel = collectionGroup.LeftModel;
         }
         collectionGroup.modelList.Add(leftModel);
@@ -116,8 +135,7 @@ void Start() {
           GameObject spawnedGO = GameObject.Instantiate(modelToSpawn.gameObject);
           rightModel = spawnedGO.GetComponent<IHandModel>();
           rightModel.transform.parent = transform;
-        }
-        else {
+        } else {
           rightModel = collectionGroup.RightModel;
         }
         collectionGroup.modelList.Add(rightModel);
@@ -126,29 +144,31 @@ void Start() {
     }
 
     /**
-     * MakeHandRepresentation receives a Hand and combines that with an IHandModel to create a HandRepresentation
+     * MakeHandRepresentation receives a Hand and combines that with an IHandModel to create a HandProxy
      * @param hand The Leap Hand data to be drive an IHandModel
      * @param modelType Filters for a type of hand model, for example, physics or graphics hands.
      */
 
     public override HandRepresentation MakeHandRepresentation(Hand hand, ModelType modelType) {
       Chirality handChirality = hand.IsRight ? Chirality.Right : Chirality.Left;
-      HandRepresentation handRep = new HandProxy(this, hand, handChirality, modelType);
+      HandProxy handRep = new HandProxy(this, hand, handChirality, modelType);
       for (int i = 0; i < ModelPool.Count; i++) {
         ModelGroup group = ModelPool[i];
         if (group.IsEnabled) {
           IHandModel model = group.TryGetModel(handChirality, modelType);
-          if (model != null) {
+          if (model != null ) {
             handRep.AddModel(model);
-            modelToHandRepMapping.Add(model, handRep);
+            if (!modelToHandRepMapping.ContainsKey(model)) {
+              modelToHandRepMapping.Add(model, handRep);
+            }
           }
         }
       }
       activeHandReps.Add(handRep);
       return handRep;
     }
     /**
-    * EnableGroup finds suitable HandRepresentations and adds IHandModels from the ModelGroup, returns them to their ModelGroup and sets the groups IsEnabled to true.
+    * EnableGroup finds suitable HandProxys and adds IHandModels from the ModelGroup, returns them to their ModelGroup and sets the groups IsEnabled to true.
      * @param groupName Takes a string that matches the ModelGroup's groupName serialized in the Inspector
     */
     public void EnableGroup(string groupName) {
@@ -161,7 +181,7 @@ private IEnumerator enableGroup(string groupName) {
         if (ModelPool[i].GroupName == groupName) {
           group = ModelPool[i];
           for (int hp = 0; hp < activeHandReps.Count; hp++) {
-            HandRepresentation handRep = activeHandReps[hp];
+            HandProxy handRep = activeHandReps[hp];
             IHandModel model = group.TryGetModel(handRep.RepChirality, handRep.RepType);
             if (model != null) {
               handRep.AddModel(model);
@@ -176,7 +196,7 @@ private IEnumerator enableGroup(string groupName) {
       }
     }
     /**
-     * DisableGroup finds and removes the ModelGroup's IHandModels from their HandRepresentations, returns them to their ModelGroup and sets the groups IsEnabled to false.
+     * DisableGroup finds and removes the ModelGroup's IHandModels from their HandProxys, returns them to their ModelGroup and sets the groups IsEnabled to false.
      * @param groupName Takes a string that matches the ModelGroup's groupName serialized in the Inspector
      */
     public void DisableGroup(string groupName) {
@@ -190,7 +210,7 @@ private IEnumerator disableGroup(string groupName) {
           group = ModelPool[i];
           for (int m = 0; m < group.modelsCheckedOut.Count; m++) {
             IHandModel model = group.modelsCheckedOut[m];
-            HandRepresentation handRep;
+            HandProxy handRep;
             if (modelToHandRepMapping.TryGetValue(model, out handRep)) {
               handRep.RemoveModel(model);
               group.ReturnToGroup(model);
@@ -215,13 +235,11 @@ private IEnumerator toggleGroup(string groupName) {
         if (modelGroup.IsEnabled == true) {
           DisableGroup(groupName);
           modelGroup.IsEnabled = false;
-        }
-        else {
+        } else {
           EnableGroup(groupName);
           modelGroup.IsEnabled = true;
         }
-      }
-      else Debug.LogWarning("A group matching that name does not exisit in the modelPool");
+      } else Debug.LogWarning("A group matching that name does not exisit in the modelPool");
     }
     public void AddNewGroup(string groupName, IHandModel leftModel, IHandModel rightModel) {
       ModelGroup newGroup = new ModelGroup();
@@ -247,15 +265,24 @@ void OnValidate() {
       for (int i = 0; i < ModelPool.Count; i++) {
         if (ModelPool[i] != null) {
           if (ModelPool[i].LeftModel) {
-            ModelPool[i].IsLeftToBeSpawned = PrefabUtility.GetPrefabType(ModelPool[i].LeftModel) == PrefabType.Prefab;
+            ModelPool[i].IsLeftToBeSpawned = shouldBeSpawned(ModelPool[i].LeftModel);
           }
           if (ModelPool[i].RightModel) {
-            ModelPool[i].IsRightToBeSpawned = PrefabUtility.GetPrefabType(ModelPool[i].RightModel) == PrefabType.Prefab;
+            ModelPool[i].IsRightToBeSpawned = shouldBeSpawned(ModelPool[i].RightModel);
           }
         }
       }
     }
 
+    private bool shouldBeSpawned(Object model) {
+      var prefabType = PrefabUtility.GetPrefabType(model);
+      if (PrefabUtility.GetPrefabType(this) != PrefabType.Prefab) {
+        return prefabType == PrefabType.Prefab;
+      } else {
+        return PrefabUtility.GetPrefabObject(model) != PrefabUtility.GetPrefabObject(this);
+      }
+    }
+
 #endif
   }
 }