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

Merge pull request #720 from redbirdly/main 

Fix lightmap save loading, and rgbToArray function in both lightmap.js and fast_lightmap.js
This commit is contained in:
slweeb 2024-06-28 23:17:48 -04:00 committed by GitHub
parent be46cb2340 53622b58b1
commit 925c53db0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 427 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

386
mods/fast_lightmap.js
View File

@ -16,252 +16,284 @@ var strangeMatterColor = [220 * 0.3, 255 * 0.3, 210 * 0.3];
var sparkColors = [[255, 210, 120], [255, 140, 10]]; var sparkColors = [[255, 210, 120], [255, 140, 10]];
function getRandomElement(arr) { function getRandomElement(arr) {
return arr[Math.floor(Math.random() * arr.length)]; return arr[Math.floor(Math.random() * arr.length)];
} }
function rgbToArray(rgbString) { if (!rgbToArray) {
return rgbString.slice(4, -1).split(',').map(val => parseInt(val.trim())); function rgbToArray(colorString) {
if (typeof colorString !== 'string') {
console.error('Invalid colorString:', colorString);
return null;
}
if (colorString.startsWith('rgb')) {
// Handle RGB format
return colorString.slice(4, -1).split(',').map(val => parseInt(val.trim()));
} else if (colorString.startsWith('#')) {
// Handle HEX format
let hex = colorString.slice(1);
// Handle shorthand hex (e.g., #03F)
if (hex.length === 3) {
hex = hex.split('').map(char => char + char).join('');
}
if (hex.length !== 6) {
console.error('Invalid hex color:', colorString);
return null;
}
const r = parseInt(hex.slice(0, 2), 16);
const g = parseInt(hex.slice(2, 4), 16);
const b = parseInt(hex.slice(4, 6), 16);
return [r, g, b];
} else {
console.error('Invalid color format:', colorString);
return null;
}
}
} }
function scaleList(numbers, scale) { function scaleList(numbers, scale) {
return numbers.map(number => number * scale); return numbers.map(number => number * scale);
} }
function initializeLightmap(width, height) { function initializeLightmap(width, height) {
lightmapWidth = Math.ceil(width / lightmapScale); lightmapWidth = Math.ceil(width / lightmapScale);
lightmapHeight = Math.ceil(height / lightmapScale); lightmapHeight = Math.ceil(height / lightmapScale);
for (var y = 0; y < lightmapHeight; y++) { for (var y = 0; y < lightmapHeight; y++) {
lightmap[y] = []; lightmap[y] = [];
nextLightmap[y] = []; nextLightmap[y] = [];
for (var x = 0; x < lightmapWidth; x++) { for (var x = 0; x < lightmapWidth; x++) {
lightmap[y][x] = { color: [0, 0, 0] }; lightmap[y][x] = { color: [0, 0, 0] };
nextLightmap[y][x] = { color: [0, 0, 0] }; nextLightmap[y][x] = { color: [0, 0, 0] };
} }
} }
} }
function deepCopy(source, target) { function deepCopy(source, target) {
for (var y = 0; y < source.length; y++) { for (var y = 0; y < source.length; y++) {
target[y] = []; target[y] = [];
for (var x = 0; x < source[y].length; x++) { for (var x = 0; x < source[y].length; x++) {
target[y][x] = { ...source[y][x] }; target[y][x] = { ...source[y][x] };
} }
} }
} }
function propagateLightmap() { function propagateLightmap() {
if (!lightmap || !lightmap[0]) return; if (!lightmap || !lightmap[0]) return;
var width = lightmap[0].length; var width = lightmap[0].length;
var height = lightmap.length; var height = lightmap.length;
var neighbors = [ var neighbors = [
{ dx: 1, dy: 0 }, { dx: 1, dy: 0 },
{ dx: -1, dy: 0 }, { dx: -1, dy: 0 },
{ dx: 0, dy: 1 }, { dx: 0, dy: 1 },
{ dx: 0, dy: -1 }, { dx: 0, dy: -1 },
]; ];
for (var y = 0; y < height; y++) { for (var y = 0; y < height; y++) {
for (var x = 0; x < width; x++) { for (var x = 0; x < width; x++) {
var totalColor = [0, 0, 0]; var totalColor = [0, 0, 0];
var neighborCount = 0; var neighborCount = 0;
neighbors.forEach(({ dx, dy }) => { neighbors.forEach(({ dx, dy }) => {
var nx = x + dx; var nx = x + dx;
var ny = y + dy; var ny = y + dy;
if (nx >= 0 && ny >= 0 && nx < width && ny < height) { if (nx >= 0 && ny >= 0 && nx < width && ny < height) {
totalColor[0] += lightmap[ny][nx].color[0]; totalColor[0] += lightmap[ny][nx].color[0];
totalColor[1] += lightmap[ny][nx].color[1]; totalColor[1] += lightmap[ny][nx].color[1];
totalColor[2] += lightmap[ny][nx].color[2]; totalColor[2] += lightmap[ny][nx].color[2];
neighborCount++; neighborCount++;
} }
}); });
nextLightmap[y][x] = { nextLightmap[y][x] = {
color: [ color: [
Math.min(Math.max(0, totalColor[0] / neighborCount * 0.8), 255 * 8), Math.min(Math.max(0, totalColor[0] / neighborCount * 0.8), 255 * 8),
Math.min(Math.max(0, totalColor[1] / neighborCount * 0.8), 255 * 8), Math.min(Math.max(0, totalColor[1] / neighborCount * 0.8), 255 * 8),
Math.min(Math.max(0, totalColor[2] / neighborCount * 0.8), 255 * 8) Math.min(Math.max(0, totalColor[2] / neighborCount * 0.8), 255 * 8)
] ]
}; };
} }
} }
deepCopy(nextLightmap, lightmap); deepCopy(nextLightmap, lightmap);
} }
function rgbToHsv(r, g, b) { function rgbToHsv(r, g, b) {
r /= 255; g /= 255; b /= 255; r /= 255; g /= 255; b /= 255;
var max = Math.max(r, g, b), min = Math.min(r, g, b); var max = Math.max(r, g, b), min = Math.min(r, g, b);
var h, s, v = max; var h, s, v = max;
var d = max - min; var d = max - min;
s = max === 0 ? 0 : d / max; s = max === 0 ? 0 : d / max;
if (max === min) { if (max === min) {
h = 0; h = 0;
} else { } else {
switch (max) { switch (max) {
case r: h = (g - b) / d + (g < b ? 6 : 0); break; case r: h = (g - b) / d + (g < b ? 6 : 0); break;
case g: h = (b - r) / d + 2; break; case g: h = (b - r) / d + 2; break;
case b: h = (r - g) / d + 4; break; case b: h = (r - g) / d + 4; break;
} }
h /= 6; h /= 6;
} }
return [h, s, v]; return [h, s, v];
} }
function hsvToRgb(h, s, v) { function hsvToRgb(h, s, v) {
var r, g, b; var r, g, b;
var i = Math.floor(h * 6); var i = Math.floor(h * 6);
var f = h * 6 - i; var f = h * 6 - i;
var p = v * (1 - s); var p = v * (1 - s);
var q = v * (1 - f * s); var q = v * (1 - f * s);
var t = v * (1 - (1 - f) * s); var t = v * (1 - (1 - f) * s);
switch (i % 6) { switch (i % 6) {
case 0: r = v; g = t; b = p; break; case 0: r = v; g = t; b = p; break;
case 1: r = q; g = v; b = p; break; case 1: r = q; g = v; b = p; break;
case 2: r = p; g = v; b = t; break; case 2: r = p; g = v; b = t; break;
case 3: r = p; g = q; b = v; break; case 3: r = p; g = q; b = v; break;
case 4: r = t; g = p; b = v; break; case 4: r = t; g = p; b = v; break;
case 5: r = v; g = p; b = q; break; case 5: r = v; g = p; b = q; break;
} }
return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)]; return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)];
} }
function renderLightmap() { function renderLightmap() {
if (!canvas) return; if (!canvas) return;
if (!lightmap || !lightmap[0]) return; if (!lightmap || !lightmap[0]) return;
var context = canvas.getContext('2d'); var context = canvas.getContext('2d');
var width = lightmap[0].length; var width = lightmap[0].length;
var height = lightmap.length; var height = lightmap.length;
for (var y = 0; y < height; y++) { for (var y = 0; y < height; y++) {
for (var x = 0; x < width; x++) { for (var x = 0; x < width; x++) {
var { color } = lightmap[y][x]; var { color } = lightmap[y][x];
var [r, g, b] = color; var [r, g, b] = color;
if (r > 0 || g > 0 || b > 0) { if (r > 0 || g > 0 || b > 0) {
var [h, s, v] = rgbToHsv(r, g, b); var [h, s, v] = rgbToHsv(r, g, b);
var newColor = hsvToRgb(h, s, 1); var newColor = hsvToRgb(h, s, 1);
var alpha = v; var alpha = v;
context.fillStyle = `rgba(${newColor[0]}, ${newColor[1]}, ${newColor[2]}, ${alpha * 0.4})`; context.fillStyle = `rgba(${newColor[0]}, ${newColor[1]}, ${newColor[2]}, ${alpha * 0.4})`;
context.fillRect( context.fillRect(
x * pixelSize * lightmapScale, x * pixelSize * lightmapScale,
y * pixelSize * lightmapScale, y * pixelSize * lightmapScale,
pixelSize * lightmapScale, pixelSize * lightmapScale,
pixelSize * lightmapScale pixelSize * lightmapScale
); );
context.fillStyle = `rgba(${newColor[0]}, ${newColor[1]}, ${newColor[2]}, ${alpha * 0.25})`; context.fillStyle = `rgba(${newColor[0]}, ${newColor[1]}, ${newColor[2]}, ${alpha * 0.25})`;
context.fillRect( context.fillRect(
(x * pixelSize - pixelSizeHalf) * lightmapScale, (x * pixelSize - pixelSizeHalf) * lightmapScale,
(y * pixelSize - pixelSizeHalf) * lightmapScale, (y * pixelSize - pixelSizeHalf) * lightmapScale,
pixelSize * lightmapScale * 2, pixelSize * lightmapScale * 2,
pixelSize * lightmapScale * 2 pixelSize * lightmapScale * 2
); );
} }
} }
} }
} }
function glowItsOwnColor(pixel) { function glowItsOwnColor(pixel) {
if (!pixel.color) {return;} if (!pixel.color) {return;}
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
lightmap[y][x] = { color: rgbToArray(pixel.color) }; lightmap[y][x] = { color: rgbToArray(pixel.color) };
} }
function glowItsOwnColorIfPowered(pixel) { function glowItsOwnColorIfPowered(pixel) {
if (!pixel.charge || pixel.charge <= 0) {return;} if (!pixel.charge || pixel.charge <= 0) {return;}
if (!pixel.color) return; if (!pixel.color) return;
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
lightmap[y][x] = { color: rgbToArray(pixel.color) }; lightmap[y][x] = { color: rgbToArray(pixel.color) };
} }
function glowColor(pixel, color) { function glowColor(pixel, color) {
if (!color) {return;} if (!color) {return;}
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
lightmap[y][x] = { color: color }; lightmap[y][x] = { color: color };
} }
function glowRadiationColor(pixel) { function glowRadiationColor(pixel) {
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
lightmap[y][x] = { color: radColor }; lightmap[y][x] = { color: radColor };
} }
// Define element tick functions // Define element tick functions
var originalStrangeMatterTick = elements.strange_matter.tick; var originalStrangeMatterTick = elements.strange_matter.tick;
elements.strange_matter.tick = function(pixel) { elements.strange_matter.tick = function(pixel) {
originalStrangeMatterTick(pixel); originalStrangeMatterTick(pixel);
glowColor(pixel, strangeMatterColor); glowColor(pixel, strangeMatterColor);
}; };
var originalLightTick = elements.light.tick; var originalLightTick = elements.light.tick;
elements.light.tick = function(pixel) { elements.light.tick = function(pixel) {
originalLightTick(pixel); originalLightTick(pixel);
glowItsOwnColor(pixel); glowItsOwnColor(pixel);
}; };
var originalLiquidLightTick = elements.liquid_light.tick; var originalLiquidLightTick = elements.liquid_light.tick;
elements.liquid_light.tick = function(pixel) { elements.liquid_light.tick = function(pixel) {
originalLiquidLightTick(pixel); originalLiquidLightTick(pixel);
glowItsOwnColor(pixel); glowItsOwnColor(pixel);
}; };
var originalLaserTick = elements.laser.tick; var originalLaserTick = elements.laser.tick;
elements.laser.tick = function(pixel) { elements.laser.tick = function(pixel) {
originalLaserTick(pixel); originalLaserTick(pixel);
glowColor(pixel, scaleList(rgbToArray(pixel.color), 0.5)); glowColor(pixel, scaleList(rgbToArray(pixel.color), 0.5));
}; };
var originalFireTick2 = elements.fire.tick; var originalFireTick2 = elements.fire.tick;
elements.fire.tick = function(pixel) { elements.fire.tick = function(pixel) {
originalFireTick2(pixel); originalFireTick2(pixel);
glowColor(pixel, fireColor); glowColor(pixel, fireColor);
}; };
var originalFlashTick = elements.flash.tick; var originalFlashTick = elements.flash.tick;
elements.flash.tick = function(pixel) { elements.flash.tick = function(pixel) {
originalFlashTick(pixel); originalFlashTick(pixel);
glowItsOwnColor(pixel); glowItsOwnColor(pixel);
}; };
var originalRainbowTick = elements.rainbow.tick; var originalRainbowTick = elements.rainbow.tick;
elements.rainbow.tick = function(pixel) { elements.rainbow.tick = function(pixel) {
originalRainbowTick(pixel); originalRainbowTick(pixel);
glowItsOwnColor(pixel); glowItsOwnColor(pixel);
}; };
var originalFireflyTick = elements.firefly.tick; var originalFireflyTick = elements.firefly.tick;
elements.firefly.tick = function(pixel) { elements.firefly.tick = function(pixel) {
originalFireflyTick(pixel); originalFireflyTick(pixel);
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
var tickMod = pixelTicks % pixel.fff; var tickMod = pixelTicks % pixel.fff;
var num; var num;
if (tickMod <= 2) num = 1; if (tickMod <= 2) num = 1;
else if (tickMod <= 3) num = 0.75; else if (tickMod <= 3) num = 0.75;
else if (tickMod <= 4) num = 0.5; else if (tickMod <= 4) num = 0.5;
else if (tickMod <= 5) num = 0.25; else if (tickMod <= 5) num = 0.25;
else return; else return;
lightmap[y][x] = { color: scaleList(fireflyColor, num) }; lightmap[y][x] = { color: scaleList(fireflyColor, num) };
}; };
elements.electric.tick = pixel => glowColor(pixel, scaleList(getRandomElement(sparkColors), 0.5)); elements.electric.tick = pixel => glowColor(pixel, scaleList(getRandomElement(sparkColors), 0.5));
@ -281,40 +313,46 @@ elements.cold_fire.tick = pixel => glowColor(pixel, coldFireColor);
// Radioactive elements // Radioactive elements
var radioactiveElements = [ var radioactiveElements = [
"uranium", "radiation", "rad_glass", "fallout", "uranium", "radiation", "rad_glass", "fallout",
"molten_uranium", "rad_shard", "rad_cloud", "rad_steam" "molten_uranium", "rad_shard", "rad_cloud", "rad_steam"
]; ];
radioactiveElements.forEach(element => { radioactiveElements.forEach(element => {
elements[element].tick = glowRadiationColor; elements[element].tick = glowRadiationColor;
}); });
window.addEventListener('load', () => initializeLightmap(width, height)); window.addEventListener('load', () => initializeLightmap(width, height));
var originalResizeCanvas = resizeCanvas;
resizeCanvas = function(newHeight, newWidth, newPixelSize, clear) {
originalResizeCanvas(newHeight, newWidth, newPixelSize, clear);
initializeLightmap(newHeight, newWidth);
};
var originalTick = tick; var originalTick = tick;
tick = function() { tick = function() {
originalTick(); originalTick();
if (!paused) propagateLightmap(); if (!paused) propagateLightmap();
}; };
resetInterval(tps); resetInterval(tps);
var originalDoFrame = doFrame; var originalDoFrame = doFrame;
doFrame = function() { doFrame = function() {
originalDoFrame(); originalDoFrame();
propagateLightmap(); propagateLightmap();
}; };
if (enabledMods.includes("mods/velocity.js")) { if (enabledMods.includes("mods/velocity.js")) {
runAfterAutogen(() => { runAfterAutogen(() => {
var originalDrawPixels = drawPixels; var originalDrawPixels = drawPixels;
drawPixels = function(forceTick = false) { drawPixels = function(forceTick = false) {
originalDrawPixels(forceTick); originalDrawPixels(forceTick);
renderLightmap(); renderLightmap();
}; };
}); });
} else { } else {
var originalDrawPixels = drawPixels; var originalDrawPixels = drawPixels;
drawPixels = function(forceTick = false) { drawPixels = function(forceTick = false) {
originalDrawPixels(forceTick); originalDrawPixels(forceTick);
renderLightmap(); renderLightmap();
}; };
} }

390
mods/lightmap.js
View File

@ -16,252 +16,284 @@ var strangeMatterColor = [220 * 0.3, 255 * 0.3, 210 * 0.3];
var sparkColors = [[255, 210, 120], [255, 140, 10]]; var sparkColors = [[255, 210, 120], [255, 140, 10]];
function getRandomElement(arr) { function getRandomElement(arr) {
return arr[Math.floor(Math.random() * arr.length)]; return arr[Math.floor(Math.random() * arr.length)];
} }
function rgbToArray(rgbString) { if (!rgbToArray) {
return rgbString.slice(4, -1).split(',').map(val => parseInt(val.trim())); function rgbToArray(colorString) {
if (typeof colorString !== 'string') {
console.error('Invalid colorString:', colorString);
return null;
}
if (colorString.startsWith('rgb')) {
// Handle RGB format
return colorString.slice(4, -1).split(',').map(val => parseInt(val.trim()));
} else if (colorString.startsWith('#')) {
// Handle HEX format
let hex = colorString.slice(1);
// Handle shorthand hex (e.g., #03F)
if (hex.length === 3) {
hex = hex.split('').map(char => char + char).join('');
}
if (hex.length !== 6) {
console.error('Invalid hex color:', colorString);
return null;
}
const r = parseInt(hex.slice(0, 2), 16);
const g = parseInt(hex.slice(2, 4), 16);
const b = parseInt(hex.slice(4, 6), 16);
return [r, g, b];
} else {
console.error('Invalid color format:', colorString);
return null;
}
}
} }
function scaleList(numbers, scale) { function scaleList(numbers, scale) {
return numbers.map(number => number * scale); return numbers.map(number => number * scale);
} }
function initializeLightmap(width, height) { function initializeLightmap(width, height) {
lightmapWidth = Math.ceil(width / lightmapScale); lightmapWidth = Math.ceil(width / lightmapScale);
lightmapHeight = Math.ceil(height / lightmapScale); lightmapHeight = Math.ceil(height / lightmapScale);
for (var y = 0; y < lightmapHeight; y++) { for (var y = 0; y < lightmapHeight; y++) {
lightmap[y] = []; lightmap[y] = [];
nextLightmap[y] = []; nextLightmap[y] = [];
for (var x = 0; x < lightmapWidth; x++) { for (var x = 0; x < lightmapWidth; x++) {
lightmap[y][x] = { color: [0, 0, 0] }; lightmap[y][x] = { color: [0, 0, 0] };
nextLightmap[y][x] = { color: [0, 0, 0] }; nextLightmap[y][x] = { color: [0, 0, 0] };
} }
} }
} }
function deepCopy(source, target) { function deepCopy(source, target) {
for (var y = 0; y < source.length; y++) { for (var y = 0; y < source.length; y++) {
target[y] = []; target[y] = [];
for (var x = 0; x < source[y].length; x++) { for (var x = 0; x < source[y].length; x++) {
target[y][x] = { ...source[y][x] }; target[y][x] = { ...source[y][x] };
} }
} }
} }
function propagateLightmap() { function propagateLightmap() {
if (!lightmap || !lightmap[0]) return; if (!lightmap || !lightmap[0]) return;
var width = lightmap[0].length; var width = lightmap[0].length;
var height = lightmap.length; var height = lightmap.length;
var neighbors = [ var neighbors = [
{ dx: 1, dy: 0 }, { dx: 1, dy: 0 },
{ dx: -1, dy: 0 }, { dx: -1, dy: 0 },
{ dx: 0, dy: 1 }, { dx: 0, dy: 1 },
{ dx: 0, dy: -1 }, { dx: 0, dy: -1 },
]; ];
for (var y = 0; y < height; y++) { for (var y = 0; y < height; y++) {
for (var x = 0; x < width; x++) { for (var x = 0; x < width; x++) {
var totalColor = [0, 0, 0]; var totalColor = [0, 0, 0];
var neighborCount = 0; var neighborCount = 0;
neighbors.forEach(({ dx, dy }) => { neighbors.forEach(({ dx, dy }) => {
var nx = x + dx; var nx = x + dx;
var ny = y + dy; var ny = y + dy;
if (nx >= 0 && ny >= 0 && nx < width && ny < height) { if (nx >= 0 && ny >= 0 && nx < width && ny < height) {
totalColor[0] += lightmap[ny][nx].color[0]; totalColor[0] += lightmap[ny][nx].color[0];
totalColor[1] += lightmap[ny][nx].color[1]; totalColor[1] += lightmap[ny][nx].color[1];
totalColor[2] += lightmap[ny][nx].color[2]; totalColor[2] += lightmap[ny][nx].color[2];
neighborCount++; neighborCount++;
} }
}); });
nextLightmap[y][x] = { nextLightmap[y][x] = {
color: [ color: [
Math.min(Math.max(0, totalColor[0] / neighborCount * 0.8), 255 * 8), Math.min(Math.max(0, totalColor[0] / neighborCount * 0.8), 255 * 8),
Math.min(Math.max(0, totalColor[1] / neighborCount * 0.8), 255 * 8), Math.min(Math.max(0, totalColor[1] / neighborCount * 0.8), 255 * 8),
Math.min(Math.max(0, totalColor[2] / neighborCount * 0.8), 255 * 8) Math.min(Math.max(0, totalColor[2] / neighborCount * 0.8), 255 * 8)
] ]
}; };
} }
} }
deepCopy(nextLightmap, lightmap); deepCopy(nextLightmap, lightmap);
} }
function rgbToHsv(r, g, b) { function rgbToHsv(r, g, b) {
r /= 255; g /= 255; b /= 255; r /= 255; g /= 255; b /= 255;
var max = Math.max(r, g, b), min = Math.min(r, g, b); var max = Math.max(r, g, b), min = Math.min(r, g, b);
var h, s, v = max; var h, s, v = max;
var d = max - min; var d = max - min;
s = max === 0 ? 0 : d / max; s = max === 0 ? 0 : d / max;
if (max === min) { if (max === min) {
h = 0; h = 0;
} else { } else {
switch (max) { switch (max) {
case r: h = (g - b) / d + (g < b ? 6 : 0); break; case r: h = (g - b) / d + (g < b ? 6 : 0); break;
case g: h = (b - r) / d + 2; break; case g: h = (b - r) / d + 2; break;
case b: h = (r - g) / d + 4; break; case b: h = (r - g) / d + 4; break;
} }
h /= 6; h /= 6;
} }
return [h, s, v]; return [h, s, v];
} }
function hsvToRgb(h, s, v) { function hsvToRgb(h, s, v) {
var r, g, b; var r, g, b;
var i = Math.floor(h * 6); var i = Math.floor(h * 6);
var f = h * 6 - i; var f = h * 6 - i;
var p = v * (1 - s); var p = v * (1 - s);
var q = v * (1 - f * s); var q = v * (1 - f * s);
var t = v * (1 - (1 - f) * s); var t = v * (1 - (1 - f) * s);
switch (i % 6) { switch (i % 6) {
case 0: r = v; g = t; b = p; break; case 0: r = v; g = t; b = p; break;
case 1: r = q; g = v; b = p; break; case 1: r = q; g = v; b = p; break;
case 2: r = p; g = v; b = t; break; case 2: r = p; g = v; b = t; break;
case 3: r = p; g = q; b = v; break; case 3: r = p; g = q; b = v; break;
case 4: r = t; g = p; b = v; break; case 4: r = t; g = p; b = v; break;
case 5: r = v; g = p; b = q; break; case 5: r = v; g = p; b = q; break;
} }
return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)]; return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)];
} }
function renderLightmap() { function renderLightmap() {
if (!canvas) return; if (!canvas) return;
if (!lightmap || !lightmap[0]) return; if (!lightmap || !lightmap[0]) return;
var context = canvas.getContext('2d'); var context = canvas.getContext('2d');
var width = lightmap[0].length; var width = lightmap[0].length;
var height = lightmap.length; var height = lightmap.length;
for (var y = 0; y < height; y++) { for (var y = 0; y < height; y++) {
for (var x = 0; x < width; x++) { for (var x = 0; x < width; x++) {
var { color } = lightmap[y][x]; var { color } = lightmap[y][x];
var [r, g, b] = color; var [r, g, b] = color;
if (r > 0 || g > 0 || b > 0) { if (r > 0 || g > 0 || b > 0) {
var [h, s, v] = rgbToHsv(r, g, b); var [h, s, v] = rgbToHsv(r, g, b);
var newColor = hsvToRgb(h, s, 1); var newColor = hsvToRgb(h, s, 1);
var alpha = v; var alpha = v;
context.fillStyle = `rgba(${newColor[0]}, ${newColor[1]}, ${newColor[2]}, ${alpha * 0.4})`; context.fillStyle = `rgba(${newColor[0]}, ${newColor[1]}, ${newColor[2]}, ${alpha * 0.4})`;
context.fillRect( context.fillRect(
x * pixelSize * lightmapScale, x * pixelSize * lightmapScale,
y * pixelSize * lightmapScale, y * pixelSize * lightmapScale,
pixelSize * lightmapScale, pixelSize * lightmapScale,
pixelSize * lightmapScale pixelSize * lightmapScale
); );
context.fillStyle = `rgba(${newColor[0]}, ${newColor[1]}, ${newColor[2]}, ${alpha * 0.25})`; context.fillStyle = `rgba(${newColor[0]}, ${newColor[1]}, ${newColor[2]}, ${alpha * 0.25})`;
context.fillRect( context.fillRect(
(x * pixelSize - pixelSizeHalf) * lightmapScale, (x * pixelSize - pixelSizeHalf) * lightmapScale,
(y * pixelSize - pixelSizeHalf) * lightmapScale, (y * pixelSize - pixelSizeHalf) * lightmapScale,
pixelSize * lightmapScale * 2, pixelSize * lightmapScale * 2,
pixelSize * lightmapScale * 2 pixelSize * lightmapScale * 2
); );
} }
} }
} }
} }
function glowItsOwnColor(pixel) { function glowItsOwnColor(pixel) {
if (!pixel.color) {return;} if (!pixel.color) {return;}
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
lightmap[y][x] = { color: rgbToArray(pixel.color) }; lightmap[y][x] = { color: rgbToArray(pixel.color) };
} }
function glowItsOwnColorIfPowered(pixel) { function glowItsOwnColorIfPowered(pixel) {
if (!pixel.charge || pixel.charge <= 0) {return;} if (!pixel.charge || pixel.charge <= 0) {return;}
if (!pixel.color) return; if (!pixel.color) return;
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
lightmap[y][x] = { color: rgbToArray(pixel.color) }; lightmap[y][x] = { color: rgbToArray(pixel.color) };
} }
function glowColor(pixel, color) { function glowColor(pixel, color) {
if (!color) {return;} if (!color) {return;}
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
lightmap[y][x] = { color: color }; lightmap[y][x] = { color: color };
} }
function glowRadiationColor(pixel) { function glowRadiationColor(pixel) {
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
lightmap[y][x] = { color: radColor }; lightmap[y][x] = { color: radColor };
} }
// Define element tick functions // Define element tick functions
var originalStrangeMatterTick = elements.strange_matter.tick; var originalStrangeMatterTick = elements.strange_matter.tick;
elements.strange_matter.tick = function(pixel) { elements.strange_matter.tick = function(pixel) {
originalStrangeMatterTick(pixel); originalStrangeMatterTick(pixel);
glowColor(pixel, strangeMatterColor); glowColor(pixel, strangeMatterColor);
}; };
var originalLightTick = elements.light.tick; var originalLightTick = elements.light.tick;
elements.light.tick = function(pixel) { elements.light.tick = function(pixel) {
originalLightTick(pixel); originalLightTick(pixel);
glowItsOwnColor(pixel); glowItsOwnColor(pixel);
}; };
var originalLiquidLightTick = elements.liquid_light.tick; var originalLiquidLightTick = elements.liquid_light.tick;
elements.liquid_light.tick = function(pixel) { elements.liquid_light.tick = function(pixel) {
originalLiquidLightTick(pixel); originalLiquidLightTick(pixel);
glowItsOwnColor(pixel); glowItsOwnColor(pixel);
}; };
var originalLaserTick = elements.laser.tick; var originalLaserTick = elements.laser.tick;
elements.laser.tick = function(pixel) { elements.laser.tick = function(pixel) {
originalLaserTick(pixel); originalLaserTick(pixel);
glowColor(pixel, scaleList(rgbToArray(pixel.color), 0.5)); glowColor(pixel, scaleList(rgbToArray(pixel.color), 0.5));
}; };
var originalFireTick2 = elements.fire.tick; var originalFireTick2 = elements.fire.tick;
elements.fire.tick = function(pixel) { elements.fire.tick = function(pixel) {
originalFireTick2(pixel); originalFireTick2(pixel);
glowColor(pixel, fireColor); glowColor(pixel, fireColor);
}; };
var originalFlashTick = elements.flash.tick; var originalFlashTick = elements.flash.tick;
elements.flash.tick = function(pixel) { elements.flash.tick = function(pixel) {
originalFlashTick(pixel); originalFlashTick(pixel);
glowItsOwnColor(pixel); glowItsOwnColor(pixel);
}; };
var originalRainbowTick = elements.rainbow.tick; var originalRainbowTick = elements.rainbow.tick;
elements.rainbow.tick = function(pixel) { elements.rainbow.tick = function(pixel) {
originalRainbowTick(pixel); originalRainbowTick(pixel);
glowItsOwnColor(pixel); glowItsOwnColor(pixel);
}; };
var originalFireflyTick = elements.firefly.tick; var originalFireflyTick = elements.firefly.tick;
elements.firefly.tick = function(pixel) { elements.firefly.tick = function(pixel) {
originalFireflyTick(pixel); originalFireflyTick(pixel);
var x = Math.floor(pixel.x / lightmapScale); var x = Math.floor(pixel.x / lightmapScale);
var y = Math.floor(pixel.y / lightmapScale); var y = Math.floor(pixel.y / lightmapScale);
var tickMod = pixelTicks % pixel.fff; var tickMod = pixelTicks % pixel.fff;
var num; var num;
if (tickMod <= 2) num = 1; if (tickMod <= 2) num = 1;
else if (tickMod <= 3) num = 0.75; else if (tickMod <= 3) num = 0.75;
else if (tickMod <= 4) num = 0.5; else if (tickMod <= 4) num = 0.5;
else if (tickMod <= 5) num = 0.25; else if (tickMod <= 5) num = 0.25;
else return; else return;
lightmap[y][x] = { color: scaleList(fireflyColor, num) }; lightmap[y][x] = { color: scaleList(fireflyColor, num) };
}; };
elements.electric.tick = pixel => glowColor(pixel, scaleList(getRandomElement(sparkColors), 0.5)); elements.electric.tick = pixel => glowColor(pixel, scaleList(getRandomElement(sparkColors), 0.5));
@ -281,40 +313,48 @@ elements.cold_fire.tick = pixel => glowColor(pixel, coldFireColor);
// Radioactive elements // Radioactive elements
var radioactiveElements = [ var radioactiveElements = [
"uranium", "radiation", "rad_glass", "fallout", "uranium", "radiation", "rad_glass", "fallout",
"molten_uranium", "rad_shard", "rad_cloud", "rad_steam" "molten_uranium", "rad_shard", "rad_cloud", "rad_steam"
]; ];
radioactiveElements.forEach(element => { radioactiveElements.forEach(element => {
elements[element].tick = glowRadiationColor; elements[element].tick = glowRadiationColor;
}); });
window.addEventListener('load', () => initializeLightmap(width, height)); window.addEventListener('load', () => {
initializeLightmap(width, height);
var originalResizeCanvas = resizeCanvas;
resizeCanvas = function(newHeight, newWidth, newPixelSize, clear) {
originalResizeCanvas(newHeight, newWidth, newPixelSize, clear);
initializeLightmap(newHeight, newWidth);
};
});
var originalTick = tick; var originalTick = tick;
tick = function() { tick = function() {
originalTick(); originalTick();
if (!paused) propagateLightmap(); if (!paused) propagateLightmap();
}; };
resetInterval(tps); resetInterval(tps);
var originalDoFrame = doFrame; var originalDoFrame = doFrame;
doFrame = function() { doFrame = function() {
originalDoFrame(); originalDoFrame();
propagateLightmap(); propagateLightmap();
}; };
if (enabledMods.includes("mods/velocity.js")) { if (enabledMods.includes("mods/velocity.js")) {
runAfterAutogen(() => { runAfterAutogen(() => {
var originalDrawPixels = drawPixels; var originalDrawPixels = drawPixels;
drawPixels = function(forceTick = false) { drawPixels = function(forceTick = false) {
originalDrawPixels(forceTick); originalDrawPixels(forceTick);
renderLightmap(); renderLightmap();
}; };
}); });
} else { } else {
var originalDrawPixels = drawPixels; var originalDrawPixels = drawPixels;
drawPixels = function(forceTick = false) { drawPixels = function(forceTick = false) {
originalDrawPixels(forceTick); originalDrawPixels(forceTick);
renderLightmap(); renderLightmap();
}; };
} }