mirror/pixel-editor
1
0
Fork 0
mirror of https://github.com/lospec/pixel-editor.git synced 2023-08-10 21:12:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'unsettledgames:master' into master

Browse Source
This commit is contained in:
Leamsi Escribano 2021-06-28 15:46:41 -05:00 committed by GitHub
commit 8d64522a68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/_fill.js
View File

@ -16,8 +16,9 @@ function fill(cursorLocation) {
var r = tempImage.data[pixelPos]; var r = tempImage.data[pixelPos];
var g = tempImage.data[pixelPos + 1]; var g = tempImage.data[pixelPos + 1];
var b = tempImage.data[pixelPos + 2]; var b = tempImage.data[pixelPos + 2];
var a = tempImage.data[pixelPos + 3];
//console.log(r == color[0] && g == color[1] && b == color[2]); //console.log(r == color[0] && g == color[1] && b == color[2]);
return (r == color[0] && g == color[1] && b == color[2]); return (r == color[0] && g == color[1] && b == color[2] && a == color[3]);
} }
//save history state //save history state
@ -36,7 +37,7 @@ function fill(cursorLocation) {
var startingPosition = (topmostPixelsArray[0][1] * canvasSize[0] + topmostPixelsArray[0][0]) * 4; var startingPosition = (topmostPixelsArray[0][1] * canvasSize[0] + topmostPixelsArray[0][0]) * 4;
//the color of the cluster that is being filled //the color of the cluster that is being filled
var clusterColor = [tempImage.data[startingPosition],tempImage.data[startingPosition+1],tempImage.data[startingPosition+2]]; var clusterColor = [tempImage.data[startingPosition],tempImage.data[startingPosition+1],tempImage.data[startingPosition+2], tempImage.data[startingPosition+3]];
//the new color to fill with //the new color to fill with
var fillColor = hexToRgb(currentLayer.context.fillStyle); var fillColor = hexToRgb(currentLayer.context.fillStyle);
@ -44,7 +45,8 @@ function fill(cursorLocation) {
//if you try to fill with the same color that's already there, exit the function //if you try to fill with the same color that's already there, exit the function
if (clusterColor[0] == fillColor.r && if (clusterColor[0] == fillColor.r &&
clusterColor[1] == fillColor.g && clusterColor[1] == fillColor.g &&
clusterColor[2] == fillColor.b ) clusterColor[2] == fillColor.b &&
clusterColor[3] == fillColor.a)
return; return;
//loop until there are no more values left in this array //loop until there are no more values left in this array