Merge branch 'master' into licence-update

Author: jakechai

README.md

@@ -20,17 +20,19 @@ A [ComfyUI](https://github.com/comfyanonymous/ComfyUI) workflow customization by
         `pip install -r requirements.txt`
 
 ## Video Introduction
-- txt2img&img2img: [Youtube](https://www.youtube.com/watch?v=PKnxhFZNu2c) [Bilibili](https://www.bilibili.com/video/BV1h6421f7AQ/)
-- img2mesh: WIP
-- 3D-Pack Installation Tips： WIP
+- txt2img&img2img workflow: [Youtube](https://www.youtube.com/watch?v=PKnxhFZNu2c) [Bilibili](https://www.bilibili.com/video/BV1h6421f7AQ/)
+- img2mesh workflow: [Youtube](https://www.youtube.com/watch?v=CbG2Vq3kps0) [Bilibili](https://www.bilibili.com/video/BV1CE4m1R7br/)
+- 3D-Pack Installation Tips： [Youtube](https://www.youtube.com/watch?v=RjuoLMCpvbI) [Bilibili](https://www.bilibili.com/video/BV1Nm421375F/)
+- 3D-Pack Algorithm Comparison： [Youtube](https://www.youtube.com/watch?v=E7Oj8UUGLic) [Bilibili](https://www.bilibili.com/video/BV1CU411U7y4/)
 
 ## JakeUpgrade Workflow
 Main:
-- [JK_workflow_tex2img_img2img_SDXL](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Main/JK_workflow_tex2img_img2img_SDXL.json)
-- [JK_workflow_tex2img_img2img_SD15](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Main/JK_workflow_tex2img_img2img_SD15.json)
+- [JK_workflow_txt2img_img2img_SDXL](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Main/JK_workflow_txt2img_img2img_SDXL.json)
+- [JK_workflow_txt2img_img2img_SD15](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Main/JK_workflow_txt2img_img2img_SD15.json)
 - [JK_workflow_img2mesh_CRM&Zero123plus&MVDream&CharacterGen](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Main/JK_workflow_img2mesh_CRM&Zero123plus&MVDream&CharacterGen.json)
 - [JK_workflow_img2mesh_Unique3D&Wonder3D&Era3D](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Main/JK_workflow_img2mesh_Unique3D&Wonder3D&Era3D.json)
 - [JK_workflow_img2mesh_Zero123&SV3D](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Main/JK_workflow_img2mesh_Zero123&SV3D.json)
+- [JK_workflow_img2mesh_3DGS](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Main/JK_workflow_img2mesh_3DGS.json)
 
 (Tips: ComfyUI-3D-Pack needs pytorch 2.3.0+cu121 and xformers, but the latest ComfyUI_windows_portable version uses pytorch 2.3.1+cu121, you should separate those two ComfyUI.)
 
@@ -39,41 +41,46 @@ Other:
 - [JK_workflow_Seamless Texture](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Module/JK_workflow_Seamless%20Texture.json)
 - [JK_workflow_Detailer](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Module/JK_workflow_Detailer.json)
 - [JK_workflow_Inpaint](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Module/JK_workflow_Inpaint.json)
-- [JK_workflow_tex2img_Simple](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Module/JK_workflow_tex2img_Simple.json)
+- [JK_workflow_txt2img_Simple](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Module/JK_workflow_txt2img_Simple.json)
 - [JK_workflow_Upscale](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Module/JK_workflow_Upscale.json)
 - [JK_Workflow_Mesh-ReMesh_Projection](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/Workflow/Module/JK_Workflow_Mesh-ReMesh_Projection.json)
 
 ## Required Custom Nodes
 To use JK_workflow, you need to install:
 - [rgthree](https://github.com/rgthree/rgthree-comfy)
-- [Comfyroll](https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes)
 - [pythongosssss](https://github.com/pythongosssss/ComfyUI-Custom-Scripts)
 - [ControlNet AUX](https://github.com/Fannovel16/comfyui_controlnet_aux)
 - [Impact Pack](https://github.com/ltdrdata/ComfyUI-Impact-Pack)
 - [Inspire Pack](https://github.com/ltdrdata/ComfyUI-Inspire-Pack)
+- [IP Adapter Plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus)
 - [KJ Nodes](https://github.com/kijai/ComfyUI-KJNodes)
+- [Essentials](https://github.com/cubiq/ComfyUI_essentials)
+- [WAS Node Suite](https://github.com/WASasquatch/was-node-suite-comfyui)
+- [Segment Anything](https://github.com/storyicon/comfyui_segment_anything)
+- [JakeUpgrade](https://github.com/jakechai/ComfyUI-JakeUpgrade)
+
+txt2img_img2img workflow:
+- [Comfyroll](https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes)
 - [WD14 Tagger](https://github.com/pythongosssss/ComfyUI-WD14-Tagger)
 - [ComfyUI Noise](https://github.com/BlenderNeko/ComfyUI_Noise)
-- [IP Adapter Plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus)
 - [Face Analysis](https://github.com/cubiq/ComfyUI_FaceAnalysis)
 - [StyleAligned](https://github.com/brianfitzgerald/style_aligned_comfy)
 - [NNLatentUpscale](https://github.com/Ttl/ComfyUi_NNLatentUpscale)
 - [Dynamic Prompts](https://github.com/adieyal/comfyui-dynamicprompts)
 - [One Button Prompt](https://github.com/AIrjen/OneButtonPrompt)
 - [ComfyUI ELLA](https://github.com/TencentQQGYLab/ComfyUI-ELLA)
-- [Essentials](https://github.com/cubiq/ComfyUI_essentials)
-- [WAS Node Suite](https://github.com/WASasquatch/was-node-suite-comfyui)
 - [Ultimate SD Upscale](https://github.com/ssitu/ComfyUI_UltimateSDUpscale)
-- [ComfyUI 3D Pack](https://github.com/MrForExample/ComfyUI-3D-Pack)
 - [Seamless tiling](https://github.com/spinagon/ComfyUI-seamless-tiling)
 - [Portrait Master](https://github.com/florestefano1975/comfyui-portrait-master)
-- [JakeUpgrade](https://github.com/jakechai/ComfyUI-JakeUpgrade)
+
+img2mesh workflow:
+- [ComfyUI 3D Pack](https://github.com/MrForExample/ComfyUI-3D-Pack)
 
 Install and copy | replace files (see in replacement folder):
 - [ComfyUI Manager](https://github.com/ltdrdata/ComfyUI-Manager) : Copy _JK.pack in the replacement folder to `custom_nodes\ComfyUI-Manager\component'.
 - [Prompt Stylers](https://github.com/wolfden/ComfyUi_PromptStylers) : Copy new styles (optional).
 
-## JK_workflow : tex2img_img2img : Introduction
+## JK_workflow : txt2img_img2img : Introduction
 	Hotkey:
 		0: usage guide
 		\`: overall workflow
@@ -121,7 +128,7 @@ Install and copy | replace files (see in replacement folder):
 		1. Nodes State JK🐉 uses target nodes' id to control their active | mute | bypass mode. Need to update node_id_list if you make a copy.
 		2. The order of Detailer Progress and Upscale Progress can be swapped. Please avoid to form loops. 
 
-## JK_workflow : tex2img_img2img : Explanation
+## JK_workflow : txt2img_img2img : Explanation
 ![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/0-1_OverallWorkflow.png)
 - Overall Workflow
 
@@ -193,7 +200,7 @@ Install and copy | replace files (see in replacement folder):
 
 	Other:
 		TripoSR workflow is not included because it is straightforward.
-		3DGS workflow is not included but you can integrate LGM or GS3D nodes into the workflows I provided easily.
+		Triplane workflow is not included because it is straightforward.
 
 ## JK_workflow : img2mesh : Explanation
 ![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/img2mesh-types.png)
@@ -205,9 +212,12 @@ Install and copy | replace files (see in replacement folder):
 ![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/img2mesh_Unique3D&Wonder3D&Era3D-structure.png)
 - Workflow breakdown: JUnique3D&Wonder3D&Era3D
 
-![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/img2mesh_Zero123&SV3D-sturcture.png)
+![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/img2mesh_Zero123&SV3D-structure.png)
 - Workflow breakdown: Zero123&SV3D
 
+![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/img2mesh_3DGS-structure.png)
+- Workflow breakdown: 3DGS
+
 ![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/img2mesh_CRM&Zero123plus&MVDream&CharacterGen.png)
 - Workflow Control Panels: CRM&Zero123plus&MVDream&CharacterGen
 
@@ -217,6 +227,9 @@ Install and copy | replace files (see in replacement folder):
 ![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/img2mesh_Zero123&SV3D.png)
 - Workflow Control Panels: Zero123&SV3D
 
+![image](https://github.com/jakechai/ComfyUI-JakeUpgrade/blob/master/imgs/img2mesh_3DGS.png)
+- Workflow Control Panels: 3DGS
+
 ## JakeUpgrade Custom Nodes
 	Misc Nodes
 		SD1.5 Aspect Ratio JK🐉
@@ -291,6 +304,7 @@ Install and copy | replace files (see in replacement folder):
 		Pipe Input Switch JK🐉
 		Impact Pipe Input Switch JK🐉
 		Mesh Input Switch JK🐉
+		Ply Input Switch JK🐉
 		Orbit Pose Input Switch JK🐉
     ComfyMath Fix Nodes
 		BoolToInt JK🐉
@@ -363,7 +377,7 @@ Install and copy | replace files (see in replacement folder):
 		JK🐉::Inpaint Simple
 		JK🐉::Inpaint Checkpoint
 		JK🐉::Outpaint Checkpoint
-		JK🐉::Tex2Img
+		JK🐉::txt2img
 
 ## Reference Custom Nodes
 Jake Upgrade Nodes are inspired by:
@@ -382,6 +396,8 @@ Jake Upgrade Nodes are inspired by:
 - 2024-07-11 - v1.0.6 Noise Injection for Upscale Workflow.
 - 2024-07-16 - v1.0.7 Single Image to Mesh Workflow updated.
 - 2024-07-21 - v1.0.8 Orbit Poses Constant nodes added. 3 Image to Mesh Workflows updated.
+- 2024-07-22 - v1.0.9 3DGS workflow added.
+- 2024-07-24 - v1.1.0 img2mesh workflow updated. Craftsman Mesh added. Three OrbitPoses nodes been added to 3D-Pack.
 
 ## Workflow Todo List
 - ControlNet Preprocess

Workflow/Main/JK_workflow_img2mesh_3DGS.json

@@ -91,6 +91,7 @@ def setup_js():
     "CR Pipe Input Switch JK": CR_PipeInputSwitch_JK,
     "CR Impact Pipe Input Switch JK": CR_ImpactPipeInputSwitch_JK,
     "CR Mesh Input Switch JK": CR_MeshInputSwitch_JK,
+    "CR Ply Input Switch JK": CR_PlyInputSwitch_JK,
     "CR Orbit Pose Input Switch JK": CR_OrbitPoseInputSwitch_JK,
     ### ComfyMath Fix Nodes
     "CM_BoolToInt JK": BoolToInt_JK,
@@ -228,6 +229,7 @@ def setup_js():
     "CR Pipe Input Switch JK": "Pipe Input Switch JK🐉",
     "CR Impact Pipe Input Switch JK": "Impact Pipe Input Switch JK🐉",
     "CR Mesh Input Switch JK": "Mesh Input Switch JK🐉",
+    "CR Ply Input Switch JK": "Ply Input Switch JK🐉",
     "CR Orbit Pose Input Switch JK": "Orbit Pose Input Switch JK🐉",
     ### ComfyMath Fix Nodes
     "CM_BoolToInt JK": "BoolToInt JK🐉",