From fc8e6fb557832320a770af80ec661d59f99878a4 Mon Sep 17 00:00:00 2001
From: Victor Seiji Hariki <victorseijih@gmail.com>
Date: Sun, 22 Jan 2023 09:18:47 -0300
Subject: [PATCH 1/4] Quick fix for zoom to cursor and brush erase blur

Quick fix to some issues pointed out by @raivshard at #177

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
---
 index.html                      |  4 ++--
 js/initalize/layers.populate.js | 24 ++++++++++++------------
 js/ui/tool/colorbrush.js        |  3 +++
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/index.html b/index.html
index 948abff..e0b9697 100644
--- a/index.html
+++ b/index.html
@@ -358,7 +358,7 @@
 		<script src="js/lib/ui.js?v=fe9b702" type="text/javascript"></script>
 
 		<script
-			src="js/initalize/layers.populate.js?v=8bc8815"
+			src="js/initalize/layers.populate.js?v=066dc8e"
 			type="text/javascript"></script>
 
 		<!-- Configuration -->
@@ -386,7 +386,7 @@
 			src="js/ui/tool/maskbrush.js?v=d88810f"
 			type="text/javascript"></script>
 		<script
-			src="js/ui/tool/colorbrush.js?v=3f8c01a"
+			src="js/ui/tool/colorbrush.js?v=6f1d2f4"
 			type="text/javascript"></script>
 		<script
 			src="js/ui/tool/select.js?v=f290e83"
diff --git a/js/initalize/layers.populate.js b/js/initalize/layers.populate.js
index be63ef6..5235f5e 100644
--- a/js/initalize/layers.populate.js
+++ b/js/initalize/layers.populate.js
@@ -307,28 +307,28 @@ mouse.listen.camera.onwheel.on((evn) => {
 	evn.evn.preventDefault();
 
 	// Get cursor world position
-	const cursorPosition = viewport.viewToCanvas(evn.x, evn.y);
+	const wcursor = viewport.viewToCanvas(evn.x, evn.y);
 
 	// Get viewport center
-	const pcx = viewport.cx;
-	const pcy = viewport.cy;
+	const wcx = viewport.cx;
+	const wcy = viewport.cy;
 
 	// Apply zoom
 	viewport.zoom *= 1 + evn.delta * 0.0002;
 
+	// Get cursor new world position
+	const nwcursor = viewport.viewToCanvas(evn.x, evn.y);
+
 	// Apply normal zoom (center of viewport)
-	viewport.cx = pcx;
-	viewport.cy = pcy;
+	viewport.cx = wcx;
+	viewport.cy = wcy;
+
+	// Move viewport to keep cursor in same location
+	viewport.cx += wcursor.x - nwcursor.x;
+	viewport.cy += wcursor.y - nwcursor.y;
 
 	viewport.transform(imageCollection.element);
 
-	// Calculate new viewport center and move
-	//const newCursorPosition = viewport.viewToCanvas(evn.x, evn.y);
-	//viewport.cx = pcx - (newCursorPosition.x - cursorPosition.x);
-	//viewport.cy = pcy - (newCursorPosition.y - cursorPosition.y);
-
-	//viewport.transform(imageCollection.element);
-
 	toolbar._current_tool.redrawui && toolbar._current_tool.redrawui();
 });
 
diff --git a/js/ui/tool/colorbrush.js b/js/ui/tool/colorbrush.js
index 46e82f4..a8a78a9 100644
--- a/js/ui/tool/colorbrush.js
+++ b/js/ui/tool/colorbrush.js
@@ -22,8 +22,10 @@ const _color_brush_draw_callback = (evn, state) => {
 };
 
 const _color_brush_erase_callback = (evn, state, ctx) => {
+	ctx.save();
 	ctx.strokeStyle = "black";
 
+	ctx.filter = "blur(" + state.brushBlur + "px)";
 	ctx.lineWidth = state.brushSize;
 	ctx.beginPath();
 	ctx.moveTo(
@@ -33,6 +35,7 @@ const _color_brush_erase_callback = (evn, state, ctx) => {
 	ctx.lineTo(evn.x, evn.y);
 	ctx.lineJoin = ctx.lineCap = "round";
 	ctx.stroke();
+	ctx.restore();
 };
 
 const colorBrushTool = () =>

From cb36c2b59984fb986f33544ed4554b160a0f7358 Mon Sep 17 00:00:00 2001
From: Victor Seiji Hariki <victorseijih@gmail.com>
Date: Mon, 23 Jan 2023 19:24:50 -0300
Subject: [PATCH 2/4] Maybe better than using new Image?

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
---
 index.html  | 4 ++--
 js/index.js | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index e0b9697..19abad6 100644
--- a/index.html
+++ b/index.html
@@ -270,7 +270,7 @@
 						<button
 							type="button"
 							title="Add Layer"
-							onclick="commands.runCommand('addLayer', 'Added Layer')"
+							onclick="commands.runCommand('addLayer', 'Added Layer', {})"
 							class="ui icon button">
 							<div class="icon-file-plus"></div>
 						</button>
@@ -367,7 +367,7 @@
 
 		<!-- Content -->
 		<script src="js/prompt.js?v=7a1c68c" type="text/javascript"></script>
-		<script src="js/index.js?v=6944460" type="text/javascript"></script>
+		<script src="js/index.js?v=c4a7bed" type="text/javascript"></script>
 
 		<script
 			src="js/ui/floating/history.js?v=fc92d14"
diff --git a/js/index.js b/js/index.js
index f8797c0..0677fbd 100644
--- a/js/index.js
+++ b/js/index.js
@@ -883,12 +883,14 @@ async function getUpscalers() {
 	// hacky way to get the correct list of upscalers
 	var extras_url =
 		document.getElementById("host").value + "/sdapi/v1/extra-single-image/"; // endpoint for upscaling, needed for the hacky way to get the correct list of upscalers
-	var empty_image = new Image(1, 1);
+	var empty_image = document.createElement("canvas");
+	empty_image.width = 1;
+	empty_image.height = 1;
 	var purposefully_incorrect_data = {
-		"resize-mode": 0, // 0 = just resize, 1 = crop and resize, 2 = resize and fill i assume based on theimg2img tabs options
+		resize_mode: 0, // 0 = just resize, 1 = crop and resize, 2 = resize and fill i assume based on theimg2img tabs options
 		upscaling_resize: 2,
 		upscaler_1: "fake_upscaler",
-		image: empty_image.src,
+		image: empty_image.toDataURL(),
 	};
 
 	try {

From 85776d86371cd8d07cf92661499da71dfa4ea53a Mon Sep 17 00:00:00 2001
From: tim h <zero01101@gmail.com>
Date: Mon, 23 Jan 2023 17:58:16 -0600
Subject: [PATCH 3/4] "emergency" fix to just get upscalers working again

temporary as hell hardcoded list of "should be available to everyone from a fresh install" upscalers, subject to change upon bug reports
---
 index.html  |  4 +--
 js/index.js | 70 +++++++++++++++++++++++++++++++----------------------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/index.html b/index.html
index 19abad6..9fbff4f 100644
--- a/index.html
+++ b/index.html
@@ -209,7 +209,7 @@
 					<br />
 					<span id="version">
 						<a href="https://github.com/zero01101/openOutpaint" target="_blank">
-							Alpha release v0.0.13
+							Alpha release v0.0.13.1
 						</a>
 						<br />
 						<a
@@ -367,7 +367,7 @@
 
 		<!-- Content -->
 		<script src="js/prompt.js?v=7a1c68c" type="text/javascript"></script>
-		<script src="js/index.js?v=c4a7bed" type="text/javascript"></script>
+		<script src="js/index.js?v=4c9e978" type="text/javascript"></script>
 
 		<script
 			src="js/ui/floating/history.js?v=fc92d14"
diff --git a/js/index.js b/js/index.js
index 0677fbd..9a0ea07 100644
--- a/js/index.js
+++ b/js/index.js
@@ -881,38 +881,48 @@ async function getUpscalers() {
 	*/
 
 	// hacky way to get the correct list of upscalers
-	var extras_url =
-		document.getElementById("host").value + "/sdapi/v1/extra-single-image/"; // endpoint for upscaling, needed for the hacky way to get the correct list of upscalers
-	var empty_image = document.createElement("canvas");
-	empty_image.width = 1;
-	empty_image.height = 1;
-	var purposefully_incorrect_data = {
-		resize_mode: 0, // 0 = just resize, 1 = crop and resize, 2 = resize and fill i assume based on theimg2img tabs options
-		upscaling_resize: 2,
-		upscaler_1: "fake_upscaler",
-		image: empty_image.toDataURL(),
-	};
+	// var extras_url =
+	// 	document.getElementById("host").value + "/sdapi/v1/extra-single-image/"; // endpoint for upscaling, needed for the hacky way to get the correct list of upscalers
+	// var purposefully_incorrect_data = {
+	// 	resize_mode: 0, // 0 = just resize, 1 = crop and resize, 2 = resize and fill i assume based on theimg2img tabs options
+	// 	upscaling_resize: 2,
+	// 	upscaler_1: "fake_upscaler",
+	// 	image: empty_image.toDataURL(),
+	// };
+
+	upscalers = [
+		"Lanczos",
+		"Nearest",
+		"LDSR",
+		"SwinIR",
+		"R-ESRGAN General 4xV3",
+		"R-ESRGAN General WDN 4xV3",
+		"R-ESRGAN AnimeVideo",
+		"R-ESRGAN 4x+",
+		"R-ESRGAN 4x+ Anime6B",
+		"R-ESRGAN 2x+",
+	];
 
 	try {
-		const response = await fetch(extras_url, {
-			method: "POST",
-			headers: {
-				Accept: "application/json",
-				"Content-Type": "application/json",
-			},
-			body: JSON.stringify(purposefully_incorrect_data),
-		});
-		const data = await response.json();
+		// const response = await fetch(extras_url, {
+		// 	method: "POST",
+		// 	headers: {
+		// 		Accept: "application/json",
+		// 		"Content-Type": "application/json",
+		// 	},
+		// 	body: JSON.stringify(purposefully_incorrect_data),
+		// });
+		// const data = await response.json();
 
-		console.log(
-			"[index] purposefully_incorrect_data response, ignore above error"
-		);
-		// result = purposefully_incorrect_data response: Invalid upscaler, needs to be on of these: None , Lanczos , Nearest , LDSR , BSRGAN , R-ESRGAN General 4xV3 , R-ESRGAN 4x+ Anime6B , ScuNET , ScuNET PSNR , SwinIR_4x
-		const upscalersPlusNone = data.detail
-			.split(": ")[1]
-			.split(",")
-			.map((v) => v.trim()); // need "None" for stupid hrfix changes razza frazza
-		const upscalers = upscalersPlusNone.filter((v) => v !== "None"); // converting the result to a list of upscalers
+		// console.log(
+		// 	"[index] purposefully_incorrect_data response, ignore above error"
+		// );
+		// // result = purposefully_incorrect_data response: Invalid upscaler, needs to be on of these: None , Lanczos , Nearest , LDSR , BSRGAN , R-ESRGAN General 4xV3 , R-ESRGAN 4x+ Anime6B , ScuNET , ScuNET PSNR , SwinIR_4x
+		// const upscalersPlusNone = data.detail
+		// 	.split(": ")[1]
+		// 	.split(",")
+		// 	.map((v) => v.trim()); // need "None" for stupid hrfix changes razza frazza
+		// const upscalers = upscalersPlusNone.filter((v) => v !== "None"); // converting the result to a list of upscalers
 		// upscalersPlusNone.push([
 		// 	"Latent",
 		// 	"Latent (antialiased)",
@@ -920,6 +930,8 @@ async function getUpscalers() {
 		// 	"Latent (bicubic, antialiased)",
 		// 	"Latent (nearest)",
 		// ]);
+		const upscalersPlusNone = [...upscalers];
+		upscalersPlusNone.unshift("None"); //this is absurd
 		upscalersPlusNone.push("Latent");
 		upscalersPlusNone.push("Latent (antialiased)");
 		upscalersPlusNone.push("Latent (bicubic)");

From aabc35dc8754bd58db85d3e561f8766d75731806 Mon Sep 17 00:00:00 2001
From: Victor Seiji Hariki <victorseijih@gmail.com>
Date: Mon, 23 Jan 2023 23:13:00 -0300
Subject: [PATCH 4/4] removed useless code

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
---
 js/index.js | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/js/index.js b/js/index.js
index 9a0ea07..acf2148 100644
--- a/js/index.js
+++ b/js/index.js
@@ -846,26 +846,6 @@ function drawBackground() {
 			bgLayer.canvas.style.backgroundImage = `url(${url})`;
 		});
 	}
-	return;
-
-	// Checkerboard
-	let darkTileColor = "#333";
-	let lightTileColor = "#555";
-	for (
-		var x = -bgLayer.origin.x - 64;
-		x < bgLayer.canvas.width - bgLayer.origin.x;
-		x += 64
-	) {
-		for (
-			var y = -bgLayer.origin.y - 64;
-			y < bgLayer.canvas.height - bgLayer.origin.y;
-			y += 64
-		) {
-			bgLayer.ctx.fillStyle =
-				(x + y) % 128 === 0 ? lightTileColor : darkTileColor;
-			bgLayer.ctx.fillRect(x, y, 64, 64);
-		}
-	}
 }
 
 async function getUpscalers() {