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

367 commits

Author SHA1 Message Date
Victor Seiji Hariki
6ec27df919 add some guards to input handlers to easier debug 
Sometimes before this I used mouse.listen.window.left.onclick = () =>
{thing}. Now it throws an error telling me not to do this.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-28 10:08:47 -03:00
Victor Seiji Hariki
42a1266da5 Add custom errors 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-28 10:08:47 -03:00
tim h
b75297e8f2 tiny fix to keep approve/reject controls in viewable area if generated image is particularly close to the left edge 2022-11-27 15:35:49 -06: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
d91519226f
Merge pull request #56 from zero01101/bleeding-edge 
Allow mask inversion in both dream tools
 2022-11-26 23:21:57 -03:00
Victor Seiji Hariki
a417ec85db Now cursor is actually visible in preview 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-26 23:08:54 -03:00
Victor Seiji Hariki
bd98b8dbb1 add some mask actions for mask brush 
Add clear to clear all mask, add preview to show mask in full opacity

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-26 23:00:41 -03:00
tim h
14abeac966 tiny change to auto-display currently loaded model in SD settings 2022-11-26 19:46:02 -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
9c0f6df20b fixes console error on send to resource 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-26 16:45:37 -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
d0439798c8 now actually checks network continuously 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-26 13:43:28 -03:00
Victor Seiji Hariki
73c441534b improved network handling 
Detects if it is a CORS problem, checks for invalid saved host
configuration, webui connection status indicator

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-26 13:10:37 -03:00
tim h
8667f94f12 change default prompt again, less quietly 
gotta get those AWARD WINNER people outta there
 2022-11-25 21:06:15 -06:00
Victor Seiji Hariki
ca3533c9e4
some more fixes and things 
fixed scrolling on basically everything but the canvas, prompt fields
now automatically expand when focused, prompt, host and negprompt now
are stored on localstorage. on hover prompt and negprompt fields now
show full text in tooltips

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-25 20:27:44 -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
72ebe5ba21
some fixes and comments 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
(cherry picked from commit 6299b561f196a7c78c66a8d21b2e1b27cecdee77)
 2022-11-25 19:23:22 -03:00
tim h
905a815cf2 Merge pull request #50 from seijihariki/quick-patches 
Dream and Selection - Resource Manager Interaction and Selected Area saving

Former-commit-id: d361b4731686b52d5dc48a4717d637569a03180a
 2022-11-25 10:28:28 -06:00
Victor Seiji Hariki
7bb2238056 clear canvas now has history 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 6ec970f947ee6a7472a6e376c236885d26f5b276
 2022-11-25 13:26:44 -03:00
Victor Seiji Hariki
df5dc32eee Some quick lunch patches 
Allows for selections and dreams to be sent to the resource manager,
allows resource deselection when clicking on the currently selected
item, put some extra comments and allow saving of a selected canvas area

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

Former-commit-id: 963312115d4827de1c8d4fac88a97dd64db7fa15
 2022-11-25 13:16:22 -03:00
tim h
317c921852 Merge branch 'pr/49' into main 
Former-commit-id: d4295067d1ed96215cbe3d5bcc274e7b73ab388e
 2022-11-25 09:14:26 -06:00
Victor Seiji Hariki
db73982df2 some general fixes 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4434e218c4f67ac3c63c3a5b645013588a7ce770
 2022-11-25 01:46:49 -03:00
tim h
e92976d158 hacky re-addition of painted mask auto disappearance after image generation 
Former-commit-id: f34d1d077f0be69fce3f3b339eac596863d5846a
 2022-11-24 22:44:38 -06:00
Victor Seiji Hariki
8419f52f43 fix cancel action for select tool 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0bfa9a2cae4aa080571ae8eca576c94c023b6d44
 2022-11-25 00:59:10 -03:00
Victor Seiji Hariki
97f3a54644 Make pasting lock the toolbar 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4b236153eb7b61af5d7ec8703069709aeea684a3
 2022-11-25 00:55:16 -03:00
Victor Seiji Hariki
ded2e448bb focus on dream again 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: a07d53d6f1a2fa469da81054084ad67a174b21b6
 2022-11-25 00:41:30 -03:00
Victor Seiji Hariki
7f1905061b remove old image upload 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 281286dfc3b040fb196dd0141278201c9d7036eb
 2022-11-25 00:39:22 -03:00
Victor Seiji Hariki
70d1fda23d a big commit with the selection and stamping tools 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: b3f849f3fdb334916f1a4ee6c81ac6bdf42a8f52
 2022-11-25 00:34:34 -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
Victor Seiji Hariki
2fdcdc7f0c remove usebordermask box 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: f194ab10ed3caa63d3e8468de035b70d414244bf
 2022-11-24 12:17:29 -03:00
Victor Seiji Hariki
65961ad0a9 Merge branch 'main' into img2img-fix 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 61d27f561539a40e64da7218f022f846ed9727d4
 2022-11-24 12:08:35 -03:00
Victor Seiji Hariki
76938b535f img2img fix and better custom slider rendering 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: eb961230a2eeb352dd6097c7010ed0775f1dd3ce
 2022-11-24 11:54:30 -03:00
tim h
9417ba7902 fix issue 47 
Former-commit-id: ac5e43439e0a1b56243c522c750ecd7b8e0323fc
 2022-11-24 08:46:02 -06:00
tim h
5550c7622e hey i thought i told you to get outta here 
Former-commit-id: 2b4bbbaa12a08e88c0949fd1349b38a6f0d4af42
 2022-11-24 00:38:57 -06: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
da95542c34 Merge pull request #43 from seijihariki/input-rework-2 
non-broken version on input-rework

Former-commit-id: 44ae64a42f7bb11520e4e29180be4a67f2814b50
 2022-11-23 23:54:07 -06:00
tim h
eb46b36afb moves overmask to txt2img/outpaint context menu 
Former-commit-id: 0ee5c7946da0e037be950b3c3354e2cba87bdfca
 2022-11-23 23:43:51 -06:00
Victor Seiji Hariki
951fbacd6c non-broken version on input-rework 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 3c337c8cf8d4a65cb2fe0845f6eaf9315eb21ae7
 2022-11-24 01:53:14 -03:00
tim h
617d8ee25c the inglorious return of overmasking 
Former-commit-id: 1a81a3f783d0bf78f530b9a72db090f9ed65d8ae
 2022-11-23 17:40:10 -06:00
Victor Seiji Hariki
d7c42510ad well, that was painful 
Seems history was actually working until I decided to put a pretty
"removing ###" message

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

Former-commit-id: a40f1d6e0d53e7186aa2d85832906280331f4aad
 2022-11-23 19:06:59 -03:00
Victor Seiji Hariki
89b1323cd9 Merge branch 'main' into img2img 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4a07944ebfb71076a6dfb9a83e45a07a30874abd
 2022-11-23 19:03:15 -03:00
Kalekki
53635fc26f prettier 
Former-commit-id: 25e8a310d47a5e34e269b31e75699e99b1c8888b
 2022-11-23 21:34:42 +02:00
Kalekki
43c6344507 Model switching, samplers from api 
Former-commit-id: 78da6ff935a79ecbb00114c8e467d8996d2752af
 2022-11-23 21:23:20 +02:00
Victor Seiji Hariki
8b20807c1b fix history do after undo 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: de84fcb501cd576e8546abc5b1d4e42933488252
 2022-11-23 09:09:59 -03:00
Victor Seiji Hariki
f5b0369476 finally fix shortcuts triggering on prompt fields 
Basically checks if focus is an input field, and transfer focus to
window as soon as mouse hovers over the canvas

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

Former-commit-id: 5ce4877c69708a1ea981d9dac4b9102048152e58
 2022-11-23 08:24:18 -03: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
678ab518ea Merge branch 'main' into toolbar 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 53bab7e5237fe54b7a3d421bef01c011499e0e74
 2022-11-22 22:38:30 -03:00
tim h
e619636d33 not super attractive but really simple progress indicator during generation 
(not so much on upscale yet)


Former-commit-id: 802cb7507d160035207b8c15b98b9d6fa9855525
 2022-11-22 19:35:15 -06: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
tim h
9a796ecd67 reenables LDSR, ran prettier, version bump ( ͡° ͜ʖ ͡°) 
Former-commit-id: 2c75f84ad9a88f7454a5469bba8c4c90ca09186a
 2022-11-22 17:40:05 -06: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
Kalekki
837de404ee Upscaling 
Former-commit-id: b8f0e47edd2f2f5ab2f8cae911c8739bd9d41b7f
 2022-11-22 23:18:40 +02:00
Victor Seiji Hariki
87ea1be32d add history list view and interaction 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 7064b38c9663c0219424b4864243f16d4aa68a24
 2022-11-22 02:16:17 -03:00
tim h
fcc61c5710 Merge pull request #30 from seijihariki/keyboard_ìnput 
Keyboard Input Support

Former-commit-id: 7559fa453face2012b0f0cd8d2b34fcf9aa31c1c
 2022-11-21 20:30:19 -06:00
Victor Seiji Hariki
fb0c2f2443 add shortcuts to undo/redo 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-21 23:19:56 -03:00
Victor Seiji Hariki
1d6d2c1978 add keyboard support to input 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-21 23:19:41 -03:00
tim h
7e7146eaa1 dream output text legibility, invert marching ants 2022-11-21 18:04:05 -06:00
tim h
2c120320ff Merge branch 'main' into checkerboard 2022-11-21 17:57:41 -06:00
Kalekki
4381642e88 Checkerboard background to signal transparency 2022-11-21 13:40:44 +02:00
Victor Seiji Hariki
c1bc54a4eb add new history window and fix multi-window support 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-21 08:27:21 -03:00
Victor Seiji Hariki
93b6118254 some simple features to inputjs and menu overhaul 
for dragging, add original target to avoid paint intermitence when dragging
windows too fast.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-21 08:24:35 -03:00
Victor Seiji Hariki
80c446da3d format input.js according to new guidelines 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-21 00:02:25 -03:00
Victor Seiji Hariki
096d8770f2 Merge branch 'main' into edit_utils 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-20 23:59:46 -03:00
Victor Seiji Hariki
c27da0f51a add target info to events and fix mask impl 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-20 23:42:07 -03:00
Victor Seiji Hariki
d6435abf2e solid color mask and migration to new input method 
reimplements mask using the new input lib, makes mask use a solid color
(masks shouldn't become darker the more you draw over itself) and the
mask layer is now rendered with the alpha using css.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-20 23:29:50 -03:00
Victor Seiji Hariki
217b89efef fix prev field for drag events and add onmousemove 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

a

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-20 23:26:48 -03:00
Victor Seiji Hariki
ea64c138c3 Add generic mouse input handler 
input.js is now responsible for processing mouse input and translating
it to relevant events. This allows for less bloat on the main logic in
index.js and easy implementation of new functionality

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-20 23:03:07 -03:00
tim h
32904051aa yeah overmasking is _definitely_ fixed, works great now 2022-11-20 17:21:55 -06:00
tim h
959bb4f8b1 marching ants during image generation 
i uh also decided to useTabs in prettier and it now looks like i rewrote the entire application again :badpokerface:
 2022-11-20 17:10:03 -06:00
tim h
bef6b214f4 very minor unnecessary changes 2022-11-20 15:47:53 -06:00
tim h
327e90c88c prettier! 2022-11-20 15:39:24 -06:00
tim h
e88dc0acf9 bump version, remove pointless checkbox 2022-11-20 17:31:51 -03:00
Kalekki
ff9d930956 Mask erasing 2022-11-20 17:31:51 -03:00
Kalekki
d563e8ba3a make draggable class for possible future re-use 2022-11-20 17:31:51 -03:00
tim h
aefd45f436 removed redundant overmask toggle 
overmaskpx = 0 effectively disables it anyway
sets overmaskpx to a localstorage option
removes moot "plain" mask monitor
 2022-11-20 17:31:51 -03:00
tim h
2861c100bd font size/stroke visibility upgrade 
for us old folks
 2022-11-20 17:31:51 -03:00
tim h
3062766c13 right-click erase is now an option 2022-11-20 17:31:51 -03:00
tim h
772cc7552d completely rework and fix(?) overmasking 2022-11-20 14:08:48 -06:00
tim h
04e208ce04 Merge pull request #21 from seijihariki/edit_utils 
Simple Edit History
 2022-11-20 12:17:19 -06:00
Victor Seiji Hariki
fe508f8b21 simple command pattern and edit history 
Implements command pattern for providing edit history capabilities to
editing. For now, no implementation is done to support keyboard
shortcuts, so the buttons are the only way to navigate. Also, only image
insertion is supported for now. Waiting for the masking updates to
implement masking history.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-20 14:59:11 -03:00
tim h
0906609da2 bump version, remove pointless checkbox 2022-11-20 11:56:37 -06:00
tim h
d276876bf0 Merge pull request #17 from Kalekki/erase_mask 
Mask erasing
 2022-11-20 11:48:14 -06:00
tim h
f43d072f60 Merge pull request #18 from Kalekki/main 
make draggable class for possible future re-use
 2022-11-20 11:41:46 -06:00
tim h
172e7dae0a removed redundant overmask toggle 
overmaskpx = 0 effectively disables it anyway
sets overmaskpx to a localstorage option
removes moot "plain" mask monitor
 2022-11-20 11:38:24 -06:00
Kalekki
ebf6900bfc make draggable class for possible future re-use 2022-11-20 18:24:17 +02:00
Kalekki
ff68fcdeda Mask erasing 2022-11-20 14:26:33 +02:00
tim h
e6fa805f61 Merge pull request #16 from seijihariki/main 
fix scale factor slider broken by refactor
 2022-11-20 00:37:23 -06:00
Victor Seiji Hariki
8ebf273bfa fix scale factor slider broken by refactor 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-20 02:56:37 -03:00
tim h
aa2c1956ee Merge branch 'pr/14' into main 2022-11-19 22:40:57 -06:00
tim h
5b5b1fbfce font size/stroke visibility upgrade 
for us old folks
 2022-11-19 22:10:20 -06:00
Victor Seiji Hariki
06c53e6062 Streamline and add text input to range pickers 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
 2022-11-20 00:49:51 -03:00
tim h
f92a7ff98e right-click erase is now an option 2022-11-19 21:32:35 -06:00
tim h
7f6c42aa51 Merge pull request #11 from Kalekki/UI_rework 
New draggable settings panel
 2022-11-19 16:15:52 -06:00
tim h
9be9dd3479 fixes issue 10 
adds new bug where dropped arbitrary images now do that annoying odd-number scale garbage

fixes that too
 2022-11-19 16:11:48 -06:00
Kalekki
2a911e900e New draggable settings panel 2022-11-19 23:48:12 +02:00
tim h
085aa5a33a fixes issue 6 2022-11-19 15:16:50 -06:00
tim h
bcb4593d44 fixes issue 8 2022-11-19 13:49:25 -06:00
tim h
86d8b9b702 readme update, surprise 2022-11-19 11:33:18 -06:00
tim h
dc472d49c3 right-click erase, ensure webUI is running on startup 2022-11-19 11:17:47 -06:00
tim h
6e9013ade7 whoops, painted masks weren't cleared on new image 2022-11-18 20:08:43 -06:00
tim h
1771954b90 0.0.5 - arbitrary image superimposition, etc 2022-11-18 18:04:27 -06:00
tim h
da593e93ed fixes odd-number scale factor snap offset 2022-11-17 22:34:14 -06:00
tim h
2553f297d1 minor cleanup 2022-11-17 22:28:03 -06:00
tim h
290226f267 adds seed to localstorage values, updates readme for github pages 2022-11-17 21:46:53 -06:00
tim h
839cfa94a3 Merge remote-tracking branch 'origin/pr/5' into main 2022-11-17 21:26:17 -06:00
tim h
3d45e549c0 remedial overmasking FINALLY 2022-11-17 21:21:48 -06:00
Kalle
8e66c305e6 Persistent settings with localstorage 2022-11-17 19:10:18 +02:00
tim h
0469f81880 pull requests!!! <3 thanks everyone! 
readme updates, downloaded image file name changes
 2022-11-16 16:52:11 -06:00
Kalekki
b78f94b72e Crop transparency 2022-11-16 23:33:20 +02:00
tim h
266d87938c teeny ui change, egotistical readme update 2022-11-15 23:19:09 -06:00
zero01101
695cd9c673 minor refactoring, typo fix 2022-11-15 21:15:52 -06:00
tim h
87e4ff4c2f initial commit 2022-11-15 17:31:11 -06:00