sneedgroup-holder/openOutpaint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into testing

Browse source
This commit is contained in:
tim h 2022-12-17 15:07:26 -06:00
commit 072e81ce5e
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -2,7 +2,7 @@
[openOutpaint creating some undersea... well, stuff](https://user-images.githubusercontent.com/1649724/205455599-7817812e-5b50-4c96-807e-268b40fa2fd7.mp4) [openOutpaint creating some undersea... well, stuff](https://user-images.githubusercontent.com/1649724/205455599-7817812e-5b50-4c96-807e-268b40fa2fd7.mp4)
_silly demo example current as of [9b174d6](https://github.com/zero01101/openOutpaint/commit/9b174d66c9b9d83ce8657128c97f917b473b13a9) / v0.0.8 / 2022-12-03_ _silly demo example current as of [9b174d6](https://github.com/zero01101/openOutpaint/commit/9b174d66c9b9d83ce8657128c97f917b473b13a9) / v0.0.8 / 2022-12-03_ //TODO UPDATE
this is a completely vanilla javascript and html canvas outpainting convenience doodad built for the API optionally exposed by [AUTOMATIC1111's stable diffusion webUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui), operating similarly to a few others that are probably more well-known. this simply offers an alternative for my following vain desires: this is a completely vanilla javascript and html canvas outpainting convenience doodad built for the API optionally exposed by [AUTOMATIC1111's stable diffusion webUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui), operating similarly to a few others that are probably more well-known. this simply offers an alternative for my following vain desires:
@ -17,14 +17,18 @@ this is a completely vanilla javascript and html canvas outpainting convenience
## features ## features
- intuitive, convenient outpainting - that's like the whole point right - intuitive, convenient outpainting - that's like the whole point right
- queueable, cancelable dreams - just start a'clickin' all over the place
- arbitrary dream reticle size - draw the rectangle of your dreams
- a giant, resizable, scalable canvas for you to paint all over _(infinite canvas area planned, in //todo already)_ - a giant, resizable, scalable canvas for you to paint all over _(infinite canvas area planned, in //todo already)_
- **_NOTE: v0.0.10 introduces a new "camera control" modifier key - hold [`CTRL`] ([`CMD`] on mac) and use the scrollwheel to zoom (scroll the wheel) and pan (hold the wheel button) around the canvas_**
- a very nicely functional and familiar layer system - a very nicely functional and familiar layer system
- inpainting/touchup mask brush - inpainting/touchup mask brush
- prompt history panel
- optional (visibly) inverted mask mode - red masks get mutated, blue masks stay the same, but you can't take both pills at once - optional (visibly) inverted mask mode - red masks get mutated, blue masks stay the same, but you can't take both pills at once
- inpainting color brush to bring out your inner vincent van bob ross - inpainting color brush to bring out your inner vincent van bob ross
- dedicated img2img tool with optional border masking for enhanced output coherence with existing subject matter - dedicated img2img tool with optional border masking for enhanced output coherence with existing subject matter
- marquee select tool to select regions and arbitrarily scale, create stamps, move chunks, do all sorts of damage - marquee select tool to select regions and arbitrarily scale, create stamps, move chunks, do all sorts of damage
- decoupled cursor size and output resolution - optionally decoupled cursor size and output resolution
- interrogate tool - interrogate tool
- floating control panel to easily change models/samplers/steps/prompts/CFG/etc options for each dream summoned from the latent void _(NOTE: model switching requires A1111 webUI to be on commit [5a6387e](https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/5a6387e189dc365c47a7979b9040d5b6fdd7ba43) or more recent)_ - floating control panel to easily change models/samplers/steps/prompts/CFG/etc options for each dream summoned from the latent void _(NOTE: model switching requires A1111 webUI to be on commit [5a6387e](https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/5a6387e189dc365c47a7979b9040d5b6fdd7ba43) or more recent)_
- floating toolbox with handy keyboard shortcuts - floating toolbox with handy keyboard shortcuts
@ -36,6 +40,7 @@ this is a completely vanilla javascript and html canvas outpainting convenience
- saves your preferences/imported images to browser localstorage for maximum convenience - saves your preferences/imported images to browser localstorage for maximum convenience
- reset to defaults button to unsave your preferences if things go squirrely - reset to defaults button to unsave your preferences if things go squirrely
- floating navigable undo/redo palette with ctrl+z/y keyboard shortcuts for additional maximum convenience and desquirreliness - floating navigable undo/redo palette with ctrl+z/y keyboard shortcuts for additional maximum convenience and desquirreliness
- _all this and much more for the low, low price of simply already owning an expensive GPU!_
## operation ## operation

2
index.html
View file

@ -177,7 +177,7 @@
<br /> <br />
<span id="version"> <span id="version">
<a href="https://github.com/zero01101/openOutpaint" target="_blank"> <a href="https://github.com/zero01101/openOutpaint" target="_blank">
Alpha release v0.0.9.6 Alpha release v0.0.10
</a> </a>
</span> </span>
<br /> <br />

5
js/index.js
View file

@ -960,7 +960,10 @@ function informCursorSizeSlider() {
} }
const _resolution_onwheel = (evn) => { const _resolution_onwheel = (evn) => {
if (stableDiffusionData.sync_cursor_size) { if (
stableDiffusionData.sync_cursor_size &&
!toolbar._current_tool.state.block_res_change
) {
toolbar._current_tool.state.ignorePrevious = true; //so hacky toolbar._current_tool.state.ignorePrevious = true; //so hacky
resSlider.value = resSlider.value =
stableDiffusionData.width - (128 * evn.deltaY) / Math.abs(evn.deltaY); stableDiffusionData.width - (128 * evn.deltaY) / Math.abs(evn.deltaY);

11
js/ui/tool/dream.js
View file

@ -532,16 +532,21 @@ const _generate = async (endpoint, request, bb, options = {}) => {
(evn, state) => { (evn, state) => {
const contains = bb.contains(evn.x, evn.y); const contains = bb.contains(evn.x, evn.y);
if (!contains && !state.dream_processed) if (!contains && !state.dream_processed) {
imageCollection.inputElement.style.cursor = "auto"; imageCollection.inputElement.style.cursor = "auto";
if (!contains || state.dream_processed) marchingOptions.style = "#FFF"; toolbar._current_tool.state.block_res_change = false;
}
if (!contains || state.dream_processed) {
marchingOptions.style = "#FFF";
toolbar._current_tool.state.block_res_change = false;
}
if (!state.dream_processed && contains) { if (!state.dream_processed && contains) {
marchingOptions.style = "#F55"; marchingOptions.style = "#F55";
imageCollection.inputElement.style.cursor = "pointer"; imageCollection.inputElement.style.cursor = "pointer";
state.dream_processed = true; state.dream_processed = true;
toolbar._current_tool.state.block_res_change = true;
} }
}, },
0, 0,