From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 3 Apr 2021 23:59:34 +0000 (+0100)
Subject: js: Multi select, make drag_delta more persistent
X-Git-Tag: otter-0.5.0~206
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cccda5630b7392e655ec1a79f5831e3e9cf00333;p=otter.git

js: Multi select, make drag_delta more persistent

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/templates/script.ts b/templates/script.ts
index 3d609cdf..7d399384 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -82,6 +82,7 @@ type PieceInfo = {
   last_seen_moved : DOMHighResTimeStamp | null, // non-0 means halo'd
   held_us_inoccult: boolean,
   bbox: Rect,
+  drag_delta: number,
 }
 
 let wasm : InitOutput;
@@ -788,11 +789,11 @@ function piece_xy(p: PieceInfo): Pos {
 	   parseFloat(p.uelem.getAttributeNS(null,"y")!) ];
 }
 
-function drag_add_piece(piece: PieceId, p: PieceInfo, delta: number) {
+function drag_add_piece(piece: PieceId, p: PieceInfo) {
   let [dox, doy] = piece_xy(p);
   drag_pieces.push({
     piece: piece,
-    dox: dox + delta,
+    dox: dox + p.drag_delta,
     doy: doy,
   });
 }
@@ -897,13 +898,13 @@ function drag_mousedown(e : MouseEvent, shifted: boolean) {
     dragging = DRAGGING.MAYBE_UNGRAB;
     // contrive to have these first
     for (let piece of clicked) {
-      drag_add_piece(piece,pieces[piece]!, 0);
+      drag_add_piece(piece,pieces[piece]!);
     }
     for (let tpiece of Object.keys(pieces)) {
       if (clicked.indexOf(tpiece) >= 0) continue;
       let tp = pieces[tpiece]!;
       if (tp.held != us) continue;
-      drag_add_piece(tpiece,tp, 0);
+      drag_add_piece(tpiece,tp);
     }
   } else if (held == null || wresting) {
     if (!shifted) {
@@ -918,9 +919,9 @@ function drag_mousedown(e : MouseEvent, shifted: boolean) {
       let piece = clicked[i];
       let p = pieces[piece]!;
       let delta = (-(clicked.length-1)/2 + i) * SPECIAL_MULTI_DELTA_EACH;
-      delta = Math.min(Math.max(delta, -SPECIAL_MULTI_DELTA_MAX),
-		                       +SPECIAL_MULTI_DELTA_MAX);
-      drag_add_piece(piece,p, delta);
+      p.drag_delta = Math.min(Math.max(delta, -SPECIAL_MULTI_DELTA_MAX),
+		                              +SPECIAL_MULTI_DELTA_MAX);
+      drag_add_piece(piece,p);
       set_grab(piece,p, us);
       api_piece(api, wresting ? 'wrest' : 'grab', piece,p, { });
     }
@@ -966,11 +967,13 @@ function ungrab_all() {
 
 function set_grab(piece: PieceId, p: PieceInfo, owner: PlayerId) {
   p.held = owner;
+  if (owner != us) p.drag_delta = 0;
   redisplay_ancillaries(piece,p);
   recompute_keybindings();
 }
 function set_ungrab(piece: PieceId, p: PieceInfo) {
   p.held = null;
+  p.drag_delta = 0;
   redisplay_ancillaries(piece,p);
   recompute_keybindings();
 }