diff options
Diffstat (limited to 'public/js/mp/dye.js')
| -rw-r--r-- | public/js/mp/dye.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/public/js/mp/dye.js b/public/js/mp/dye.js index c8c5fd5..138e332 100644 --- a/public/js/mp/dye.js +++ b/public/js/mp/dye.js @@ -105,21 +105,27 @@ var mp = function(mp) { for (var p = 0; p < imageData.length; p += 4) { var pixel = [imageData[p], imageData[p + 1], imageData[p + 2]]; var alpha = imageData[p + 3]; + + // Skip fully transparent pixels if (!alpha) { continue; } var channel = getChannel(pixel); var channelId = channel.channel; + var intensity = channel.intensity; - if (!channelId || !(channelId in dyeData) || !dyeData[channelId].length) { + // If this is an unknown dye channel, an empty dye channel, not a pure color, or black, skip it + if (!channelId || !(channelId in dyeData) || !dyeData[channelId].length || intensity == 0) { continue; } - var intensity = channel.intensity; + // Scale the intensity from 0-255 to the palette size (i is the palette index, t is the remainder) var val = intensity * dyeData[channelId].length var i = Math.floor(val / 255); var t = val - i * 255; + + // If we exactly hit one of the palette colors, just use it if (!t) { --i; imageData[p ] = dyeData[channelId][i][0]; @@ -128,6 +134,7 @@ var mp = function(mp) { continue; } + // If we're between two palette colors, interpolate between them (the first color in a palette is implicitly black) imageData[p ] = ((255 - t) * (i && dyeData[channelId][i - 1][0]) + t * dyeData[channelId][i][0]) / 255; imageData[p + 1] = ((255 - t) * (i && dyeData[channelId][i - 1][1]) + t * dyeData[channelId][i][1]) / 255; imageData[p + 2] = ((255 - t) * (i && dyeData[channelId][i - 1][2]) + t * dyeData[channelId][i][2]) / 255; |