sneedgroup-holder/openOutpaint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

think this was out-of-order and causing math problems with resolutions but i could be an idiot

Browse source
This commit is contained in:
tim h 2023-01-06 12:49:15 -06:00
parent e7d955a768
commit 16ad7a550d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
js/ui/tool/dream.js
View file

@ -820,13 +820,10 @@ const dream_generate_callback = async (bb, resolution, state) => {
/** /**
* try and make the new HRfix method useful for our purposes * try and make the new HRfix method useful for our purposes
*/ */
// laziness convenience
//laziness convenience
let lockpx = stableDiffusionData.hr_fix_lock_px; let lockpx = stableDiffusionData.hr_fix_lock_px;
var divW = Math.floor(request.width / request.hr_scale);
var divH = Math.floor(request.height / request.hr_scale);
if (lockpx > 0) { if (lockpx > 0) {
// find the appropriate scale factor for hrfix // find the most appropriate scale factor for hrfix
var widthFactor = var widthFactor =
request.width / lockpx <= 4 ? request.width / lockpx : 4; request.width / lockpx <= 4 ? request.width / lockpx : 4;
var heightFactor = var heightFactor =
@ -834,6 +831,9 @@ const dream_generate_callback = async (bb, resolution, state) => {
var factor = heightFactor > widthFactor ? heightFactor : widthFactor; var factor = heightFactor > widthFactor ? heightFactor : widthFactor;
request.hr_scale = hrFixScaleSlider.value = factor < 1 ? 1 : factor; request.hr_scale = hrFixScaleSlider.value = factor < 1 ? 1 : factor;
} }
// moar laziness convenience
var divW = Math.floor(request.width / request.hr_scale);
var divH = Math.floor(request.height / request.hr_scale);
if (localStorage.getItem("openoutpaint/settings.hrfix-liar") == "true") { if (localStorage.getItem("openoutpaint/settings.hrfix-liar") == "true") {
/** /**
@ -855,8 +855,7 @@ const dream_generate_callback = async (bb, resolution, state) => {
// ensure firstpass "resolution" complies with lockpx // ensure firstpass "resolution" complies with lockpx
if (lockpx > 0) { if (lockpx > 0) {
//sigh repeated code //sigh repeated loop
// scale down by hr_scale?
firstpassWidth = divW < lockpx ? divW : lockpx; firstpassWidth = divW < lockpx ? divW : lockpx;
firstpassHeight = divH < lockpx ? divH : lockpx; firstpassHeight = divH < lockpx ? divH : lockpx;
} }