chiark / gitweb /
~ianmdlvl / otter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ba251d5)
hidden fixes: Transform occulted versions too
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 11 Mar 2021 16:47:26 +0000 (16:47 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 11 Mar 2021 16:51:35 +0000 (16:51 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/shapelib.rs patch | blob | history

diff --git a/src/shapelib.rs b/src/shapelib.rs
index daf1f020b193145f5e9b2813d1248b78e012658f..11e22129b1067d22cf2f33f928e4e3c9de87e3ec 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -55,6 +55,7 @@ struct OccData {
   item_name: Arc<String>,
   outline: Outline,
   desc: Html,
+  xform: FaceTransform,
   svg: parking_lot::Mutex<Option<Arc<Html>>>,
 }
 
@@ -152,6 +153,7 @@ struct Item {
 struct ItemOccultable {
   svg: Arc<Html>,
   desc: Html,
+  xform: FaceTransform,
   outline: Outline,
 }
 
@@ -164,7 +166,9 @@ impl OutlineTrait for ItemOccultable { delegate! { to self.outline {
 #[typetag::serde(name="Lib")]
 impl OccultedPieceTrait for ItemOccultable {
   #[throws(IE)]
-  fn svg(&self, f: &mut Html, _:VisiblePieceId) { f.0.write_str(&self.svg.0)? }
+  fn svg(&self, f: &mut Html, _: VisiblePieceId) {
+    self.xform.write_svgd(f, &self.svg)?;
+  }
   #[throws(IE)]
   fn describe_html(&self) -> Html { self.desc.clone() }
 }
@@ -298,6 +302,7 @@ impl Contents {
         };
         let it = Box::new(ItemOccultable {
           svg,
+          xform: occ.xform.clone(),
           desc: occ.desc.clone(),
           outline: occ.outline.clone(),
         }) as Box<dyn OccultedPieceTrait>;
@@ -475,6 +480,7 @@ fn load_catalogue(libname: &str, dirname: &str, toml_path: &str) -> Contents {
             item_name: Arc::new(subst(&item_name, "_c", &colour)?),
             desc: Html(subst(&fe.desc.0, "_colour", "")?),
             outline: outline.clone(),
+            xform: FaceTransform::from_group(&group.d),
             svg: default(),
           }))
         },
Unnamed repository; edit this file 'description' to name the repository.