From 60c4ee38d5939de460b8273698e9ae0f486779a6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 28 Feb 2021 13:12:04 +0000 Subject: [PATCH] refactor: drop face from PieceRenderInstructions Signed-off-by: Ian Jackson --- daemon/cmdlistener.rs | 2 -- src/gamestate.rs | 1 - src/hidden.rs | 7 +++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index b3d96715..586b78b2 100644 --- 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 d977dfa5..1a75c7f3 100644 --- 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 f45b9fbf..9c44008e 100644 --- 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( -- 2.30.2