[#18]Added left and right handler for head shake

heyhellomila · Oct 16, 2019 · 6979a03 · 6979a03
1 parent 97250b2
commit 6979a03
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 9 deletions.
diff --git a/...ts/HeadMotion/FrameSynthesis/VRGestureRecognizer/Example/Scripts/YesNoMessageGenerator.cs b/...ts/HeadMotion/FrameSynthesis/VRGestureRecognizer/Example/Scripts/YesNoMessageGenerator.cs
@@ -10,7 +10,7 @@ public class YesNoMessageGenerator : MonoBehaviour
         void Start()
         {
             VRGestureRecognizer.Current.NodHandler += OnNod;
-            VRGestureRecognizer.Current.HeadshakeHandler += OnHeadshake;
+            //VRGestureRecognizer.Current.HeadshakeHandler += OnHeadshake;
         }
 
         void OnNod()

diff --git a/Social_AI_XR/Assets/HeadMotion/FrameSynthesis/VRGestureRecognizer/VRGestureRecognizer.cs b/Social_AI_XR/Assets/HeadMotion/FrameSynthesis/VRGestureRecognizer/VRGestureRecognizer.cs
@@ -31,7 +31,8 @@ public class VRGestureRecognizer : MonoBehaviour
         float recognitionInterval = 0.5f;
 
         public event Action NodHandler;
-        public event Action HeadshakeHandler;
+        public event Action HeadshakeRightHandler;
+        public event Action HeadshakeLeftHandler;
 
         public Queue<PoseSample> PoseSamples { get; } = new Queue<PoseSample>();
 
@@ -55,7 +56,8 @@ void Update()
 
             // Recognize gestures
             RecognizeNod();
-            RecognizeHeadshake();
+            RecognizeHeadshakeRight();
+            RecognizeHeadshakeLeft();
         }
 
         IEnumerable<PoseSample> PoseSamplesWithin(float startTime, float endTime)
@@ -89,7 +91,7 @@ void RecognizeNod()
             }
         }
 
-        void RecognizeHeadshake()
+        void RecognizeHeadshakeLeft()
         {
             try
             {
@@ -98,13 +100,37 @@ void RecognizeHeadshake()
                 var minYaw = PoseSamplesWithin(0.01f, 0.2f).Min(sample => sample.eulerAngles.y);
                 var yaw = PoseSamples.First().eulerAngles.y;
 
-                if ((maxYaw - averageYaw > 10f || averageYaw - minYaw > 10f) &&
+                if (averageYaw - minYaw > 10f &&
                     Mathf.Abs(yaw - averageYaw) < 5f)
                 {
                     if (prevGestureTime < Time.time - recognitionInterval)
                     {
                         prevGestureTime = Time.time;
-                        HeadshakeHandler?.Invoke();
+                        HeadshakeLeftHandler?.Invoke();
+                    }
+                }
+            }
+            catch (InvalidOperationException)
+            {
+                // PoseSamplesWithin contains no entry
+            }
+        }
+        void RecognizeHeadshakeRight()
+        {
+            try
+            {
+                var averageYaw = PoseSamplesWithin(0.2f, 0.4f).Average(sample => sample.eulerAngles.y);
+                var maxYaw = PoseSamplesWithin(0.01f, 0.2f).Max(sample => sample.eulerAngles.y);
+                var minYaw = PoseSamplesWithin(0.01f, 0.2f).Min(sample => sample.eulerAngles.y);
+                var yaw = PoseSamples.First().eulerAngles.y;
+
+                if (maxYaw - averageYaw > 10f &&
+                    Mathf.Abs(yaw - averageYaw) < 5f)
+                {
+                    if (prevGestureTime < Time.time - recognitionInterval)
+                    {
+                        prevGestureTime = Time.time;
+                        HeadshakeRightHandler?.Invoke();
                     }
                 }
             }

diff --git a/Social_AI_XR/Assets/HeadMotion/ScriptExample/Scripts/Main.cs b/Social_AI_XR/Assets/HeadMotion/ScriptExample/Scripts/Main.cs
@@ -13,7 +13,7 @@ public class Main : MonoBehaviour
         void Start()
         {
             VRGestureRecognizer.Current.NodHandler += OnNod;
-            VRGestureRecognizer.Current.HeadshakeHandler += OnHeadshake;
+            //VRGestureRecognizer.Current.HeadshakeHandler += OnHeadshake;
         }
 
         void OnNod()

diff --git a/Social_AI_XR/Assets/cubefly.cs b/Social_AI_XR/Assets/cubefly.cs
@@ -12,15 +12,21 @@ void Start()
         {
 
             VRGestureRecognizer.Current.NodHandler += OnNod;
-            VRGestureRecognizer.Current.HeadshakeHandler += OnHeadshake;
+            VRGestureRecognizer.Current.HeadshakeLeftHandler += OnHeadshakeLeft;
+            VRGestureRecognizer.Current.HeadshakeRightHandler += OnHeadshakeRight;
+
         }
 
         void OnNod()
         {
             gameObject.GetComponent<Rigidbody>().AddForce(0, 5, 0, ForceMode.Impulse);
         }
 
-        void OnHeadshake()
+        void OnHeadshakeLeft()
+        {
+            gameObject.GetComponent<Rigidbody>().AddForce(-5, 0, 0, ForceMode.Impulse);
+        }
+        void OnHeadshakeRight()
         {
             gameObject.GetComponent<Rigidbody>().AddForce(5, 0, 0, ForceMode.Impulse);
         }