sync with source

app.py

@@ -68,19 +68,18 @@ with gr.Blocks(title="DiLightNet Demo") as demo:
                     outputs=[mesh, fov],
                 )
 
-    gr.Markdown("## Step 4. Render Hints")
     with gr.Row():
-        with gr.Column():
+        with gr.Column(variant="panel"):
+            gr.Markdown("## Step 4. Render Hints")
             hint_image = gr.Image(label="Hint Image", height=512, width=512)
-        with gr.Column():
             res_folder_path = gr.Textbox("", visible=False)
             is_env_lighting = gr.Checkbox(label="Use Environmental Lighting", value=True, interactive=False, visible=False)
             with gr.Tab("Environmental Lighting"):
                 env_map_preview = gr.Image(label="Environment Map Preview", height=256, width=512, interactive=False, show_download_button=False)
-                env_map_path = gr.Text(interactive=False, visible=False, value="examples/env_map/grace.exr")
+                env_map_path = gr.Text(interactive=False, visible=True, value="examples/env_map/grace.exr")
                 env_rotation = gr.Slider(value=0., label="Environment Rotation", minimum=0., maximum=360., step=0.5)
                 env_examples = gr.Examples(
-                    examples=[[os.path.join("examples/env_map_preview", i), os.path.join("examples/env_map", i).replace("png", "exr")] for i in os.listdir("examples/env_map_preview")],
+                    examples=[[os.path.join("examples/env_map_preview", i), os.path.join("examples/env_map_preview", i).replace("png", "exr")] for i in os.listdir("examples/env_map_preview")],
                     inputs=[env_map_preview, env_map_path],
                     examples_per_page = 20,
                 )
@@ -126,39 +125,35 @@ with gr.Blocks(title="DiLightNet Demo") as demo:
                     outputs=[hint_image, res_folder_path, is_env_lighting]
                 )
 
-    gr.Markdown("## Step 5. Control Lighting!")
-    with gr.Row():
-        res_image = gr.Image(label="Result Image")
-        with gr.Column():
+        with gr.Column(variant="panel"):
+            gr.Markdown("## Step 5. Control Lighting!")
+            res_image = gr.Image(label="Result Image", height=512, width=512)
             with gr.Group():
-                with gr.Row():
-                    relighting_prompt = gr.Textbox(value="", label="Appearance Text Prompt", lines=3,
+                relighting_prompt = gr.Textbox(value="", label="Appearance Text Prompt", lines=3,
                                                 placeholder="Input prompt here",
                                                 interactive=True)
+                # several example prompts
                 with gr.Row():
-                    # several example prompts
                     metallic_prompt_btn = gr.Button(value="Metallic", size="sm")
                     specular_prompt_btn = gr.Button(value="Specular", size="sm")
                     very_specular_prompt_btn = gr.Button(value="Very Specular", size="sm")
-                    clear_prompt_btn = gr.Button(value="Clear", size="sm")
-                    metallic_prompt_btn.click(fn=lambda x: x + " metallic", inputs=[relighting_prompt], outputs=[relighting_prompt])
-                    specular_prompt_btn.click(fn=lambda x: x + " specular", inputs=[relighting_prompt], outputs=[relighting_prompt])
-                    very_specular_prompt_btn.click(fn=lambda x: x + " very specular", inputs=[relighting_prompt], outputs=[relighting_prompt])
-                    clear_prompt_btn.click(fn=lambda x: "", inputs=[relighting_prompt], outputs=[relighting_prompt])
+                metallic_prompt_btn.click(fn=lambda x: x + " metallic", inputs=[relighting_prompt], outputs=[relighting_prompt])
+                specular_prompt_btn.click(fn=lambda x: x + " specular", inputs=[relighting_prompt], outputs=[relighting_prompt])
+                very_specular_prompt_btn.click(fn=lambda x: x + " very specular", inputs=[relighting_prompt], outputs=[relighting_prompt])
                 with gr.Row():
+                    clear_prompt_btn = gr.Button(value="Clear")
                     reuse_btn = gr.Button(value="Reuse Provisional Image Generation Prompt")
-                    reuse_btn.click(fn=lambda x: x, inputs=[prompt], outputs=[relighting_prompt])
-                with gr.Accordion("Options", open=False):
-                    with gr.Row():
-                        relighting_seed = gr.Number(value=3407, label="Seed", interactive=True)
-                        relighting_steps = gr.Number(value=20, label="Steps", interactive=True)
-                        relighting_cfg = gr.Number(value=3.0, label="CFG", interactive=True)
-            with gr.Row():
-                relighting_generate_btn = gr.Button(value="Generate")
+                clear_prompt_btn.click(fn=lambda x: "", inputs=[relighting_prompt], outputs=[relighting_prompt])
+                reuse_btn.click(fn=lambda x: x, inputs=[prompt], outputs=[relighting_prompt])
+            with gr.Accordion("Options", open=False):
+                relighting_seed = gr.Number(value=3407, label="Seed", interactive=True)
+                relighting_steps = gr.Number(value=20, label="Steps", interactive=True)
+                relighting_cfg = gr.Number(value=3.0, label="CFG", interactive=True)
+            relighting_generate_btn = gr.Button(value="Generate")
 
             def gen_relighting_image(masked_image, mask, res_folder_path, relighting_prompt, relighting_seed,
-                                     relighting_steps, relighting_cfg, do_env_inpainting,
-                                     progress=gr.Progress(track_tqdm=True)):
+                                    relighting_steps, relighting_cfg, do_env_inpainting,
+                                    progress=gr.Progress(track_tqdm=True)):
                 relighting_gen(
                     masked_ref_img=masked_image,
                     mask=mask,
@@ -178,11 +173,10 @@ with gr.Blocks(title="DiLightNet Demo") as demo:
                     relit_img = (relit_img * 255).clip(0, 255).astype(np.uint8)
                 return relit_img
 
-
             relighting_generate_btn.click(fn=gen_relighting_image,
-                                          inputs=[masked_image, mask, res_folder_path, relighting_prompt, relighting_seed,
-                                                  relighting_steps, relighting_cfg, is_env_lighting],
-                                          outputs=[res_image])
+                                        inputs=[masked_image, mask, res_folder_path, relighting_prompt, relighting_seed,
+                                                relighting_steps, relighting_cfg, is_env_lighting],
+                                        outputs=[res_image])
 
 
 if __name__ == '__main__':

demo/render_hints.py

@@ -58,7 +58,7 @@ def render_hint_images(model_path, fov, pls, power=500., geo_smooth=True, output
                 obj.modifiers.new("Smooth", type="SMOOTH")
                 smooth_modifier = obj.modifiers["Smooth"]
                 smooth_modifier.factor = 0.5
-                smooth_modifier.iterations = 150
+                smooth_modifier.iterations = 25
     configure_blender()
 
     c2w = np.array([