Commit graph

56 commits

Author SHA1 Message Date
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
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
83470ebba3 input.js types and move type definitions
Moved type definitions to .d.js files to avoid clutter and network
overhead. Added typing to input.js, but still no event typing

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 19:48:42 -03:00
Victor Seiji Hariki
fdb93bad26 remove history console prints
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 12:46:37 -03:00
Victor Seiji Hariki
54c381de8e added jsdoc to commands
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 12:17:07 -03:00
tim h
1496c88382 remove commented out console.log entries
just wanted to make sure they existed in history
2022-11-27 13:24:28 -06:00
tim h
2574793e4f finally 2022-11-27 13:21:17 -06:00
Victor Seiji Hariki
a417ec85db Now cursor is actually visible in preview
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-26 23:08:54 -03:00
Victor Seiji Hariki
bd98b8dbb1 add some mask actions for mask brush
Add clear to clear all mask, add preview to show mask in full opacity

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-26 23:00:41 -03:00
Victor Seiji Hariki
fe2ebec569 Mask now colorful depending on inversion
Blue masking means SD will try to keep image as-is under the mask. Red
masking means SD will try to replace whatever is under the mask. (Red is
default masking, Blue is inverted masking)

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-26 22:35:16 -03:00
Victor Seiji Hariki
fe4b50cb8d fix mask brush and add full resolution img2img
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-26 16:59:24 -03:00
Victor Seiji Hariki
9c0f6df20b fixes console error on send to resource
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-26 16:45:37 -03:00
Victor Seiji Hariki
bd5c93ce58 Allow mask inversion in both dream tools
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-26 16:34:12 -03:00
Victor Seiji Hariki
059c0759fe
fix border mask rendering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-25 19:39:38 -03:00
Victor Seiji Hariki
bc19de9c4e
fix border mask
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-25 19:29:50 -03:00
Victor Seiji Hariki
72ebe5ba21
some fixes and comments
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
(cherry picked from commit 6299b561f196a7c78c66a8d21b2e1b27cecdee77)
2022-11-25 19:23:22 -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
Victor Seiji Hariki
db73982df2 some general fixes
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4434e218c4f67ac3c63c3a5b645013588a7ce770
2022-11-25 01:46:49 -03:00
Victor Seiji Hariki
8419f52f43 fix cancel action for select tool
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0bfa9a2cae4aa080571ae8eca576c94c023b6d44
2022-11-25 00:59:10 -03:00
Victor Seiji Hariki
97f3a54644 Make pasting lock the toolbar
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4b236153eb7b61af5d7ec8703069709aeea684a3
2022-11-25 00:55:16 -03:00
Victor Seiji Hariki
ded2e448bb focus on dream again
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: a07d53d6f1a2fa469da81054084ad67a174b21b6
2022-11-25 00:41:30 -03:00
Victor Seiji Hariki
70d1fda23d a big commit with the selection and stamping tools
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: b3f849f3fdb334916f1a4ee6c81ac6bdf42a8f52
2022-11-25 00:34:34 -03:00
Victor Seiji Hariki
42144ea577 allow shortcut deletion via callback
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0a46ffda9945ad95665634c21c9732e7d9d1497e
2022-11-24 12:30:13 -03:00
Victor Seiji Hariki
2fdcdc7f0c remove usebordermask box
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: f194ab10ed3caa63d3e8468de035b70d414244bf
2022-11-24 12:17:29 -03:00
Victor Seiji Hariki
65961ad0a9 Merge branch 'main' into img2img-fix
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 61d27f561539a40e64da7218f022f846ed9727d4
2022-11-24 12:08:35 -03:00
Victor Seiji Hariki
76938b535f img2img fix and better custom slider rendering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: eb961230a2eeb352dd6097c7010ed0775f1dd3ce
2022-11-24 11:54:30 -03:00
tim h
9417ba7902 fix issue 47
Former-commit-id: ac5e43439e0a1b56243c522c750ecd7b8e0323fc
2022-11-24 08:46:02 -06:00
tim h
9a21d4f786 tweak to overmask """formula""", updates it for fancy new slider
Former-commit-id: 9ecd7c40e154270e66eb36677f64656cc616cdb0
2022-11-24 00:02:04 -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
d7c42510ad well, that was painful
Seems history was actually working until I decided to put a pretty
"removing ###" message

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: a40f1d6e0d53e7186aa2d85832906280331f4aad
2022-11-23 19:06:59 -03: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
Victor Seiji Hariki
8b20807c1b fix history do after undo
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: de84fcb501cd576e8546abc5b1d4e42933488252
2022-11-23 09:09:59 -03:00