[#18] Added a nod up but its very sensitive. I commented it out but w…

…e can adjust the settings
heyhellomila · Oct 16, 2019 · f1c78d1 · f1c78d1
1 parent 01d2d1c
commit f1c78d1
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
@@ -9,7 +9,7 @@ public class YesNoMessageGenerator : MonoBehaviour
 
         void Start()
         {
-            VRGestureRecognizer.Current.NodHandler += OnNod;
+            //VRGestureRecognizer.Current.NodHandler += OnNod;
             //VRGestureRecognizer.Current.HeadshakeHandler += OnHeadshake;
         }
 

diff --git a/Social_AI_XR/Assets/HeadMotion/FrameSynthesis/VRGestureRecognizer/VRGestureRecognizer.cs b/Social_AI_XR/Assets/HeadMotion/FrameSynthesis/VRGestureRecognizer/VRGestureRecognizer.cs
@@ -30,7 +30,8 @@ public class VRGestureRecognizer : MonoBehaviour
         [SerializeField]
         float recognitionInterval = 0.5f;
 
-        public event Action NodHandler;
+        public event Action NodDownHandler;
+        //public event Action NodUpHandler;
         public event Action HeadshakeRightHandler;
         public event Action HeadshakeLeftHandler;
 
@@ -55,7 +56,8 @@ void Update()
             }
 
             // Recognize gestures
-            RecognizeNod();
+            RecognizeNodDown();
+            //RecognizeNodUp();
             RecognizeHeadshakeRight();
             RecognizeHeadshakeLeft();
         }
@@ -67,7 +69,7 @@ IEnumerable<PoseSample> PoseSamplesWithin(float startTime, float endTime)
                 sample.timestamp >= Time.time - endTime);
         }
 
-        void RecognizeNod()
+        void RecognizeNodDown()
         {
             try
             {
@@ -81,7 +83,7 @@ void RecognizeNod()
                     if (prevGestureTime < Time.time - recognitionInterval)
                     {
                         prevGestureTime = Time.time;
-                        NodHandler?.Invoke();
+                        NodDownHandler?.Invoke();
                     }
                 }
             }
@@ -91,6 +93,30 @@ void RecognizeNod()
             }
         }
 
+       /* void RecognizeNodUp()
+        {
+            try
+            {
+                var averagePitch = PoseSamplesWithin(0.2f, 0.4f).Average(sample => sample.eulerAngles.x);
+                var maxPitch = PoseSamplesWithin(0.01f, 0.2f).Max(sample => sample.eulerAngles.x);
+                var pitch = PoseSamples.First().eulerAngles.x;
+
+                if (maxPitch - averagePitch < 10f &&
+                    Mathf.Abs(pitch - averagePitch) < 5f)
+                {
+                    if (prevGestureTime < Time.time - recognitionInterval)
+                    {
+                        prevGestureTime = Time.time;
+                        NodUpHandler?.Invoke();
+                    }
+                }
+            }
+            catch (InvalidOperationException)
+            {
+                // PoseSamplesWithin contains no entry
+            }
+        }*/
+
         void RecognizeHeadshakeLeft()
         {
             try

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

diff --git a/Social_AI_XR/Assets/cubefly.cs b/Social_AI_XR/Assets/cubefly.cs
@@ -12,17 +12,23 @@ public class cubefly : MonoBehaviour
         void Start()
         {
 
-            VRGestureRecognizer.Current.NodHandler += OnNod;
+            VRGestureRecognizer.Current.NodDownHandler += OnNodDown;
+            //VRGestureRecognizer.Current.NodUpHandler += OnNodUp;
             VRGestureRecognizer.Current.HeadshakeLeftHandler += OnHeadshakeLeft;
             VRGestureRecognizer.Current.HeadshakeRightHandler += OnHeadshakeRight;
             textDebugger.text = "START";
         }
 
-        void OnNod()
+        void OnNodDown()
         {
             gameObject.GetComponent<Rigidbody>().AddForce(0, 5, 0, ForceMode.Impulse);
-            textDebugger.text = "Nodding";
+            textDebugger.text = "Nod Down";
         }
+        /*void OnNodUp()
+        {
+            gameObject.GetComponent<Rigidbody>().AddForce(0, 0, -5, ForceMode.Impulse);
+            textDebugger.text = "Nod Up";
+        }*/
 
         void OnHeadshakeLeft()
         {