Commit graph

181 commits

Author SHA1 Message Date
Victor Seiji Hariki
d571eca7b0
some quick fixes for older browsers/documentation
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-18 11:26:47 -03: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
Victor Seiji Hariki
ea68e25cf0 canvas scaling?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 00:21:28 -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
58b5805bd7 remove debug
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:47:30 -03:00
Victor Seiji Hariki
3ef2bce9f0 fixed loading of boolean values from localStorage
It seems we were doing localStorage wrong for boolean values. It just
worked for enable_hr by chance. Now it should work properly.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:24:22 -03:00
Victor Seiji Hariki
cb6d9ac7d8 now it should work?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:16:26 -03:00
Victor Seiji Hariki
b1a42c4cd7 seems I failed to save the file before closing merge
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:13:46 -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
8a7e0a08f8 enable sync cursor size by default
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:09:57 -03: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
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
bf025d2ab8 multiselect now also custom autocomplete
This is mainly to free space for the prompt history on #87

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-11 16:01:22 -03:00
Victor Seiji Hariki
ec43674695 now connection check actually working
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-10 23:23:26 -03:00
Victor Seiji Hariki
012f6ae272 add check for --api flag and helpful error message
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-10 21:46:14 -03:00
Victor Seiji Hariki
f8687e9bac Seems like fix didn't work
performance optimization for firefox seems to have broken chrome after
today's changes. Seems like we will have to accept the slower method of
calculating coordinates. At least it is more flexible.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 19:42:14 -03:00
Victor Seiji Hariki
047d5ef01f fix getmodels that seems to have broken with merge
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 19:12:02 -03:00
Victor Seiji Hariki
dc914d9243 removing debug calls as always
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 19:04:41 -03:00
Victor Seiji Hariki
57a2debe5d Merge branch 'main' into testing
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:29:34 -03:00
Victor Seiji Hariki
2cda410b41 add custom select element with autocomplete
Same as a select, but you can kind of search for the item you want. Good
for when you have a lot of models.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:23:17 -03:00
Victor Seiji Hariki
0b5b0188e4
Merge pull request #75 from zero01101/testing
Some general fixes
2022-12-07 23:36:28 -03:00
Victor Seiji Hariki
c51c71915e add test for recommended configs
also adds option to change to recommended automatically

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 18:09:43 -03:00
tim h
8329784c88 wtf how did that even work 2022-12-06 21:17:02 -06:00
tim h
8818a355f6 upscale amount
probably should've put this in testing first but it's pretty bulletproof so far
2022-12-06 21:12:10 -06:00
Victor Seiji Hariki
7bc0549337 fix smooth rendering box incongruency on reload
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 18:22:22 -03:00
Victor Seiji Hariki
0cc6f7660a fix interrogate for new layer system
interrogate now uses visible data, and add green marching ants to show
something is happening

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-05 12:26:52 -03:00
tim h
986466f6d8 fixes issue 68 2022-12-04 20:19:34 -06: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
583f9245b6 fix eyedropper interactions and remove unused code
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-04 00:22:29 -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
514c498391 definitive (for now) fix for None style
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 02:47:47 -03:00
tim h
441eec8e38 slightly less but still ugly hack 2022-12-02 18:20:07 -06:00
tim h
6810dd9c3a ugly hack to allow for functional "none" style 2022-12-02 16:43:24 -06:00
tim h
60b81031fa tiny thing ;) 2022-12-02 16:23:55 -06:00
Victor Seiji Hariki
ac70691cff
little things
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-02 14:31:49 -03:00
tim h
2e668b4a16 more tiny QOL things
upscaler select no longer escapes floating control panel boundary, simple "reset to defaults" button to clear localstorage if desired, maybe get prettier action to stop complaining about where i put the ref :|
2022-12-01 20:31:49 -06:00
tim h
8c777fee04 tiny fix for upscaling 2022-12-01 20:00:33 -06:00
Victor Seiji Hariki
c63003e1cf
a quick try at a tool for painting
From yesterday night, just finished some final touches; should be
enough for some cool things.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-01 18:22:12 -03: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
6f99b15320
general improvements for connection checking
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-30 18:47:30 -03:00
Victor Seiji Hariki
e84ea7a8f4 Merge branch 'main' into bleeding-edge
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-29 23:54:09 -03:00
zero01101
d33edaa8cf Prettified Code! 2022-11-30 02:08:43 +00: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
4e27770284 some layer upgrades
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 20:03:58 -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
14abeac966 tiny change to auto-display currently loaded model in SD settings 2022-11-26 19:46:02 -06: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
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