Rewrite 3D visualizer with proper surface meshes (not wireframes)

garment_3d.py

@@ -1,212 +1,278 @@
 """
-3D Garment Visualizer
-Generates a 3D garment mesh on a parametric body using Plotly.
+3D Garment Visualizer - Surface Mesh Approach
+Creates realistic 3D garment surfaces on a parametric body using Plotly.
 """
 import numpy as np
 import plotly.graph_objects as go
-from typing import Dict, Optional
+from typing import Dict
 
-def create_body_mesh(height=170, chest=88, waist=74, hip=96):
-    theta = np.linspace(0, 2*np.pi, 30)
-    z_levels = np.linspace(0, height, 40)
-    vertices = []
-    faces = []
-    for i, z in enumerate(z_levels):
-        t = z / height
-        if t < 0.12:
-            r = 8 + t * 40
-        elif t < 0.20:
-            r = chest/2 * 0.3 + (t-0.12)/0.08 * (chest/2*0.7-chest/2*0.3)
-        elif t < 0.45:
-            frac = (t-0.20)/0.25
-            r = chest/2 * (1 - 0.08*frac)
+def _make_body_surface(height=170, chest=88, waist=74, hip=96):
+    """Create a parametric human body as a mesh surface."""
+    n_theta = 36
+    n_z = 50
+    theta = np.linspace(0, 2*np.pi, n_theta)
+    z = np.linspace(0, height, n_z)
+    Theta, Z = np.meshgrid(theta, z)
+    R = np.zeros_like(Z)
+    for i in range(n_z):
+        t = Z[i,0] / height
+        if t < 0.08:
+            r = 6 + t*50
+        elif t < 0.15:
+            f = (t-0.08)/0.07
+            r = 10 + (chest/2*0.5 - 10)*f
+        elif t < 0.44:
+            f = (t-0.15)/0.29
+            r = chest/2 * (1 - 0.05*f)
         elif t < 0.55:
-            r = waist/2
+            f = (t-0.44)/0.11
+            r = chest/2*0.95 - (chest/2*0.95 - waist/2)*f
         elif t < 0.72:
-            frac = (t-0.55)/0.17
-            r = waist/2 + (hip/2 - waist/2) * frac
+            f = (t-0.55)/0.17
+            r = waist/2 + (hip/2 - waist/2)*f
         else:
-            frac = (t-0.72)/0.28
-            r = hip/2 * (1 - 0.5*frac)
-        for j, th in enumerate(theta):
-            x = r * np.cos(th) * 0.85
-            y = r * np.sin(th) * 0.5
-            vertices.append([x, y, z])
-    vertices = np.array(vertices)
-    n_theta = len(theta)
-    for i in range(len(z_levels)-1):
-        for j in range(n_theta-1):
-            v0 = i*n_theta + j
-            v1 = i*n_theta + j+1
-            v2 = (i+1)*n_theta + j
-            v3 = (i+1)*n_theta + j+1
-            faces.append([v0, v2, v1])
-            faces.append([v1, v2, v3])
-    return vertices, faces
+            f = (t-0.72)/0.28
+            r = hip/2 * (1 - 0.6*f)
+        R[i,:] = r
+    X = R * np.cos(Theta) * 0.85
+    Y = R * np.sin(Theta) * 0.55
+    return X, Y, Z
 
-def _garment_mesh_shirt(params, body_verts, n_theta, z_levels):
-    parts = []
-    bust = params.get('bust', 92)/2
-    waist = params.get('waist', 74)/2
-    shoulder = params.get('shoulder_width', 42)/2
-    body_len = params.get('bodice_length', 72)
-    sleeve_len = params.get('sleeve_length', 60)
-    sleeve_lo = params.get('bicep', 30)/2 + 2
-    sleeve_hi = params.get('wrist', 18)/2 + 1
-    # Front panel
-    front_z = np.linspace(0, body_len, 20)
-    front_x = []
-    front_y = []
-    for z in front_z:
-        t = z / body_len
-        if t < 0.3:
-            x = shoulder * (1 - 0.1*t)
+def _garment_surface_shirt(params):
+    """Create shirt/t-shirt/blouse as 3D surface mesh."""
+    bust = params.get("bust", 92)
+    waist = params.get("waist", 74)
+    hip = params.get("hip", 96)
+    shoulder = params.get("shoulder_width", 42)
+    body_len = params.get("bodice_length", 72)
+    sleeve_len = params.get("sleeve_length", 60)
+    bicep_r = params.get("bicep", 30) / 2 + 2
+    wrist_r = params.get("wrist", 18) / 2 + 1
+    flare = params.get("flare", 0)
+    fit = params.get("fit", "regular")
+    ease = {"fitted": 2, "regular": 4, "oversized": 10, "loose": 8}.get(fit, 4)
+    n_theta = 36
+    theta = np.linspace(0, 2*np.pi, n_theta)
+    surfaces = []
+
+    # Torso - main body of shirt
+    n_z_torso = 30
+    z_torso = np.linspace(0, body_len, n_z_torso)
+    Theta_t, Z_t = np.meshgrid(theta, z_torso)
+    R_t = np.zeros_like(Z_t)
+    for i in range(n_z_torso):
+        t = z_torso[i] / body_len
+        if t < 0.25:
+            r = (shoulder/2 + ease) * (1 - 0.15*t)
         elif t < 0.55:
-            x = shoulder - (shoulder - bust*0.85) * ((t-0.3)/0.25)
+            f = (t-0.25)/0.3
+            r_top = (shoulder/2 + ease) * 0.962
+            r_bot = (bust/2 + ease)
+            r = r_top + (r_bot - r_top) * f
+        elif t < 0.7:
+            f = (t-0.55)/0.15
+            r = (bust/2 + ease) * (1 - 0.05*f)
         else:
-            x = bust*0.85 - (bust*0.85 - waist*0.9) * ((t-0.55)/0.45)
-        front_x.append(x)
-        front_y.append(0)
-    pts = list(zip(front_x, front_y, front_z))
-    pts.append((0, 0, front_z[-1]))
-    pts.insert(0, (0, 0, 0))
-    n = len(pts)
-    xs = [p[0] for p in pts]
-    ys = [p[1] for p in pts]
-    zs = [p[2] for p in pts]
-    parts.append(dict(x=xs, y=ys, z=zs, type='scatter3d', mode='lines',
-        line=dict(color='#4A90D9', width=4), name='Front'))
-    # Back panel (mirror x)
-    back_x = [-x for x in xs]
-    parts.append(dict(x=back_x, y=ys, z=zs, type='scatter3d', mode='lines',
-        line=dict(color='#6BB3E0', width=4), name='Back'))
+            f = (t-0.7)/0.3
+            r_bust = (bust/2 + ease) * 0.95
+            r_waist = (waist/2 + ease + flare)
+            r = r_bust + (r_waist - r_bust) * f
+        R_t[i,:] = r
+    X_t = R_t * np.cos(Theta_t) * 0.85
+    Y_t = R_t * np.sin(Theta_t) * 0.55
+    surfaces.append((X_t, Y_t, Z_t, "#5B9BD5", "Torso", 0.7))
+
     # Sleeves
-    shoulder_pt = [shoulder*0.9, 0, body_len*0.92]
-    sl_z = np.linspace(0, sleeve_len, 10)
     for side in [1, -1]:
-        sx = [side * (shoulder*0.9 + (sleeve_lo - shoulder*0.3)*0.3 + sl*0.08*side) for sl in sl_z]
-        sy = [sl*0.6 for sl in sl_z]
-        sz = [body_len*0.92 - sl*0.15 for sl in sl_z]
-        color = '#7BC8F6' if side > 0 else '#5BA3D9'
-        parts.append(dict(x=sx, y=sy, z=sz, type='scatter3d', mode='lines',
-            line=dict(color=color, width=4), name='Sleeve R' if side > 0 else 'Sleeve L'))
-    return parts
+        n_sl = 15
+        z_sl = np.linspace(0, sleeve_len, n_sl)
+        n_th_sl = 16
+        th_sl = np.linspace(0, 2*np.pi, n_th_sl)
+        Theta_s, Z_s = np.meshgrid(th_sl, z_sl)
+        R_s = np.zeros_like(Z_s)
+        for j in range(n_sl):
+            t = z_sl[j] / sleeve_len
+            R_s[j,:] = bicep_r * (1-t) + wrist_r * t + ease*0.5
+        sx_center = side * (shoulder*0.85 + ease*0.3)
+        sy_center = 0
+        sz_top = body_len * 0.92
+        X_s = sx_center + R_s * np.cos(Theta_s) * 0.7 + side * np.linspace(0, sleeve_len*0.15, n_sl).reshape(-1,1)
+        Y_s = sy_center + R_s * np.sin(Theta_s) * 0.5 + np.linspace(0, -sleeve_len*0.4, n_sl).reshape(-1,1)
+        Z_s = sz_top - Z_s * 0.3
+        color = "#6BB3E0" if side > 0 else "#4A90D9"
+        surfaces.append((X_s, Y_s, Z_s, color, "Sleeve", 0.65))
 
-def _garment_mesh_pants(params, body_verts, n_theta, z_levels):
-    parts = []
-    waist_r = params.get('waist', 74)/2
-    hip_r = params.get('hip', 96)/2
-    pant_len = params.get('pant_length', 100)
-    crotch = params.get('crotch_depth', 27)
-    ankle = params.get('ankle', 24)/2 + 1
+    # Collar
+    if params.get("has_collar", False):
+        collar_h = params.get("collar_height", 4)
+        neck_r = params.get("neckline_width", 7) + 1
+        n_c = 24
+        th_c = np.linspace(0, 2*np.pi, n_c)
+        n_zc = 5
+        z_c = np.linspace(0, collar_h, n_zc)
+        Theta_c, Z_c = np.meshgrid(th_c, z_c)
+        R_c = np.ones_like(Z_c) * neck_r
+        X_c = R_c * np.cos(Theta_c) * 0.85
+        Y_c = R_c * np.sin(Theta_c) * 0.55
+        Z_c = Z_c + body_len - 2
+        surfaces.append((X_c, Y_c, Z_c, "#FFFFFF", "Collar", 0.9))
+
+    return surfaces
+def _garment_surface_pants(params):
+    """Create pants/trousers as 3D surface mesh."""
+    waist = params.get("waist", 74)
+    hip = params.get("hip", 96)
+    thigh = params.get("thigh", 56)
+    ankle = params.get("ankle", 24)
+    pant_len = params.get("pant_length", 100)
+    crotch = params.get("crotch_depth", 27)
+    fit = params.get("fit", "regular")
+    ease = {"fitted":1,"regular":3,"oversized":6,"loose":5}.get(fit, 3)
     body_h = 170
+    n_theta = 24
+    theta = np.linspace(0, 2*np.pi, n_theta)
+    surfaces = []
     for side in [1, -1]:
-        leg_x = [side * waist_r*0.5, side * hip_r*0.7, side * hip_r*0.9, side * ankle*1.5, side * ankle]
-        leg_y = [0, 0, 0, 0, 0]
-        leg_z = [body_h, body_h*0.6, body_h*0.55, body_h*0.55 - (pant_len-crotch)*0.5, body_h*0.55 - pant_len*0.7]
-        parts.append(dict(x=leg_x, y=leg_y, z=leg_z, type='scatter3d', mode='lines',
-            line=dict(color='#2C5F8A', width=5), name='Leg R' if side > 0 else 'Leg L'))
-    return parts
+        n_z = 25
+        z = np.linspace(0, pant_len, n_z)
+        Theta, Z = np.meshgrid(theta, z)
+        R = np.zeros_like(Z)
+        for i in range(n_z):
+            t = z[i] / pant_len
+            if t < 0.2:
+                f = t/0.2
+                r = (hip/2+ease) * (1-f) + (thigh/2+ease)*f
+            elif t < 0.35:
+                r = thigh/2 + ease
+            else:
+                f = (t-0.35)/0.65
+                r = (thigh/2+ease) * (1-f) + (ankle/2+ease) * f
+            R[i,:] = r
+        cx = side * (hip/4 + ease*0.3)
+        X = cx + R * np.cos(Theta) * 0.8
+        Y = R * np.sin(Theta) * 0.55
+        Z = (body_h * 0.58 - crotch * 0.3) - Z * 0.3 + Z * 0.7
+        color = "#2C5F8A" if side > 0 else "#3A6FA0"
+        surfaces.append((X, Y, Z, color, "Leg", 0.7))
+    # Waistband
+    n_wb = 24
+    th_wb = np.linspace(0, 2*np.pi, n_wb)
+    n_zw = 4
+    z_wb = np.linspace(0, params.get("waistband_height", 4), n_zw)
+    Theta_w, Z_w = np.meshgrid(th_wb, z_wb)
+    R_w = np.ones_like(Z_w) * (waist/2 + ease)
+    X_w = R_w * np.cos(Theta_w) * 0.85
+    Y_w = R_w * np.sin(Theta_w) * 0.55
+    Z_w = Z_w + body_h * 0.58
+    surfaces.append((X_w, Y_w, Z_w, "#1A3D5C", "Waistband", 0.85))
+    return surfaces
 
-def _garment_mesh_skirt(params, body_verts, n_theta, z_levels):
-    parts = []
-    waist_r = params.get('waist', 74)/2
-    hip_r = params.get('hip', 96)/2
-    skirt_len = params.get('skirt_length', 55)
-    flare = params.get('flare', 5)
+def _garment_surface_skirt(params):
+    """Create skirt as 3D surface mesh."""
+    waist = params.get("waist", 74)
+    hip = params.get("hip", 96)
+    skirt_len = params.get("skirt_length", 55)
+    flare = params.get("flare", 5)
     body_h = 170
+    n_theta = 36
+    theta = np.linspace(0, 2*np.pi, n_theta)
+    n_z = 25
+    z = np.linspace(0, skirt_len, n_z)
+    Theta, Z = np.meshgrid(theta, z)
+    R = np.zeros_like(Z)
+    for i in range(n_z):
+        t = z[i] / skirt_len
+        if t < 0.3:
+            f = t / 0.3
+            r = (waist/2+2) * (1-f) + (hip/2+2) * f
+        else:
+            f = (t-0.3)/0.7
+            r = (hip/2+2) + flare * f * (1 + 0.5*np.sin(3*theta)**2)[np.newaxis,:]
+        R[i,:] = r
+    X = R * np.cos(Theta) * 0.85
+    Y = R * np.sin(Theta) * 0.55
     waist_z = body_h * 0.58
-    hem_z = waist_z - skirt_len
-    hem_r = hip_r + flare
-    theta = np.linspace(0, 2*np.pi, 40)
-    for t_val, r, z_val, c, nm in [(0, waist_r, waist_z, '#D4A5C9', 'Waist'), (1, hip_r, waist_z - 20, '#C48BB8', 'Hip'), (2, hem_r, hem_z, '#E8C5E0', 'Hem')]:
-        xs = [r * np.cos(th)*0.85 for th in theta]
-        ys = [r * np.sin(th)*0.5 for th in theta]
-        zs = [z_val]*len(theta)
-        parts.append(dict(x=xs, y=ys, z=zs, type='scatter3d', mode='lines',
-            line=dict(color=c, width=3), name=nm))
-    return parts
+    Z = waist_z - Z
+    return [(X, Y, Z, "#C48BB8", "Skirt", 0.7)]
+def _garment_surface_dress(params):
+    return _garment_surface_shirt(params) + _garment_surface_skirt(params)
 
-def _garment_mesh_dress(params, body_verts, n_theta, z_levels):
-    parts = _garment_mesh_shirt(params, body_verts, n_theta, z_levels)
-    parts += _garment_mesh_skirt(params, body_verts, n_theta, z_levels)
-    return parts
-
-def _garment_mesh_hoodie(params, body_verts, n_theta, z_levels):
-    parts = _garment_mesh_shirt(params, body_verts, n_theta, z_levels)
-    head_circ = params.get('head_circumference', 57)/2
-    body_len = params.get('bodice_length', 65)
+def _garment_surface_hoodie(params):
+    surfaces = _garment_surface_shirt(params)
+    head_r = params.get("head_circumference", 57) / 2
+    n_th = 24
+    theta = np.linspace(0, 2*np.pi, n_th)
+    n_z = 15
+    z = np.linspace(0, head_r*1.3, n_z)
+    Theta, Z = np.meshgrid(theta, z)
+    R = np.zeros_like(Z)
+    for i in range(n_z):
+        t = z[i] / (head_r*1.3)
+        if t < 0.3:
+            R[i,:] = head_r * (0.8 + 0.2*t)
+        elif t < 0.7:
+            R[i,:] = head_r * (1.0 - 0.1*(t-0.3)/0.4)
+        else:
+            R[i,:] = head_r * 0.9 * (1 - 0.5*(t-0.7)/0.3)
+    body_len = params.get("bodice_length", 65)
     body_h = 170
-    hood_z = [body_h*0.9, body_h*0.95, body_h*1.02, body_h*1.05, body_h*1.02, body_h*0.95]
-    hood_x = [head_circ*0.8, head_circ, head_circ*0.7, 0, -head_circ*0.7, -head_circ]
-    hood_y = [0, head_circ*0.3, head_circ*0.5, head_circ*0.6, head_circ*0.5, head_circ*0.3]
-    parts.append(dict(x=hood_x, y=hood_y, z=hood_z, type='scatter3d', mode='lines',
-        line=dict(color='#3A7BD5', width=5), name='Hood'))
-    return parts
+    X = R * np.cos(Theta) * 0.85
+    Y = R * np.sin(Theta) * 0.55 + np.linspace(0, head_r*0.3, n_z).reshape(-1,1)
+    Z = Z + body_h * 0.92
+    surfaces.append((X, Y, Z, "#3A7BD5", "Hood", 0.65))
+    return surfaces
 
-def _garment_mesh_jacket(params, body_verts, n_theta, z_levels):
-    return _garment_mesh_shirt(params, body_verts, n_theta, z_levels)
+def _garment_surface_jacket(params):
+    return _garment_surface_shirt(params)
 
-def _garment_mesh_default(params, body_verts, n_theta, z_levels):
-    return _garment_mesh_shirt(params, body_verts, n_theta, z_levels)
-
-GARMENT_MESH_FUNCS = {
-    'shirt': _garment_mesh_shirt,
-    'blouse': _garment_mesh_shirt,
-    'top': _garment_mesh_shirt,
-    't-shirt': _garment_mesh_shirt,
-    'tee': _garment_mesh_shirt,
-    'dress': _garment_mesh_dress,
-    'skirt': _garment_mesh_skirt,
-    'pants': _garment_mesh_pants,
-    'trousers': _garment_mesh_pants,
-    'jeans': _garment_mesh_pants,
-    'jacket': _garment_mesh_jacket,
-    'coat': _garment_mesh_jacket,
-    'blazer': _garment_mesh_jacket,
-    'hoodie': _garment_mesh_hoodie,
-    'sweatshirt': _garment_mesh_hoodie,
-    'vest': _garment_mesh_shirt,
+GARMENT_SURFACE_FUNCS = {
+    "shirt": _garment_surface_shirt, "blouse": _garment_surface_shirt,
+    "top": _garment_surface_shirt, "t-shirt": _garment_surface_shirt, "tee": _garment_surface_shirt,
+    "dress": _garment_surface_dress,
+    "skirt": _garment_surface_skirt,
+    "pants": _garment_surface_pants, "trousers": _garment_surface_pants, "jeans": _garment_surface_pants,
+    "jacket": _garment_surface_jacket, "coat": _garment_surface_jacket, "blazer": _garment_surface_jacket,
+    "hoodie": _garment_surface_hoodie, "sweatshirt": _garment_surface_hoodie,
+    "vest": _garment_surface_shirt,
 }
-
 def create_3d_figure(analysis: Dict) -> go.Figure:
-    """Create interactive 3D garment visualization."""
-    garment_type = analysis.get('garment_type', 'shirt').lower()
-    measurements = analysis.get('measurements', {})
-    features = analysis.get('features', {})
+    """Create interactive 3D garment visualization with surface meshes."""
+    garment_type = analysis.get("garment_type", "shirt").lower()
+    measurements = analysis.get("measurements", {})
+    features = analysis.get("features", {})
     params = {**measurements, **features}
-    chest = params.get('bust', 92)
-    waist_m = params.get('waist', 74)
-    hip_m = params.get('hip', 96)
-    body_v, body_f = create_body_mesh(chest=chest, waist=waist_m, hip=hip_m)
+    chest = params.get("bust", 92)
+    waist_m = params.get("waist", 74)
+    hip_m = params.get("hip", 96)
     fig = go.Figure()
-    # Body wireframe
-    n_t = 30
-    for i in range(0, len(body_v), n_t*3):
-        row = body_v[i:i+n_t]
-        fig.add_trace(go.Scatter3d(
-            x=row[:,0], y=row[:,1], z=row[:,2],
-            mode='lines', line=dict(color='#DDCCAA', width=1),
-            showlegend=False, hoverinfo='skip'))
-    # Garment
-    mesh_func = GARMENT_MESH_FUNCS.get(garment_type, _garment_mesh_default)
-    garment_traces = mesh_func(params, body_v, n_t, np.linspace(0, 170, 40))
-    for trace in garment_traces:
-        fig.add_trace(go.Scatter3d(
-            x=trace['x'], y=trace['y'], z=trace['z'],
-            mode=trace.get('mode', 'lines'),
-            line=trace.get('line', dict(width=3)),
-            name=trace.get('name', '')))
+    # Body - translucent skin-toned surface
+    BX, BY, BZ = _make_body_surface(chest=chest, waist=waist_m, hip=hip_m)
+    fig.add_trace(go.Surface(
+        x=BX, y=BY, z=BZ,
+        surfacecolor=np.ones_like(BX) * 0.8,
+        colorscale=[[0,"#E8D0B0"],[1,"#E8D0B0"]],
+        opacity=0.25, showscale=False, name="Body",
+        hoverinfo="skip", lighting=dict(ambient=0.9, diffuse=0.1, specular=0)))
+    # Garment surfaces
+    func = GARMENT_SURFACE_FUNCS.get(garment_type, _garment_surface_shirt)
+    surfaces = func(params)
+    for X, Y, Z, color, name, opacity in surfaces:
+        fig.add_trace(go.Surface(
+            x=X, y=Y, z=Z,
+            surfacecolor=np.ones_like(X) * 0.5,
+            colorscale=[[0, color], [1, color]],
+            opacity=opacity, showscale=False, name=name,
+            hoverinfo="name",
+            lighting=dict(ambient=0.6, diffuse=0.4, specular=0.2, roughness=0.5)))
     fig.update_layout(
         scene=dict(
-            xaxis=dict(showgrid=False, showticklabels=False, title=''),
-            yaxis=dict(showgrid=False, showticklabels=False, title=''),
-            zaxis=dict(showgrid=False, showticklabels=False, title=''),
-            aspectmode='data',
-            camera=dict(eye=dict(x=1.5, y=1.5, z=0.8))),
+            xaxis=dict(showgrid=False, showticklabels=False, title="", zeroline=False),
+            yaxis=dict(showgrid=False, showticklabels=False, title="", zeroline=False),
+            zaxis=dict(showgrid=False, showticklabels=False, title="", zeroline=False),
+            aspectmode="data",
+            camera=dict(eye=dict(x=1.8, y=0.8, z=0.9), center=dict(x=0, y=0, z=-0.15))),
         margin=dict(l=0, r=0, t=30, b=0),
         height=500,
-        title=dict(text=f'3D Preview: {garment_type.title()}', font=dict(size=14)),
-        paper_bgcolor='#fafafa',
-    )
-    return fig
+        title=dict(text=f"3D Preview: {garment_type.title()}", font=dict(size=14)),
+        paper_bgcolor="#fafafa")
+    return fig