aperx/factorio-clusterio
1
0 Fork 0
mirror of https://github.com/clusterio/clusterio.git synced 2026-11-14 23:24:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

In 2.0, icon_size is optional with a default of 64 - fixes #699

Browse Source
This commit is contained in:
Danielv123 authored and Daniel committed 2024-12-09 15:23:45 -08:00
1 parent 485504d885
commit c0d33d5852
1 file changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files
packages/host/src/export.ts
+7 -7
View File
@@ -15,12 +15,12 @@ interface Prototype {
}
interface SimpleIconSpecification {
icon: string;
icon_size: number;
icon_size?: number;
icon_mipmaps?: number;
}
interface IconLayer {
icon: string;
icon_size: number;
icon_size?: number;
tint?: lib.FactorioColor,
shift?: [number, number],
scale?: number,
@@ -28,7 +28,7 @@ interface IconLayer {
}
interface LayeredIconSpecification {
icons: IconLayer[];
icon_size: number;
icon_size?: number;
icon_mipmaps?: number;
}
type IconSpecification = LayeredIconSpecification | SimpleIconSpecification;
@@ -165,9 +165,9 @@ async function loadSimpleIcon(
size: number,
iconCache: IconCache,
) {
let icon = await loadIcon(server, modVersions, item.icon, item.icon_size, 0, iconCache);
let icon = await loadIcon(server, modVersions, item.icon, item.icon_size ?? 64, 0, iconCache);
if (icon) {
let iconScale = size / item.icon_size;
let iconScale = size / (item.icon_size ?? 64);
if (iconScale !== 1) {
icon = icon.clone();
icon.scale(iconScale);
@@ -183,7 +183,7 @@ async function loadLayeredIcon(
size: number,
iconCache: IconCache,
) {
let baseLayerSize = item.icons[0].icon_size || item.icon_size;
let baseLayerSize = (item.icons[0].icon_size || item.icon_size) ?? 64;
let icon = await Jimp.create(size, size);
// The scaling factor of the base layer
@@ -193,7 +193,7 @@ async function loadLayeredIcon(
let baseUnit = size / (baseLayerSize * baseLayerScale);
for (let layer of item.icons) {
let layerSize = layer.icon_size || item.icon_size;
let layerSize = (layer.icon_size || item.icon_size) ?? 64;
let iconLayer = await loadIcon(server, modVersions, layer.icon, layerSize, layer.icon_mipmaps || 0, iconCache);
if (!iconLayer) {