Mascali
/
shapez.io
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add layersupport for waypoints

This commit is contained in:
tobspr 2020-12-07 12:57:49 +01:00
parent 944b3c011c
commit f5032a02ce
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/ui/icons/waypoint_wires.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
res_raw/sprites/misc/waypoint_wires.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

6
src/css/ingame_hud/waypoints.scss
View File

@ -61,6 +61,12 @@
/* @load-async */ /* @load-async */
background: uiResource("icons/waypoint.png") left 50% / #{D(8px)} no-repeat; background: uiResource("icons/waypoint.png") left 50% / #{D(8px)} no-repeat;
} }
&.layer--wires {
/* @load-async */
background-image: uiResource("icons/waypoint_wires.png");
}
opacity: 0.7; opacity: 0.7;
@include S(margin-bottom, 1px); @include S(margin-bottom, 1px);
font-weight: bold; font-weight: bold;

5
src/js/changelog.js
View File

@ -2,7 +2,10 @@ export const CHANGELOG = [
{ {
version: "1.2.2", version: "1.2.2",
date: "07.12.2020", date: "07.12.2020",
entries: ["Added the ability to edit constant signals by left clicking them"], entries: [
"Added the ability to edit constant signals by left clicking them",
"You can now add markers in the wire layer (partially by daanbreur)",
],
}, },
{ {
version: "1.2.1", version: "1.2.1",

19
src/js/game/hud/parts/waypoints.js
View File

@ -20,7 +20,6 @@ import { BaseItem } from "../../base_item";
import { MetaHubBuilding } from "../../buildings/hub"; import { MetaHubBuilding } from "../../buildings/hub";
import { enumMouseButton } from "../../camera"; import { enumMouseButton } from "../../camera";
import { KEYMAPPINGS } from "../../key_action_mapper"; import { KEYMAPPINGS } from "../../key_action_mapper";
import { layers } from "../../root";
import { ShapeDefinition } from "../../shape_definition"; import { ShapeDefinition } from "../../shape_definition";
import { BaseHUDPart } from "../base_hud_part"; import { BaseHUDPart } from "../base_hud_part";
import { DynamicDomAttach } from "../dynamic_dom_attach"; import { DynamicDomAttach } from "../dynamic_dom_attach";
@ -92,7 +91,12 @@ export class HUDWaypoints extends BaseHUDPart {
*/ */
initialize() { initialize() {
// Cache the sprite for the waypoints // Cache the sprite for the waypoints
this.waypointSprite = Loader.getSprite("sprites/misc/waypoint.png");
this.waypointSprites = {
regular: Loader.getSprite("sprites/misc/waypoint.png"),
wires: Loader.getSprite("sprites/misc/waypoint_wires.png"),
};
this.directionIndicatorSprite = Loader.getSprite("sprites/misc/hub_direction_indicator.png"); this.directionIndicatorSprite = Loader.getSprite("sprites/misc/hub_direction_indicator.png");
/** @type {Array<Waypoint>} /** @type {Array<Waypoint>}
@ -192,7 +196,10 @@ export class HUDWaypoints extends BaseHUDPart {
const waypoint = this.waypoints[i]; const waypoint = this.waypoints[i];
const label = this.getWaypointLabel(waypoint); const label = this.getWaypointLabel(waypoint);
const element = makeDiv(this.waypointsListElement, null, ["waypoint"]); const element = makeDiv(this.waypointsListElement, null, [
"waypoint",
"layer--" + waypoint.layer,
]);
if (ShapeDefinition.isValidShortKey(label)) { if (ShapeDefinition.isValidShortKey(label)) {
const canvas = this.getWaypointCanvas(waypoint); const canvas = this.getWaypointCanvas(waypoint);
@ -544,7 +551,7 @@ export class HUDWaypoints extends BaseHUDPart {
const iconOpacity = 1 - this.currentCompassOpacity; const iconOpacity = 1 - this.currentCompassOpacity;
if (iconOpacity > 0.01) { if (iconOpacity > 0.01) {
context.globalAlpha = iconOpacity; context.globalAlpha = iconOpacity;
this.waypointSprite.drawCentered(context, dims / 2, dims / 2, dims * 0.7); this.waypointSprites.regular.drawCentered(context, dims / 2, dims / 2, dims * 0.7);
context.globalAlpha = 1; context.globalAlpha = 1;
} }
} }
@ -623,11 +630,11 @@ export class HUDWaypoints extends BaseHUDPart {
} }
// Render the small icon on the left // Render the small icon on the left
this.waypointSprite.drawCentered( this.waypointSprites[waypoint.layer].drawCentered(
parameters.context, parameters.context,
bounds.x + contentPaddingX, bounds.x + contentPaddingX,
bounds.y + bounds.h / 2, bounds.y + bounds.h / 2,
bounds.h * 0.7 bounds.h * 0.6
); );
} }