Commit graph

126 commits

Author SHA1 Message Date
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
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
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
tim h
317c921852 Merge branch 'pr/49' into main
Former-commit-id: d4295067d1ed96215cbe3d5bcc274e7b73ab388e
2022-11-25 09:14:26 -06: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
tim h
e92976d158 hacky re-addition of painted mask auto disappearance after image generation
Former-commit-id: f34d1d077f0be69fce3f3b339eac596863d5846a
2022-11-24 22:44:38 -06: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
7f1905061b remove old image upload
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 281286dfc3b040fb196dd0141278201c9d7036eb
2022-11-25 00:39:22 -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
5550c7622e hey i thought i told you to get outta here
Former-commit-id: 2b4bbbaa12a08e88c0949fd1349b38a6f0d4af42
2022-11-24 00:38:57 -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