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
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
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
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
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
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
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
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
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
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
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
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
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
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