Upload gradio_app.py

gradio_app.py

@@ -123,10 +123,13 @@ def build_model_viewer_html(save_folder, height=660, width=790, textured=False):
         related_path = f"./textured_mesh.glb"
         template_name = './assets/modelviewer-textured-template.html'
         output_html_path = os.path.join(save_folder, f'textured_mesh.html')
+        mesh_file_path = os.path.join(save_folder, f'textured_mesh.glb')
     else:
         related_path = f"./white_mesh.glb"
         template_name = './assets/modelviewer-template.html'
         output_html_path = os.path.join(save_folder, f'white_mesh.html')
+        mesh_file_path = os.path.join(save_folder, f'white_mesh.glb')
+
     offset = 50 if textured else 10
     with open(os.path.join(CURRENT_DIR, template_name), 'r', encoding='utf-8') as f:
         template_html = f.read()
@@ -134,39 +137,19 @@ def build_model_viewer_html(save_folder, height=660, width=790, textured=False):
     with open(output_html_path, 'w', encoding='utf-8') as f:
         template_html = template_html.replace('#height#', f'{height - offset}')
         template_html = template_html.replace('#width#', f'{width}')
-        template_html = template_html.replace('#src#', f'{related_path}/')
+        #template_html = template_html.replace('#src#', f'{related_path}/')
+        template_html = template_html.replace('#src#', f'{mesh_file_path}/')
         f.write(template_html)
 
-    #iframe_tag = f'<iframe src="file={output_html_path}" height="{height}" width="100%" frameborder="0"></iframe>'
-    #print(
-    #    f'Find html file {output_html_path}, {os.path.exists(output_html_path)}')
-
-    #return f"""
-    #    <div style='height: {height}; width: 100%;'>
-    #    {iframe_tag}
-    #    </div>
-    #"""
-
-
-    if textured:
-        mesh_file_path = os.path.join(save_folder, f'textured_mesh.glb')
-    else: 
-        mesh_file_path = os.path.join(save_folder, f'white_mesh.glb')
-
-    print(
-        f'Find html file {mesh_file_path}, {os.path.exists(mesh_file_path)}')
+    iframe_tag = f'<iframe src="file={output_html_path}" height="{height}" width="100%" frameborder="0"></iframe>'
     
-    html="""
-    <script type="module" src="https://unpkg.com/@google/model-viewer/dist/model-viewer.min.js"></script>
-    <model-viewer src="https://modelviewer.dev/shared-assets/models/Astronaut.glb" 
-                  alt="A 3D model of an astronaut" 
-                  auto-rotate 
-                  camera-controls 
-                  style="height: 500px; width: 500px;">
-    </model-viewer>
-    """
+    print(f'Find html file {output_html_path}, {os.path.exists(output_html_path)}')
 
-    return html
+    return f"""
+        <div style='height: {height}; width: 100%;'>
+        {iframe_tag}
+        </div>
+    """
 
 @spaces.GPU(duration=40)
 def _gen_shape(
@@ -496,16 +479,6 @@ def build_app():
             with gr.Column(scale=9):
                 with gr.Tabs(selected='gen_mesh_panel') as tabs_output:
                     with gr.Tab('Generated Mesh', id='gen_mesh_panel'):
-                        html_model_viewer="""
-                            <script type="module" src="https://unpkg.com/@google/model-viewer/dist/model-viewer.min.js"></script>
-                            <model-viewer src="https://modelviewer.dev/shared-assets/models/Astronaut.glb" 
-                                          alt="A 3D model of an astronaut" 
-                                          auto-rotate 
-                                          camera-controls 
-                                          style="height: 500px; width: 500px;">
-                            </model-viewer>
-                        """
-                        gr.HTML(html_model_viewer)
                         html_gen_mesh = gr.HTML(HTML_OUTPUT_PLACEHOLDER, label='Output')
                     with gr.Tab('Exporting Mesh', id='export_mesh_panel'):
                         html_export_mesh = gr.HTML(HTML_OUTPUT_PLACEHOLDER, label='Output')