diff --git a/.gitignore b/.gitignore index 9593a84..7d3fe28 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,6 @@ __pycache__/ output* *.log scripts/tools/ -weights/ +weights apps/sessions/ apps/assets/ \ No newline at end of file diff --git a/README.md b/README.md index bee2a5b..8858e72 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ Models will be downloaded automatically, see `download_kolors_weights`, `geo_con ```sh bash embodied_gen/scripts/texture_gen.sh \ --mesh_path "apps/assets/example_texture/meshes/robot_text.obj" \ - --prompt "举着牌子的红色写实风格机器人,牌子上写着“Hello”" \ + --prompt "举着牌子的写实风格机器人,大眼睛,牌子上写着“Hello”的文字" \ --output_root "outputs/texture_gen/" \ --uuid "robot_text" ``` diff --git a/apps/assets/example_texture/text_prompts.txt b/apps/assets/example_texture/text_prompts.txt index cba2bde..b9b45fd 100644 --- a/apps/assets/example_texture/text_prompts.txt +++ b/apps/assets/example_texture/text_prompts.txt @@ -1,22 +1,19 @@ apps/assets/example_texture/meshes/robot.obj \ 写实风格机甲3D模型,主体色调为米色和深灰色,机甲结构带有机械细节和磨损痕迹 apps/assets/example_texture/meshes/robot.obj \ 写实风格机甲3D模型,主体色调为深灰色和荧光黄,机甲结构带有机械细节和磨损痕迹 -apps/assets/example_texture/meshes/robot_text.obj \ 举着牌子的红色写实风格机器人,牌子上写着“Hello”的文字 +apps/assets/example_texture/meshes/robot_text.obj \ 举着牌子的写实风格机器人,大眼睛,牌子上写着“Hello”的文字 apps/assets/example_texture/meshes/robot_text.obj \ 举着牌子的彩色写实风格机器人,牌子上写着“World”的文字 -apps/assets/example_texture/meshes/robot_text.obj \ 举着木质牌子的写实风格机甲3D模型,主体红色,牌子上写着“中国”的文字 -apps/assets/example_texture/meshes/robot_text.obj \ 举着牌子的黄色写实风格机器人,牌子上画着爱心 -apps/assets/example_texture/meshes/horse.obj \ 具有古典质感、鬃毛飞扬的棕色马首,黑色眼睛 -apps/assets/example_texture/meshes/horse.obj \ 具有古典质感、鬃毛飞扬的栗色马首 +apps/assets/example_texture/meshes/robot_text.obj \ 举着木质牌子的写实风格机甲3D模型,大眼睛,牌子上写着“中国”的文字 +apps/assets/example_texture/meshes/robot_text.obj \ 举着牌子的粉色写实风格机器人,爱心眼睛,牌子上画着爱心 +apps/assets/example_texture/meshes/horse.obj \ 一匹棕色的马头,有着经典的纹理和飞扬的鬃毛,还有黑色的眼睛 +apps/assets/example_texture/meshes/horse.obj \ A gray horse head with flying mane and brown eyes apps/assets/example_texture/meshes/electric_drill.obj \ 电动手钻,有磨损细节,灰色红色相间磨砂质感哑光外壳 apps/assets/example_texture/meshes/electric_drill.obj \ 电动手钻,有磨损细节,黄蓝色哑光外壳带有磨砂质感 apps/assets/example_texture/meshes/chair.obj \ 具有大理石材质框架,坐垫为柔软青色织物纹理的旋转吧台椅 apps/assets/example_texture/meshes/chair.obj \ 具有桃木色木质框架,坐垫为柔软灰色织物纹理的旋转吧台椅 apps/assets/example_texture/meshes/vase.obj \ 瓶身上绘有彩色飞鸟图案的花瓶 apps/assets/example_texture/meshes/vase.obj \ 陶土花瓶 -apps/assets/example_texture/meshes/globe.obj \ 木质底座的经纬线地球仪 apps/assets/example_texture/meshes/flashlight.obj \ 筒橡胶防滑纹路,红色磨砂质感的手电筒 apps/assets/example_texture/meshes/desk.obj \ 欧式风格木质梳妆台及配套凳子 apps/assets/example_texture/meshes/desk.obj \ 白色带抽屉和镜子的欧式风格梳妆台及配套凳子模型,添加金色装饰细节 apps/assets/example_texture/meshes/clock.obj \ 木质闹钟,黑色指针,显示时间为数字 apps/assets/example_texture/meshes/clock.obj \ 黑色闹钟搭配复古罗马数字表盘,古典韵味 -apps/assets/example_texture/meshes/table2.obj \ 一套现代简约风格的灰色方桌和四把木质椅子,桌面呈现光滑的哑光质感 -apps/assets/example_texture/meshes/table2.obj \ 一套现代简约风格的青色方桌和四把蓝色木质椅子,桌面呈现光滑的哑光质感 diff --git a/apps/texture_edit.py b/apps/texture_edit.py index cc3158c..ca7d1d4 100644 --- a/apps/texture_edit.py +++ b/apps/texture_edit.py @@ -116,7 +116,7 @@ with gr.Blocks(delete_cache=(43200, 43200), theme=custom_theme) as demo: 0.0, 1.0, label="Geo Condition Scale", - value=0.60, + value=0.70, step=0.01, ) guidance_scale = gr.Slider( diff --git a/embodied_gen/models/texture_model.py b/embodied_gen/models/texture_model.py index 1745163..4d609c2 100644 --- a/embodied_gen/models/texture_model.py +++ b/embodied_gen/models/texture_model.py @@ -60,7 +60,7 @@ def build_texture_gen_pipe( ) if controlnet_ckpt is None: - suffix = "geo_cond_mv" + suffix = "texture_gen_mv_v1" # "geo_cond_mv" model_path = snapshot_download( repo_id="xinjjj/RoboAssetGen", allow_patterns=f"{suffix}/*" ) diff --git a/embodied_gen/scripts/texture_gen.sh b/embodied_gen/scripts/texture_gen.sh index 747a5fe..8311e22 100644 --- a/embodied_gen/scripts/texture_gen.sh +++ b/embodied_gen/scripts/texture_gen.sh @@ -40,7 +40,7 @@ drender-cli --mesh_path ${mesh_path} \ # Step 2: multi-view rendering python embodied_gen/scripts/render_mv.py \ --index_file "${output_root}/condition/index.json" \ - --controlnet_cond_scale 0.75 \ + --controlnet_cond_scale 0.7 \ --guidance_scale 9 \ --strength 0.9 \ --num_inference_steps 40 \