Commit graph

145 commits

Author SHA1 Message Date
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
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
6d44db5d66
fixes chrome coords and canvas now starts at center
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-30 18:46:03 -03:00
Victor Seiji Hariki
a63228a552
no more losing the window
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-30 18:44:51 -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
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
zero01101
d33edaa8cf Prettified Code! 2022-11-30 02:08:43 +00: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
d32e48a018 made canvas smaller for some tests; putting back
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-29 20:25:44 -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
77380a7b53 remove debug dot in the cursor
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-29 18:23:35 -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
64ff4e8f3e
Merge pull request #58 from zero01101/bleeding-edge
Mostly Documentation and Development Tooling
2022-11-28 22:37:29 -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
Victor Seiji Hariki
c1b17c1b0e Some start for layering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 20:03:58 -03:00
Victor Seiji Hariki
0a33d3e491 Some first bases for infinity screen
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 20:03:58 -03:00
Victor Seiji Hariki
7c7352a0eb fixed issue when migrating mouse listeners
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 20:03:08 -03:00
Victor Seiji Hariki
3088a9dfed forgot to remove types from commands.js
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 19:54:26 -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
593a37bdfc add error for non-existent commands
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 12:44:40 -03:00
Victor Seiji Hariki
17b75cb64b util doc tab instead of space
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 12:32:31 -03:00
Victor Seiji Hariki
4d874b5c9a observer fix
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 12:25:31 -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
Victor Seiji Hariki
8d0b44e36b Some jsdoc for util
Also allows for downloadCanvas to open image in new tab. This may be
useful for debugging anything that has a canvas (such as overmasking).

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 12:11:19 -03:00
Victor Seiji Hariki
6ec27df919 add some guards to input handlers to easier debug
Sometimes before this I used mouse.listen.window.left.onclick = () =>
{thing}. Now it throws an error telling me not to do this.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 10:08:47 -03:00
Victor Seiji Hariki
42a1266da5 Add custom errors
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 10:08:47 -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
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
d91519226f
Merge pull request #56 from zero01101/bleeding-edge
Allow mask inversion in both dream tools
2022-11-26 23:21:57 -03: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
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
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
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
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
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