From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 12 Jan 2021 00:49:44 +0000 (+0000)
Subject: otterlib: wip preview, reorg a bit nfc
X-Git-Tag: otter-0.3.0~78
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cc82c0edded3e73e840ec802b3c091a87f831a40;p=otter.git

otterlib: wip preview, reorg a bit nfc

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

diff --git a/src/bin/otterlib.rs b/src/bin/otterlib.rs
index 98e48479..967cd2ce 100644
--- a/src/bin/otterlib.rs
+++ b/src/bin/otterlib.rs
@@ -54,16 +54,17 @@ fn preview(items: Vec<ItemForOutput>) {
     println!(r#"<th align="left"><kbd>{}</kbd><th>"#, &spec.item);
     println!(r#"<th align="left">{}</th>"#, pc.describe_html(None).0);
     let only1 = pc.nfaces() == 1;
+    let getpri = |face: FaceId| PieceRenderInstructions {
+      id: default(),
+      angle: VisiblePieceAngle(default()),
+      face
+    };
     for face in 0..(if only1 { 1 } else { max_faces }) {
       print!(r#"<td align="center""#);
       if only1 { print!(r#" colspan="{}""#, max_faces); }
       println!(r#">"#);
       if face < pc.nfaces() {
-        let pri = PieceRenderInstructions {
-          id: default(),
-          angle: VisiblePieceAngle(default()),
-          face: face.into(),
-        };
+        let pri = getpri(face.into());
         const BORDER: f64 = 1.;
         let bbox = pc
           .bbox_approx();