aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/nodes/generativeFill/generativeFillUtils
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/views/nodes/generativeFill/generativeFillUtils')
-rw-r--r--src/client/views/nodes/generativeFill/generativeFillUtils/ImageHandler.ts10
-rw-r--r--src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillConstants.ts2
-rw-r--r--src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillInterfaces.ts19
3 files changed, 17 insertions, 14 deletions
diff --git a/src/client/views/nodes/generativeFill/generativeFillUtils/ImageHandler.ts b/src/client/views/nodes/generativeFill/generativeFillUtils/ImageHandler.ts
index 8d32221bd..4847bfeed 100644
--- a/src/client/views/nodes/generativeFill/generativeFillUtils/ImageHandler.ts
+++ b/src/client/views/nodes/generativeFill/generativeFillUtils/ImageHandler.ts
@@ -35,7 +35,6 @@ export class ImageUtility {
if (width < height) {
// horizontal padding, x offset
const xOffset = (canvasSize - width) / 2;
- console.log(xOffset);
ctx.drawImage(img, xOffset, 0, canvas.width, canvas.height, 0, 0, canvas.width, canvas.height);
} else {
// vertical padding, y offset
@@ -156,7 +155,7 @@ export class ImageUtility {
}
};
- // The image must be loaded!
+ // The image must be loaded
static getCanvasMask = (srcCanvas: HTMLCanvasElement): HTMLCanvasElement | undefined => {
const canvas = document.createElement('canvas');
canvas.width = canvasSize;
@@ -164,7 +163,7 @@ export class ImageUtility {
const ctx = canvas.getContext('2d');
if (!ctx) return;
ctx?.clearRect(0, 0, canvasSize, canvasSize);
- ctx.fillStyle = bgColor;
+ ctx.fillStyle = '#000000';
ctx.fillRect(0, 0, canvasSize, canvasSize);
// extract and set padding data
@@ -182,7 +181,7 @@ export class ImageUtility {
return canvas;
};
- // The image must be loaded!
+ // The image must be loaded
static getCanvasImg = (img: HTMLImageElement): HTMLCanvasElement | undefined => {
const canvas = document.createElement('canvas');
canvas.width = canvasSize;
@@ -194,10 +193,9 @@ export class ImageUtility {
const width = img.width * scale;
const height = img.height * scale;
ctx?.clearRect(0, 0, canvasSize, canvasSize);
- ctx.fillStyle = bgColor;
+ ctx.fillStyle = '#000000';
ctx.fillRect(0, 0, canvasSize, canvasSize);
- // extract and set padding data
if (img.naturalHeight > img.naturalWidth) {
// horizontal padding, x offset
const xOffset = (canvasSize - width) / 2;
diff --git a/src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillConstants.ts b/src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillConstants.ts
index 286dc6e4c..1fe151b46 100644
--- a/src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillConstants.ts
+++ b/src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillConstants.ts
@@ -1,7 +1,7 @@
// constants
export const canvasSize = 512;
export const freeformRenderSize = 300;
-export const offsetDistanceY = freeformRenderSize + 300;
+export const offsetDistanceY = freeformRenderSize + 400;
export const offsetX = 200;
export const newCollectionSize = 500;
diff --git a/src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillInterfaces.ts b/src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillInterfaces.ts
index 9b9b9d3c2..83a21a1a5 100644
--- a/src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillInterfaces.ts
+++ b/src/client/views/nodes/generativeFill/generativeFillUtils/generativeFillInterfaces.ts
@@ -1,16 +1,21 @@
// interfaces
export interface CursorData {
- x: number;
- y: number;
- width: number;
+ x: number;
+ y: number;
+ width: number;
}
export interface Point {
- x: number;
- y: number;
+ x: number;
+ y: number;
}
export enum BrushMode {
- ADD,
- SUBTRACT,
+ ADD,
+ SUBTRACT,
+}
+
+export interface ImageDimensions {
+ width: number;
+ height: number;
}