Update micro_gestures.py

micro_gestures.py

@@ -1,47 +1,49 @@
 # micro_gestures.py
 # routines for detecting single-frame micro-gestures
 
-from utils import angle_between_points, distance_between_points, is_finger_extended
+from utils import distance_between_points, is_finger_extended
 
-def thumb_up(landmarks):
-    """
-    thumb is extended upward, other fingers curled or relaxed.
-    landmarks: list of (x, y, z) points from mediapipe hands.
-    returns true if detected.
-    """
-    return (
-        is_finger_extended(landmarks, finger="thumb", direction="up") and
-        not is_finger_extended(landmarks, finger="index") and
-        not is_finger_extended(landmarks, finger="middle") and
-        not is_finger_extended(landmarks, finger="ring") and
-        not is_finger_extended(landmarks, finger="pinky")
-    )
-
-def thumb_down(landmarks):
-    """thumb extended downward, others curled."""
-    return (
-        is_finger_extended(landmarks, finger="thumb", direction="down") and
-        all(not is_finger_extended(landmarks, finger=f) for f in ["index", "middle", "ring", "pinky"])
-    )
+def fist_closed(landmarks):
+    # all fingers curled into palm
+    return all(not is_finger_extended(landmarks, finger=f) for f in ["thumb","index","middle","ring","pinky"])
+
+def palm_open(landmarks):
+    # all fingers extended
+    return all(is_finger_extended(landmarks, finger=f) for f in ["thumb","index","middle","ring","pinky"])
 
 def index_pointing_up(landmarks):
-    """index extended up, others curled."""
-    return (
-        is_finger_extended(landmarks, finger="index", direction="up") and
-        all(not is_finger_extended(landmarks, finger=f) for f in ["middle", "ring", "pinky", "thumb"])
-    )
+    # only index extended up
+    return is_finger_extended(landmarks, "index", "up") and all(not is_finger_extended(landmarks,f) for f in ["thumb","middle","ring","pinky"])
 
-def fist_closed(landmarks):
-    """all fingers curled into palm."""
-    return all(not is_finger_extended(landmarks, finger=f) for f in ["thumb", "index", "middle", "ring", "pinky"])
+def v_sign(landmarks):
+    # index and middle extended, others curled
+    return is_finger_extended(landmarks, "index") and is_finger_extended(landmarks, "middle") and all(not is_finger_extended(landmarks,f) for f in ["thumb","ring","pinky"])
 
-def palm_open(landmarks):
-    """all fingers extended."""
-    return all(is_finger_extended(landmarks, finger=f) for f in ["thumb", "index", "middle", "ring", "pinky"])
+def thumb_up(landmarks):
+    # thumb up, others curled
+    return is_finger_extended(landmarks,"thumb","up") and all(not is_finger_extended(landmarks,f) for f in ["index","middle","ring","pinky"])
+
+def thumb_side(landmarks):
+    # thumb horizontal, others curled
+    return is_finger_extended(landmarks,"thumb") and all(not is_finger_extended(landmarks,f) for f in ["index","middle","ring","pinky"])
+
+def pinky_up(landmarks):
+    # only pinky extended up
+    return is_finger_extended(landmarks,"pinky","up") and all(not is_finger_extended(landmarks,f) for f in ["thumb","index","middle","ring"])
+
+def four_fingers(landmarks):
+    # four fingers extended, thumb curled
+    return all(is_finger_extended(landmarks,f) for f in ["index","middle","ring","pinky"]) and not is_finger_extended(landmarks,"thumb")
 
 def ok_sign(landmarks):
-    """index and thumb tips touching, other fingers extended."""
+    # thumb and index touching, others extended
     thumb_tip = landmarks[4]
     index_tip = landmarks[8]
-    dist = distance_between_points(thumb_tip, index_tip)
-    return dist < 0.05 and all(is_finger_extended(landmarks, finger=f) for f in ["middle", "ring", "pinky"])
+    return distance_between_points(thumb_tip,index_tip) < 0.05 and all(is_finger_extended(landmarks,f) for f in ["middle","ring","pinky"])
+
+def palm_inward(landmarks):
+    # palm facing body (approximate using wrist-middle_finger vector)
+    wrist = landmarks[0]
+    mcp = landmarks[9]
+    vector_y = mcp[1] - wrist[1]
+    return vector_y > 0  # palm facing down or inward