Upload gradio_app.py

gradio_app.py

@@ -346,24 +346,21 @@ def build_app():
 
         with gr.Row():
             with gr.Column(scale=3):
-                with gr.Row():
-                    with gr.Row():
-                        mv_image_front = gr.Image(label='Front', type='pil', image_mode='RGBA', height=140,
-                                                  min_width=100, elem_classes='mv-image')
-                        mv_image_back = gr.Image(label='Back', type='pil', image_mode='RGBA', height=140,
-                                                 min_width=100, elem_classes='mv-image')
-                    with gr.Row():
-                        mv_image_left = gr.Image(label='Left', type='pil', image_mode='RGBA', height=140,
-                                                 min_width=100, elem_classes='mv-image')
-                        mv_image_right = gr.Image(label='Right', type='pil', image_mode='RGBA', height=140,
-                                                  min_width=100, elem_classes='mv-image')
+                with gr.Tabs(selected='tab_mv'):
+                    with gr.Tab("Imágenes", id='tab_mv', visible=TURBO_MODE):
+                        with gr.Row():
+                            mv_image_front = gr.Image(label='Parte Frontal', type='pil', image_mode='RGBA', height=140,
+                                                      min_width=100, elem_classes='mv-image')
+                            mv_image_back = gr.Image(label='Parte Trasera', type='pil', image_mode='RGBA', height=140,
+                                                     min_width=100, elem_classes='mv-image')
+                        with gr.Row():
+                            mv_image_left = gr.Image(label='Izquierda', type='pil', image_mode='RGBA', height=140,
+                                                     min_width=100, elem_classes='mv-image')
+                            mv_image_right = gr.Image(label='Derecha', type='pil', image_mode='RGBA', height=140,
+                                                      min_width=100, elem_classes='mv-image')
 
                 with gr.Row():
-                    btn = gr.Button(value='Gen Shape', variant='primary', min_width=100)
-                    btn_all = gr.Button(value='Gen Textured Shape',
-                                        variant='primary',
-                                        visible=HAS_TEXTUREGEN,
-                                        min_width=100)
+                    btn = gr.Button(value='Generar Modelo', variant='primary', min_width=100)
 
                 with gr.Group():
                     file_out = gr.File(label="File", visible=False)
@@ -416,12 +413,12 @@ 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'):
+                    with gr.Tab('Modelo Generado', id='gen_mesh_panel'):
                         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')
-                    with gr.Tab('Mesh Statistic', id='stats_panel'):
-                        stats = gr.Json({}, label='Mesh Stats')
+                    #with gr.Tab('Exporting Mesh', id='export_mesh_panel'):
+                    #    html_export_mesh = gr.HTML(HTML_OUTPUT_PLACEHOLDER, label='Output')
+                    #with gr.Tab('Mesh Statistic', id='stats_panel'):
+                    #    stats = gr.Json({}, label='Mesh Stats')
 
         btn.click(
             shape_generation,
@@ -448,31 +445,6 @@ def build_app():
             outputs=[tabs_output],
         )
 
-        btn_all.click(
-            generation_all,
-            inputs=[
-                mv_image_front,
-                mv_image_back,
-                mv_image_left,
-                mv_image_right,
-                num_steps,
-                cfg_scale,
-                seed,
-                octree_resolution,
-                check_box_rembg,
-                num_chunks,
-                randomize_seed,
-            ],
-            outputs=[file_out, file_out2, html_gen_mesh, stats, seed]
-        ).then(
-            lambda: (gr.update(visible=True, value=True), gr.update(interactive=False), gr.update(interactive=True),
-                     gr.update(interactive=False)),
-            outputs=[export_texture, reduce_face, confirm_export, file_export],
-        ).then(
-            lambda: gr.update(selected='gen_mesh_panel'),
-            outputs=[tabs_output],
-        )
-
         def on_gen_mode_change(value):
             if value == 'Turbo':
                 return gr.update(value=5)
@@ -499,30 +471,20 @@ def build_app():
 
             print(f'exporting {file_out}')
             print(f'reduce face to {target_face_num}')
-            if export_texture:
-                mesh = trimesh.load(file_out2)
-                save_folder = gen_save_folder()
-                path = export_mesh(mesh, save_folder, textured=True, type=file_type)
-
-                # for preview
-                save_folder = gen_save_folder()
-                _ = export_mesh(mesh, save_folder, textured=True)
-                model_viewer_html = build_model_viewer_html(save_folder, height=HTML_HEIGHT, width=HTML_WIDTH,
-                                                            textured=True)
-            else:
-                mesh = trimesh.load(file_out)
-                mesh = floater_remove_worker(mesh)
-                mesh = degenerate_face_remove_worker(mesh)
-                if reduce_face:
-                    mesh = face_reduce_worker(mesh, target_face_num)
-                save_folder = gen_save_folder()
-                path = export_mesh(mesh, save_folder, textured=False, type=file_type)
-
-                # for preview
-                save_folder = gen_save_folder()
-                _ = export_mesh(mesh, save_folder, textured=False)
-                model_viewer_html = build_model_viewer_html(save_folder, height=HTML_HEIGHT, width=HTML_WIDTH,
-                                                            textured=False)
+            
+            mesh = trimesh.load(file_out)
+            mesh = floater_remove_worker(mesh)
+            mesh = degenerate_face_remove_worker(mesh)
+            if reduce_face:
+                mesh = face_reduce_worker(mesh, target_face_num)
+            save_folder = gen_save_folder()
+            path = export_mesh(mesh, save_folder, textured=False, type=file_type)
+
+            # for preview
+            save_folder = gen_save_folder()
+            _ = export_mesh(mesh, save_folder, textured=False)
+            model_viewer_html = build_model_viewer_html(save_folder, height=HTML_HEIGHT, width=HTML_WIDTH,
+                                                        textured=False)
             print(f'export to {path}')
             return model_viewer_html, gr.update(value=path, interactive=True)