rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only snap resolution if pixel counts change

This commit is contained in:
Cohee 2024-02-13 11:40:37 +02:00
parent b8387df15e
commit 8d4c4c1945
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
public/scripts/extensions/stable-diffusion/index.js
View File

@ -1799,18 +1799,21 @@ function setTypeSpecificDimensions(generationType) {
// Force to use roughly the same pixel count as before rescaling // Force to use roughly the same pixel count as before rescaling
const prevPixelCount = prevSDHeight * prevSDWidth; const prevPixelCount = prevSDHeight * prevSDWidth;
const newPixelCount = extension_settings.sd.height * extension_settings.sd.width; const newPixelCount = extension_settings.sd.height * extension_settings.sd.width;
const ratio = Math.sqrt(prevPixelCount / newPixelCount);
extension_settings.sd.height = Math.round(extension_settings.sd.height * ratio / 64) * 64;
extension_settings.sd.width = Math.round(extension_settings.sd.width * ratio / 64) * 64;
console.log(`Pixel counts after rescaling: ${prevPixelCount} -> ${newPixelCount} (ratio: ${ratio})`);
const resolution = resolutionOptions[getClosestKnownResolution()]; if (prevPixelCount !== newPixelCount) {
if (resolution) { const ratio = Math.sqrt(prevPixelCount / newPixelCount);
extension_settings.sd.height = resolution.height; extension_settings.sd.height = Math.round(extension_settings.sd.height * ratio / 64) * 64;
extension_settings.sd.width = resolution.width; extension_settings.sd.width = Math.round(extension_settings.sd.width * ratio / 64) * 64;
console.log('Snap to resolution', JSON.stringify(resolution)); console.log(`Pixel counts after rescaling: ${prevPixelCount} -> ${newPixelCount} (ratio: ${ratio})`);
} else {
console.warn('Snap to resolution failed, using custom dimensions'); const resolution = resolutionOptions[getClosestKnownResolution()];
if (resolution) {
extension_settings.sd.height = resolution.height;
extension_settings.sd.width = resolution.width;
console.log('Snap to resolution', JSON.stringify(resolution));
} else {
console.warn('Snap to resolution failed, using custom dimensions');
}
} }
} }