commodore
/
sandboxels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update circuitcore_displays.js

This commit is contained in:
redbirdly 2025-07-01 09:39:06 +09:00 committed by GitHub
parent 4bc5f43c70
commit b7d58df9fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 120 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
mods/circuitcore_displays.js
View File

@ -1,17 +1,28 @@
if (!enabledMods.includes("mods/circuitcore.js")) { enabledMods.unshift("mods/circuitcore.js"); localStorage.setItem("enabledMods", JSON.stringify(enabledMods)); window.location.reload() }; // Circuitcore_displays.js
var lightmapEnabled = enabledMods.includes("mods/lightmap.js") || enabledMods.includes("mods/fast_lightmap.js");
ccd_ensureModEnabled("mods/circuitcore.js");
const ccd_isLightmapEnabled = enabledMods.includes("mods/lightmap.js") || enabledMods.includes("mods/fast_lightmap.js");
function ccd_ensureModEnabled(modName) {
if (enabledMods.includes(modName))
return;
enabledMods.unshift(modName);
localStorage.setItem("enabledMods", JSON.stringify(enabledMods));
window.location.reload();
}
function general_display(w, h, colorMode) { // colorMode: 0 for monochrome, 1 for 3-bit, 2 for 4-bit function general_display(w, h, colorMode) { // colorMode: 0 for monochrome, 1 for 3-bit, 2 for 4-bit
return function(pixel) { return function(pixel) {
var pins = []; let pins = [];
// X input (expands right) // X input (expands right)
for (var i = 0; i < Math.ceil(Math.log2(w)); i++) { for (let i = 0; i < Math.ceil(Math.log2(w)); i++) {
pins.push([-1, (i * 2) + 1, true]); pins.push([-1, (i * 2) + 1, true]);
} }
// Y input (expands downward) // Y input (expands downward)
for (var i = 0; i < Math.ceil(Math.log2(h)); i++) { for (let i = 0; i < Math.ceil(Math.log2(h)); i++) {
pins.push([(i * 2) + 1, -1, true]); pins.push([(i * 2) + 1, -1, true]);
} }
@ -20,7 +31,7 @@ function general_display(w, h, colorMode) { // colorMode: 0 for monochrome, 1 fo
pins.push([-1, 13, true]); // Green pins.push([-1, 13, true]); // Green
pins.push([-1, 15, true]); // Blue pins.push([-1, 15, true]); // Blue
} else if (colorMode === 2) { // 4-bit color } else if (colorMode === 2) { // 4-bit color
for (var i = 0; i < 4; i++) { for (let i = 0; i < 4; i++) {
pins.push([-1, 11 + (i * 2), true]); // 4-bit color input pins.push([-1, 11 + (i * 2), true]); // 4-bit color input
} }
} else { // Monochrome } else { // Monochrome
@ -35,25 +46,25 @@ function general_display(w, h, colorMode) { // colorMode: 0 for monochrome, 1 fo
initializeCircuit(pixel, pins, w + 2, h + 2, false, pixel.circuitRotation, addDisplayCallback); initializeCircuit(pixel, pins, w + 2, h + 2, false, pixel.circuitRotation, addDisplayCallback);
var X = []; let X = [];
for (var i = 0; i < Math.ceil(Math.log2(w)); i++) { for (let i = 0; i < Math.ceil(Math.log2(w)); i++) {
X.push(checkPin(pixel, pins, i)); X.push(checkPin(pixel, pins, i));
} }
var Y = []; let Y = [];
for (var i = 0; i < Math.ceil(Math.log2(h)); i++) { for (let i = 0; i < Math.ceil(Math.log2(h)); i++) {
Y.push(checkPin(pixel, pins, Math.ceil(Math.log2(w)) + i)); Y.push(checkPin(pixel, pins, Math.ceil(Math.log2(w)) + i));
} }
var color; let color;
if (colorMode === 1) { if (colorMode === 1) {
var red = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h))); let red = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)));
var green = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + 1); let green = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + 1);
var blue = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + 2); let blue = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + 2);
color = `rgb(${red ? 255 : 0}, ${green ? 255 : 0}, ${blue ? 255 : 0})`; color = `rgb(${red ? 255 : 0}, ${green ? 255 : 0}, ${blue ? 255 : 0})`;
} else if (colorMode === 2) { } else if (colorMode === 2) {
var colorIndex = 0; let colorIndex = 0;
for (var i = 0; i < 4; i++) { for (let i = 0; i < 4; i++) {
colorIndex += checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + i) ? Math.pow(2, i) : 0; colorIndex += checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + i) ? Math.pow(2, i) : 0;
} }
color = colorPalette_4bit[colorIndex]; color = colorPalette_4bit[colorIndex];
@ -61,30 +72,30 @@ function general_display(w, h, colorMode) { // colorMode: 0 for monochrome, 1 fo
color = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h))) ? "rgb(16, 230, 120)" : "rgb(16, 24, 32)"; color = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h))) ? "rgb(16, 230, 120)" : "rgb(16, 24, 32)";
} }
var reset = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + (colorMode === 1 ? 3 : (colorMode === 2 ? 4 : 1))); let reset = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + (colorMode === 1 ? 3 : (colorMode === 2 ? 4 : 1)));
var clock = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + (colorMode === 1 ? 4 : (colorMode === 2 ? 5 : 2))); let clock = checkPin(pixel, pins, Math.ceil(Math.log2(w)) + Math.ceil(Math.log2(h)) + (colorMode === 1 ? 4 : (colorMode === 2 ? 5 : 2)));
var x_pos = 0; let x_pos = 0;
for (var i = 0; i < X.length; i++) { for (let i = 0; i < X.length; i++) {
x_pos += X[i] ? Math.pow(2, (X.length - 1) - i) : 0; x_pos += X[i] ? Math.pow(2, (X.length - 1) - i) : 0;
} }
var y_pos = 0; let y_pos = 0;
for (var i = 0; i < Y.length; i++) { for (let i = 0; i < Y.length; i++) {
y_pos += Y[i] ? Math.pow(2, (Y.length - 1) - i) : 0; y_pos += Y[i] ? Math.pow(2, (Y.length - 1) - i) : 0;
} }
if (x_pos >= w || y_pos >= h) return; if (x_pos >= w || y_pos >= h) return;
var px = pixel.x + 1 + x_pos; let px = pixel.x + 1 + x_pos;
var py = pixel.y + 1 + y_pos; let py = pixel.y + 1 + y_pos;
if (reset) { if (reset) {
for (var y = 1; y <= h; y++) { for (let y = 1; y <= h; y++) {
for (var x = 1; x <= w; x++) { for (let x = 1; x <= w; x++) {
var reset_px = pixel.x + x; let reset_px = pixel.x + x;
var reset_py = pixel.y + y; let reset_py = pixel.y + y;
if (pixelMap[reset_px] && pixelMap[reset_px][reset_py] && pixelMap[reset_px][reset_py].element == "displayPixel") { if (pixelMap[reset_px] && pixelMap[reset_px][reset_py] && pixelMap[reset_px][reset_py].element === "displayPixel") {
pixelMap[reset_px][reset_py].color = "rgb(16, 24, 32)"; pixelMap[reset_px][reset_py].color = "rgb(16, 24, 32)";
} }
} }
@ -93,7 +104,7 @@ function general_display(w, h, colorMode) { // colorMode: 0 for monochrome, 1 fo
} }
if (clock) { if (clock) {
if (pixelMap[px] && pixelMap[px][py] && pixelMap[px][py].element == "displayPixel") { if (pixelMap[px] && pixelMap[px][py] && pixelMap[px][py].element === "displayPixel") {
pixelMap[px][py].color = color; pixelMap[px][py].color = color;
} }
} }
@ -106,9 +117,9 @@ elements.gridDisplay = {
maxSize: 1, maxSize: 1,
onSelect: function() { onSelect: function() {
// Prompt the user for display width, height, and color depth // Prompt the user for display width, height, and color depth
var width = parseInt(prompt("Enter the display width (e.g., 16, 32, 64):", "16")); let width = parseInt(prompt("Enter the display width (e.g., 16, 32, 64):", "16"));
var height = parseInt(prompt("Enter the display height (e.g., 16, 32, 64):", "16")); let height = parseInt(prompt("Enter the display height (e.g., 16, 32, 64):", "16"));
var colorDepth = parseInt(prompt("Enter the color depth (1 for monochrome, 3 for 3-bit, 4 for 4-bit):", "4")); let colorDepth = parseInt(prompt("Enter the color depth (1 for monochrome, 3 for 3-bit, 4 for 4-bit):", "4"));
// Set these values for the pixel // Set these values for the pixel
elements.gridDisplay.displayWidth = width; elements.gridDisplay.displayWidth = width;
@ -117,12 +128,12 @@ elements.gridDisplay = {
}, },
cc_stableTick: function(pixel) { cc_stableTick: function(pixel) {
// Get the display properties // Get the display properties
var width = elements.gridDisplay.displayWidth || 16; let width = elements.gridDisplay.displayWidth || 16;
var height = elements.gridDisplay.displayHeight || 16; let height = elements.gridDisplay.displayHeight || 16;
var colorDepth = elements.gridDisplay.displayColorDepth || 4; let colorDepth = elements.gridDisplay.displayColorDepth || 4;
// Call general_display with the appropriate parameters // Call general_display with the appropriate parameters
var displayFunction = general_display(width, height, colorDepth === 1 ? 0 : (colorDepth === 3 ? 1 : 2)); let displayFunction = general_display(width, height, colorDepth === 1 ? 0 : (colorDepth === 3 ? 1 : 2));
displayFunction(pixel); displayFunction(pixel);
} }
}; };
@ -133,14 +144,14 @@ elements.displayPixel = {
state: "solid", state: "solid",
behavior: behaviors.WALL, behavior: behaviors.WALL,
tick: function(pixel) { tick: function(pixel) {
if (pixel.start == pixelTicks) { if (pixel.start === pixelTicks) {
pixel.color = "rgb(16, 24, 32)"; pixel.color = "rgb(16, 24, 32)";
} }
// if (lightmapEnabled && pixel.color) { if (ccd_isLightmapEnabled && pixel.color) {
// var x = Math.floor(pixel.x / lightmapScale); let x = Math.floor(pixel.x / lightmapScale);
// var y = Math.floor(pixel.y / lightmapScale); let y = Math.floor(pixel.y / lightmapScale);
// lightmap[y][x] = { color: scaleList(rgbToArray(pixel.color), 2) }; lightmap[y][x] = { color: scaleList(rgbToArray(pixel.color), 2) };
// } }
} }
}; };