From 7f5413a4856afe1700562abbcd4f440f3147503f Mon Sep 17 00:00:00 2001
From: Dimava <dimava2@ya.ru>
Date: Mon, 1 Jun 2020 01:07:01 +0300
Subject: [PATCH 1/2] make selection relative to world

---
 src/js/game/hud/parts/mass_selector.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/js/game/hud/parts/mass_selector.js b/src/js/game/hud/parts/mass_selector.js
index f89d4055..af23eb28 100644
--- a/src/js/game/hud/parts/mass_selector.js
+++ b/src/js/game/hud/parts/mass_selector.js
@@ -41,6 +41,7 @@ export class HUDMassSelector extends BaseHUDPart {
         this.deletionMarker = Loader.getSprite("sprites/misc/deletion_marker.png");
 
         this.currentSelectionStart = null;
+        this.currentSelectionStartWorld = null;
         this.currentSelectionEnd = null;
         this.selectedUids = new Set();
 
@@ -147,6 +148,7 @@ export class HUDMassSelector extends BaseHUDPart {
         }
 
         this.currentSelectionStart = pos.copy();
+        this.currentSelectionStartWorld = this.root.camera.screenToWorld(this.currentSelectionStart);
         this.currentSelectionEnd = pos.copy();
         return STOP_PROPAGATION;
     }
@@ -163,7 +165,7 @@ export class HUDMassSelector extends BaseHUDPart {
 
     onMouseUp() {
         if (this.currentSelectionStart) {
-            const worldStart = this.root.camera.screenToWorld(this.currentSelectionStart);
+            const worldStart = this.currentSelectionStartWorld;
             const worldEnd = this.root.camera.screenToWorld(this.currentSelectionEnd);
 
             const tileStart = worldStart.toTileSpace();
@@ -182,6 +184,7 @@ export class HUDMassSelector extends BaseHUDPart {
             }
 
             this.currentSelectionStart = null;
+            this.currentSelectionStartWorld = null;
             this.currentSelectionEnd = null;
         }
     }
@@ -198,7 +201,7 @@ export class HUDMassSelector extends BaseHUDPart {
         const boundsBorder = 2;
 
         if (this.currentSelectionStart) {
-            const worldStart = this.root.camera.screenToWorld(this.currentSelectionStart);
+            const worldStart = this.currentSelectionStartWorld;
             const worldEnd = this.root.camera.screenToWorld(this.currentSelectionEnd);
 
             const realWorldStart = worldStart.min(worldEnd);

From 7653c51e1b1f26b37c101674495c7277fc2d5579 Mon Sep 17 00:00:00 2001
From: Dimava <dimava2@ya.ru>
Date: Fri, 12 Jun 2020 15:49:31 +0300
Subject: [PATCH 2/2] remove currentSelectionStart (use -World instead)

---
 src/js/game/hud/parts/mass_selector.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/js/game/hud/parts/mass_selector.js b/src/js/game/hud/parts/mass_selector.js
index af23eb28..5b5d53c3 100644
--- a/src/js/game/hud/parts/mass_selector.js
+++ b/src/js/game/hud/parts/mass_selector.js
@@ -40,7 +40,6 @@ export class HUDMassSelector extends BaseHUDPart {
     initialize() {
         this.deletionMarker = Loader.getSprite("sprites/misc/deletion_marker.png");
 
-        this.currentSelectionStart = null;
         this.currentSelectionStartWorld = null;
         this.currentSelectionEnd = null;
         this.selectedUids = new Set();
@@ -147,8 +146,7 @@ export class HUDMassSelector extends BaseHUDPart {
             this.selectedUids = new Set();
         }
 
-        this.currentSelectionStart = pos.copy();
-        this.currentSelectionStartWorld = this.root.camera.screenToWorld(this.currentSelectionStart);
+        this.currentSelectionStartWorld = this.root.camera.screenToWorld(pos.copy());
         this.currentSelectionEnd = pos.copy();
         return STOP_PROPAGATION;
     }
@@ -158,13 +156,13 @@ export class HUDMassSelector extends BaseHUDPart {
      * @param {Vector} pos
      */
     onMouseMove(pos) {
-        if (this.currentSelectionStart) {
+        if (this.currentSelectionStartWorld) {
             this.currentSelectionEnd = pos.copy();
         }
     }
 
     onMouseUp() {
-        if (this.currentSelectionStart) {
+        if (this.currentSelectionStartWorld) {
             const worldStart = this.currentSelectionStartWorld;
             const worldEnd = this.root.camera.screenToWorld(this.currentSelectionEnd);
 
@@ -183,7 +181,6 @@ export class HUDMassSelector extends BaseHUDPart {
                 }
             }
 
-            this.currentSelectionStart = null;
             this.currentSelectionStartWorld = null;
             this.currentSelectionEnd = null;
         }
@@ -200,7 +197,7 @@ export class HUDMassSelector extends BaseHUDPart {
     draw(parameters) {
         const boundsBorder = 2;
 
-        if (this.currentSelectionStart) {
+        if (this.currentSelectionStartWorld) {
             const worldStart = this.currentSelectionStartWorld;
             const worldEnd = this.root.camera.screenToWorld(this.currentSelectionEnd);