Commit graph

254 commits

Author SHA1 Message Date
Victor Seiji Hariki
f064719515 add some logging for #133
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-24 23:48:09 -03:00
Victor Seiji Hariki
af5b9b9680 Add history logging
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-24 23:37:38 -03:00
tim h
06f4e82347 Merge branch 'main' into manual-scripts
# Conflicts:
#	index.html
2023-01-23 21:36:50 -06:00
tim h
da317229c0 some silly default values for a few built-in scripts 2023-01-22 13:29:24 -06:00
Victor Seiji Hariki
fc8e6fb557 Quick fix for zoom to cursor and brush erase blur
Quick fix to some issues pointed out by @raivshard at #177

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-22 09:18:47 -03:00
Victor Seiji Hariki
006aa608e8 we have working workspaces!!
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-22 02:48:56 -03:00
Victor Seiji Hariki
13e29898a3 fix param type issue
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-21 13:06:21 -03:00
Victor Seiji Hariki
e92d8fa9b6 fixes #179
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-21 10:18:55 -03:00
tim h
6889affcad even better single image discard handling
sorry for pushing to main but these are tiny and don't deserve PRs lol
2023-01-20 19:33:42 -06:00
tim h
025d50a10e got it passing scripts and params but wtf is it bitching about with
x_opt = axis_options[x_type]
TypeError: list indices must be integers or slices, not str
2023-01-20 18:53:16 -06:00
tim h
b52e3dc2ba better single-image removal handling 2023-01-20 16:19:01 -06:00
Victor Seiji Hariki
9064a006d5 add send image to parent interface
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-17 00:03:43 -03:00
Victor Seiji Hariki
874e39de4b add Ctrl+A and Ctrl+Shift+A shortcuts to select
selects all layer content and all visible (still only on current layer)

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-16 23:21:16 -03:00
Victor Seiji Hariki
4596d4cc8d fixes #174
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-16 20:54:46 -03:00
Victor Seiji Hariki
c30314b2ac remove now irrelevant TODO
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-14 18:46:01 -03:00
tim h
4f73aba5c2 lmao you are really making me feel guilty about not merging your version ;) 2023-01-14 09:47:50 -06:00
Victor Seiji Hariki
51095160f1 fix scaled rotate handle
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 23:41:01 -03:00
Victor Seiji Hariki
e198cf9af4 allow stamp rotation(drag) and scaling(wheel)
also adds shift as a 'finetune' for wheel. works for dream and stamp. if
shift is pressed, wheel will scale slower (not snapping to 128 for
dream, or 0.1 for stamp)

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 23:00:34 -03:00
Victor Seiji Hariki
c4d6826369 Merge branch 'main' into rotate
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 21:51:25 -03:00
Victor Seiji Hariki
d764221d63 support select tool rotation
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 21:49:06 -03:00
Victor Seiji Hariki
5078265d14 fix select click
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 20:32:53 -03:00
Victor Seiji Hariki
e2afee3432 fix send to buttons
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 01:04:59 -03:00
Victor Seiji Hariki
9186d2a387 Merge branch 'testing' into rotate
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 01:03:07 -03:00
Victor Seiji Hariki
35a62ae9fe back to original transform tool state
But way more flexible implementation

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 01:00:06 -03:00
Victor Seiji Hariki
d7e20f87dc putting back selection 1
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-11 00:36:14 -03:00
tim h
16c2b36c1b ...also implements 164 quite similarly 2023-01-10 17:00:45 -06:00
Victor Seiji Hariki
487f3bed0c implements #164
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-10 14:30:09 -03:00
Victor Seiji Hariki
8d88ca6632 Merge branch 'transform-vp' into rotate
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-10 01:08:48 -03:00
Victor Seiji Hariki
857cb29c12 migrates vp to DOMMatrix implementation
breaks select, but it was broken anyway.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-10 01:03:28 -03:00
tim h
40c69d7dd6 tiny fix to prevent generate-ahead from freaking out with alerts if something goes wrong 2023-01-08 16:44:46 -06:00
Victor Seiji Hariki
b056f81155 test
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-08 18:21:08 -03:00
Victor Seiji Hariki
2c9eea4ce6 rotation working, broke scale
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-08 01:54:37 -03:00
tim h
16ad7a550d think this was out-of-order and causing math problems with resolutions but i could be an idiot 2023-01-06 12:49:15 -06:00
tim h
bb815d62f9 option to enforce square firstpass aspect ratio 2023-01-05 17:42:50 -06:00
tim h
b45ce1aeba WIP - parity with square vs non- in/output HRfix res 2023-01-04 23:27:02 -06:00
tim h
3c596e6a4c experimental? newer hrfix stuff 2023-01-04 20:00:51 -06:00
Victor Seiji Hariki
bbce97d48d I guess this does not do much, but precautions
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-04 21:37:21 -03:00
Victor Seiji Hariki
ad66f0ec29 add some hrfix compatibility with old version
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-04 21:00:17 -03:00
seijihariki
82ca6269d2 Prettified Code! 2023-01-04 21:14:52 +00:00
Vladimir Mandic
31dc797583
remove debug console message 2023-01-04 16:07:16 -05:00
Vladimir Mandic
9ab0991f4d
fix leave-page alert 2023-01-04 13:33:27 -05:00
tim h
227c7839f3 return of HRfix lock px
not sure if useful or i'm just salty
2023-01-03 21:41:03 -06:00
tim h
92f91e23ae selectable outpaint type separate from inpaint now that i know how _horrible_ original is for outpainting 2023-01-03 15:52:56 -06:00
Victor Seiji Hariki
967b49842f fix dream cursor shows on img2img
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-03 12:50:38 -03:00
Victor Seiji Hariki
50ab30f411
Merge branch 'main' into fix-addon-black-screen 2023-01-03 11:38:23 -03:00
tim h
d31eb541cf tiny but very vital fix for inpainting 2023-01-03 08:16:09 -06:00
tim h
8b4a35d030 tiny critical fixes
gotta keep that outpaint mask at 1
2023-01-02 23:36:42 -06:00
tim h
fdd9c8def1 whoops just noticed this, tiny fix 2023-01-02 22:15:47 -06:00
tim h
af014aff8b
Merge branch 'main' into compact-checkboxes 2023-01-02 22:07:43 -06:00
Victor Seiji Hariki
7dfd35839b generally fix black when outpainting using addons
For some reason, when using some extensions, firefox just bugs out the
context after running a toDataURL. We now create a separate canvas for
mask drawing.
2023-01-02 23:31:25 -03:00
tim h
212769f3bd invite interrogate to the party 2023-01-02 18:59:15 -06:00
Victor Seiji Hariki
b186ef4c22 some space-saving measures for checkboxes
Some eye-candy as well

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-02 21:12:18 -03:00
tim h
8962d75c60 optionally implements dishonesty to POST request data to make new HRfix actually useful to our needs 2023-01-02 14:49:47 -06:00
tim h
43d4239824 sigh 2023-01-02 13:50:28 -06:00
tim h
0181091ceb Merge branch 'pr/140' into main
# Conflicts:
#	index.html
#	js/ui/tool/dream.js
2023-01-01 22:48:24 -06:00
tim h
25eb6258cf remove extra <br> 2023-01-01 22:06:09 -06:00
ribawaja
a0a5b57c12 add eager generate feature 2023-01-01 20:40:43 -05:00
tim h
5fbf9c37f2 marginally less ugly inpaint mode selector
really don't think it has any need to be a full-on autocomplete fancy thingy
2023-01-01 10:31:49 -06:00
tim h
370994a5d2 extremely ugly WIP implementation of img2img inpaint fill modes 2022-12-31 13:31:31 -06:00
tim h
aee0c33c7b significantly more useful hrfix updates
adds lock-to-max-hrfix-px slider which works pretty well if i do say so myself
2022-12-30 23:40:45 -06:00
tim h
c9a768d406 fixes hrfix x/y calcs on non-square reticles 2022-12-30 22:29:01 -06:00
Victor Seiji Hariki
c4d52fdfad now only considers staged files
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-30 07:44:10 -03:00
Victor Seiji Hariki
6d31640ae5 now only adds html files
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-30 07:27:26 -03:00
Victor Seiji Hariki
a95906dc8a sync should now work a bit better; #116
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-29 02:39:32 -03:00
Victor Seiji Hariki
84ba327706 allow pan via LMB drag
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-27 17:49:46 -03:00
Victor Seiji Hariki
12e371a481 Unused variable cleanup and new overmask px default
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-27 17:49:40 -03:00
tim h
8fbc42744e
Merge pull request #123 from zero01101/testing
An easy fix for mouse wheel scrolling
2022-12-26 16:49:56 -06:00
Victor Seiji Hariki
100829298c fixes #124
System clipboard paste was not working correctly

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-26 10:35:33 -03:00
Victor Seiji Hariki
3d298473b7 An easy fix for mouse wheel scrolling
Relates to #116

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-25 23:29:03 -03:00
Victor Seiji Hariki
14aed51a89 debugging button to help get information
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-24 11:56:30 -03:00
seijihariki
953aed236e Prettified Code! 2022-12-24 01:19:11 +00:00
Victor Seiji Hariki
92ab54282d fix addselection starting selection
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-23 22:18:37 -03:00
seijihariki
cfca5d95ba Prettified Code! 2022-12-24 00:48:55 +00:00
Victor Seiji Hariki
7a52508a3b Fixes #117
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-23 21:48:25 -03:00
tim h
01dbafb17f Merge branch 'main' into clear_brush_mask_option 2022-12-21 19:36:06 -06:00
tim h
1f407c4187 Merge branch 'main' into clear_brush_mask_option 2022-12-21 18:12:18 -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
Victor Seiji Hariki
35d5868854 make stamp redraw on zoom
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-20 23:43:29 -03:00
Victor Seiji Hariki
94de86a971 webui set prompt and stamp uictx cursor
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-20 23:26:52 -03:00
tim h
aec0b5a5a1 adds option to preserve brushed mask post-dream 2022-12-19 18:51:29 -06:00
tim h
7cf9e468d5 fixes synced resolution changing undesirably with some tools on scrollwheel 2022-12-18 20:35:48 -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
9a8b064ab2 no need for this anymore
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 01:15:27 -03: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
tim h
b30f7f23a9 brings back interrogate reticle 2022-12-15 21:15:50 -06: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