Rename make_svg_defs

This is the thing that generates SVG.  That's worth mentioning.

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

diff --git a/daemon/session.rs b/daemon/session.rs
index b1376db92b9af7186970de1ea5c8bcfb29b2ad51..b2970813de55f4157ffc84ff0b2b3d5828f9c513 100644 (file)
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -141,7 +141,7 @@ fn session_inner(form: Json<SessionForm>,
                           piece, gpc, ipc);
       let pri = if let Some(pri) = pri { pri } else { continue /*invisible*/};
 
-      let (defs, bbox) = pri.make_defs(ioccults, &ig.gs, gpc, ipc)?;
+      let (defs, bbox) = pri.make_svg_defs(ioccults, &ig.gs, gpc, ipc)?;
       alldefs.push((pri.vpid, defs));
       let desc = pri.describe(ioccults,&ig.gs.occults, gpc, ipc);
 

diff --git a/src/pcrender.rs b/src/pcrender.rs
index a8c6985a0534b15f2a68a027c8d109e2b554c63d..9d3910b954cb43a440597f85958c7eda66babb5e 100644 (file)
--- a/src/pcrender.rs
+++ b/src/pcrender.rs
@@ -121,7 +121,7 @@ impl PieceRenderInstructions {
     let (pos, zlevel) = pri.pos_zlevel(gpc);
     let occregion = gpc.occult.active_region(&gs.occults)?
       .map(|r| JsonString(r.clone()));
-    let (svg, bbox) = pri.make_defs(ioccults, gs, gpc, ipc)?;
+    let (svg, bbox) = pri.make_svg_defs(ioccults, gs, gpc, ipc)?;
     let r = PreparedPieceState {
       pos, svg, occregion, bbox,
       held       : gpc.held,
@@ -143,7 +143,7 @@ impl PieceRenderInstructions {
                          gpc: &GPiece, ipc: &IPiece)
                          -> PreparedPieceImage {
     let pri = self;
-    let (svg, bbox) = pri.make_defs(ioccults, gs, gpc, ipc)?;
+    let (svg, bbox) = pri.make_svg_defs(ioccults, gs, gpc, ipc)?;
     let r = PreparedPieceImage {
       svg, bbox,
       uos: pri.ui_operations(gs, gpc, ipc)?,
@@ -175,8 +175,8 @@ impl PieceRenderInstructions {
   }
 
   #[throws(IE)]
-  pub fn make_defs(&self, ioccults: &IOccults, gs: &GameState,
-                   gpc: &GPiece, ipc: &IPiece) -> (Html, Rect)
+  pub fn make_svg_defs(&self, ioccults: &IOccults, gs: &GameState,
+                       gpc: &GPiece, ipc: &IPiece) -> (Html, Rect)
   {
     let pri = self;
     let instead = pri.instead(ioccults, ipc)?;