From f5032a02ce4ebd05c2e57929226de2980f39cbe0 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Mon, 7 Dec 2020 12:57:49 +0100
Subject: [PATCH] Add layersupport for waypoints

---
 res/ui/icons/waypoint_wires.png         | Bin 0 -> 1312 bytes
 res_raw/sprites/misc/waypoint_wires.png | Bin 0 -> 1312 bytes
 src/css/ingame_hud/waypoints.scss       |   6 ++++++
 src/js/changelog.js                     |   5 ++++-
 src/js/game/hud/parts/waypoints.js      |  19 +++++++++++++------
 5 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 res/ui/icons/waypoint_wires.png
 create mode 100644 res_raw/sprites/misc/waypoint_wires.png

diff --git a/res/ui/icons/waypoint_wires.png b/res/ui/icons/waypoint_wires.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d3fd2833c8d60a235b1d43989a836ba2211745
GIT binary patch
literal 1312
zcmV+*1>gFKP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11f5AlK~#90<(o@r9#s^8zw`T-TAC6=9>rKiOA4h{QB$;TG=dAG
zs8|&jf)quR(o$WBby2L{L~*Br6$OJk3st0GmK8yKC89M&7nP=Hn_5kpKw?uHdR*K|
z7^ZXQ_0OI8o&STgxzBUY+<WJq`#@DGT7WBnr-APQ%|T{>w}ADjbt%aJkLA?xpnRQH
zmm1~pyrXirib#K&3}qQ$v%|7)N|U%O12hfwESW^46Sz8S{s!_T;W`nyB__=YRh<Rm
zCqY1fJAonKC~zJ(6IhWl4}1W0$2I;w;HM@~*p=+FHM|oTX#xdZ%fw}4QA9QYhk^CM
zxC-(^@XK!irYZl+6d?=1z;X`|ku|_)Ku3(#E&;z{Cd3OdX>B|KT$wR%9A5#)W73QR
z!>anX|LYGEZLuT3-9TFoOW`vybu}W})96wM@cx@mS*-OBum^ZYJ?*Q+(hwNJ{O^NY
z1nyGRv7GCj1J>qTroZe|^kT+!Sa;g%$Q#^msjpF)0#>Eeg&mf{MuEB`1FXYLM0qxT
z9@v>ympU+L=@|!9buoEIN{*`j0c;kLdw@G~C~^k)SXIxZ%_x}PS(poXtE&FksAkQM
z0B3>jK==h<jjCQOUZrBG0qr5-r&^)$U<~kANci<4(pI!GWl#eqE#bEntV=1>Fzfm-
zwic;KS=2BNP#7<XNKcW<ltB%%@v#sR*9E*=tUAS0Q`LFkLreTN5qY6Vg^EU06%kpB
z@u6)q|L4H7s(QLO)rvuu90Cz}8F)P+?K$8*;5%ScReyJ{o_qWT5a1B-NW#1`WZx0W
zn?=lub`sN*4+CE$@?`>ES{pD%`TKQw$TaXK&=KjGhPbM$frCxZfIJPcJFx+LhS*KD
zc8CuGs}mc*GeU>gjjCdZF#?;q%adRfB2otifCqs-%)w|6ZVx%ruoAc`VcJiDN0&Bu
z6B*$DfQVcRYyoZuo+J8vV~?u70TnWU9}(#V-UsftB$)&HRQ1nFUXW1L)2jLa@S-J2
z8}KSrv<LVRkwd_?kf;Tqs}&5;102J6w?Q7S<Ph+qs%J63@-QB*ya7DEv4n4|{15=}
zHh5>b{8rqlmgoVhItNUIM0K}>0Yqd4a7{?mY)cpbxDm5l4ss^zMad4#HJ7C8?<l@i
z)gw8S6U7!w_{l6s+dDBw(Rq4l<G?ycNAY#cQGZyyJJJ@m3Udj;g{!*XkpcEv>bnH=
zrY+3XJ%0s`J7|1A@UNx55!LkX1zaAO=2o^Cb^%`kD?*Ye@Cr1~hDI)U3!Z*pA7%r`
z#z*R1{#d#u*9B}R{vktOqe@25E+WGj^R5JL1~wA^2I3cBmp@<t;~JK|Usr@o0~-SK
z1fMj4VnxVrz^0Iil8Giz&b5pHone298s?60RXGX_s_LMsPT3N5W1f%Xy}Bzy&U=j>
z!aVblxV3`+aI_t`A;zK)0k6fR$;uRPZ^pcfz+}`{wz0epQ1gl^@?vCy*I13Ps3ly?
zY!!FdN?HT_>_iL0xWlroq%we-cLTN!#zr~dsN6`h41p(sw=tWHc`yn*gE_P;oc{p%
WOnDQHqQ9&F0000<MNUMnLSTZ$-AIK1

literal 0
HcmV?d00001

diff --git a/res_raw/sprites/misc/waypoint_wires.png b/res_raw/sprites/misc/waypoint_wires.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d3fd2833c8d60a235b1d43989a836ba2211745
GIT binary patch
literal 1312
zcmV+*1>gFKP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11f5AlK~#90<(o@r9#s^8zw`T-TAC6=9>rKiOA4h{QB$;TG=dAG
zs8|&jf)quR(o$WBby2L{L~*Br6$OJk3st0GmK8yKC89M&7nP=Hn_5kpKw?uHdR*K|
z7^ZXQ_0OI8o&STgxzBUY+<WJq`#@DGT7WBnr-APQ%|T{>w}ADjbt%aJkLA?xpnRQH
zmm1~pyrXirib#K&3}qQ$v%|7)N|U%O12hfwESW^46Sz8S{s!_T;W`nyB__=YRh<Rm
zCqY1fJAonKC~zJ(6IhWl4}1W0$2I;w;HM@~*p=+FHM|oTX#xdZ%fw}4QA9QYhk^CM
zxC-(^@XK!irYZl+6d?=1z;X`|ku|_)Ku3(#E&;z{Cd3OdX>B|KT$wR%9A5#)W73QR
z!>anX|LYGEZLuT3-9TFoOW`vybu}W})96wM@cx@mS*-OBum^ZYJ?*Q+(hwNJ{O^NY
z1nyGRv7GCj1J>qTroZe|^kT+!Sa;g%$Q#^msjpF)0#>Eeg&mf{MuEB`1FXYLM0qxT
z9@v>ympU+L=@|!9buoEIN{*`j0c;kLdw@G~C~^k)SXIxZ%_x}PS(poXtE&FksAkQM
z0B3>jK==h<jjCQOUZrBG0qr5-r&^)$U<~kANci<4(pI!GWl#eqE#bEntV=1>Fzfm-
zwic;KS=2BNP#7<XNKcW<ltB%%@v#sR*9E*=tUAS0Q`LFkLreTN5qY6Vg^EU06%kpB
z@u6)q|L4H7s(QLO)rvuu90Cz}8F)P+?K$8*;5%ScReyJ{o_qWT5a1B-NW#1`WZx0W
zn?=lub`sN*4+CE$@?`>ES{pD%`TKQw$TaXK&=KjGhPbM$frCxZfIJPcJFx+LhS*KD
zc8CuGs}mc*GeU>gjjCdZF#?;q%adRfB2otifCqs-%)w|6ZVx%ruoAc`VcJiDN0&Bu
z6B*$DfQVcRYyoZuo+J8vV~?u70TnWU9}(#V-UsftB$)&HRQ1nFUXW1L)2jLa@S-J2
z8}KSrv<LVRkwd_?kf;Tqs}&5;102J6w?Q7S<Ph+qs%J63@-QB*ya7DEv4n4|{15=}
zHh5>b{8rqlmgoVhItNUIM0K}>0Yqd4a7{?mY)cpbxDm5l4ss^zMad4#HJ7C8?<l@i
z)gw8S6U7!w_{l6s+dDBw(Rq4l<G?ycNAY#cQGZyyJJJ@m3Udj;g{!*XkpcEv>bnH=
zrY+3XJ%0s`J7|1A@UNx55!LkX1zaAO=2o^Cb^%`kD?*Ye@Cr1~hDI)U3!Z*pA7%r`
z#z*R1{#d#u*9B}R{vktOqe@25E+WGj^R5JL1~wA^2I3cBmp@<t;~JK|Usr@o0~-SK
z1fMj4VnxVrz^0Iil8Giz&b5pHone298s?60RXGX_s_LMsPT3N5W1f%Xy}Bzy&U=j>
z!aVblxV3`+aI_t`A;zK)0k6fR$;uRPZ^pcfz+}`{wz0epQ1gl^@?vCy*I13Ps3ly?
zY!!FdN?HT_>_iL0xWlroq%we-cLTN!#zr~dsN6`h41p(sw=tWHc`yn*gE_P;oc{p%
WOnDQHqQ9&F0000<MNUMnLSTZ$-AIK1

literal 0
HcmV?d00001

diff --git a/src/css/ingame_hud/waypoints.scss b/src/css/ingame_hud/waypoints.scss
index d30c5120..e5a38705 100644
--- a/src/css/ingame_hud/waypoints.scss
+++ b/src/css/ingame_hud/waypoints.scss
@@ -61,6 +61,12 @@
             /* @load-async */
             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;
         @include S(margin-bottom, 1px);
         font-weight: bold;
diff --git a/src/js/changelog.js b/src/js/changelog.js
index 6cc50993..b13ccf31 100644
--- a/src/js/changelog.js
+++ b/src/js/changelog.js
@@ -2,7 +2,10 @@ export const CHANGELOG = [
     {
         version: "1.2.2",
         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",
diff --git a/src/js/game/hud/parts/waypoints.js b/src/js/game/hud/parts/waypoints.js
index c0f94271..b16bfa9e 100644
--- a/src/js/game/hud/parts/waypoints.js
+++ b/src/js/game/hud/parts/waypoints.js
@@ -20,7 +20,6 @@ import { BaseItem } from "../../base_item";
 import { MetaHubBuilding } from "../../buildings/hub";
 import { enumMouseButton } from "../../camera";
 import { KEYMAPPINGS } from "../../key_action_mapper";
-import { layers } from "../../root";
 import { ShapeDefinition } from "../../shape_definition";
 import { BaseHUDPart } from "../base_hud_part";
 import { DynamicDomAttach } from "../dynamic_dom_attach";
@@ -92,7 +91,12 @@ export class HUDWaypoints extends BaseHUDPart {
      */
     initialize() {
         // 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");
 
         /** @type {Array<Waypoint>}
@@ -192,7 +196,10 @@ export class HUDWaypoints extends BaseHUDPart {
             const waypoint = this.waypoints[i];
             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)) {
                 const canvas = this.getWaypointCanvas(waypoint);
@@ -544,7 +551,7 @@ export class HUDWaypoints extends BaseHUDPart {
         const iconOpacity = 1 - this.currentCompassOpacity;
         if (iconOpacity > 0.01) {
             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;
         }
     }
@@ -623,11 +630,11 @@ export class HUDWaypoints extends BaseHUDPart {
             }
 
             // Render the small icon on the left
-            this.waypointSprite.drawCentered(
+            this.waypointSprites[waypoint.layer].drawCentered(
                 parameters.context,
                 bounds.x + contentPaddingX,
                 bounds.y + bounds.h / 2,
-                bounds.h * 0.7
+                bounds.h * 0.6
             );
         }