Upload app.py

app.py

@@ -100,33 +100,23 @@ def preprocess(input_image, do_remove_background, foreground_ratio):
 
 @spaces.GPU
 def generate(image, mc_resolution, formats=["obj", "stl"]):
-    #Substituir stl por stl
     scene_codes = model(image, device=device)
     mesh = model.extract_mesh(scene_codes, resolution=mc_resolution)[0]
     mesh = to_gradio_3d_orientation(mesh)
 
-    mesh_path_stl = tempfile.NamedTemporaryFile(suffix=f".stl", delete=False)
-   # mesh_path_stl = tempfile.NamedTemporaryFile(suffix=f".stl", delete=False)
-    if try_import("trimesh"):
-        import trimesh as tm
-
-        # Converter malha para formato trimesh
-        mesh_tri = tm.Trimesh(vertices=mesh.vertices, faces=mesh.faces)
-
-        # Salvar malha como STL
-        mesh_tri.export(mesh_path_stl.name)
-   # mesh.export(mesh_path_stl.name)
+    mesh_path_glb = tempfile.NamedTemporaryFile(suffix=f".stl", delete=False)
+    mesh.export(mesh_path_glb.name)
 
     mesh_path_obj = tempfile.NamedTemporaryFile(suffix=f".obj", delete=False)
     mesh.apply_scale([-1, 1, 1])  # Otherwise the visualized .obj will be flipped
     mesh.export(mesh_path_obj.name)
     
-    return mesh_path_obj.name, mesh_path_stl.name
+    return mesh_path_obj.name, mesh_path_glb.name
 
 def run_example(image_pil):
     preprocessed = preprocess(image_pil, False, 0.9)
-    mesh_name_obj, mesh_name_stl = generate(preprocessed, 256, ["obj", "stl"])
-    return preprocessed, mesh_name_obj, mesh_name_stl
+    mesh_name_obj, mesh_name_glb = generate(preprocessed, 256, ["obj", "stl"])
+    return preprocessed, mesh_name_obj, mesh_name_glb
 
 with gr.Blocks() as demo:
     gr.Markdown(HEADER)
@@ -168,10 +158,10 @@ with gr.Blocks() as demo:
                     label="Output Model (OBJ Format)",
                     interactive=False,
                 )
-                gr.Markdown("Note: Downloaded object will be flipped in case of .obj export. Export .stl instead or manually flip it before usage.")
-            with gr.Tab("stl"):
-                output_model_stl = gr.Model3D(
-                    label="Output Model (stl Format)",
+                gr.Markdown("Note: Downloaded object will be flipped in case of .obj export. Export .glb instead or manually flip it before usage.")
+            with gr.Tab("GLB"):
+                output_model_glb = gr.Model3D(
+                    label="Output Model (GLB Format)",
                     interactive=False,
                 )
                 gr.Markdown("Note: The model shown here has a darker appearance. Download to get correct results.")
@@ -181,7 +171,7 @@ with gr.Blocks() as demo:
                 os.path.join("examples", img_name) for img_name in sorted(os.listdir("examples"))
             ],
             inputs=[input_image],
-            outputs=[processed_image, output_model_obj, output_model_stl],
+            outputs=[processed_image, output_model_obj, output_model_glb],
             cache_examples=True,
             fn=partial(run_example),
             label="Examples",
@@ -194,7 +184,7 @@ with gr.Blocks() as demo:
     ).success(
         fn=generate,
         inputs=[processed_image, mc_resolution],
-        outputs=[output_model_obj, output_model_stl],
+        outputs=[output_model_obj, output_model_glb],
     )
 
 demo.queue(max_size=10)