From 204f27de98c52bb0274d0534d60f9118e10f492c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 28 Feb 2021 13:25:41 +0000 Subject: [PATCH] angle: Provide and use to_compass Signed-off-by: Ian Jackson --- daemon/session.rs | 4 +--- src/gamestate.rs | 12 +++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon/session.rs b/daemon/session.rs index eb6be01c..de75eed0 100644 --- a/daemon/session.rs +++ b/daemon/session.rs @@ -118,9 +118,7 @@ fn session_inner(form: Json, alldefs.push((pri.id, defs)); let desc = pri.describe(&pr, p); - let vangle = match pri.angle(pr) { - PieceAngle::Compass(vangle) => vangle, - }; + let vangle = pri.angle(pr).to_compass(); let for_info = SessionPieceLoadJson { held: &pr.held, diff --git a/src/gamestate.rs b/src/gamestate.rs index ddadcf9f..6fef4f9c 100644 --- a/src/gamestate.rs +++ b/src/gamestate.rs @@ -254,12 +254,14 @@ impl Debug for Html { impl VisiblePieceAngle { pub fn to_transform(self) -> VisibleAngleTransform { + VisibleAngleTransform(base_misc::raw_angle_transform( + self.to_compass().into() + )) + } + + pub fn to_compass(self) -> CompassAngle { match self { - PieceAngle::Compass(angle) => VisibleAngleTransform( - base_misc::raw_angle_transform( - angle.into() - ) - ), + PieceAngle::Compass(compass) => compass, } } } -- 2.30.2