Commit graph

177 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
ea4226e877
Merge pull request #72 from zero01101/bleeding-edge
fix maskbrush stationary cursor wheel rendering
2022-12-06 22:09:18 -03:00
Victor Seiji Hariki
1c6fd1fb1a fix maskbrush stationary cursor wheel rendering
brush did not redraw when changing brush size. now it does

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 22:07:02 -03:00
tim h
ed99ec9f73 version bump, readme update, tiny tiny fixes so small they could be considered typos 2022-12-06 18:05:43 -06:00
Victor Seiji Hariki
5f16b8b21d some more visual tweaks
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 20:08:55 -03:00
Victor Seiji Hariki
e16800e5cf add tool identifier to reticle (it was too similar)
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 20:00:50 -03:00
Victor Seiji Hariki
2c82c0468f some visual changes to image generation
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 18:28:34 -03:00
Victor Seiji Hariki
55de66a127 fix some console debug messages
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 12:32:37 -03:00
Victor Seiji Hariki
c5d887620d select color and do not redraw twice on maskbrush
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 12:30:55 -03:00
Victor Seiji Hariki
207921978b selection now uses ui canvas
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 12:25:06 -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
Victor Seiji Hariki
4118d78a7f fix for eyedropper rendering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-05 00:26:52 -03:00
tim h
61930b74da much less broken surprise interrogate tool 2022-12-05 00:26:52 -03:00
tim h
4a76eecd92 surprise interrogate tool 2022-12-05 00:26:52 -03:00
Victor Seiji Hariki
d49b68ae29 add options to brushes for opacity, and mask blur
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-04 19:35:44 -03:00
Victor Seiji Hariki
8df0649553 first gradient tooling test (img2img gradient border mask)
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-04 18:58:46 -03:00
Victor Seiji Hariki
6222975825 some... i guess performance improvements for chrome
also fixes pixelated view for chrome

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-04 17:02:46 -03: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
559f4493ca rename button (resources) also stops evn propag
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-04 08:31:43 -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
4d414186c0 another fix for resource persistence
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 23:09:02 -03:00
Victor Seiji Hariki
e1c684eaef fix resource manager persistence
persistence only worked once per image due to lack of wait load in image
loading from storage

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 22:59:16 -03:00
Victor Seiji Hariki
4549e21293 fix chrome giant icon/add pipette tool (shift)
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 20:00:10 -03:00
Victor Seiji Hariki
c35742b68f removed download/no more dream tool softlocks
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 13:20:35 -03:00
Victor Seiji Hariki
249e83ed07 fix resource saving for uploaded resources
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 13:08:29 -03:00
Victor Seiji Hariki
eea14e1cc9 now browsers with literally no clipboard support are ok
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 11:40:40 -03:00
Victor Seiji Hariki
464ab31431 fix delete button selects the item too
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 11:07:25 -03:00
Victor Seiji Hariki
993381a123 resources are now persistent between sessions
we should add a settings page to allow people to customize what they
want to save and other things

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 10:48:05 -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
ac70691cff
little things
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-02 14:31:49 -03:00
Victor Seiji Hariki
ba69013b3d
fix copy-paste issues
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-02 07:23:07 -03: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
9dcef66c21
some optimization
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-01 18:05:14 -03:00
tim h
e0eed2831c so much better 2022-11-30 21:25:06 -06:00
tim h
4dafe50248 tiny fix to reintroduce mask removal on image accept 2022-11-30 20:20:57 -06: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
b9976d9e8b avoid filling history with uneventful moves
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-30 19:30:41 -03:00
Victor Seiji Hariki
7394ffff57
Add back "Enter" shortcut
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-30 19:18:32 -03:00
Victor Seiji Hariki
ce78370eb3
fix reject shortcut and add + shortcut to dream
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-30 18:57:40 -03:00
Victor Seiji Hariki
e5597889f2 Add shortcuts for image choosing/fix cursor
Add some shortcuts to dream image selection and fix strange cursor
behavior on resource add from dream. (l/r arrow keys for navigation,
enter for image select; esc for reject)

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-29 23:48:07 -03:00
Victor Seiji Hariki
6b0a25c15e remove debug message and fix snap coords
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-29 20:43:13 -03:00
Victor Seiji Hariki
b2d51d40d4 pixel things seem to have been fixed
At least temporarily, still want to check what causes smaller canvases
to break pixel perfection

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-29 19:47:19 -03:00