Skip to content

Commit

Permalink
Merge pull request #118 from zero01101/testing
Browse files Browse the repository at this point in the history
adds preserve mask option
  • Loading branch information
zero01101 authored Dec 23, 2022
2 parents 29321a9 + 01dbafb commit 2a0235a
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion js/ui/tool/dream.js
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ const _generate = async (endpoint, request, bb, options = {}) => {
h: bb.h,
image: canvas,
});
clean(true);
clean(!toolbar._current_tool.state.preserveMasks);
});
};

Expand Down Expand Up @@ -1151,6 +1151,7 @@ const dreamTool = () =>
state.keepUnmasked = true;
state.keepUnmaskedBlur = 8;
state.overMaskPx = 0;
state.preserveMasks = false;

state.erasePrevCursor = () =>
uiCtx.clearRect(0, 0, uiCanvas.width, uiCanvas.height);
Expand Down Expand Up @@ -1413,6 +1414,13 @@ const dreamTool = () =>
}
).slider;

// Preserve Brushed Masks Checkbox
state.ctxmenu.preserveMasksLabel = _toolbar_input.checkbox(
state,
"preserveMasks",
"Preserve Brushed Masks"
).label;

// Overmasking Slider
state.ctxmenu.overMaskPxLabel = _toolbar_input.slider(
state,
Expand All @@ -1434,6 +1442,8 @@ const dreamTool = () =>
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.keepUnmaskedLabel);
menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider);
menu.appendChild(state.ctxmenu.preserveMasksLabel);
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.overMaskPxLabel);
},
shortcut: "D",
Expand Down Expand Up @@ -1518,6 +1528,7 @@ const img2imgTool = () =>
state.keepUnmasked = true;
state.keepUnmaskedBlur = 8;
state.fullResolution = false;
state.preserveMasks = false;

state.denoisingStrength = 0.7;

Expand Down Expand Up @@ -1900,6 +1911,13 @@ const img2imgTool = () =>
"invisible"
);

// Preserve Brushed Masks Checkbox
state.ctxmenu.preserveMasksLabel = _toolbar_input.checkbox(
state,
"preserveMasks",
"Preserve Brushed Masks"
).label;

// Inpaint Full Resolution Checkbox
state.ctxmenu.fullResolutionLabel = _toolbar_input.checkbox(
state,
Expand Down Expand Up @@ -1949,6 +1967,8 @@ const img2imgTool = () =>
menu.appendChild(state.ctxmenu.keepUnmaskedLabel);
menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider);
menu.appendChild(state.ctxmenu.keepUnmaskedBlurSliderLinebreak);
menu.appendChild(state.ctxmenu.preserveMasksLabel);
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.fullResolutionLabel);
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.denoisingStrengthSlider);
Expand Down

0 comments on commit 2a0235a

Please sign in to comment.