Merge pull request #145 from zero01101/fix-addon-black-screen
Generally fix black when outpainting using some firefox addons
This commit is contained in:
commit
b128943f0c
2 changed files with 16 additions and 11 deletions
|
@ -354,7 +354,7 @@
|
||||||
src="js/ui/tool/generic.js?v=2bcd36d"
|
src="js/ui/tool/generic.js?v=2bcd36d"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
|
|
||||||
<script src="js/ui/tool/dream.js?v=0e12874" type="text/javascript"></script>
|
<script src="js/ui/tool/dream.js?v=a68bed9" type="text/javascript"></script>
|
||||||
<script
|
<script
|
||||||
src="js/ui/tool/maskbrush.js?v=1e8a893"
|
src="js/ui/tool/maskbrush.js?v=1e8a893"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
|
|
|
@ -835,16 +835,21 @@ const dream_generate_callback = async (bb, resolution, state) => {
|
||||||
bbCanvas.height = bb.h;
|
bbCanvas.height = bb.h;
|
||||||
const bbCtx = bbCanvas.getContext("2d");
|
const bbCtx = bbCanvas.getContext("2d");
|
||||||
|
|
||||||
const reqCanvas = document.createElement("canvas");
|
const maskCanvas = document.createElement("canvas");
|
||||||
reqCanvas.width = request.width;
|
maskCanvas.width = request.width;
|
||||||
reqCanvas.height = request.height;
|
maskCanvas.height = request.height;
|
||||||
const reqCtx = reqCanvas.getContext("2d");
|
const maskCtx = maskCanvas.getContext("2d");
|
||||||
|
|
||||||
|
const initCanvas = document.createElement("canvas");
|
||||||
|
initCanvas.width = request.width;
|
||||||
|
initCanvas.height = request.height;
|
||||||
|
const initCtx = initCanvas.getContext("2d");
|
||||||
|
|
||||||
bbCtx.fillStyle = "#000F";
|
bbCtx.fillStyle = "#000F";
|
||||||
|
|
||||||
// Get init image
|
// Get init image
|
||||||
reqCtx.fillRect(0, 0, request.width, request.height);
|
initCtx.fillRect(0, 0, request.width, request.height);
|
||||||
reqCtx.drawImage(
|
initCtx.drawImage(
|
||||||
visibleCanvas,
|
visibleCanvas,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
|
@ -855,7 +860,7 @@ const dream_generate_callback = async (bb, resolution, state) => {
|
||||||
request.width,
|
request.width,
|
||||||
request.height
|
request.height
|
||||||
);
|
);
|
||||||
request.init_images = [reqCanvas.toDataURL()];
|
request.init_images = [initCanvas.toDataURL()];
|
||||||
|
|
||||||
// Get mask image
|
// Get mask image
|
||||||
bbCtx.fillStyle = "#000F";
|
bbCtx.fillStyle = "#000F";
|
||||||
|
@ -909,8 +914,8 @@ const dream_generate_callback = async (bb, resolution, state) => {
|
||||||
bbCtx.fillStyle = "#FFFF";
|
bbCtx.fillStyle = "#FFFF";
|
||||||
bbCtx.fillRect(0, 0, bb.w, bb.h);
|
bbCtx.fillRect(0, 0, bb.w, bb.h);
|
||||||
|
|
||||||
reqCtx.clearRect(0, 0, reqCanvas.width, reqCanvas.height);
|
maskCtx.clearRect(0, 0, maskCanvas.width, maskCanvas.height);
|
||||||
reqCtx.drawImage(
|
maskCtx.drawImage(
|
||||||
bbCanvas,
|
bbCanvas,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
|
@ -921,7 +926,7 @@ const dream_generate_callback = async (bb, resolution, state) => {
|
||||||
request.width,
|
request.width,
|
||||||
request.height
|
request.height
|
||||||
);
|
);
|
||||||
request.mask = reqCanvas.toDataURL();
|
request.mask = maskCanvas.toDataURL();
|
||||||
|
|
||||||
// Dream
|
// Dream
|
||||||
_generate("img2img", request, bb, {
|
_generate("img2img", request, bb, {
|
||||||
|
|
Loading…
Reference in a new issue