Commit Graph

882 Commits

Author SHA1 Message Date
Lt.Dr.Data
716640b3eb preview fix 2023-04-27 15:33:54 +09:00
Lt.Dr.Data
eb3b6c0581 optimize 2023-04-27 15:29:07 +09:00
Lt.Dr.Data
1f9e88fcd1 Enable brush preview for key and slider events 2023-04-27 14:59:02 +09:00
Lt.Dr.Data
45b049669b Add support for channel-specific image data retrieval in /view API to fix alpha mask loading issue
When loading an image with an alpha mask in JavaScript canvas, there is an issue where the alpha and RGB channels are premultiplied. To avoid reliance on JavaScript canvas, I added support for channel-specific image data retrieval in the "/view" API. This allows us to retrieve data for each channel separately and fix the alpha mask loading issue. The changes have been committed to the repository.
2023-04-27 14:33:02 +09:00
ltdrdata
a13fee6882
Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-04-27 14:05:36 +09:00
Lt.Dr.Data
d423798cea keyup -> keydown event 2023-04-27 11:54:52 +09:00
Lt.Dr.Data
c66b114879 missionfloyd implementation
* hiding brush preview off the canvas
* change brush size on wheel event
2023-04-27 11:47:44 +09:00
Lt.Dr.Data
d662e9298e refactor: Replace brush preview feature with missionfloyd implementation 2023-04-27 10:25:04 +09:00
Lt.Dr.Data
fc976f48b1 Add cursor functionality to display brush size 2023-04-27 10:15:50 +09:00
ltdrdata
977c1ae506 Merge branch 'feature/maskpainting' of https://github.com/ltdrdata/ComfyUI into feature/maskpainting 2023-04-26 20:44:36 +09:00
ltdrdata
2bed0fad0a remove dbg message 2023-04-26 20:44:22 +09:00
ltdrdata
ce55aa784a
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-26 20:37:45 +09:00
ltdrdata
5cc97cf2bf various bug fixes
* paste action
- prevent opening upload popup
- ensure rendering after widget_value update

* view api update
- support annotated_filepath

* maskeditor layout
- prevent covering button by hidden div
2023-04-26 20:36:58 +09:00
comfyanonymous
3a1f9dba20 If IS_CHANGED returns exception delete the output instead of crashing. 2023-04-26 02:13:56 -04:00
comfyanonymous
951c0c2bbe Don't keep cached outputs for removed nodes. 2023-04-26 02:05:57 -04:00
Jake D
54251ad85e
Colored MultilineWidget (#524)
* fixes colors and z-index

* light mode fix

* Update widgets.js
2023-04-26 01:22:36 -04:00
ltdrdata
d40e08cb5f
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-26 09:17:42 +09:00
comfyanonymous
ee3a12d283 Update litegraph from upstream. 2023-04-25 19:18:50 -04:00
comfyanonymous
07194297fd Python 3.7 support. 2023-04-25 14:02:17 -04:00
Lt.Dr.Data
9926897b78 clean code 2023-04-25 18:02:23 +09:00
ltdrdata
7dc1dd6503
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-25 16:21:17 +09:00
comfyanonymous
aa57136dae Some fixes to the batch masks PR. 2023-04-25 01:12:40 -04:00
comfyanonymous
c7c1f0d074 Merge branch 'multiple_inpaint_masks' of https://github.com/guill/ComfyUI
# Conflicts:
#	nodes.py
2023-04-25 00:54:15 -04:00
comfyanonymous
c50208a703 Refactor more code to sample.py 2023-04-24 23:25:51 -04:00
Lt.Dr.Data
79a07bb813 clean commit 2023-04-25 12:01:32 +09:00
Lt.Dr.Data
55e46e708e Merge branch 'Main' into feature/maskpainting 2023-04-25 11:52:53 +09:00
comfyanonymous
7983b3a975 This is cleaner this way. 2023-04-24 22:45:35 -04:00
comfyanonymous
36acce58e7 Auto increase the size of the image upload widget when there's an image. 2023-04-24 18:13:18 -04:00
comfyanonymous
a2236a0c2a Merge branch 'master' of https://github.com/BlenderNeko/ComfyUI 2023-04-24 17:57:27 -04:00
BlenderNeko
0b07b2cc0f gligen tuple 2023-04-24 21:47:57 +02:00
Dr.Lt.Data
76db999497 Fix button positioning issue related to window height.
Change brush size from button to slider.
2023-04-24 21:30:06 +09:00
BlenderNeko
d9b1595f85 made sample functions more explicit 2023-04-24 12:53:10 +02:00
comfyanonymous
463bde66a1 Add hypernetwork example link to readme.
Move hypernetwork loader node to loaders.
2023-04-24 03:08:51 -04:00
comfyanonymous
4e345b31f6 Support all known hypernetworks. 2023-04-24 02:36:06 -04:00
comfyanonymous
f1b87f50fa Add hypernetworks path config to extra_model_paths.yaml.example 2023-04-24 01:50:56 -04:00
comfyanonymous
0ac319fd81 Don't delete all outputs when execution gets interrupted. 2023-04-23 22:44:38 -04:00
comfyanonymous
ccad603b2e Add a way for nodes to validate their own inputs. 2023-04-23 16:03:26 -04:00
ltdrdata
f7a8218814
Add clipspace feature. (#541)
* Add clipspace feature.
* feat: copy content to clipspace
* feat: paste content from clipspace

Extend validation to allow for validating annotated_path in addition to other parameters.

Add support for annotated_filepath in folder_paths function.

Generalize the '/upload/image' API to allow for uploading images to the 'input', 'temp', or 'output' directories.

* rename contentClipboard -> clipspace

* Do deep copy for imgs on copy to clipspace.

* add original_imgs into clipspace
* Preserve the original image when 'imgs' are modified

* robust patch & refactoring folder_paths about annotated_filepath

* Only show the Paste menu if the ComfyApp.clipspace is not empty

* instant refresh on paste

force triggering 'changed' on paste action

* subfolder fix on paste logic

attach subfolder if subfolder isn't empty

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-04-23 15:58:55 -04:00
BlenderNeko
5818539743 add docstrings 2023-04-23 20:09:09 +02:00
BlenderNeko
8d2de420d3 Merge branch 'master' of https://github.com/BlenderNeko/ComfyUI 2023-04-23 20:02:18 +02:00
BlenderNeko
2a09e2aa27 refactor/split various bits of code for sampling 2023-04-23 20:02:08 +02:00
comfyanonymous
737c158763 Merge branch 'change-session-store' of https://github.com/pythongosssss/ComfyUI 2023-04-23 12:56:12 -04:00
comfyanonymous
5282f56434 Implement Linear hypernetworks.
Add a HypernetworkLoader node to use hypernetworks.
2023-04-23 12:35:25 -04:00
ltdrdata
ea19315b4d event listener patch
add ], [ key event for brush size
remove listener on close
2023-04-24 00:01:20 +09:00
ltdrdata
cc7ad627a8 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-23 23:34:39 +09:00
ltdrdata
b2abfa6ad7 subfolder fix on paste logic
attach subfolder if subfolder isn't empty
2023-04-23 23:32:48 +09:00
ltdrdata
a09406bff5 robust patch
again...
2023-04-23 23:05:00 +09:00
ltdrdata
1a9c556890 robust patch
use mouseup event
2023-04-23 22:59:20 +09:00
ltdrdata
b5a7bd2be1 enhance mask painting
smooth drawing
add brush_size +/- button
2023-04-23 22:32:32 +09:00
ltdrdata
f8e6adac06 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-23 21:23:25 +09:00