Add glb export

app.py

@@ -53,7 +53,7 @@ HEADER = """
 
 **Tips:**
 1. If you find the result is unsatisfied, please try to change the foreground ratio. It might improve the results.
-2. You can disable "Remove Background" for the provided examples since they have been already preprocessed.
+2. It's better to disable "Remove Background" for the provided examples since they have been already preprocessed.
 3. Otherwise, please disable "Remove Background" option only if your input image is RGBA with transparent background, image contents are centered and occupy more than 70% of image width or height.
 """
 
@@ -99,18 +99,24 @@ def preprocess(input_image, do_remove_background, foreground_ratio):
 
 
 @spaces.GPU
-def generate(image):
+def generate(image, mc_resolution, formats=["obj", "glb"]):
     scene_codes = model(image, device=device)
-    mesh = model.extract_mesh(scene_codes)[0]
+    mesh = model.extract_mesh(scene_codes, resolution=mc_resolution)[0]
     mesh = to_gradio_3d_orientation(mesh)
-    mesh_path = tempfile.NamedTemporaryFile(suffix=".obj", delete=False)
-    mesh.export(mesh_path.name)
-    return mesh_path.name
+
+    mesh_path_glb = tempfile.NamedTemporaryFile(suffix=f".glb", 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_glb.name
 
 def run_example(image_pil):
     preprocessed = preprocess(image_pil, False, 0.9)
-    mesh_name = generate(preprocessed)
-    return preprocessed, mesh_name
+    mesh_name_obj, mesh_name_glb = generate(preprocessed, 256, ["obj", "glb"])
+    return preprocessed, mesh_name_obj, mesh_name_glb
 
 with gr.Blocks() as demo:
     gr.Markdown(HEADER)
@@ -137,21 +143,35 @@ with gr.Blocks() as demo:
                         value=0.85,
                         step=0.05,
                     )
+                    mc_resolution = gr.Slider(
+                        label="Marching Cubes Resolution",
+                        minimum=32,
+                        maximum=320,
+                        value=256,
+                        step=32
+                     )
             with gr.Row():
                 submit = gr.Button("Generate", elem_id="generate", variant="primary")
         with gr.Column():
-            with gr.Tab("Model"):
-                output_model = gr.Model3D(
-                    label="Output Model",
+            with gr.Tab("OBJ"):
+                output_model_obj = gr.Model3D(
+                    label="Output Model (OBJ Format)",
+                    interactive=False,
+                )
+                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.")
     with gr.Row(variant="panel"):
         gr.Examples(
             examples=[
                 os.path.join("examples", img_name) for img_name in sorted(os.listdir("examples"))
             ],
             inputs=[input_image],
-            outputs=[processed_image, output_model],
+            outputs=[processed_image, output_model_obj, output_model_glb],
             cache_examples=True,
             fn=partial(run_example),
             label="Examples",
@@ -163,8 +183,8 @@ with gr.Blocks() as demo:
         outputs=[processed_image],
     ).success(
         fn=generate,
-        inputs=[processed_image],
-        outputs=[output_model],
+        inputs=[processed_image, mc_resolution],
+        outputs=[output_model_obj, output_model_glb],
     )
 
 demo.queue(max_size=10)

markdown.md

@@ -1,40 +0,0 @@
-# TripoSR Demo
-<table>
-<tr>
-<td style="text-align: center;">
-<a href="https://stability.ai">
-<img src="https://images.squarespace-cdn.com/content/v1/6213c340453c3f502425776e/6c9c4c25-5410-4547-bc26-dc621cdacb25/Stability+AI+logo.png" height="40" />
-</a>
-</td>
-<td style="border-left: 1px solid #000; width: 1px;"></td>
-<td style="text-align: center;">
-<a href="https://www.tripo3d.ai">
-<img src="https://www.tripo3d.ai/logo.png" height="40" />
-</a>
-</td>
-</tr>
-</table>
-
-<table cellspacing="0" cellpadding="0">
-<tr>
-<td style="text-align: center;">
-<a href="https://huggingface.co/stabilityai/TripoSR"><img src="https://img.shields.io/badge/%F0%9F%A4%97%20Model_Card-Huggingface-orange"></a>
-</td>
-<td style="border-left: 1px solid #000; width: 1px;"></td>
-<td style="text-align: center;">
-<a href="https://github.com/VAST-AI-Research/TripoSR"><img src="logos/github-mark-white.png" height="20"></a>
-</td>
-<td style="border-left: 1px solid #000; width: 1px;"></td>
-<td style="text-align: left;">
-<a href="https://github.com/VAST-AI-Research/TripoSR"><img src="https://img.shields.io/badge/arXiv-1234.56789-b31b1b.svg" height="20"></a>
-</td>
-</tr>
-</table>
-
-
-
-**TripoSR** is a state-of-the-art open-source model for **fast** feedforward 3D reconstruction from a single image, developed in collaboration between [Tripo AI](https://www.tripo3d.ai/) and [Stability AI](https://stability.ai/).
-
-**Tips:**
-1. If you find the result is unsatisfied, please try to change the foreground ratio. It might improve the results.
-2. Please disable "Remove Background" option only if your input image is RGBA with transparent background, image contents are centered and occupy more than 70% of image width or height.

tsr/utils.py

@@ -477,6 +477,6 @@ def save_video(
 
 def to_gradio_3d_orientation(mesh):
     mesh.apply_transform(trimesh.transformations.rotation_matrix(-np.pi/2, [1, 0, 0]))
-    mesh.apply_scale([1, 1, -1])
+    # mesh.apply_scale([1, 1, -1])
     mesh.apply_transform(trimesh.transformations.rotation_matrix(np.pi/2, [0, 1, 0]))
     return mesh