Skip to content

Use jpeg instead of png for prompt image #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soulofmischief wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Use jpeg instead of png for prompt image #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42b0e1e
Use jpeg instead of png for prompt image
soulofmischief Dec 20, 2022
79987d1
Clean up file
soulofmischief Dec 20, 2022
e0bdfe2
Use jpeg instead of png for prompt image
soulofmischief Dec 20, 2022
83a54ed
Clean up file
soulofmischief Dec 20, 2022
766df9c
Merge branch 'jpeg' of github.com-soulofmischief:upstreet-labs/gen in…
soulofmischief Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/generators/scene-generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3817,7 +3817,7 @@ export class PanelRenderer extends EventTarget {
const editedImgBlob = new Blob([
editedImg,
], {
type: 'image/png',
type: 'image/jpeg',
});
editedImgTex.image = await blob2img(editedImgBlob);
editedImgTex.needsUpdate = true;
Expand Down Expand Up @@ -4086,7 +4086,7 @@ const _getImageSegements = async imgBlob => {
export async function compileVirtualScene(imageArrayBuffer) {
// color
const blob = new Blob([imageArrayBuffer], {
type: 'image/png',
type: 'image/jpeg',
});
const img = await blob2img(blob);
img.classList.add('img');
Expand Down Expand Up @@ -4547,4 +4547,4 @@ export async function compileVirtualScene(imageArrayBuffer) {
edgeDepths,
paths,
};
}
}
11 changes: 6 additions & 5 deletions src/utils/convert-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export function img2canvas(img) {

export function canvas2blob(canvas) {
return new Promise((accept, reject) => {
canvas.toBlob(accept, 'image/png');
canvas.toBlob(accept, 'image/jpeg');
});
}

Expand All @@ -50,15 +50,16 @@ export async function image2DataUrl(img, className = '') {
document.body.appendChild(canvas);

// get the blob
const blob = await new Promise(resolve => canvas.toBlob(resolve, 'image/png'));
const blob = await new Promise(resolve =>
canvas.toBlob(resolve, 'image/jpeg')
);
// get the blob url
// read the data url from the blob
const dataUrl = await new Promise(resolve => {
return await new Promise(resolve => {
const reader = new FileReader();
reader.onload = e => resolve(e.target.result);
reader.readAsDataURL(blob);
});
return dataUrl;
}

export function img2ImageData(img) {
Expand Down Expand Up @@ -87,4 +88,4 @@ export const resizeImage = (image, width, height) => {
ctx.drawImage(image, 0, 0, width, height);
}
return canvas;
};
};