Upload app.py

app.py

@@ -200,46 +200,46 @@ def build_textured_cube(pil_imgs, face_rotations=None):
 
     # --- géométrie : définir quads par face (CCW en regardant la face de l'extérieur)
     # Convention: +X = right, +Y = front, +Z = up
-    # Les 8 coins (pour référence)
+    # 8 corners:
     #   (-x,-y,-z), ( x,-y,-z), ( x, y,-z), (-x, y,-z),
     #   (-x,-y, z), ( x,-y, z), ( x, y, z), (-x, y, z)
     quads = {
-        # top (+Z)  : regarder depuis +Z (au-dessus)
+        # top (+Z)  : look from +Z
         "front": [
             (-half_x, -half_y,  half_z),
             ( half_x, -half_y,  half_z),
             ( half_x,  half_y,  half_z),
             (-half_x,  half_y,  half_z),
         ],
-        # right (+X) : regarder depuis +X (côté droit)
+        # right (+X) : look from +X
         "right": [
             ( half_x, -half_y, -half_z),
             ( half_x,  half_y, -half_z),
             ( half_x,  half_y,  half_z),
             ( half_x, -half_y,  half_z),
         ],
-        # bottom (-Z) : regarder depuis -Z (dessous)
+        # bottom (-Z) : look from -Z
         "back": [
             (-half_x,  half_y, -half_z),
             ( half_x,  half_y, -half_z),
             ( half_x, -half_y, -half_z),
             (-half_x, -half_y, -half_z),
         ],
-        # left (-X) : regarder depuis -X (côté gauche)
+        # left (-X) : look from -X
         "left": [
             (-half_x, -half_y,  half_z),
             (-half_x,  half_y,  half_z),
             (-half_x,  half_y, -half_z),
             (-half_x, -half_y, -half_z),
         ],
-        # front (+Y) : regarder depuis +Y (face avant)
+        # front (+Y) : look from +Y
         "top": [
             (-half_x,  half_y, -half_z),
             (-half_x,  half_y,  half_z),
             ( half_x,  half_y,  half_z),
             ( half_x,  half_y, -half_z),
         ],
-        # back (-Y) : regarder depuis -Y (face arrière)
+        # back (-Y) : look from -Y 
         "bottom": [
             ( half_x, -half_y, -half_z),
             ( half_x, -half_y,  half_z),
@@ -248,28 +248,24 @@ def build_textured_cube(pil_imgs, face_rotations=None):
         ],
     }
 
-    # --- écrire l'OBJ (24 vertices, 24 vt, triangulé) selon face_order demandé ---
+
     face_order = ["top", "right", "bottom", "left", "front", "back"]
-    # face_order = ["back", "left", "top", "front", "right", "bottom"]
     obj_path = os.path.join(tmpdir, "parallelep.obj")
     with open(obj_path, "w", encoding="utf-8") as f:
         f.write("# Parallelepiped OBJ generated by build_textured_cube\n")
         f.write("mtllib parallelep.mtl\n\n")
 
-        # écrire vertices : 4 par face, dans l'ordre face_order
         for face_name in face_order:
             for v in quads[face_name]:
                 f.write("v {:.6f} {:.6f} {:.6f}\n".format(*v))
         f.write("\n")
 
-        # écrire UVs : 4 UVs par face (0..1). On garde origine UV bas-gauche.
         uvs = [(0.0, 0.0), (1.0, 0.0), (1.0, 1.0), (0.0, 1.0)]
         for _ in range(6):
             for (u, v) in uvs:
                 f.write("vt {:.6f} {:.6f}\n".format(u, v))
         f.write("\n")
 
-        # faces (2 triangles par face), en s'assurant que les matériaux correspondent
         for i, face_name in enumerate(face_order):
             f.write(f"usemtl m_{face_name}\n")
             v_base = i * 4 + 1
@@ -284,7 +280,6 @@ def build_textured_cube(pil_imgs, face_rotations=None):
     except Exception:
         pass
 
-    # vérifications rapides
     for fname in ["parallelep.obj", "parallelep.mtl"] + list(tex_names.values()):
         p = os.path.join(tmpdir, fname)
         if not os.path.exists(p):
@@ -295,15 +290,14 @@ def build_textured_cube(pil_imgs, face_rotations=None):
 
 
 # -------------------------
-# Fonction appelée par Gradio
-# retourne : 4 miniatures (PIL) + chemin vers le .obj (str)
+# return : 4 img (PIL) + path to .obj (str)
 # -------------------------
 def run(fibers: Image.Image, rings: Image.Image, num_steps: int):
     try:
         outputs = inference(fibers, rings, num_steps)
         if not (isinstance(outputs, (list, tuple)) and len(outputs) >= 4):
             raise ValueError("user_inference doit renvoyer une liste/tuple de 4 images.")
-        # Prendre les 4 premières images et convertir en PIL RGB
+
         pil_imgs = []
         for im in outputs[:4]:
             if isinstance(im, np.ndarray):
@@ -313,19 +307,15 @@ def run(fibers: Image.Image, rings: Image.Image, num_steps: int):
             print(im.size)
             pil_imgs.append(im)
 
-        # miniatures affichées dans l'UI
+
         thumbs = [im.copy() for im in pil_imgs]
 
-        # construire le .obj + textures
+
         obj_path, tmpdir = build_textured_cube(pil_imgs)
 
-        # IMPORTANT: on renvoie le chemin absolu vers le fichier .obj
-        # Gradio/Spaces chargera le modèle 3D depuis ce fichier et les textures
-        # doivent être dans le même dossier que le .obj (ce qui est le cas).
         return (*thumbs, obj_path)
     except Exception as e:
         traceback.print_exc()
-        # en cas d'erreur, renvoyer 4 images grises et None pour le modèle
         blank = Image.new("RGB", (256,256), (220,220,220))
         return (blank, blank, blank, blank, None)
 
@@ -333,6 +323,7 @@ def run(fibers: Image.Image, rings: Image.Image, num_steps: int):
 # Interface Gradio
 # -------------------------
 with gr.Blocks(title="Photorealistic wood generator (4 faces)") as demo:
+    gr.HTML("<h1 style='text-align:center; margin-bottom:8px;'>Photorealistic wood generator (4 faces)</h1>")
     gr.Markdown("""Upload 2 images (four fiber maps and four ring maps) corresponding to the board faces. The model will return four generated images (one per face), produced in a single coherent pass.
     Set the number of inference steps. Higher values can improve quality but increase processing time.""")
     with gr.Row():
@@ -344,10 +335,10 @@ with gr.Blocks(title="Photorealistic wood generator (4 faces)") as demo:
         with gr.Column(scale=2):
             model3d_out = gr.Model3D(label="3D board")
     with gr.Row():
-        out1 = gr.Image(width=600, height=600, label="Front")
-        out2 = gr.Image(width=600, height=600,label="Right")
-        out3 = gr.Image(width=600, height=600,label="Back")
-        out4 = gr.Image(width=600, height=600,label="Left")
+        out1 = gr.Image(label="Front")
+        out2 = gr.Image(label="Right")
+        out3 = gr.Image(label="Back")
+        out4 = gr.Image(label="Left")
 
     run_btn.click(fn=run, inputs=[inp1, inp2, inp3], outputs=[out1, out2, out3, out4, model3d_out])