Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-12-11 01:01:53 +00:00
Code Issues Projects Releases Wiki Activity

Improved Highlighting and Added Key for Selecting

Browse Source
This commit is contained in:
Christopher-Robin 2020-10-07 23:57:24 +11:00
parent 129c2baec7
commit a54db45999
No known key found for this signature in database
GPG Key ID: 39A83BF9D91CC108
3 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/js/game/hud/parts/mass_selector.js
View File

@ -7,6 +7,7 @@ import { Loader } from "../../../core/loader";
import { globalConfig } from "../../../core/config"; import { globalConfig } from "../../../core/config";
import { makeDiv, formatBigNumber, formatBigNumberFull } from "../../../core/utils"; import { makeDiv, formatBigNumber, formatBigNumberFull } from "../../../core/utils";
import { DynamicDomAttach } from "../dynamic_dom_attach"; import { DynamicDomAttach } from "../dynamic_dom_attach";
import { MapChunkView } from "../../map_chunk_view";
import { createLogger } from "../../../core/logging"; import { createLogger } from "../../../core/logging";
import { enumMouseButton } from "../../camera"; import { enumMouseButton } from "../../camera";
import { T } from "../../../translations"; import { T } from "../../../translations";
@ -244,9 +245,16 @@ export class HUDMassSelector extends BaseHUDPart {
for(let x = realTileStart.x; x <= realTileEnd.x; ++x) { for(let x = realTileStart.x; x <= realTileEnd.x; ++x) {
for(let y = realTileStart.y; y <= realTileEnd.y; ++y) { for(let y = realTileStart.y; y <= realTileEnd.y; ++y) {
for(let contents of this.root.map.getLayersContentsMultipleXY(x, y)){ let entities = []
if(this.root.logic.canDeleteBuilding(contents)) if(this.root.keyMapper.getBinding(KEYMAPPINGS.massSelect.massSelectSelectMultiLayer).pressed)
this.selectedUids.add(contents.uid); entities = this.root.map.getLayersContentsMultipleXY(x, y);
else
entities = [this.root.map.getLayerContentXY(x, y, this.root.currentLayer)];
for(let i = 0; i < entities.length; ++i){
let entity = entities[i];
if(entity !== null && this.root.logic.canDeleteBuilding(entity))
this.selectedUids.add(entity.uid);
} }
} }
} }
@ -289,32 +297,56 @@ export class HUDMassSelector extends BaseHUDPart {
parameters.context.fill(); parameters.context.fill();
parameters.context.stroke(); parameters.context.stroke();
parameters.context.fillStyle = THEME.map.selectionOverlay;
const renderedUids = new Set(); const renderedUids = new Set();
let isMultiLayerPressed = this.root.keyMapper.getBinding(KEYMAPPINGS.massSelect.massSelectSelectMultiLayer).pressed;
for(let x = realTileStart.x; x <= realTileEnd.x; ++x) { for(let x = realTileStart.x; x <= realTileEnd.x; ++x) {
for(let y = realTileStart.y; y <= realTileEnd.y; ++y) { for(let y = realTileStart.y; y <= realTileEnd.y; ++y) {
for(let component of this.root.map.getLayersContentsMultipleXY(x, y)) { let entities = []
if(isMultiLayerPressed)
entities = this.root.map.getLayersContentsMultipleXY(x, y);
else
entities = [this.root.map.getLayerContentXY(x, y, this.root.currentLayer)];
for(let i = 0; i < entities.length; ++i) {
let component = entities[i];
if(component && this.root.logic.canDeleteBuilding(component)) { if(component && this.root.logic.canDeleteBuilding(component)) {
// Prevent rendering the overlay twice // Prevent rendering the overlay twice
const uid = component.uid; const uid = component.uid;
if(renderedUids.has(uid)) { if(renderedUids.has(uid)) {
continue; continue;
} }
renderedUids.add(uid); renderedUids.add(uid);
const staticComp = component.components.StaticMapEntity;
const bounds = staticComp.getTileSpaceBounds();
parameters.context.beginPath();
if(this.root.currentLayer === "wires" || component.layer === "regular"){
parameters.context.fillStyle = THEME.map.selectionOverlay;
parameters.context.beginRoundedRect(
bounds.x * globalConfig.tileSize + boundsBorder,
bounds.y * globalConfig.tileSize + boundsBorder,
bounds.w * globalConfig.tileSize - 2 * boundsBorder,
bounds.h * globalConfig.tileSize - 2 * boundsBorder,
2
);
}else{
MapChunkView.drawSingleWiresOverviewTile({
context: parameters.context,
x: bounds.x * globalConfig.tileSize + boundsBorder,
y: bounds.y * globalConfig.tileSize + boundsBorder,
entity: component,
tileSizePixels: globalConfig.tileSize * 1.01,
});
}
const staticComp = component.components.StaticMapEntity;
const bounds = staticComp.getTileSpaceBounds();
parameters.context.beginRoundedRect(
bounds.x * globalConfig.tileSize + boundsBorder,
bounds.y * globalConfig.tileSize + boundsBorder,
bounds.w * globalConfig.tileSize - 2 * boundsBorder,
bounds.h * globalConfig.tileSize - 2 * boundsBorder,
2
);
parameters.context.fill(); parameters.context.fill();
} }
} }
@ -327,13 +359,26 @@ export class HUDMassSelector extends BaseHUDPart {
const entity = this.root.entityMgr.findByUid(uid); const entity = this.root.entityMgr.findByUid(uid);
const staticComp = entity.components.StaticMapEntity; const staticComp = entity.components.StaticMapEntity;
const bounds = staticComp.getTileSpaceBounds(); const bounds = staticComp.getTileSpaceBounds();
parameters.context.beginRoundedRect( parameters.context.beginPath();
bounds.x * globalConfig.tileSize + boundsBorder, if(this.root.currentLayer === "wires" || entity.layer === "regular"){
bounds.y * globalConfig.tileSize + boundsBorder, parameters.context.fillStyle = THEME.map.selectionOverlay;
bounds.w * globalConfig.tileSize - 2 * boundsBorder, parameters.context.beginRoundedRect(
bounds.h * globalConfig.tileSize - 2 * boundsBorder, bounds.x * globalConfig.tileSize + boundsBorder,
2 bounds.y * globalConfig.tileSize + boundsBorder,
); bounds.w * globalConfig.tileSize - 2 * boundsBorder,
bounds.h * globalConfig.tileSize - 2 * boundsBorder,
2
);
}else{
MapChunkView.drawSingleWiresOverviewTile({
context: parameters.context,
x: bounds.x * globalConfig.tileSize + boundsBorder,
y: bounds.y * globalConfig.tileSize + boundsBorder,
entity: entity,
tileSizePixels: globalConfig.tileSize * 1.01,
});
}
parameters.context.fill(); parameters.context.fill();
}); });
} }

3
src/js/game/key_action_mapper.js
View File

@ -90,7 +90,8 @@ export const KEYMAPPINGS = {
massSelect: { massSelect: {
massSelectStart: { keyCode: 17 }, // CTRL massSelectStart: { keyCode: 17 }, // CTRL
massSelectSelectMultiple: { keyCode: 16 }, // SHIFT massSelectSelectMultiple: { keyCode: 16 }, // SHIFT
massSelectSelectMultiLayer: { keyCode: 18 }, // Alt
massSelectCopy: { keyCode: key("C") }, massSelectCopy: { keyCode: key("C") },
massSelectCut: { keyCode: key("X") }, massSelectCut: { keyCode: key("X") },
confirmMassDelete: { keyCode: 46 }, // DEL confirmMassDelete: { keyCode: 46 }, // DEL

1
translations/base-en.yaml
View File

@ -1174,6 +1174,7 @@ keybindings:
Wires: Copy value below cursor Wires: Copy value below cursor
massSelectStart: Hold and drag to start massSelectStart: Hold and drag to start
massSelectSelectMultiple: Select multiple areas massSelectSelectMultiple: Select multiple areas
massSelectSelectMultiLayer: Select multiple Layers
massSelectCopy: Copy area massSelectCopy: Copy area
massSelectCut: Cut area massSelectCut: Cut area