hmm not half bad
This commit is contained in:
parent
cecd031352
commit
3216af39d6
1 changed files with 39 additions and 6 deletions
|
@ -540,10 +540,15 @@ function decimate(input, palette, n, inputError, y) {
|
||||||
|
|
||||||
// Median cut!
|
// Median cut!
|
||||||
// https://en.wikipedia.org/wiki/Median_cut
|
// https://en.wikipedia.org/wiki/Median_cut
|
||||||
//let buckets = [input.slice()];
|
let buckets = [input.slice()];
|
||||||
let initial = dither(palette);
|
//let initial = dither(palette);
|
||||||
let buckets = [initial.output.map((i) => atariRGB[palette[i]])];
|
//let buckets = [initial.output.map((i) => atariRGB[palette[i]])];
|
||||||
let medianCut = (bucket, range) => {
|
let medianCut = (bucket, range) => {
|
||||||
|
if (bucket.length < 2) {
|
||||||
|
console.log(bucket);
|
||||||
|
throw new Error('short bucket');
|
||||||
|
}
|
||||||
|
//console.log('medianCut', bucket, range);
|
||||||
// Sort by the channel with the greatest range,
|
// Sort by the channel with the greatest range,
|
||||||
// then cut the bucket in two at the median.
|
// then cut the bucket in two at the median.
|
||||||
if (range.g >= range.r && range.g >= range.b) {
|
if (range.g >= range.r && range.g >= range.b) {
|
||||||
|
@ -554,6 +559,7 @@ function decimate(input, palette, n, inputError, y) {
|
||||||
bucket.sort((a, b) => b.b - a.b);
|
bucket.sort((a, b) => b.b - a.b);
|
||||||
}
|
}
|
||||||
let half = bucket.length >> 1;
|
let half = bucket.length >> 1;
|
||||||
|
//console.log('cutting', half, bucket.length);
|
||||||
return [bucket.slice(0, half), bucket.slice(half)];
|
return [bucket.slice(0, half), bucket.slice(half)];
|
||||||
};
|
};
|
||||||
while (buckets.length < n) {
|
while (buckets.length < n) {
|
||||||
|
@ -580,8 +586,24 @@ function decimate(input, palette, n, inputError, y) {
|
||||||
// .reduce((acc, rgb) => acc.inc(rgb), new RGB(0, 0, 0))
|
// .reduce((acc, rgb) => acc.inc(rgb), new RGB(0, 0, 0))
|
||||||
// .divide(bucket.length);
|
// .divide(bucket.length);
|
||||||
|
|
||||||
|
// scale to the max luma
|
||||||
|
let lumas = bucket.map((rgb) => rgb.luma());
|
||||||
|
console.log(lumas);
|
||||||
|
let luma = Math.max(...lumas);
|
||||||
|
let rgb = bucket[lumas.indexOf(luma)];
|
||||||
|
console.log(rgb, luma);
|
||||||
|
let from = rgb.luma();
|
||||||
|
if (from > 0) {
|
||||||
|
rgb = rgb.multiply(luma / rgb.luma());
|
||||||
|
}
|
||||||
|
console.log(rgb, luma);
|
||||||
|
if (!rgb) {
|
||||||
|
throw new Error('xxx');
|
||||||
|
}
|
||||||
|
|
||||||
// Take the channel-brightest color in the bucket
|
// Take the channel-brightest color in the bucket
|
||||||
//let rgb = bucket[bucket.length - 1];
|
// bad
|
||||||
|
//rgb = bucket[bucket.length - 1];
|
||||||
|
|
||||||
// Take the luma-brightest color in the bucket
|
// Take the luma-brightest color in the bucket
|
||||||
//let rgb = bucket.slice().sort((a, b) => b.luma() - a.luma())[bucket.length - 1];
|
//let rgb = bucket.slice().sort((a, b) => b.luma() - a.luma())[bucket.length - 1];
|
||||||
|
@ -591,11 +613,22 @@ function decimate(input, palette, n, inputError, y) {
|
||||||
|
|
||||||
// Combine the brightest of each channel
|
// Combine the brightest of each channel
|
||||||
// this is kinda good
|
// this is kinda good
|
||||||
|
/*
|
||||||
let rgb = new RGB(
|
let rgb = new RGB(
|
||||||
Math.max(...bucket.map((rgb) => rgb.r)),
|
Math.max(...bucket.map((rgb) => rgb.r)),
|
||||||
Math.max(...bucket.map((rgb) => rgb.g)),
|
Math.max(...bucket.map((rgb) => rgb.g)),
|
||||||
Math.max(...bucket.map((rgb) => rgb.b))
|
Math.max(...bucket.map((rgb) => rgb.b))
|
||||||
);
|
);
|
||||||
|
*/
|
||||||
|
// combine the median of each channel
|
||||||
|
// sux
|
||||||
|
/*
|
||||||
|
let rgb = new RGB(
|
||||||
|
bucket.map((rgb) => rgb.r).sort((a, b) => b - a)[bucket.length >> 1],
|
||||||
|
bucket.map((rgb) => rgb.g).sort((a, b) => b - a)[bucket.length >> 1],
|
||||||
|
bucket.map((rgb) => rgb.b).sort((a, b) => b - a)[bucket.length >> 1]
|
||||||
|
);
|
||||||
|
*/
|
||||||
|
|
||||||
// Take the luma-median color in the bucket
|
// Take the luma-median color in the bucket
|
||||||
//let rgb = bucket.slice().sort((a, b) => b.luma() - a.luma())[bucket.length >> 1];
|
//let rgb = bucket.slice().sort((a, b) => b.luma() - a.luma())[bucket.length >> 1];
|
||||||
|
@ -612,7 +645,7 @@ function decimate(input, palette, n, inputError, y) {
|
||||||
});
|
});
|
||||||
// hack
|
// hack
|
||||||
decimated.sort((a, b) => a - b);
|
decimated.sort((a, b) => a - b);
|
||||||
console.log(decimated);
|
//console.log(decimated);
|
||||||
decimated[0] = 0;
|
decimated[0] = 0;
|
||||||
|
|
||||||
// Palette fits
|
// Palette fits
|
||||||
|
|
Loading…
Reference in a new issue