From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 1 Oct 2020 00:46:02 +0000 (+0100)
Subject: flipping works!
X-Git-Tag: otter-0.2.0~806
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=30f0a5c35dc64845d9eec2381cbf85594780c408;p=otter.git

flipping works!

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

diff --git a/src/api.rs b/src/api.rs
index eefecdd4..2e43a3b0 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -288,7 +288,7 @@ impl ApiPieceOp for ApiPieceUo {
 
         ("flip", wrc@ WRC::UpdateSvg) => {
           let nfaces = p.nfaces();
-          pc.face = (RawFaceId::from(pc.face) % nfaces).into();
+          pc.face = ((RawFaceId::from(pc.face) + 1) % nfaces).into();
           return (
             wrc,
             PieceUpdateOp::Modify(()),
diff --git a/templates/script.ts b/templates/script.ts
index 0e406355..905b9efa 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -96,6 +96,7 @@ var gen = 0;
 var cseq : ClientSeq = 0;
 var ctoken : string;
 var uo_map : { [k: string]: UoRecord | null } = Object.create(null);
+var keyops_pieces : { [opname: string]: (uo: UoRecord) => void } = Object();
 
 var svg_ns : string;
 var space : SVGGraphicsElement;
@@ -290,16 +291,25 @@ function some_keydown(e: KeyboardEvent) {
   if (uo === undefined || uo === null) return;
 
   console.log('KEY UO', e, uo);
-  if (uo.targets === null) {
+  if (uo.kind == 'Client' || uo.kind == 'ClientExtra') {
+    let f = keyops_pieces[uo.opname];
     // xxx 'wrest'
+    // xxx 'lower'
+    f(uo);
     return;
   }
-  // xxx 'lower'
   if (!(uo.kind == 'Global' || uo.kind == 'GlobalExtra'))
     throw 'bad kind '+uo.kind;
 
-  if (uo.wrc! == 'UpdateSvg' || uo.wrc! == 'Predictable') {
-    
+  if (uo.wrc == 'UpdateSvg' || uo.wrc == 'Predictable') {
+    for (var piece of uo.targets!) {
+      let p = pieces[piece]!;
+      api_piece(api, 'k', piece, p, { opname: uo.opname, wrc: uo.wrc });
+      if (uo.wrc == 'UpdateSvg') {
+	p.cseq_updatesvg = p.cseq;
+	redisplay_ancillaries(piece,p);
+      }
+    }
   }
 }
 
@@ -428,13 +438,19 @@ function redisplay_ancillaries(piece: PieceId, p: PieceInfo) {
     }
   }
 
-  if (p.last_seen_moved != null) {
-    let nelem = ancillary_node(piece, 'yellow');
+  let halo_colour = null;
+  if (p.cseq_updatesvg != null) {
+    halo_colour = 'purple';
+  } else if (p.last_seen_moved != null) {
+    halo_colour = 'yellow';
+  }
+  if (halo_colour != null) {
+    let nelem = ancillary_node(piece, halo_colour);
     if (p.held != null) {
       nelem.setAttributeNS(null,'stroke-width','2px');
     }
     p.pelem.prepend(nelem);
-  }
+  } 
   if (p.held != null) {
     let da = players[p.held!]!.dasharray;
     let nelem = ancillary_node(piece, 'black');
@@ -677,13 +693,22 @@ pieceops.SetZLevel = <PieceHandler>function
 }
 
 messages.Recorded = <MessageHandler>function
-(j: { piece: PieceId, cseq: ClientSeq, gen: Generation,
-      zg: Generation|null } ) {
+(j: { piece: PieceId, cseq: ClientSeq, gen: Generation
+      zg: Generation|null, svg: string | null } ) {
   let piece = j.piece;
   let p = pieces[piece]!;
   if (p.cseq != null && j.cseq >= p.cseq) {
     p.cseq = null;
   }
+  if (p.cseq_updatesvg != null && j.cseq >= p.cseq_updatesvg) {
+    p.cseq_updatesvg = null;
+    redisplay_ancillaries(piece,p);
+  }
+  if (j.svg != null) {
+    p.delem.innerHTML = j.svg;
+    p.pelem= piece_element('piece',piece)!;
+    redisplay_ancillaries(piece,p);
+  }
   if (j.zg != null) {
     var zg_new = j.zg; // type narrowing doesn't propagate :-/
     piece_set_zlevel(piece,p, (oldtop_piece: PieceId)=>{