Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Revert "Fix layer handling in cutter (#352)" 

This reverts commit 97870da048.
This commit is contained in:
tobspr 2020-07-27 13:49:46 +02:00
parent 2d54b72882
commit 94c59e0e33
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/game/shape_definition.js
View File

@ -183,11 +183,6 @@ export class ShapeDefinition extends BasicSerializableObject {
*/ */
static isValidShortKeyInternal(key) { static isValidShortKeyInternal(key) {
const sourceLayers = key.split(":"); const sourceLayers = key.split(":");
if (sourceLayers.length === 0 || sourceLayers.length > 4) {
return false;
}
let layers = []; let layers = [];
for (let i = 0; i < sourceLayers.length; ++i) { for (let i = 0; i < sourceLayers.length; ++i) {
const text = sourceLayers[i]; const text = sourceLayers[i];
@ -226,14 +221,17 @@ export class ShapeDefinition extends BasicSerializableObject {
} }
} }
if (!anyFilled && i === sourceLayers.length - 1) { if (!anyFilled) {
// Topmost layer isn't allowed being empty // Empty layer
return false; return false;
} }
layers.push(quads); layers.push(quads);
} }
if (layers.length === 0 || layers.length > 4) {
return false;
}
return true; return true;
} }
@ -449,23 +447,23 @@ export class ShapeDefinition extends BasicSerializableObject {
*/ */
cloneFilteredByQuadrants(includeQuadrants) { cloneFilteredByQuadrants(includeQuadrants) {
const newLayers = this.internalCloneLayers(); const newLayers = this.internalCloneLayers();
let lastNonEmptyLayer = -1;
for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) {
const quadrants = newLayers[layerIndex]; const quadrants = newLayers[layerIndex];
let anyContents = false;
for (let quadrantIndex = 0; quadrantIndex < 4; ++quadrantIndex) { for (let quadrantIndex = 0; quadrantIndex < 4; ++quadrantIndex) {
if (includeQuadrants.indexOf(quadrantIndex) < 0) { if (includeQuadrants.indexOf(quadrantIndex) < 0) {
quadrants[quadrantIndex] = null; quadrants[quadrantIndex] = null;
} else if (quadrants[quadrantIndex]) { } else if (quadrants[quadrantIndex]) {
lastNonEmptyLayer = layerIndex; anyContents = true;
} }
} }
}
// Remove top most empty layers which aren't needed anymore // Check if the layer is entirely empty
if (lastNonEmptyLayer !== newLayers.length - 1) { if (!anyContents) {
newLayers.splice(lastNonEmptyLayer + 1); newLayers.splice(layerIndex, 1);
layerIndex -= 1;
}
} }
return new ShapeDefinition({ layers: newLayers }); return new ShapeDefinition({ layers: newLayers });
} }