commit
c81eeeb302
8 changed files with 455 additions and 14 deletions
|
@ -16,6 +16,7 @@ this is a completely vanilla javascript and html canvas outpainting convenience
|
||||||
|
|
||||||
## features
|
## features
|
||||||
|
|
||||||
|
- [soft inpainting](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/14208) support
|
||||||
- SDXL "support"! (please check outpaint/inpaint fill types in the context menus and fiddle with denoising a LOT for img2img, it's touchy)
|
- SDXL "support"! (please check outpaint/inpaint fill types in the context menus and fiddle with denoising a LOT for img2img, it's touchy)
|
||||||
- [now available as an extension for webUI!](https://github.com/zero01101/openOutpaint-webUI-extension) you can find it under the default "available" section in the webUI _extensions_ tab
|
- [now available as an extension for webUI!](https://github.com/zero01101/openOutpaint-webUI-extension) you can find it under the default "available" section in the webUI _extensions_ tab
|
||||||
- **_NOTE: extension still requires `--api` flag in webui-user launch script_**
|
- **_NOTE: extension still requires `--api` flag in webui-user launch script_**
|
||||||
|
|
|
@ -196,3 +196,9 @@
|
||||||
-webkit-mask-image: url("../res/icons/clipboard-list.svg");
|
-webkit-mask-image: url("../res/icons/clipboard-list.svg");
|
||||||
mask-image: url("../res/icons/clipboard-list.svg");
|
mask-image: url("../res/icons/clipboard-list.svg");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ui.inline-icon.icon-squircle::after,
|
||||||
|
.ui.icon > .icon-squircle {
|
||||||
|
-webkit-mask-image: url("../res/icons/squircle.svg");
|
||||||
|
mask-image: url("../res/icons/squircle.svg");
|
||||||
|
}
|
||||||
|
|
16
index.html
16
index.html
|
@ -5,7 +5,7 @@
|
||||||
<title>openOutpaint 🐠</title>
|
<title>openOutpaint 🐠</title>
|
||||||
<!-- CSS Variables -->
|
<!-- CSS Variables -->
|
||||||
<link href="css/colors.css?v=f732f19" rel="stylesheet" />
|
<link href="css/colors.css?v=f732f19" rel="stylesheet" />
|
||||||
<link href="css/icons.css?v=e6f94af" rel="stylesheet" />
|
<link href="css/icons.css?v=1640e24" rel="stylesheet" />
|
||||||
|
|
||||||
<link href="css/index.css?v=cf6b502" rel="stylesheet" />
|
<link href="css/index.css?v=cf6b502" rel="stylesheet" />
|
||||||
<link href="css/layers.css?v=92c0352" rel="stylesheet" />
|
<link href="css/layers.css?v=92c0352" rel="stylesheet" />
|
||||||
|
@ -186,12 +186,12 @@
|
||||||
<label id="hrFixLabel" class="hrfix">Choose HRfix upscaler</label>
|
<label id="hrFixLabel" class="hrfix">Choose HRfix upscaler</label>
|
||||||
<div id="hrFixUpscaler" class="hrfix"></div>
|
<div id="hrFixUpscaler" class="hrfix"></div>
|
||||||
<div id="hrDenoising" class="hrfix"></div>
|
<div id="hrDenoising" class="hrfix"></div>
|
||||||
<input
|
<!-- <input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
id="cbxRestoreFaces"
|
id="cbxRestoreFaces"
|
||||||
onchange="changeRestoreFaces()" />
|
onchange="changeRestoreFaces()" />
|
||||||
<label for="cbxRestoreFaces">Restore Faces</label>
|
<label for="cbxRestoreFaces">Restore Faces</label>
|
||||||
<br />
|
<br /> -->
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
id="cbxSyncCursorSize"
|
id="cbxSyncCursorSize"
|
||||||
|
@ -337,7 +337,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">
|
||||||
v20240127.001
|
v20240302.001
|
||||||
</a>
|
</a>
|
||||||
<br />
|
<br />
|
||||||
<a
|
<a
|
||||||
|
@ -534,7 +534,7 @@
|
||||||
<!-- Basics -->
|
<!-- Basics -->
|
||||||
<script src="js/global.js?v=ac30d16" type="text/javascript"></script>
|
<script src="js/global.js?v=ac30d16" type="text/javascript"></script>
|
||||||
<script src="js/defaults.js?v=5b06818" type="text/javascript"></script>
|
<script src="js/defaults.js?v=5b06818" type="text/javascript"></script>
|
||||||
<script src="js/extensions.js?v=0bd1fbe" type="text/javascript"></script>
|
<script src="js/extensions.js?v=5102854" type="text/javascript"></script>
|
||||||
|
|
||||||
<!-- Base Libs -->
|
<!-- Base Libs -->
|
||||||
<script src="js/lib/util.js?v=379aef7" type="text/javascript"></script>
|
<script src="js/lib/util.js?v=379aef7" type="text/javascript"></script>
|
||||||
|
@ -560,7 +560,7 @@
|
||||||
|
|
||||||
<!-- Content -->
|
<!-- Content -->
|
||||||
<script src="js/prompt.js?v=7a1c68c" type="text/javascript"></script>
|
<script src="js/prompt.js?v=7a1c68c" type="text/javascript"></script>
|
||||||
<script src="js/index.js?v=70af18f" type="text/javascript"></script>
|
<script src="js/index.js?v=206c7df" type="text/javascript"></script>
|
||||||
|
|
||||||
<script
|
<script
|
||||||
src="js/ui/floating/history.js?v=4f29db4"
|
src="js/ui/floating/history.js?v=4f29db4"
|
||||||
|
@ -574,7 +574,7 @@
|
||||||
src="js/ui/tool/generic.js?v=3e678e0"
|
src="js/ui/tool/generic.js?v=3e678e0"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
|
|
||||||
<script src="js/ui/tool/dream.js?v=be5099a" type="text/javascript"></script>
|
<script src="js/ui/tool/dream.js?v=56c7c50" type="text/javascript"></script>
|
||||||
<script
|
<script
|
||||||
src="js/ui/tool/maskbrush.js?v=e9bd0eb"
|
src="js/ui/tool/maskbrush.js?v=e9bd0eb"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
|
@ -584,7 +584,7 @@
|
||||||
<script
|
<script
|
||||||
src="js/ui/tool/select.js?v=76df58e"
|
src="js/ui/tool/select.js?v=76df58e"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
<script src="js/ui/tool/stamp.js?v=b4d414d" type="text/javascript"></script>
|
<script src="js/ui/tool/stamp.js?v=fdca5bc" type="text/javascript"></script>
|
||||||
<script
|
<script
|
||||||
src="js/ui/tool/interrogate.js?v=dd45b4a"
|
src="js/ui/tool/interrogate.js?v=dd45b4a"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
const extensions = {
|
const extensions = {
|
||||||
// alwaysOnScriptsData: {},
|
// alwaysOnScriptsData: {},
|
||||||
alwaysOnScripts: false,
|
alwaysOnScripts: false,
|
||||||
|
// softInpaintingEnabled: false, //???
|
||||||
controlNetEnabled: false,
|
controlNetEnabled: false,
|
||||||
controlNetActive: false,
|
controlNetActive: false,
|
||||||
controlNetReferenceActive: false,
|
controlNetReferenceActive: false,
|
||||||
|
@ -53,6 +54,7 @@ const extensions = {
|
||||||
console.warn("[index] Failed to fetch extensions");
|
console.warn("[index] Failed to fetch extensions");
|
||||||
console.warn(e);
|
console.warn(e);
|
||||||
}
|
}
|
||||||
|
this.checkForSoftInpainting();
|
||||||
this.checkForDynamicPrompts();
|
this.checkForDynamicPrompts();
|
||||||
this.checkForControlNet(
|
this.checkForControlNet(
|
||||||
controlNetModelAutoComplete,
|
controlNetModelAutoComplete,
|
||||||
|
@ -64,6 +66,11 @@ const extensions = {
|
||||||
//checkForSAG(); //??
|
//checkForSAG(); //??
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async checkForSoftInpainting() {
|
||||||
|
this.alwaysOnScripts = true;
|
||||||
|
//TODO implement, inpaint/img2img only
|
||||||
|
},
|
||||||
|
|
||||||
async checkForDynamicPrompts() {
|
async checkForDynamicPrompts() {
|
||||||
if (
|
if (
|
||||||
this.enabledExtensions.filter((e) => e.includes("dynamic prompts"))
|
this.enabledExtensions.filter((e) => e.includes("dynamic prompts"))
|
||||||
|
|
|
@ -170,7 +170,7 @@ function startup() {
|
||||||
changeRefinerEnabled();
|
changeRefinerEnabled();
|
||||||
changeHiResFix();
|
changeHiResFix();
|
||||||
changeHiResSquare();
|
changeHiResSquare();
|
||||||
changeRestoreFaces();
|
// changeRestoreFaces();
|
||||||
changeSyncCursorSize();
|
changeSyncCursorSize();
|
||||||
changeControlNetExtension();
|
changeControlNetExtension();
|
||||||
changeControlNetReference();
|
changeControlNetReference();
|
||||||
|
@ -1558,7 +1558,7 @@ function loadSettings() {
|
||||||
document.getElementById("maskBlur").value = Number(_mask_blur);
|
document.getElementById("maskBlur").value = Number(_mask_blur);
|
||||||
document.getElementById("seed").value = Number(_seed);
|
document.getElementById("seed").value = Number(_seed);
|
||||||
document.getElementById("cbxHRFix").checked = Boolean(_enable_hr);
|
document.getElementById("cbxHRFix").checked = Boolean(_enable_hr);
|
||||||
document.getElementById("cbxRestoreFaces").checked = Boolean(_restore_faces);
|
// document.getElementById("cbxRestoreFaces").checked = Boolean(_restore_faces);
|
||||||
document.getElementById("cbxSyncCursorSize").checked =
|
document.getElementById("cbxSyncCursorSize").checked =
|
||||||
Boolean(_sync_cursor_size);
|
Boolean(_sync_cursor_size);
|
||||||
document.getElementById("hrFixScale").value = Number(_hrfix_scale);
|
document.getElementById("hrFixScale").value = Number(_hrfix_scale);
|
||||||
|
|
|
@ -1227,6 +1227,7 @@ const dream_generate_callback = async (bb, resolution, state) => {
|
||||||
if (extensions.dynamicPromptsEnabled) {
|
if (extensions.dynamicPromptsEnabled) {
|
||||||
addDynamicPromptsToAlwaysOnScripts(state);
|
addDynamicPromptsToAlwaysOnScripts(state);
|
||||||
}
|
}
|
||||||
|
// and controlnet stuff
|
||||||
if (
|
if (
|
||||||
extensions.controlNetActive &&
|
extensions.controlNetActive &&
|
||||||
!isCanvasBlank(0, 0, bb.w, bb.h, visibleCanvas)
|
!isCanvasBlank(0, 0, bb.w, bb.h, visibleCanvas)
|
||||||
|
@ -1358,10 +1359,15 @@ const dream_generate_callback = async (bb, resolution, state) => {
|
||||||
// add dynamic prompts stuff if it's enabled
|
// add dynamic prompts stuff if it's enabled
|
||||||
if (extensions.dynamicPromptsEnabled) {
|
if (extensions.dynamicPromptsEnabled) {
|
||||||
addDynamicPromptsToAlwaysOnScripts(state);
|
addDynamicPromptsToAlwaysOnScripts(state);
|
||||||
}
|
} // and controlnet stuff
|
||||||
if (extensions.controlNetActive) {
|
if (extensions.controlNetActive) {
|
||||||
addControlNetToAlwaysOnScripts(state, initCanvas, maskCanvas);
|
addControlNetToAlwaysOnScripts(state, initCanvas, maskCanvas);
|
||||||
}
|
}
|
||||||
|
// and soft inpainting
|
||||||
|
if (state.softInpaint) {
|
||||||
|
addSoftInpaintingToAlwaysOnScripts(state);
|
||||||
|
// TODO build always on scripts entry for soft inpaint
|
||||||
|
}
|
||||||
if (extensions.alwaysOnScripts) {
|
if (extensions.alwaysOnScripts) {
|
||||||
// check again just to be sure because i'm an idiot?
|
// check again just to be sure because i'm an idiot?
|
||||||
// addControlNetToAlwaysOnScripts(state);
|
// addControlNetToAlwaysOnScripts(state);
|
||||||
|
@ -1588,6 +1594,7 @@ const dream_img2img_callback = (bb, resolution, state) => {
|
||||||
if (extensions.dynamicPromptsEnabled) {
|
if (extensions.dynamicPromptsEnabled) {
|
||||||
addDynamicPromptsToAlwaysOnScripts(state);
|
addDynamicPromptsToAlwaysOnScripts(state);
|
||||||
}
|
}
|
||||||
|
// and controlnet
|
||||||
if (extensions.controlNetActive) {
|
if (extensions.controlNetActive) {
|
||||||
if (extensions.controlNetReferenceActive) {
|
if (extensions.controlNetReferenceActive) {
|
||||||
addControlNetToAlwaysOnScripts(
|
addControlNetToAlwaysOnScripts(
|
||||||
|
@ -1599,6 +1606,12 @@ const dream_img2img_callback = (bb, resolution, state) => {
|
||||||
addControlNetToAlwaysOnScripts(state, null, null); // //WTF???
|
addControlNetToAlwaysOnScripts(state, null, null); // //WTF???
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// and soft inpainting
|
||||||
|
if (state.softInpaint) {
|
||||||
|
addSoftInpaintingToAlwaysOnScripts(state);
|
||||||
|
// TODO build always on scripts entry for soft inpaint
|
||||||
|
}
|
||||||
|
|
||||||
if (extensions.alwaysOnScripts) {
|
if (extensions.alwaysOnScripts) {
|
||||||
// check again just to be sure because i'm an idiot?
|
// check again just to be sure because i'm an idiot?
|
||||||
// addControlNetToAlwaysOnScripts(state);
|
// addControlNetToAlwaysOnScripts(state);
|
||||||
|
@ -2160,6 +2173,153 @@ const dreamTool = () =>
|
||||||
state.ctxmenu.carveThresholdSlider.classList.add("invisible");
|
state.ctxmenu.carveThresholdSlider.classList.add("invisible");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// soft inpainting checkbox - arg 0
|
||||||
|
state.ctxmenu.softInpaintLabel = _toolbar_input.checkbox(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaint",
|
||||||
|
"softInpaint",
|
||||||
|
"Soft Inpainting",
|
||||||
|
"icon-squircle",
|
||||||
|
() => {
|
||||||
|
if (state.softInpaint) {
|
||||||
|
extensions.checkForSoftInpainting();
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
// state.ctxmenu.softInpaintSliderLinebreak.classList.add(
|
||||||
|
// "invisible"
|
||||||
|
// );
|
||||||
|
} else {
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
// state.ctxmenu.softInpaintSliderLinebreak.classList.remove(
|
||||||
|
// "invisible"
|
||||||
|
// );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
).checkbox;
|
||||||
|
|
||||||
|
// soft inpainting schedule bias - arg 1, def 1
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider = _toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintschedulebias",
|
||||||
|
"softInpaintScheduleBias",
|
||||||
|
"Schedule Bias",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 8,
|
||||||
|
step: 0.25,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
// soft inpainting preservation strength - arg 2, def 0.5
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider =
|
||||||
|
_toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintpreservationstrength",
|
||||||
|
"softInpaintPreservationStrength",
|
||||||
|
"Preservation Strength",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 8,
|
||||||
|
step: 0.25,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
// soft inpainting transition contrast boost - arg 3, def 4
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider =
|
||||||
|
_toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpainttransitioncontrastboost",
|
||||||
|
"softInpaintTransitionContrastBoost",
|
||||||
|
"Transition Contrast Boost",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 32,
|
||||||
|
step: 0.5,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
//0.5 2
|
||||||
|
|
||||||
|
// soft inpainting mask influence - arg 4, def 0
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider = _toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintmaskinfluence",
|
||||||
|
"softInpaintMaskInfluence",
|
||||||
|
"Mask Influence",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 1,
|
||||||
|
step: 0.1,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
// soft inpainting difference threshold - arg 5, def 0.5
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider =
|
||||||
|
_toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintdifferencethreshold",
|
||||||
|
"softInpaintDifferenceThreshold",
|
||||||
|
"Difference Threshold",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 8,
|
||||||
|
step: 0.25,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
// soft inpainting difference contrast - arg 6, def 2
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider =
|
||||||
|
_toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintdifferenceContrast",
|
||||||
|
"softInpaintDifferenceContrast",
|
||||||
|
"Difference Contrast",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 8,
|
||||||
|
step: 0.25,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
menu.appendChild(state.ctxmenu.cursorSizeSlider);
|
menu.appendChild(state.ctxmenu.cursorSizeSlider);
|
||||||
const array = document.createElement("div");
|
const array = document.createElement("div");
|
||||||
array.classList.add("checkbox-array");
|
array.classList.add("checkbox-array");
|
||||||
|
@ -2170,6 +2330,7 @@ const dreamTool = () =>
|
||||||
//menu.appendChild(document.createElement("br"));
|
//menu.appendChild(document.createElement("br"));
|
||||||
array.appendChild(state.ctxmenu.keepUnmaskedLabel);
|
array.appendChild(state.ctxmenu.keepUnmaskedLabel);
|
||||||
array.appendChild(state.ctxmenu.removeBackgroundLabel);
|
array.appendChild(state.ctxmenu.removeBackgroundLabel);
|
||||||
|
// array.appendChild(state.ctxmenu.softInpaintLabel);
|
||||||
//TODO: if (global.controlnetAPI) { //but figure out how to update the UI after doing so
|
//TODO: if (global.controlnetAPI) { //but figure out how to update the UI after doing so
|
||||||
// never mind i think i'm using an extension menu instead
|
// never mind i think i'm using an extension menu instead
|
||||||
// array.appendChild(state.ctxmenu.controlNetLabel);
|
// array.appendChild(state.ctxmenu.controlNetLabel);
|
||||||
|
@ -2178,6 +2339,14 @@ const dreamTool = () =>
|
||||||
menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider);
|
menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider);
|
||||||
menu.appendChild(state.ctxmenu.carveBlurSlider);
|
menu.appendChild(state.ctxmenu.carveBlurSlider);
|
||||||
menu.appendChild(state.ctxmenu.carveThresholdSlider);
|
menu.appendChild(state.ctxmenu.carveThresholdSlider);
|
||||||
|
// menu.appendChild(state.ctxmenu.softInpaintScheduleBiasSlider);
|
||||||
|
// menu.appendChild(state.ctxmenu.softInpaintPreservationStrengthSlider);
|
||||||
|
// menu.appendChild(
|
||||||
|
// state.ctxmenu.softInpaintTransitionContrastBoostSlider
|
||||||
|
// );
|
||||||
|
// menu.appendChild(state.ctxmenu.softInpaintMaskInfluenceSlider);
|
||||||
|
// menu.appendChild(state.ctxmenu.softInpaintDifferenceThresholdSlider);
|
||||||
|
// menu.appendChild(state.ctxmenu.softInpaintDifferenceContrastSlider);
|
||||||
// menu.appendChild(state.ctxmenu.keepUnmaskedBlurSliderLinebreak);
|
// menu.appendChild(state.ctxmenu.keepUnmaskedBlurSliderLinebreak);
|
||||||
// menu.appendChild(state.ctxmenu.preserveMasksLabel);
|
// menu.appendChild(state.ctxmenu.preserveMasksLabel);
|
||||||
// menu.appendChild(document.createElement("br"));
|
// menu.appendChild(document.createElement("br"));
|
||||||
|
@ -2198,6 +2367,48 @@ const dreamTool = () =>
|
||||||
state.ctxmenu.carveBlurSlider.classList.add("invisible");
|
state.ctxmenu.carveBlurSlider.classList.add("invisible");
|
||||||
state.ctxmenu.carveThresholdSlider.classList.add("invisible");
|
state.ctxmenu.carveThresholdSlider.classList.add("invisible");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
localStorage.getItem("openoutpaint/img2img-softinpaint") == "true"
|
||||||
|
) {
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
shortcut: "D",
|
shortcut: "D",
|
||||||
}
|
}
|
||||||
|
@ -2717,7 +2928,7 @@ const img2imgTool = () =>
|
||||||
).slider;
|
).slider;
|
||||||
|
|
||||||
// Border Mask Gradient Checkbox
|
// Border Mask Gradient Checkbox
|
||||||
state.ctxmenu.borderMaskGradientCheckbox = _toolbar_input.checkbox(
|
state.ctxmenu.borderMaskGradientLabel = _toolbar_input.checkbox(
|
||||||
state,
|
state,
|
||||||
"openoutpaint/img2img-gradient",
|
"openoutpaint/img2img-gradient",
|
||||||
"gradient",
|
"gradient",
|
||||||
|
@ -2745,6 +2956,153 @@ const img2imgTool = () =>
|
||||||
}
|
}
|
||||||
).checkbox;
|
).checkbox;
|
||||||
|
|
||||||
|
// soft inpainting checkbox - arg 0
|
||||||
|
state.ctxmenu.softInpaintLabel = _toolbar_input.checkbox(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaint",
|
||||||
|
"softInpaint",
|
||||||
|
"Soft Inpainting",
|
||||||
|
"icon-squircle",
|
||||||
|
() => {
|
||||||
|
if (state.softInpaint) {
|
||||||
|
extensions.checkForSoftInpainting();
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
// state.ctxmenu.softInpaintSliderLinebreak.classList.add(
|
||||||
|
// "invisible"
|
||||||
|
// );
|
||||||
|
} else {
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
// state.ctxmenu.softInpaintSliderLinebreak.classList.remove(
|
||||||
|
// "invisible"
|
||||||
|
// );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
).checkbox;
|
||||||
|
|
||||||
|
// soft inpainting schedule bias - arg 1, def 1
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider = _toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintschedulebias",
|
||||||
|
"softInpaintScheduleBias",
|
||||||
|
"Schedule Bias",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 8,
|
||||||
|
step: 0.25,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
// soft inpainting preservation strength - arg 2, def 0.5
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider =
|
||||||
|
_toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintpreservationstrength",
|
||||||
|
"softInpaintPreservationStrength",
|
||||||
|
"Preservation Strength",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 8,
|
||||||
|
step: 0.25,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
// soft inpainting transition contrast boost - arg 3, def 4
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider =
|
||||||
|
_toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpainttransitioncontrastboost",
|
||||||
|
"softInpaintTransitionContrastBoost",
|
||||||
|
"Transition Contrast Boost",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 32,
|
||||||
|
step: 0.5,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
//0.5 2
|
||||||
|
|
||||||
|
// soft inpainting mask influence - arg 4, def 0
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider = _toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintmaskinfluence",
|
||||||
|
"softInpaintMaskInfluence",
|
||||||
|
"Mask Influence",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 1,
|
||||||
|
step: 0.1,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
// soft inpainting difference threshold - arg 5, def 0.5
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider =
|
||||||
|
_toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintdifferencethreshold",
|
||||||
|
"softInpaintDifferenceThreshold",
|
||||||
|
"Difference Threshold",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 8,
|
||||||
|
step: 0.25,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
|
// soft inpainting difference contrast - arg 6, def 2
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider =
|
||||||
|
_toolbar_input.slider(
|
||||||
|
state,
|
||||||
|
"openoutpaint/img2img-softinpaintdifferenceContrast",
|
||||||
|
"softInpaintDifferenceContrast",
|
||||||
|
"Difference Contrast",
|
||||||
|
{
|
||||||
|
min: 0,
|
||||||
|
max: 8,
|
||||||
|
step: 0.25,
|
||||||
|
textStep: 0.01,
|
||||||
|
}
|
||||||
|
).slider;
|
||||||
|
|
||||||
// Border Mask Size Slider
|
// Border Mask Size Slider
|
||||||
state.ctxmenu.borderMaskSlider = _toolbar_input.slider(
|
state.ctxmenu.borderMaskSlider = _toolbar_input.slider(
|
||||||
state,
|
state,
|
||||||
|
@ -2847,10 +3205,19 @@ const img2imgTool = () =>
|
||||||
array.appendChild(state.ctxmenu.preserveMasksLabel);
|
array.appendChild(state.ctxmenu.preserveMasksLabel);
|
||||||
array.appendChild(state.ctxmenu.keepUnmaskedLabel);
|
array.appendChild(state.ctxmenu.keepUnmaskedLabel);
|
||||||
array.appendChild(state.ctxmenu.removeBackgroundLabel);
|
array.appendChild(state.ctxmenu.removeBackgroundLabel);
|
||||||
|
array.appendChild(state.ctxmenu.softInpaintLabel);
|
||||||
menu.appendChild(array);
|
menu.appendChild(array);
|
||||||
menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider);
|
menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider);
|
||||||
menu.appendChild(state.ctxmenu.carveBlurSlider);
|
menu.appendChild(state.ctxmenu.carveBlurSlider);
|
||||||
menu.appendChild(state.ctxmenu.carveThresholdSlider);
|
menu.appendChild(state.ctxmenu.carveThresholdSlider);
|
||||||
|
menu.appendChild(state.ctxmenu.softInpaintScheduleBiasSlider);
|
||||||
|
menu.appendChild(state.ctxmenu.softInpaintPreservationStrengthSlider);
|
||||||
|
menu.appendChild(
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider
|
||||||
|
);
|
||||||
|
menu.appendChild(state.ctxmenu.softInpaintMaskInfluenceSlider);
|
||||||
|
menu.appendChild(state.ctxmenu.softInpaintDifferenceThresholdSlider);
|
||||||
|
menu.appendChild(state.ctxmenu.softInpaintDifferenceContrastSlider);
|
||||||
// menu.appendChild(state.ctxmenu.keepUnmaskedBlurSliderLinebreak);
|
// menu.appendChild(state.ctxmenu.keepUnmaskedBlurSliderLinebreak);
|
||||||
menu.appendChild(state.ctxmenu.inpaintTypeSelect);
|
menu.appendChild(state.ctxmenu.inpaintTypeSelect);
|
||||||
menu.appendChild(state.ctxmenu.denoisingStrengthSlider);
|
menu.appendChild(state.ctxmenu.denoisingStrengthSlider);
|
||||||
|
@ -2858,7 +3225,7 @@ const img2imgTool = () =>
|
||||||
const btnArray2 = document.createElement("div");
|
const btnArray2 = document.createElement("div");
|
||||||
btnArray2.classList.add("checkbox-array");
|
btnArray2.classList.add("checkbox-array");
|
||||||
btnArray2.appendChild(state.ctxmenu.fullResolutionLabel);
|
btnArray2.appendChild(state.ctxmenu.fullResolutionLabel);
|
||||||
btnArray2.appendChild(state.ctxmenu.borderMaskGradientCheckbox);
|
btnArray2.appendChild(state.ctxmenu.borderMaskGradientLabel);
|
||||||
menu.appendChild(btnArray2);
|
menu.appendChild(btnArray2);
|
||||||
menu.appendChild(state.ctxmenu.borderMaskSlider);
|
menu.appendChild(state.ctxmenu.borderMaskSlider);
|
||||||
menu.appendChild(state.ctxmenu.eagerGenerateCountLabel);
|
menu.appendChild(state.ctxmenu.eagerGenerateCountLabel);
|
||||||
|
@ -2878,6 +3245,48 @@ const img2imgTool = () =>
|
||||||
state.ctxmenu.carveBlurSlider.classList.add("invisible");
|
state.ctxmenu.carveBlurSlider.classList.add("invisible");
|
||||||
state.ctxmenu.carveThresholdSlider.classList.add("invisible");
|
state.ctxmenu.carveThresholdSlider.classList.add("invisible");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
localStorage.getItem("openoutpaint/img2img-softinpaint") == "true"
|
||||||
|
) {
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider.classList.remove(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
state.ctxmenu.softInpaintScheduleBiasSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintMaskInfluenceSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceContrastSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintDifferenceThresholdSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintPreservationStrengthSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
state.ctxmenu.softInpaintTransitionContrastBoostSlider.classList.add(
|
||||||
|
"invisible"
|
||||||
|
);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
shortcut: "I",
|
shortcut: "I",
|
||||||
}
|
}
|
||||||
|
@ -2888,11 +3297,28 @@ const sendSeed = (seed) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
function buildAlwaysOnScripts(state) {
|
function buildAlwaysOnScripts(state) {
|
||||||
|
//todo make sure soft inpainting works
|
||||||
|
|
||||||
if (extensions.alwaysOnScripts) {
|
if (extensions.alwaysOnScripts) {
|
||||||
state.alwayson_scripts = {};
|
state.alwayson_scripts = {};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addSoftInpaintingToAlwaysOnScripts(state) {
|
||||||
|
if (extensions.alwaysOnScripts) {
|
||||||
|
state.alwayson_scripts["Soft Inpainting"] = {};
|
||||||
|
state.alwayson_scripts["Soft Inpainting"].args = [
|
||||||
|
state.softInpaint,
|
||||||
|
state.softInpaintScheduleBias,
|
||||||
|
state.softInpaintPreservationStrength,
|
||||||
|
state.softInpaintTransitionContrastBoost,
|
||||||
|
state.softInpaintMaskInfluence,
|
||||||
|
state.softInpaintDifferenceThreshold,
|
||||||
|
state.softInpaintDifferenceContrast,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function addDynamicPromptsToAlwaysOnScripts(state) {
|
function addDynamicPromptsToAlwaysOnScripts(state) {
|
||||||
if (extensions.dynamicPromptsEnabled) {
|
if (extensions.dynamicPromptsEnabled) {
|
||||||
state.alwayson_scripts[extensions.dynamicPromptsAlwaysonScriptName] = {};
|
state.alwayson_scripts[extensions.dynamicPromptsAlwaysonScriptName] = {};
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<title>openOutpaint 🐠</title>
|
<title>openOutpaint 🐠</title>
|
||||||
<!-- CSS Variables -->
|
<!-- CSS Variables -->
|
||||||
<link href="../css/colors.css?v=f732f19" rel="stylesheet" />
|
<link href="../css/colors.css?v=f732f19" rel="stylesheet" />
|
||||||
<link href="../css/icons.css?v=e6f94af" rel="stylesheet" />
|
<link href="../css/icons.css?v=1640e24" rel="stylesheet" />
|
||||||
|
|
||||||
<link href="../css/index.css?v=cf6b502" rel="stylesheet" />
|
<link href="../css/index.css?v=cf6b502" rel="stylesheet" />
|
||||||
<link href="../css/layers.css?v=92c0352" rel="stylesheet" />
|
<link href="../css/layers.css?v=92c0352" rel="stylesheet" />
|
||||||
|
|
1
res/icons/squircle.svg
Normal file
1
res/icons/squircle.svg
Normal file
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-squircle"><path d="M12 3c7.2 0 9 1.8 9 9s-1.8 9-9 9-9-1.8-9-9 1.8-9 9-9"/></svg>
|
After Width: | Height: | Size: 282 B |
Loading…
Reference in a new issue