remove reference to deprecated mod
This commit is contained in:
An Orbit
GitHub
parent
9c573ee97a
commit
b08c91662e
|
|
@ -1,153 +1,149 @@
|
||||||
if(enabledMods.includes("mods/a_mod_by_alice.js")) {
|
currentShape = "square";
|
||||||
logMessage("cursor_shapes.js is redundant with a_mod_by_alice.js")
|
shapeOrder = ["square","circle","triangle","inverted triangle","rhombus","squircle","twinkle","slash","backslash"];
|
||||||
} else {
|
shapeExclusionConditions = {
|
||||||
currentShape = "square";
|
/*"square": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
shapeOrder = ["square","circle","triangle","inverted triangle","rhombus","squircle","twinkle","slash","backslash"];
|
return false
|
||||||
shapeExclusionConditions = {
|
},*/
|
||||||
/*"square": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
"triangle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
return false
|
var xOffset = (x - topLeft[0]);
|
||||||
},*/
|
var yOffset = (y - topLeft[1]);
|
||||||
"triangle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
var distanceFromCenterLine;
|
||||||
var xOffset = (x - topLeft[0]);
|
|
||||||
var yOffset = (y - topLeft[1]);
|
|
||||||
var distanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) {
|
|
||||||
distanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5))
|
|
||||||
} else {
|
|
||||||
distanceFromCenterLine = Math.abs(mouseX - x);
|
|
||||||
};
|
|
||||||
var distanceProportion = distanceFromCenterLine / size;
|
|
||||||
var hpovp = ((yOffset + (size % 2 == 0)) / size) / 2; //halvedPossiblyOffsetVerticalProportion
|
|
||||||
return distanceProportion > (hpovp + 0.01);
|
|
||||||
},
|
|
||||||
"inverted triangle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
|
||||||
var xOffset = (x - topLeft[0]);
|
|
||||||
var yOffset = (y - topLeft[1]);
|
|
||||||
var distanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) {
|
|
||||||
distanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5))
|
|
||||||
} else {
|
|
||||||
distanceFromCenterLine = Math.abs(mouseX - x);
|
|
||||||
};
|
|
||||||
var distanceProportion = distanceFromCenterLine / size;
|
|
||||||
var hpovpc = (1 - ((yOffset + (size % 2 !== 0)) / size)) / 2; //halvedPossiblyOffsetVerticalProportionComplement
|
|
||||||
return distanceProportion > (hpovpc + 0.01);
|
|
||||||
},
|
|
||||||
"rhombus": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
|
||||||
var xOffset = (x - topLeft[0]);
|
|
||||||
var yOffset = (y - topLeft[1]);
|
|
||||||
var xDistanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) { xDistanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5)) } else { xDistanceFromCenterLine = Math.abs(mouseX - x) };
|
|
||||||
var yDistanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) { yDistanceFromCenterLine = Math.abs((size / 2) - (yOffset + 0.5)) } else { yDistanceFromCenterLine = Math.abs(mouseY - y) };
|
|
||||||
return (xDistanceFromCenterLine + yDistanceFromCenterLine) > (size / 2) //i was just messing around, i didn't expect this to actually be the right condition :sob:
|
|
||||||
},
|
|
||||||
"squircle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
|
||||||
var xOffset = (x - topLeft[0]);
|
|
||||||
var yOffset = (y - topLeft[1]);
|
|
||||||
var xDistanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) { xDistanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5)) } else { xDistanceFromCenterLine = Math.abs(mouseX - x) };
|
|
||||||
var yDistanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) { yDistanceFromCenterLine = Math.abs((size / 2) - (yOffset + 0.5)) } else { yDistanceFromCenterLine = Math.abs(mouseY - y) };
|
|
||||||
return ( (((xDistanceFromCenterLine ** 3) + (yDistanceFromCenterLine ** 3)) ** (1/3)) > (size / 2)) || ((size > 2) && (size <= 6) && ((xDistanceFromCenterLine + yDistanceFromCenterLine) == (size - 1)));
|
|
||||||
},
|
|
||||||
"twinkle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
|
||||||
var xOffset = (x - topLeft[0]);
|
|
||||||
var yOffset = (y - topLeft[1]);
|
|
||||||
var xDistanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) { xDistanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5)) } else { xDistanceFromCenterLine = Math.abs(mouseX - x) };
|
|
||||||
var yDistanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) { yDistanceFromCenterLine = Math.abs((size / 2) - (yOffset + 0.5)) } else { yDistanceFromCenterLine = Math.abs(mouseY - y) };
|
|
||||||
return ((((xDistanceFromCenterLine ** (1/2)) + (yDistanceFromCenterLine ** (1/2))) ** (2)) > ((size / (size % 2 ? 2 : 1.7)))) && (xDistanceFromCenterLine > 0.5) && (yDistanceFromCenterLine > 0.5)
|
|
||||||
},
|
|
||||||
"circle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
|
||||||
var xOffset = (x - topLeft[0]);
|
|
||||||
var yOffset = (y - topLeft[1]);
|
|
||||||
var xDistanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) { xDistanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5)) } else { xDistanceFromCenterLine = Math.abs(mouseX - x) };
|
|
||||||
var yDistanceFromCenterLine;
|
|
||||||
if(size % 2 == 0) { yDistanceFromCenterLine = Math.abs((size / 2) - (yOffset + 0.5)) } else { yDistanceFromCenterLine = Math.abs(mouseY - y) };
|
|
||||||
if( (((xDistanceFromCenterLine ** 2) + (yDistanceFromCenterLine ** 2)) ** (1/2)) > (size / 2)) { return true }; //structured this way for legibility
|
|
||||||
if( ((xDistanceFromCenterLine + yDistanceFromCenterLine) == 2) && (size == 3)) { return true };
|
|
||||||
if( ((xDistanceFromCenterLine + yDistanceFromCenterLine) >= 3.5) && (size == 6)) { return true };
|
|
||||||
if( ((xDistanceFromCenterLine + yDistanceFromCenterLine) >= 4.5) && (size == 8) && !(Math.abs(xDistanceFromCenterLine) === Math.abs(yDistanceFromCenterLine))) { return true };
|
|
||||||
if( //i can't explain how these rules work, but they just do
|
|
||||||
(size % 2 == 1) &&
|
|
||||||
(size > 5) &&
|
|
||||||
((xDistanceFromCenterLine + yDistanceFromCenterLine) >= (size - 3)) &&
|
|
||||||
!(Math.abs(xDistanceFromCenterLine) === Math.abs(yDistanceFromCenterLine))
|
|
||||||
) { return true };
|
|
||||||
return false
|
|
||||||
},
|
|
||||||
"slash": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
|
||||||
var xOffset = (x - topLeft[0]);
|
|
||||||
var yOffset = (y - topLeft[1]);
|
|
||||||
var yOffsetComplement = (size - 1) - yOffset;
|
|
||||||
if(xOffset == yOffsetComplement) { return false };
|
|
||||||
if(xOffset == yOffsetComplement + 1) { return false };
|
|
||||||
return true
|
|
||||||
},
|
|
||||||
"backslash": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
|
||||||
var xOffset = (x - topLeft[0]);
|
|
||||||
var yOffset = (y - topLeft[1]);
|
|
||||||
if(xOffset == yOffset) { return false };
|
|
||||||
if(xOffset == yOffset + 1) { return false };
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function mouseRange(mouseX,mouseY,size,shapeOverride=null) {
|
|
||||||
var shape = shapeOverride ?? currentShape ?? "square";
|
|
||||||
var coords = [];
|
|
||||||
size = size || mouseSize;
|
|
||||||
if (elements[currentElement].maxSize < mouseSize) {
|
|
||||||
var mouseOffset = Math.trunc(elements[currentElement].maxSize/2);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
var mouseOffset = Math.trunc(size/2);
|
|
||||||
}
|
|
||||||
var topLeft = [mouseX-mouseOffset,mouseY-mouseOffset];
|
|
||||||
var bottomRight = [mouseX+mouseOffset,mouseY+mouseOffset];
|
|
||||||
if(size % 2 == 0) {
|
if(size % 2 == 0) {
|
||||||
bottomRight[0]--;
|
distanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5))
|
||||||
bottomRight[1]--;
|
} else {
|
||||||
|
distanceFromCenterLine = Math.abs(mouseX - x);
|
||||||
};
|
};
|
||||||
var exclusionFunction = shapeExclusionConditions[shape] ?? null;
|
var distanceProportion = distanceFromCenterLine / size;
|
||||||
if((shape !== "square") && (exclusionFunction == null)) {
|
var hpovp = ((yOffset + (size % 2 == 0)) / size) / 2; //halvedPossiblyOffsetVerticalProportion
|
||||||
logMessage(`Shape ${shape} not recognized!`)
|
return distanceProportion > (hpovp + 0.01);
|
||||||
return []
|
},
|
||||||
|
"inverted triangle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
|
var xOffset = (x - topLeft[0]);
|
||||||
|
var yOffset = (y - topLeft[1]);
|
||||||
|
var distanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) {
|
||||||
|
distanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5))
|
||||||
|
} else {
|
||||||
|
distanceFromCenterLine = Math.abs(mouseX - x);
|
||||||
};
|
};
|
||||||
|
var distanceProportion = distanceFromCenterLine / size;
|
||||||
|
var hpovpc = (1 - ((yOffset + (size % 2 !== 0)) / size)) / 2; //halvedPossiblyOffsetVerticalProportionComplement
|
||||||
|
return distanceProportion > (hpovpc + 0.01);
|
||||||
|
},
|
||||||
|
"rhombus": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
|
var xOffset = (x - topLeft[0]);
|
||||||
|
var yOffset = (y - topLeft[1]);
|
||||||
|
var xDistanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) { xDistanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5)) } else { xDistanceFromCenterLine = Math.abs(mouseX - x) };
|
||||||
|
var yDistanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) { yDistanceFromCenterLine = Math.abs((size / 2) - (yOffset + 0.5)) } else { yDistanceFromCenterLine = Math.abs(mouseY - y) };
|
||||||
|
return (xDistanceFromCenterLine + yDistanceFromCenterLine) > (size / 2) //i was just messing around, i didn't expect this to actually be the right condition :sob:
|
||||||
|
},
|
||||||
|
"squircle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
|
var xOffset = (x - topLeft[0]);
|
||||||
|
var yOffset = (y - topLeft[1]);
|
||||||
|
var xDistanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) { xDistanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5)) } else { xDistanceFromCenterLine = Math.abs(mouseX - x) };
|
||||||
|
var yDistanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) { yDistanceFromCenterLine = Math.abs((size / 2) - (yOffset + 0.5)) } else { yDistanceFromCenterLine = Math.abs(mouseY - y) };
|
||||||
|
return ( (((xDistanceFromCenterLine ** 3) + (yDistanceFromCenterLine ** 3)) ** (1/3)) > (size / 2)) || ((size > 2) && (size <= 6) && ((xDistanceFromCenterLine + yDistanceFromCenterLine) == (size - 1)));
|
||||||
|
},
|
||||||
|
"twinkle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
|
var xOffset = (x - topLeft[0]);
|
||||||
|
var yOffset = (y - topLeft[1]);
|
||||||
|
var xDistanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) { xDistanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5)) } else { xDistanceFromCenterLine = Math.abs(mouseX - x) };
|
||||||
|
var yDistanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) { yDistanceFromCenterLine = Math.abs((size / 2) - (yOffset + 0.5)) } else { yDistanceFromCenterLine = Math.abs(mouseY - y) };
|
||||||
|
return ((((xDistanceFromCenterLine ** (1/2)) + (yDistanceFromCenterLine ** (1/2))) ** (2)) > ((size / (size % 2 ? 2 : 1.7)))) && (xDistanceFromCenterLine > 0.5) && (yDistanceFromCenterLine > 0.5)
|
||||||
|
},
|
||||||
|
"circle": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
|
var xOffset = (x - topLeft[0]);
|
||||||
|
var yOffset = (y - topLeft[1]);
|
||||||
|
var xDistanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) { xDistanceFromCenterLine = Math.abs((size / 2) - (xOffset + 0.5)) } else { xDistanceFromCenterLine = Math.abs(mouseX - x) };
|
||||||
|
var yDistanceFromCenterLine;
|
||||||
|
if(size % 2 == 0) { yDistanceFromCenterLine = Math.abs((size / 2) - (yOffset + 0.5)) } else { yDistanceFromCenterLine = Math.abs(mouseY - y) };
|
||||||
|
if( (((xDistanceFromCenterLine ** 2) + (yDistanceFromCenterLine ** 2)) ** (1/2)) > (size / 2)) { return true }; //structured this way for legibility
|
||||||
|
if( ((xDistanceFromCenterLine + yDistanceFromCenterLine) == 2) && (size == 3)) { return true };
|
||||||
|
if( ((xDistanceFromCenterLine + yDistanceFromCenterLine) >= 3.5) && (size == 6)) { return true };
|
||||||
|
if( ((xDistanceFromCenterLine + yDistanceFromCenterLine) >= 4.5) && (size == 8) && !(Math.abs(xDistanceFromCenterLine) === Math.abs(yDistanceFromCenterLine))) { return true };
|
||||||
|
if( //i can't explain how these rules work, but they just do
|
||||||
|
(size % 2 == 1) &&
|
||||||
|
(size > 5) &&
|
||||||
|
((xDistanceFromCenterLine + yDistanceFromCenterLine) >= (size - 3)) &&
|
||||||
|
!(Math.abs(xDistanceFromCenterLine) === Math.abs(yDistanceFromCenterLine))
|
||||||
|
) { return true };
|
||||||
|
return false
|
||||||
|
},
|
||||||
|
"slash": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
|
var xOffset = (x - topLeft[0]);
|
||||||
|
var yOffset = (y - topLeft[1]);
|
||||||
|
var yOffsetComplement = (size - 1) - yOffset;
|
||||||
|
if(xOffset == yOffsetComplement) { return false };
|
||||||
|
if(xOffset == yOffsetComplement + 1) { return false };
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
"backslash": function(x,y,size,mouseX,mouseY,topLeft,bottomRight) {
|
||||||
|
var xOffset = (x - topLeft[0]);
|
||||||
|
var yOffset = (y - topLeft[1]);
|
||||||
|
if(xOffset == yOffset) { return false };
|
||||||
|
if(xOffset == yOffset + 1) { return false };
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Starting at the top left, go through each pixel
|
function mouseRange(mouseX,mouseY,size,shapeOverride=null) {
|
||||||
for (var x = topLeft[0]; x <= bottomRight[0]; x++) {
|
var shape = shapeOverride ?? currentShape ?? "square";
|
||||||
for (var y = topLeft[1]; y <= bottomRight[1]; y++) {
|
var coords = [];
|
||||||
// If the pixel is empty, add it to coords
|
size = size || mouseSize;
|
||||||
if((shape !== "square") && exclusionFunction?.(x,y,size,mouseX,mouseY,topLeft,bottomRight)) {
|
if (elements[currentElement].maxSize < mouseSize) {
|
||||||
continue
|
var mouseOffset = Math.trunc(elements[currentElement].maxSize/2);
|
||||||
};
|
}
|
||||||
coords.push([x,y]);
|
else {
|
||||||
}
|
var mouseOffset = Math.trunc(size/2);
|
||||||
};
|
}
|
||||||
return coords
|
var topLeft = [mouseX-mouseOffset,mouseY-mouseOffset];
|
||||||
|
var bottomRight = [mouseX+mouseOffset,mouseY+mouseOffset];
|
||||||
|
if(size % 2 == 0) {
|
||||||
|
bottomRight[0]--;
|
||||||
|
bottomRight[1]--;
|
||||||
|
};
|
||||||
|
var exclusionFunction = shapeExclusionConditions[shape] ?? null;
|
||||||
|
if((shape !== "square") && (exclusionFunction == null)) {
|
||||||
|
logMessage(`Shape ${shape} not recognized!`)
|
||||||
|
return []
|
||||||
};
|
};
|
||||||
|
|
||||||
document.addEventListener("keydown", function(e) {
|
// Starting at the top left, go through each pixel
|
||||||
//shift+8 to change cursor shape, alt+8 to cycle backwards
|
for (var x = topLeft[0]; x <= bottomRight[0]; x++) {
|
||||||
if (e.keyCode == 56 && [1,2].includes(shiftDown)) {
|
for (var y = topLeft[1]; y <= bottomRight[1]; y++) {
|
||||||
var currentShapeIndex = shapeOrder.indexOf(currentShape);
|
// If the pixel is empty, add it to coords
|
||||||
var newIndex;
|
if((shape !== "square") && exclusionFunction?.(x,y,size,mouseX,mouseY,topLeft,bottomRight)) {
|
||||||
switch(shiftDown) {
|
continue
|
||||||
default:
|
|
||||||
case 1:
|
|
||||||
newIndex = (currentShapeIndex + 1) % shapeOrder.length;
|
|
||||||
break
|
|
||||||
case 2:
|
|
||||||
newIndex = (currentShapeIndex - 1) % shapeOrder.length;
|
|
||||||
if(newIndex < 0) { newIndex = shapeOrder.length - 1 };
|
|
||||||
break
|
|
||||||
};
|
};
|
||||||
currentShape = shapeOrder[newIndex];
|
coords.push([x,y]);
|
||||||
logMessage(`Current shape: ${currentShape}`)
|
|
||||||
}
|
}
|
||||||
})
|
};
|
||||||
}
|
return coords
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener("keydown", function(e) {
|
||||||
|
//shift+8 to change cursor shape, alt+8 to cycle backwards
|
||||||
|
if (e.keyCode == 56 && [1,2].includes(shiftDown)) {
|
||||||
|
var currentShapeIndex = shapeOrder.indexOf(currentShape);
|
||||||
|
var newIndex;
|
||||||
|
switch(shiftDown) {
|
||||||
|
default:
|
||||||
|
case 1:
|
||||||
|
newIndex = (currentShapeIndex + 1) % shapeOrder.length;
|
||||||
|
break
|
||||||
|
case 2:
|
||||||
|
newIndex = (currentShapeIndex - 1) % shapeOrder.length;
|
||||||
|
if(newIndex < 0) { newIndex = shapeOrder.length - 1 };
|
||||||
|
break
|
||||||
|
};
|
||||||
|
currentShape = shapeOrder[newIndex];
|
||||||
|
logMessage(`Current shape: ${currentShape}`)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue