Update landmarkdiff/manipulation.py to v0.3.2

landmarkdiff/manipulation.py

@@ -1,7 +1,7 @@
-"""Landmark manipulation via Gaussian RBF deformation.
+"""Landmark manipulation engine with Free-Form Deformation (FFD/RBF).
 
-v1/v2 uses relative sliders (0-100 intensity).
-mm inputs only in v3+ with FLAME calibrated metric space.
+All v1/v2 UI uses RELATIVE sliders (0-100 intensity).
+Millimeter inputs exist only in v3+ with FLAME calibrated metric space.
 """
 
 from __future__ import annotations
@@ -19,190 +19,47 @@ if TYPE_CHECKING:
 
 @dataclass(frozen=True)
 class DeformationHandle:
-    """Single deformation control point."""
+    """A control handle for FFD manipulation."""
 
     landmark_index: int
     displacement: np.ndarray  # (2,) or (3,) pixel displacement
-    influence_radius: float  # Gaussian RBF radius in pixels
+    influence_radius: float   # Gaussian RBF radius in pixels
 
 
 # Procedure-specific landmark indices from the technical specification
 PROCEDURE_LANDMARKS: dict[str, list[int]] = {
     "rhinoplasty": [
-        1,
-        2,
-        4,
-        5,
-        6,
-        19,
-        94,
-        141,
-        168,
-        195,
-        197,
-        236,
-        240,
-        274,
-        275,
-        278,
-        279,
-        294,
-        326,
-        327,
-        360,
-        363,
-        370,
-        456,
-        460,
+        1, 2, 4, 5, 6, 19, 94, 141, 168, 195, 197, 236, 240,
+        274, 275, 278, 279, 294, 326, 327, 360, 363, 370, 456, 460,
     ],
     "blepharoplasty": [
-        33,
-        7,
-        163,
-        144,
-        145,
-        153,
-        154,
-        155,
-        157,
-        158,
-        159,
-        160,
-        161,
-        246,
-        362,
-        382,
-        381,
-        380,
-        374,
-        373,
-        390,
-        249,
-        263,
-        466,
-        388,
-        387,
-        386,
-        385,
-        384,
-        398,
+        33, 7, 163, 144, 145, 153, 154, 155, 157, 158, 159, 160, 161, 246,
+        362, 382, 381, 380, 374, 373, 390, 249, 263, 466, 388, 387, 386,
+        385, 384, 398,
     ],
     "rhytidectomy": [
-        10,
-        21,
-        54,
-        58,
-        67,
-        93,
-        103,
-        109,
-        127,
-        132,
-        136,
-        150,
-        162,
-        172,
-        176,
-        187,
-        207,
-        213,
-        234,
-        284,
-        297,
-        323,
-        332,
-        338,
-        356,
-        361,
-        365,
-        379,
-        389,
-        397,
-        400,
-        427,
-        454,
+        10, 21, 54, 58, 67, 93, 103, 109, 127, 132, 136, 148, 150, 152,
+        162, 172, 176, 187, 207, 213, 234, 284, 297, 323, 332, 338, 356,
+        361, 365, 377, 378, 379, 389, 397, 400, 427, 454,
     ],
     "orthognathic": [
-        0,
-        17,
-        18,
-        36,
-        37,
-        39,
-        40,
-        57,
-        61,
-        78,
-        80,
-        81,
-        82,
-        84,
-        87,
-        88,
-        91,
-        95,
-        146,
-        167,
-        169,
-        170,
-        175,
-        181,
-        191,
-        200,
-        201,
-        202,
-        204,
-        208,
-        211,
-        212,
-        214,
-        269,
-        270,
-        291,
-        311,
-        312,
-        317,
-        321,
-        324,
-        325,
-        375,
-        396,
-        405,
-        407,
-        415,
+        0, 17, 18, 36, 37, 39, 40, 57, 61, 78, 80, 81, 82, 84, 87, 88,
+        91, 95, 146, 167, 169, 170, 175, 181, 191, 200, 201, 202, 204,
+        208, 211, 212, 214, 269, 270, 291, 311, 312, 317, 321, 324, 325,
+        375, 396, 405, 407, 415,
     ],
     "brow_lift": [
-        70,
-        63,
-        105,
-        66,
-        107,  # left brow
-        300,
-        293,
-        334,
-        296,
-        336,  # right brow
-        9,
-        8,
-        10,
-        109,
-        67,
-        103,
-        338,
-        297,
-        332,  # forehead/upper face
+        10, 21, 46, 52, 53, 54, 55, 63, 65, 66, 67, 68, 69, 70, 71,
+        103, 104, 105, 107, 108, 109, 151, 282, 283, 284, 285, 293, 295,
+        296, 297, 298, 299, 300, 301, 332, 333, 334, 336, 337, 338,
     ],
     "mentoplasty": [
-        148,
-        149,
-        150,
-        152,
-        171,
-        175,
-        176,
-        377,
+        0, 17, 18, 57, 83, 84, 85, 86, 87, 146, 167, 169, 170, 175,
+        181, 191, 199, 200, 201, 202, 204, 208, 211, 212, 214, 316, 317,
+        321, 324, 325, 375, 396, 405, 411, 415, 419, 421, 422, 424,
     ],
 }
+
 # Default influence radii per procedure (in pixels at 512x512)
 PROCEDURE_RADIUS: dict[str, float] = {
     "rhinoplasty": 30.0,
@@ -210,7 +67,7 @@ PROCEDURE_RADIUS: dict[str, float] = {
     "rhytidectomy": 40.0,
     "orthognathic": 35.0,
     "brow_lift": 25.0,
-    "mentoplasty": 25.0,
+    "mentoplasty": 30.0,
 }
 
 
@@ -218,13 +75,23 @@ def gaussian_rbf_deform(
     landmarks: np.ndarray,
     handle: DeformationHandle,
 ) -> np.ndarray:
-    """Gaussian RBF deform: delta * exp(-dist^2 / 2r^2). Returns copy."""
+    """Apply Gaussian RBF deformation around a control handle.
+
+    Formula: delta_p_i = delta_handle * exp(-||p_i - p_handle||^2 / (2 * r^2))
+
+    Args:
+        landmarks: (N, 2) or (N, 3) landmark coordinates in pixels.
+        handle: Control handle specifying index, displacement, and radius.
+
+    Returns:
+        New landmark array with deformation applied (immutable — returns copy).
+    """
     result = landmarks.copy()
     center = landmarks[handle.landmark_index, :2]
     displacement = handle.displacement[:2]
 
     distances_sq = np.sum((landmarks[:, :2] - center) ** 2, axis=1)
-    weights = np.exp(-distances_sq / (2.0 * handle.influence_radius**2))
+    weights = np.exp(-distances_sq / (2.0 * handle.influence_radius ** 2))
 
     result[:, 0] += displacement[0] * weights
     result[:, 1] += displacement[1] * weights
@@ -248,7 +115,7 @@ def apply_procedure_preset(
 
     Args:
         face: Input face landmarks.
-        procedure: Procedure name (rhinoplasty, blepharoplasty, etc.).
+        procedure: One of the supported procedures (see PROCEDURE_LANDMARKS).
         intensity: Relative intensity 0-100 (mild=33, moderate=66, aggressive=100).
         image_size: Reference image size for displacement scaling.
         clinical_flags: Optional clinical condition flags.
@@ -269,11 +136,7 @@ def apply_procedure_preset(
     # Data-driven displacement mode
     if displacement_model_path is not None:
         return _apply_data_driven(
-            face,
-            procedure,
-            scale,
-            displacement_model_path,
-            noise_scale,
+            face, procedure, scale, displacement_model_path, noise_scale,
         )
 
     indices = PROCEDURE_LANDMARKS[procedure]
@@ -285,12 +148,11 @@ def apply_procedure_preset(
 
     # Procedure-specific displacement vectors (normalized to image_size)
     pixel_scale = image_size / 512.0
-    handles = _get_procedure_handles(procedure, indices, scale, radius * pixel_scale)
+    handles = _get_procedure_handles(procedure, indices, scale, radius * pixel_scale, pixel_scale)
 
     # Bell's palsy: remove handles on the affected (paralyzed) side
     if clinical_flags and clinical_flags.bells_palsy:
         from landmarkdiff.clinical import get_bells_palsy_side_indices
-
         affected = get_bells_palsy_side_indices(clinical_flags.bells_palsy_side)
         affected_indices = set()
         for region_indices in affected.values():
@@ -305,10 +167,12 @@ def apply_procedure_preset(
     for handle in handles:
         pixel_landmarks = gaussian_rbf_deform(pixel_landmarks, handle)
 
-    # Convert back to normalized
+    # Convert back to normalized and clamp to [0, 1]
     result = pixel_landmarks.copy()
     result[:, 0] /= face.image_width
     result[:, 1] /= face.image_height
+    result[:, :2] = np.clip(result[:, :2], 0.0, 1.0)
+    result[:, 2] = np.clip(result[:, 2], 0.0, 1.0)
 
     return FaceLandmarks(
         landmarks=result,
@@ -339,13 +203,13 @@ def _apply_data_driven(
         noise_scale=noise_scale,
     )
 
-    # field is (478, 2) in normalized coordinates
+    # field is (478, 2) in normalized coordinates — add to landmarks
     landmarks = face.landmarks.copy()
     n_lm = min(landmarks.shape[0], field.shape[0])
     landmarks[:n_lm, :2] += field[:n_lm]
 
-    # Clamp to [0, 1]
-    landmarks = np.clip(landmarks, 0.0, 1.0)
+    # Clamp x,y to [0, 1] (preserve z-depth coordinate)
+    landmarks[:n_lm, :2] = np.clip(landmarks[:n_lm, :2], 0.0, 1.0)
 
     return FaceLandmarks(
         landmarks=landmarks,
@@ -360,68 +224,65 @@ def _get_procedure_handles(
     indices: list[int],
     scale: float,
     radius: float,
+    pixel_scale: float = 1.0,
 ) -> list[DeformationHandle]:
-    """Build deformation handles per procedure. 2D pixel displacements, calibrated at 512x512."""
+    """Generate anatomically-grounded deformation handles for a procedure.
+
+    Displacements are in 2D pixel space (X, Y) since the mesh conditioning
+    and TPS warp are both 2D. Values calibrated to look natural at 512x512
+    and scaled by pixel_scale for other resolutions.
+    Based on anthropometric studies (Singh et al. TIFS 2010).
+    """
     handles = []
 
     if procedure == "rhinoplasty":
         # --- Alar base narrowing: move nostrils inward (toward midline) ---
-        # left nostril -> move RIGHT (+X)
-        left_alar = [240, 236, 141, 363, 370]
+        # Left nostril landmarks (viewer's left) → move RIGHT (+X) toward midline
+        left_alar = [240, 236, 141]
         for idx in left_alar:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([2.5 * scale, 0.0]),
-                        influence_radius=radius * 0.6,
-                    )
-                )
-        # right nostril -> move LEFT (-X)
-        right_alar = [460, 456, 274, 275, 278, 279]
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([2.5 * scale, 0.0]),
+                    influence_radius=radius * 0.6,
+                ))
+        # Right nostril landmarks (viewer's right) → move LEFT (-X) toward midline
+        right_alar = [460, 456, 274, 275, 278, 279, 363, 370]
         for idx in right_alar:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([-2.5 * scale, 0.0]),
-                        influence_radius=radius * 0.6,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([-2.5 * scale, 0.0]),
+                    influence_radius=radius * 0.6,
+                ))
 
         # --- Tip refinement: subtle upward rotation + narrowing ---
         tip_indices = [1, 2, 94, 19]
         for idx in tip_indices:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -2.0 * scale]),
-                        influence_radius=radius * 0.5,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -2.0 * scale]),
+                    influence_radius=radius * 0.5,
+                ))
 
         # --- Dorsum narrowing: bilateral squeeze of nasal bridge ---
         dorsum_left = [195, 197, 236]
         for idx in dorsum_left:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([1.5 * scale, 0.0]),
-                        influence_radius=radius * 0.5,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([1.5 * scale, 0.0]),
+                    influence_radius=radius * 0.5,
+                ))
         dorsum_right = [326, 327, 456]
         for idx in dorsum_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([-1.5 * scale, 0.0]),
-                        influence_radius=radius * 0.5,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([-1.5 * scale, 0.0]),
+                    influence_radius=radius * 0.5,
+                ))
 
     elif procedure == "blepharoplasty":
         # --- Upper lid elevation (primary effect) ---
@@ -429,37 +290,31 @@ def _get_procedure_handles(
         upper_lid_right = [386, 385, 384]
         for idx in upper_lid_left + upper_lid_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -2.0 * scale]),
-                        influence_radius=radius,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -2.0 * scale]),
+                    influence_radius=radius,
+                ))
         # --- Medial/lateral lid corners: less displacement (tapered) ---
         corner_left = [158, 157, 133, 33]
         corner_right = [387, 388, 362, 263]
         for idx in corner_left + corner_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -0.8 * scale]),
-                        influence_radius=radius * 0.7,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -0.8 * scale]),
+                    influence_radius=radius * 0.7,
+                ))
         # --- Subtle lower lid tightening ---
         lower_lid_left = [145, 153, 154]
         lower_lid_right = [374, 380, 381]
         for idx in lower_lid_left + lower_lid_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, 0.5 * scale]),
-                        influence_radius=radius * 0.5,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, 0.5 * scale]),
+                    influence_radius=radius * 0.5,
+                ))
 
     elif procedure == "rhytidectomy":
         # Different displacement vectors by anatomical sub-region.
@@ -467,172 +322,176 @@ def _get_procedure_handles(
         jowl_left = [132, 136, 172, 58, 150, 176]
         for idx in jowl_left:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([-2.5 * scale, -3.0 * scale]),
-                        influence_radius=radius,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([-2.5 * scale, -3.0 * scale]),
+                    influence_radius=radius,
+                ))
         jowl_right = [361, 365, 397, 288, 379, 400]
         for idx in jowl_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([2.5 * scale, -3.0 * scale]),
-                        influence_radius=radius,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([2.5 * scale, -3.0 * scale]),
+                    influence_radius=radius,
+                ))
         # Chin/submental: upward only (no lateral)
         chin = [152, 148, 377, 378]
         for idx in chin:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -2.0 * scale]),
-                        influence_radius=radius * 0.8,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -2.0 * scale]),
+                    influence_radius=radius * 0.8,
+                ))
         # Temple/upper face: very mild lift
         temple_left = [10, 21, 54, 67, 103, 109, 162, 127]
         temple_right = [284, 297, 332, 338, 323, 356, 389, 454]
         for idx in temple_left:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([-0.5 * scale, -1.0 * scale]),
-                        influence_radius=radius * 0.6,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([-0.5 * scale, -1.0 * scale]),
+                    influence_radius=radius * 0.6,
+                ))
         for idx in temple_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.5 * scale, -1.0 * scale]),
-                        influence_radius=radius * 0.6,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.5 * scale, -1.0 * scale]),
+                    influence_radius=radius * 0.6,
+                ))
 
     elif procedure == "orthognathic":
         # --- Mandible repositioning: move jaw up and forward (visible as upward in 2D) ---
         lower_jaw = [17, 18, 200, 201, 202, 204, 208, 211, 212, 214]
         for idx in lower_jaw:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -3.0 * scale]),
-                        influence_radius=radius,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -3.0 * scale]),
+                    influence_radius=radius,
+                ))
         # --- Chin projection: move chin point forward/upward ---
         chin_pts = [175, 170, 169, 167, 396]
         for idx in chin_pts:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -2.0 * scale]),
-                        influence_radius=radius * 0.7,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -2.0 * scale]),
+                    influence_radius=radius * 0.7,
+                ))
         # --- Lateral jaw: bilateral symmetric inward pull for narrowing ---
         jaw_left = [57, 61, 78, 91, 95, 146, 181]
         for idx in jaw_left:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([1.5 * scale, -1.0 * scale]),
-                        influence_radius=radius * 0.8,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([1.5 * scale, -1.0 * scale]),
+                    influence_radius=radius * 0.8,
+                ))
         jaw_right = [291, 311, 312, 321, 324, 325, 375, 405]
         for idx in jaw_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([-1.5 * scale, -1.0 * scale]),
-                        influence_radius=radius * 0.8,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([-1.5 * scale, -1.0 * scale]),
+                    influence_radius=radius * 0.8,
+                ))
 
     elif procedure == "brow_lift":
-        # --- Brow elevation ---
-        brow_left = [70, 63, 105, 66, 107]
-        brow_right = [300, 293, 334, 296, 336]
-
-        # Lateral brow often lifted more than medial
-        left_weights = [0.7, 0.8, 0.9, 1.0, 1.1]
-        for i, idx in enumerate(brow_left):
+        # --- Forehead/brow elevation: lift eyebrows upward ---
+        # Central brow landmarks
+        brow_left = [46, 52, 53, 55, 65, 66, 105, 107]
+        for idx in brow_left:
+            if idx in indices:
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -3.0 * scale]),
+                    influence_radius=radius,
+                ))
+        brow_right = [282, 283, 285, 295, 296, 334, 336]
+        for idx in brow_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -4.0 * left_weights[i] * scale]),
-                        influence_radius=radius,
-                    )
-                )
-
-        right_weights = [0.7, 0.8, 0.9, 1.0, 1.1]
-        for i, idx in enumerate(brow_right):
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -3.0 * scale]),
+                    influence_radius=radius,
+                ))
+        # Lateral brow: slightly less lift, mild outward pull
+        lateral_left = [63, 67, 68, 69, 70, 71, 103, 104, 108, 109]
+        for idx in lateral_left:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -4.0 * right_weights[i] * scale]),
-                        influence_radius=radius,
-                    )
-                )
-
-        # --- Forehead smoothing / subtle lift ---
-        forehead = [9, 8, 10, 109, 67, 103, 338, 297, 332]
-        for idx in forehead:
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([-0.5 * scale, -2.0 * scale]),
+                    influence_radius=radius * 0.8,
+                ))
+        lateral_right = [293, 297, 298, 299, 300, 301, 332, 333, 337, 338]
+        for idx in lateral_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -1.5 * scale]),
-                        influence_radius=radius * 1.2,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.5 * scale, -2.0 * scale]),
+                    influence_radius=radius * 0.8,
+                ))
+        # Forehead hairline: subtle upward shift
+        hairline = [10, 21, 54, 151, 284]
+        for idx in hairline:
+            if idx in indices:
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, -1.0 * scale]),
+                    influence_radius=radius * 1.2,
+                ))
+
     elif procedure == "mentoplasty":
-        # --- Chin tip advancement: move chin forward (upward in 2D) ---
-        chin_tip = [152, 175]
-        for idx in chin_tip:
+        # --- Chin augmentation/reduction: project chin forward and down ---
+        # Central chin point: strongest projection
+        chin_center = [175, 170, 169, 199, 200]
+        for idx in chin_center:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -4.0 * scale]),
-                        influence_radius=radius,
-                    )
-                )
-        # --- Lower chin contour: follow tip with softer displacement ---
-        lower_contour = [148, 149, 150, 176, 377]
-        for idx in lower_contour:
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, 2.5 * scale]),
+                    influence_radius=radius,
+                ))
+        # Lateral chin contour: bilateral symmetric outward projection
+        chin_left = [17, 18, 83, 84, 85, 86, 146, 167, 181, 191]
+        for idx in chin_left:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -2.5 * scale]),
-                        influence_radius=radius * 0.8,
-                    )
-                )
-        # --- Jaw angles: minimal upward pull for natural transition ---
-        jaw_angles = [171, 396]
-        for idx in jaw_angles:
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([-1.0 * scale, 1.5 * scale]),
+                    influence_radius=radius * 0.8,
+                ))
+        chin_right = [316, 317, 321, 324, 325, 375, 396, 411, 415, 419]
+        for idx in chin_right:
             if idx in indices:
-                handles.append(
-                    DeformationHandle(
-                        landmark_index=idx,
-                        displacement=np.array([0.0, -1.0 * scale]),
-                        influence_radius=radius * 0.6,
-                    )
-                )
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([1.0 * scale, 1.5 * scale]),
+                    influence_radius=radius * 0.8,
+                ))
+        # Jawline transition: subtle smoothing
+        jaw_transition = [57, 87, 201, 202, 204, 208, 211, 212, 214, 405, 421, 422, 424]
+        for idx in jaw_transition:
+            if idx in indices:
+                handles.append(DeformationHandle(
+                    landmark_index=idx,
+                    displacement=np.array([0.0, 0.8 * scale]),
+                    influence_radius=radius * 0.6,
+                ))
+
+    # Scale displacements for non-512 image sizes
+    if pixel_scale != 1.0:
+        handles = [
+            DeformationHandle(
+                landmark_index=h.landmark_index,
+                displacement=h.displacement * pixel_scale,
+                influence_radius=h.influence_radius,
+            )
+            for h in handles
+        ]
+
     return handles