Update app.py

app.py

@@ -193,17 +193,45 @@ def apply_dreamy_glow(img_np):
     return cv2.addWeighted(img_np, 1.0, blurred, 0.6, 0)
 
 
-# --- Face Effect Functions ---
-def _create_sunglasses_mask():
-    sunglasses = Image.new('RGBA', (300, 100), (0, 0, 0, 0))
+# --- Sunglasses Functions ---
+def _create_sunglasses_mask(style="aviator"):
+    """Creates a PIL image mask for a given sunglass style."""
+    sunglasses = Image.new('RGBA', (300, 150), (0, 0, 0, 0))
     draw = ImageDraw.Draw(sunglasses)
-    draw.polygon([(20, 20), (130, 20), (130, 80), (20, 80)], fill=(20, 20, 20, 200), outline='gray', width=5)
-    draw.polygon([(170, 20), (280, 20), (280, 80), (170, 80)], fill=(20, 20, 20, 200), outline='gray', width=5)
-    draw.line((130, 50, 170, 50), fill='gray', width=8)
+
+    if style == "aviator":
+        # Left Lens
+        draw.polygon([(20, 50), (130, 40), (120, 110), (30, 110)], fill=(20, 20, 20, 200), outline='gold', width=3)
+        # Right Lens
+        draw.polygon([(170, 40), (280, 50), (270, 110), (180, 110)], fill=(20, 20, 20, 200), outline='gold', width=3)
+        # Bridge
+        draw.line((130, 45, 170, 45), fill='gold', width=5)
+        draw.line((130, 55, 170, 55), fill='gold', width=5)
+    
+    elif style == "retro_square":
+        # Left Lens
+        draw.rectangle((20, 40, 130, 110), fill=(10, 10, 10, 210), outline='white', width=6)
+        # Right Lens
+        draw.rectangle((170, 40, 280, 110), fill=(10, 10, 10, 210), outline='white', width=6)
+        # Bridge
+        draw.rectangle((130, 60, 170, 75), fill='white')
+
+    elif style == "heart_shaped":
+        # Left Heart
+        draw.polygon([
+            (75, 40), (125, 60), (75, 120), (25, 60)
+        ], fill='deeppink', outline='hotpink', width=4)
+        # Right Heart
+        draw.polygon([
+            (225, 40), (275, 60), (225, 120), (175, 60)
+        ], fill='deeppink', outline='hotpink', width=4)
+        # Bridge
+        draw.line((125, 70, 175, 70), fill='hotpink', width=6)
+
     return sunglasses
 
-def apply_sunglasses(img_np):
-    """Applies sunglasses to all detected faces (up to 2)."""
+def apply_sunglasses(img_np, style="aviator"):
+    """Applies a specific style of sunglasses to all detected faces (up to 2)."""
     if img_np is None: return img_np
     results = face_mesh.process(img_np)
     pil_image = Image.fromarray(img_np)
@@ -214,103 +242,18 @@ def apply_sunglasses(img_np):
             eye_center = (left_eye + right_eye) / 2
             eye_width = np.linalg.norm(left_eye - right_eye)
             angle = math.degrees(math.atan2(right_eye[1] - left_eye[1], right_eye[0] - left_eye[0]))
-            sunglasses_img = _create_sunglasses_mask()
-            w, h = int(eye_width * 1.6), int(eye_width * 1.6 * sunglasses_img.height / sunglasses_img.width)
+            
+            sunglasses_img = _create_sunglasses_mask(style)
+            
+            w, h = int(eye_width * 1.8), int(eye_width * 1.8 * sunglasses_img.height / sunglasses_img.width)
             resized_sunglasses = sunglasses_img.resize((w, h), Image.Resampling.LANCZOS)
             rotated_sunglasses = resized_sunglasses.rotate(angle, expand=True, resample=Image.Resampling.BICUBIC)
             pos_x, pos_y = int(eye_center[0] - rotated_sunglasses.width / 2), int(eye_center[1] - rotated_sunglasses.height / 2)
+            
             pil_image.paste(rotated_sunglasses, (pos_x, pos_y), rotated_sunglasses)
+            
     return np.array(pil_image)
 
-def _draw_low_poly_accessories(draw, landmarks, wearable_type):
-    """Draws a single piece of headwear or accessory using low-poly polygons."""
-    chin, forehead_top, left_cheek, right_cheek = landmarks[152], landmarks[10], landmarks[234], landmarks[454]
-    nose_tip = landmarks[1]
-    upper_lip = landmarks[13]
-    left_ear = landmarks[234]
-    right_ear = landmarks[454]
-    
-    face_width, face_height = np.linalg.norm(left_cheek - right_cheek), np.linalg.norm(forehead_top - chin)
-    
-    # Improved hat positioning: find the "true" top of the head
-    top_of_head_y = forehead_top[1] - (face_height * 0.2)
-
-    if wearable_type == "Plumber":
-        hat_color = "#E62E21" # Red
-        mustache_color = "#4E2700" # Brown
-        hat_width, hat_height = face_width * 1.1, face_height * 0.4
-        hat_center_x = forehead_top[0]
-        hat_brim_y = top_of_head_y + hat_height * 0.5
-        # Brim (as a polygon)
-        draw.polygon([
-            (hat_center_x - hat_width/2, hat_brim_y), (hat_center_x + hat_width/2, hat_brim_y),
-            (hat_center_x + hat_width/2.1, hat_brim_y + hat_height*0.1), (hat_center_x - hat_width/2.1, hat_brim_y + hat_height*0.1)
-        ], fill=hat_color)
-        # Top part (as a polygon)
-        draw.polygon([
-            (hat_center_x - hat_width/2.2, hat_brim_y), (hat_center_x + hat_width/2.2, hat_brim_y),
-            (hat_center_x + hat_width/2.3, top_of_head_y), (hat_center_x - hat_width/2.3, top_of_head_y)
-        ], fill=hat_color)
-        # Mustache
-        mustache_y = upper_lip[1]
-        mustache_w, mustache_h = face_width * 0.4, face_height * 0.1
-        draw.polygon([
-            (nose_tip[0] - mustache_w/2, mustache_y), (nose_tip[0] + mustache_w/2, mustache_y),
-            (nose_tip[0] + mustache_w/2.2, mustache_y + mustache_h), (nose_tip[0] - mustache_w/2.2, mustache_y + mustache_h)
-        ], fill=mustache_color)
-
-    elif wearable_type == "Elf Hero":
-        hat_color = "#008000" # Green
-        ear_color = "#FFDAB9" # Skin tone
-        # Hat
-        pts = [(forehead_top[0], top_of_head_y - face_height*0.5), (left_cheek[0], top_of_head_y + face_height*0.2), (right_cheek[0], top_of_head_y + face_height*0.2)]
-        draw.polygon(pts, fill=hat_color)
-        # Elf Ears
-        ear_w, ear_h = face_width * 0.2, face_height * 0.3
-        # Left Ear
-        draw.polygon([(left_ear[0], left_ear[1]), (left_ear[0] - ear_w, left_ear[1] - ear_h*0.2), (left_ear[0] - ear_w*0.2, left_ear[1] + ear_h*0.8)], fill=ear_color, outline="black")
-        # Right Ear
-        draw.polygon([(right_ear[0], right_ear[1]), (right_ear[0] + ear_w, right_ear[1] - ear_h*0.2), (right_ear[0] + ear_w*0.2, right_ear[1] + ear_h*0.8)], fill=ear_color, outline="black")
-
-    elif wearable_type == "Cowboy Hat":
-        hat_color = "#634519" # Brown
-        hat_width, hat_height = face_width * 1.5, face_height * 0.5
-        hat_center_x, brim_center_y = int(forehead_top[0]), int(top_of_head_y + hat_height * 0.7)
-        # Brim
-        draw.polygon([
-            (hat_center_x - hat_width/2, brim_center_y), (hat_center_x + hat_width/2, brim_center_y),
-            (hat_center_x + hat_width/2.2, brim_center_y + hat_height*0.2), (hat_center_x - hat_width/2.2, brim_center_y + hat_height*0.2)
-        ], fill=hat_color)
-        # Crown
-        draw.polygon([
-            (hat_center_x - hat_width/3, brim_center_y), (hat_center_x + hat_width/3, brim_center_y),
-            (hat_center_x + hat_width/3.5, top_of_head_y), (hat_center_x - hat_width/3.5, top_of_head_y)
-        ], fill=hat_color)
-
-    elif wearable_type == "Crown":
-        hat_color = "#FFD700" # Gold
-        hat_width, hat_height = face_width * 1.1, face_height * 0.25
-        base_y = int(top_of_head_y)
-        base_x_start = int(forehead_top[0] - hat_width/2)
-        draw.polygon([base_x_start, base_y, base_x_start + hat_width, base_y, base_x_start + hat_width, base_y + hat_height * 0.3, base_x_start, base_y + hat_height * 0.3], fill=hat_color)
-        for i in range(5):
-            spike_base_x = base_x_start + (i * hat_width/4)
-            pts = [(spike_base_x - hat_width*0.05, base_y), (spike_base_x + hat_width*0.05, base_y), (spike_base_x, base_y - hat_height)]
-            draw.polygon(pts, fill=hat_color)
-
-def apply_accessories(img_np, wearable_type):
-    """Applies low-poly accessories to all detected faces (up to 2)."""
-    if img_np is None: return img_np
-    results = face_mesh.process(img_np)
-    pil_image = Image.fromarray(img_np)
-    if results.multi_face_landmarks:
-        overlay = Image.new('RGBA', pil_image.size, (0, 0, 0, 0))
-        draw = ImageDraw.Draw(overlay)
-        for face_landmarks in results.multi_face_landmarks:
-            landmarks = np.array([(lm.x * img_np.shape[1], lm.y * img_np.shape[0]) for lm in face_landmarks.landmark])
-            _draw_low_poly_accessories(draw, landmarks, wearable_type)
-        pil_image.paste(overlay, (0, 0), overlay)
-    return np.array(pil_image)
 
 # --- Main Processing Function ---
 def process_image(image, filter_name, splash_color):
@@ -326,11 +269,9 @@ def process_image(image, filter_name, splash_color):
         "HDR Effect": apply_hdr_effect, "Sunburst Glow": apply_sunburst_glow,
         "Dreamy Glow": apply_dreamy_glow,
         "Color Splash": lambda img: apply_color_splash(img, splash_color),
-        "Sunglasses": apply_sunglasses,
-        "Plumber": lambda img: apply_accessories(img, "Plumber"),
-        "Elf Hero": lambda img: apply_accessories(img, "Elf Hero"),
-        "Cowboy Hat": lambda img: apply_accessories(img, "Cowboy Hat"),
-        "Crown": lambda img: apply_accessories(img, "Crown"),
+        "Aviator Sunglasses": lambda img: apply_sunglasses(img, style="aviator"),
+        "Retro Square Sunglasses": lambda img: apply_sunglasses(img, style="retro_square"),
+        "Heart-Shaped Sunglasses": lambda img: apply_sunglasses(img, style="heart_shaped"),
         "None": lambda img: img
     }
     
@@ -351,7 +292,7 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
     filters_standard = ["Grayscale", "Sepia", "Invert", "Posterize", "Solarize", "Vignette", "Contour", "Sharpen"]
     filters_artistic = ["Cartoon", "Sketch", "Pixelate"]
     filters_advanced = ["N64-ify (Triangles)", "HDR Effect", "Color Splash", "Sunburst Glow", "Dreamy Glow"]
-    filters_face = ["Sunglasses", "Plumber", "Elf Hero", "Cowboy Hat", "Crown"]
+    filters_face = ["Aviator Sunglasses", "Retro Square Sunglasses", "Heart-Shaped Sunglasses"]
     
     all_filters = ["None"] + filters_standard + filters_artistic + filters_advanced + filters_face