sneedgroup-holder/openOutpaint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
752 commits 1 branch 0 tags 23 MiB
Commit graph

134 commits

Author SHA1 Message Date
tim h
01dbafb17f Merge branch 'main' into clear_brush_mask_option 2022-12-21 19:36:06 -06:00
Victor Seiji Hariki
42967f0a9a make cursors less finicky 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-21 18:29:11 -03:00
Victor Seiji Hariki
518e60f44a fix select interaction with layers and wrong sampler 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-21 14:30:35 -03:00
tim h
aec0b5a5a1 adds option to preserve brushed mask post-dream 2022-12-19 18:51:29 -06:00
tim h
f0aaf51389 css/js resource changes for extension 2022-12-18 17:50:40 -06:00
tim h
072e81ce5e Merge branch 'main' into testing 2022-12-17 15:07:26 -06:00
tim h
79ee0655b1 fixes resolution changing while scrolling through returned images if sync cursor size is enabled 2022-12-17 15:07:10 -06:00
tim h
b50b6f0ce4 come back progress bar, i miss you 2022-12-17 09:35:26 -06:00
Victor Seiji Hariki
2ee01e71c9 fix some tools 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-17 00:55:53 -03:00
Victor Seiji Hariki
ea68e25cf0 canvas scaling? 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-17 00:21:28 -03:00
tim h
6d9155261e RFC- rename keepMask to keepUnmask 
simple search/replace for keepMask[ed]
 2022-12-16 19:59:30 -06:00
Victor Seiji Hariki
34ef37869f fix img2img mask canvas weirdness 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-16 01:28:03 -03:00
Victor Seiji Hariki
5872f2c3a4 fix duplicate mousewheel events 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-15 22:37:21 -03:00
tim h
065b3062a6 whoops 2022-12-15 09:51:08 -06:00
tim h
a7e02cd76d fixes use seed button for multiple dream queues 2022-12-15 09:25:20 -06:00
Victor Seiji Hariki
3207e86566 makes ctrl + middle be move canvas 
This is for consistency with zoom and to avoid conflict with middle
mouse click for extra image generation

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-15 11:59:01 -03:00
Victor Seiji Hariki
c6a6342a8c This should be a bit better 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-15 11:51:18 -03:00
Victor Seiji Hariki
9a81946eef now selection dream compatible with mouse functions 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-15 09:57:41 -03:00
Victor Seiji Hariki
ec05084d71 ignore wheel on ctrl key and remove debug 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-14 15:45:41 -03:00
Victor Seiji Hariki
5e6b18503b Should mostly solve #94 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-14 15:12:44 -03:00
Victor Seiji Hariki
6cdd9495e3 keep masked option added 
a fix for #99

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-14 00:17:17 -03:00
tim h
59b2d451fe whoops jr 2022-12-13 20:08:46 -06:00
tim h
a350842dfd whoops 
at least it fixes fixed-seed makeMore() too
 2022-12-13 20:03:58 -06:00
tim h
9b23e3aa92 reuse random seeds 2022-12-13 19:30:40 -06:00
Victor Seiji Hariki
2e151d2bbc fix resolution not bound to cursor size anymore (again) 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-13 20:22:16 -03:00
Victor Seiji Hariki
e2afb48703 fix loading empty prompts from local storage 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-13 17:07:30 -03:00
Victor Seiji Hariki
fb83b126c7 supports drag and drop for non-square resolutions 
Has a lot of duplicate code... will try refactoring someday. Adding
mouse wheel on selection to scale generation resolution is also a
possibility.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-13 15:17:02 -03:00
Victor Seiji Hariki
5cb3617907 Merge remote-tracking branch 'zero/main' into testing 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-13 11:11:06 -03:00
Victor Seiji Hariki
9e0541bf0c view generation resolution too 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-13 11:10:13 -03:00
tim h
41e57d28cf whoops 2022-12-12 21:05:04 -06:00
tim h
9b8b432f52 Merge branch 'main' into i90 2022-12-12 19:53:30 -06:00
tim h
55e361b6e3 i am not smart enough for this lol 2022-12-12 19:52:14 -06:00
tim h
4241cbd4f9 why does the callback work fine on dream but breaks img2img 2022-12-12 19:30:28 -06:00
tim h
8e5d48f97b think it makes more sense here 2022-12-12 18:25:02 -06:00
tim h
228bd3d9a0 updates reticle size upon manually entered resolution 2022-12-12 17:09:27 -06:00
tim h
82e943b12d option to sync resolution and reticle size (issue 90) 2022-12-12 16:25:49 -06:00
Victor Seiji Hariki
f63bbafe0f add cancel button to future generations 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-12 18:49:53 -03:00
Victor Seiji Hariki
0a73687556 add prompt history as suggested in #87 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-12 18:25:32 -03:00
Victor Seiji Hariki
f279c8457b dream queueing now supported 
- Image navigation shortcuts work for all simultaneously (probably not
   optimal)

This is for #89. Some things should be ironed out, such as adding a
cancel button for future jobs and an order indicator maybe?

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-12 00:55:54 -03:00
Victor Seiji Hariki
460130396f add button to dream to save current image (no sc) 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-11 21:01:55 -03:00
Victor Seiji Hariki
57e2e6a9f3 dream image generation failed typo 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-10 23:13:14 -03:00
Victor Seiji Hariki
ba7c7608c0 index 0 not counted as an image anymore 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-09 23:18:24 -03:00
Victor Seiji Hariki
0e6a5c8d4a adds index 0 to image gen 
image gen has now index 0 to show what was before the image generation.
this is especially useful for img2img

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-09 22:07:18 -03:00
Victor Seiji Hariki
c2e0cf4615 expand input field relative to drawable canvas 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-08 12:17:59 -03:00
Victor Seiji Hariki
aee812b70a fix mouse for chrome (for now) 
Seems scroll delta is inconsistent between browsers, so for my chromium
installation it was simply not working at all due to snapping. Made it
so every event is a cursor size change for now. probably bad for smooth
mouse wheels, but for a complete fix we would have to keep track of
pixels scrolled and probably add a mouse wheel sensitivity setting
somewhere.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-07 17:32:43 -03:00
Victor Seiji Hariki
3c0eed68ce fix slider strange behavior when mouse left 
also added / to all res references

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-07 13:32:33 -03:00
Victor Seiji Hariki
de4823e749 tool name no longer renders and breaks things 
tool name now functions okay when cursor has 0 size

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-06 23:09:30 -03:00
Victor Seiji Hariki
5f16b8b21d some more visual tweaks 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-06 20:08:55 -03:00
Victor Seiji Hariki
e16800e5cf add tool identifier to reticle (it was too similar) 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-06 20:00:50 -03:00
Victor Seiji Hariki
2c82c0468f some visual changes to image generation 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-06 18:28:34 -03:00
Victor Seiji Hariki
55de66a127 fix some console debug messages 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-06 12:32:37 -03:00
Victor Seiji Hariki
8df0649553 first gradient tooling test (img2img gradient border mask) 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-04 18:58:46 -03:00
Victor Seiji Hariki
14df643326 layers? 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-04 16:22:35 -03:00
Victor Seiji Hariki
aec096b856 layers... now exist? 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-04 08:00:39 -03:00
Victor Seiji Hariki
c35742b68f removed download/no more dream tool softlocks 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-03 13:20:35 -03:00
Victor Seiji Hariki
59e783d159 no more scale factor, support for dream cursor size 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-03 10:05:14 -03:00
Victor Seiji Hariki
4681113f81 finer sliders 
Now sliders can have a better precision when editing text than when
dragging.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-03 07:56:48 -03:00
Victor Seiji Hariki
9dcef66c21
some optimization 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-12-01 18:05:14 -03:00
tim h
e0eed2831c so much better 2022-11-30 21:25:06 -06:00
tim h
4dafe50248 tiny fix to reintroduce mask removal on image accept 2022-11-30 20:20:57 -06:00
Victor Seiji Hariki
af0fb5f198 fix #63 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-30 22:08:14 -03:00
Victor Seiji Hariki
7394ffff57
Add back "Enter" shortcut 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-30 19:18:32 -03:00
Victor Seiji Hariki
ce78370eb3
fix reject shortcut and add + shortcut to dream 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-30 18:57:40 -03:00
Victor Seiji Hariki
e5597889f2 Add shortcuts for image choosing/fix cursor 
Add some shortcuts to dream image selection and fix strange cursor
behavior on resource add from dream. (l/r arrow keys for navigation,
enter for image select; esc for reject)

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-29 23:48:07 -03:00
Victor Seiji Hariki
6b0a25c15e remove debug message and fix snap coords 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-29 20:43:13 -03:00
Victor Seiji Hariki
b2d51d40d4 pixel things seem to have been fixed 
At least temporarily, still want to check what causes smaller canvases
to break pixel perfection

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-29 19:47:19 -03:00
Victor Seiji Hariki
44cf9c0e70 Layers. 
Been working on this when I could the last few days.
Not quite infinity. Middle mouse button drag, ctrl mouse wheel zoom.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-29 17:55:25 -03:00
Victor Seiji Hariki
83470ebba3 input.js types and move type definitions 
Moved type definitions to .d.js files to avoid clutter and network
overhead. Added typing to input.js, but still no event typing

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-28 19:48:42 -03:00
tim h
1496c88382 remove commented out console.log entries 
just wanted to make sure they existed in history
 2022-11-27 13:24:28 -06:00
tim h
2574793e4f finally 2022-11-27 13:21:17 -06:00
Victor Seiji Hariki
fe2ebec569 Mask now colorful depending on inversion 
Blue masking means SD will try to keep image as-is under the mask. Red
masking means SD will try to replace whatever is under the mask. (Red is
default masking, Blue is inverted masking)

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-26 22:35:16 -03:00
Victor Seiji Hariki
fe4b50cb8d fix mask brush and add full resolution img2img 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-26 16:59:24 -03:00
Victor Seiji Hariki
bd5c93ce58 Allow mask inversion in both dream tools 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-26 16:34:12 -03:00
Victor Seiji Hariki
059c0759fe
fix border mask rendering 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-25 19:39:38 -03:00
Victor Seiji Hariki
bc19de9c4e
fix border mask 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-25 19:29:50 -03:00
Victor Seiji Hariki
42144ea577 allow shortcut deletion via callback 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0a46ffda9945ad95665634c21c9732e7d9d1497e
 2022-11-24 12:30:13 -03:00
tim h
9a21d4f786 tweak to overmask """formula""", updates it for fancy new slider 
Former-commit-id: 9ecd7c40e154270e66eb36677f64656cc616cdb0
 2022-11-24 00:02:04 -06:00
tim h
eb46b36afb moves overmask to txt2img/outpaint context menu 
Former-commit-id: 0ee5c7946da0e037be950b3c3354e2cba87bdfca
 2022-11-23 23:43:51 -06:00
tim h
617d8ee25c the inglorious return of overmasking 
Former-commit-id: 1a81a3f783d0bf78f530b9a72db090f9ed65d8ae
 2022-11-23 17:40:10 -06:00
Victor Seiji Hariki
5b2a6234d4 extended timing on progress check and fixed dream 
Progress check now has a 1.5s timing window (we can update it to wait
for the last update before sending a new progress request in the future)

Fixed dream() call in img2img tool

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: c137f13e5a71f0b62cc7094bd53f8a4e5f89fcb6
 2022-11-23 08:12:14 -03:00
Victor Seiji Hariki
c54a51f8ee Merge branch 'toolbar' into img2img 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: c8b0a3983dd07e64bc67d848814494be0ee8075d
 2022-11-22 23:10:45 -03:00
Victor Seiji Hariki
35e5951c61 Merge branch 'main' into toolbar 
Now skipping images, saving bandwidth

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 214f44c7ce6a1d9bf7598d45b6cef10e88e99cae
 2022-11-22 23:06:37 -03:00
Victor Seiji Hariki
2eb6e6ff3e add img2img tool and refactor tool context menus 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 3a36d0e0d7004142ee8d1ecdec14bb905db4919f
 2022-11-22 22:24:04 -03:00
Victor Seiji Hariki
250c833895 Added tool menu and migrated image generation ot new input 
Also updates a lot of other things (brush size now independent from
scale factor, split some files, and a lot other things; removed erase
safeguard as now erase is supported by undo/redo; tried adding github
prettier autoformatting to pull requests;

may have some other things as well

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0ba21f23c69f9dca2c3189a838b945900b01f81d
 2022-11-22 19:28:27 -03:00