refactor: drop face from PieceRenderInstructions

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index b3d96715a9da95162395f4c0fe68fd2023fee558..586b78b2de8ca003bcd8da3ec9158653d6120e79 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -384,7 +384,6 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
             let pri = PieceRenderInstructions {
               id: VisiblePieceId(piece.data()),
               angle: VisiblePieceAngle(p.angle), // xxx
-              face: default(),
               occluded: PriOccluded::Visible,
             };
             let bbox = pinfo.bbox_approx()?;
@@ -568,7 +567,6 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
       let desc_html = if let Some(pc) = &pc {
         let pri = PieceRenderInstructions {
           id: default(),
-          face: default(),
           angle: VisiblePieceAngle(pc.angle), // xxx
           occluded: PriOccluded::Visible,
         };

diff --git a/src/gamestate.rs b/src/gamestate.rs
index d977dfa51bc5ded8acb1e3fe143cbcd393140d61..1a75c7f3c81407394778b36ab61381452edb53ce 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -357,7 +357,6 @@ impl PieceXDataExt for PieceXDataState {
 pub struct PieceRenderInstructions {
   pub id: VisiblePieceId,
   pub angle: VisiblePieceAngle,
-  pub face: FaceId,
   pub occluded: PriOccluded,
 }
 

diff --git a/src/hidden.rs b/src/hidden.rs
index f45b9fbf4a6d93fb28e3c5dd3d2a3447ce5d1880..9c44008ec70c09a34d4ebbfa48e5ff11e9124162 100644 (file)
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -182,11 +182,10 @@ pub fn piece_pri(
 ) -> PieceRenderInstructions {
   let vpiece = gpl.idmap.fwd_or_insert(piece);
   let angle = VisiblePieceAngle(pc.angle);
-  let face = pc.face;
   let occluded = PriOccluded::Visible; // xxx
-  trace!("{} {:?} => {} face={:?} angle={:?}",
-         player, piece, vpiece, face, angle);
-  PieceRenderInstructions { id: vpiece, angle, face, occluded }
+  trace!("{} {:?} => {} angle={:?}",
+         player, piece, vpiece, angle);
+  PieceRenderInstructions { id: vpiece, angle, occluded }
 }
 
 pub fn piece_at_all_occluded(