Commit graph

343 commits

Author SHA1 Message Date
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
Victor Seiji Hariki
04f5b0a56b
fix2 host
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-20 13:44:39 -03:00
Victor Seiji Hariki
f942f03799
fixed fixed host
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-20 12:23:45 -03:00
tim h
a49769af85 Merge branch 'main' into clear_brush_mask_option 2022-12-19 21:34:08 -06:00
Victor Seiji Hariki
a04a071965 now allows for fixed host setting
also makes rest of localstorage data prefixed

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-19 22:42:26 -03:00
tim h
aec0b5a5a1 adds option to preserve brushed mask post-dream 2022-12-19 18:51:29 -06:00
Victor Seiji Hariki
232b52bc4b outpaint prefix to localstorage things
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-19 15:45:09 -03:00
Victor Seiji Hariki
35ee716159 add prefix to ack
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-19 14:56:19 -03:00
Victor Seiji Hariki
fe4c94e895 Update external resource create
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-19 13:12:10 -03:00
Victor Seiji Hariki
3afb35e5ee Add some simple messaging for parent interaction
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-19 09:30:39 -03:00
seijihariki
20d8d70c51 Prettified Code! 2022-12-19 03:04:24 +00:00
Victor Seiji Hariki
c1614edf99 733698 workaround
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-19 00:03:26 -03: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
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
tim h
b50b6f0ce4 come back progress bar, i miss you 2022-12-17 09:35:26 -06:00
Victor Seiji Hariki
8a0b9d2e8d fix saving canvas negative images
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 02:07:10 -03:00
Victor Seiji Hariki
fc7302f8fa fix snapping for negative i values
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 01:20:51 -03: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
a941056db4 fix viewport location limits
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 01:07:02 -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
701e1573bc fix fully negative values on cropCanvas
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 00:43:36 -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
Victor Seiji Hariki
0c5ed4a17e select handle scaling
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 14:02:36 -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
Victor Seiji Hariki
7a96d77a7e fix autocomplete value reader and now use blob
It should fix #93

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 23:54:38 -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
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
9e0541bf0c view generation resolution too
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:10:13 -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
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
34b995998b fix cropCanvas bounding box
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-12 10:54:26 -03:00
Victor Seiji Hariki
b71731b7ca stamp now uses indexed DB for resources
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-12 10:03:05 -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
d65f3185c4 resource now use dblclick to rename; download
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-11 20:54:38 -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
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
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
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
f446cf3784 fixed color brush cursor rendering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 23:33:51 -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
ec59cf5538 Very crude settings interface
Very crude settings interface with only canvas size for now. Canvas size
only affects canvas on next page load. Dynamic resizing in the horizon,
but will take a while.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:38:55 -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
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
0b5b0188e4
Merge pull request #75 from zero01101/testing
Some general fixes
2022-12-07 23:36:28 -03:00
Victor Seiji Hariki
458df53fac fix pixel alingment on select for scaling
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 23:17:46 -03:00
Victor Seiji Hariki
3701eb110b fix some more issues in selectjs pixel alignment
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 23:09:41 -03:00
Victor Seiji Hariki
548aa05001 windows now stop wheel event propagation
no more of the "mouse cursor size change while scrolling" issue

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 19:22:25 -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
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
361efc76f2 bypass for browser that calculate layer*
Bypasses the kinda slow getBoundingClientRect for browsers that actually
support CSS transforms for cursors

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 17:10:01 -03:00
Victor Seiji Hariki
9a08408456 this might fix some of our pixel-alignment issues
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 17:05:14 -03:00
Victor Seiji Hariki
3373d2964e fix selection box when not grid-aligned
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 16:26:23 -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
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
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
bdf6bb8913 I swear I need to learn to delete my console.debugs
Will not merge yet to avoid pull request spam

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 22:57:39 -03:00
Victor Seiji Hariki
067b81960f Merge branch 'zero-main' into testing 2022-12-06 22:46:21 -03:00
Victor Seiji Hariki
88df998e98 fix some issues in layer delete/undo
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 22:39:33 -03:00