From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 Jul 2020 14:34:50 +0000 (+0100)
Subject: defs for each piece separately
X-Git-Tag: otter-0.2.0~1447
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=994ed7b281f6e3ef713911622878e7412a4bd190;p=otter.git

defs for each piece separately
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 4169e06b..a4dcd78c 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -54,8 +54,8 @@ struct SessionRenderContext {
   ctoken : String,
   player : PlayerId,
   gen : Generation,
-  defs : Vec<String>,
   uses : Vec<String>,
+  defs : Vec<(VisiblePieceId,Vec<String>)>,
   nick : String,
 }
 
@@ -82,12 +82,13 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
     let ctoken = record_token(ciad);
 
     let mut uses = vec![];
-    let mut defs = vec![];
+    let mut alldefs = vec![];
     for (gpid, pr) in &ig.gs.pieces {
       let pri = PieceRenderInstructions {
         id : make_pieceid_visible(gpid),
         face : pr.face,
       };
+      let mut defs = vec![];
       defs.push(format!(r##"<g id="{}">{}</g>"##,
                         pri.id_piece(),
                         pr.p.svg_piece(&pri)));
@@ -103,6 +104,8 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
                         pr.p.svg_select(&pri)));
       defs.push(pr.p.svg_x_defs(&pri));
 
+      alldefs.push((pri.id, defs));
+
       uses.push(format!(
         r##"<use href="#{}" data-piece="{}" data-gplayer="" x="{}" y="{}"/>"##,
                         pri.id_piece(),
@@ -110,14 +113,16 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
                         pr.pos[0], pr.pos[1]));
     }
 
-    SessionRenderContext {
+    let src = SessionRenderContext {
       ctoken : ctoken.0,
       gen : ig.gs.gen,
       player,
-      defs,
+      defs : alldefs,
       uses,
       nick : pl.nick.clone(),
-    }
+    };
+    eprintln!("SRC {:?}", &src);
+    src
   };
   Ok(Template::render("test",&c))
 }
diff --git a/templates/script.js b/templates/script.js
index 98277ce7..41e6b510 100644
--- a/templates/script.js
+++ b/templates/script.js
@@ -13,7 +13,11 @@
 //         .gplayer  grabbed user (player id string, or "")
 //      container to allow quick movement and hang stuff off
 //
-// In defs
+//   delem
+//      #defs{}
+//      <def id="defs{}">
+//
+// And in each delem
 //
 //   pelem
 //   #piece{}
diff --git a/templates/test.tera b/templates/test.tera
index acb07526..a7017699 100644
--- a/templates/test.tera
+++ b/templates/test.tera
@@ -15,9 +15,11 @@
 	 >
       <rect fill="green" x="20" y="20" width="200" height="100"/>
 {% for piece in uses %}{{piece}}{% endfor %}
-      <defs>
-{% for piece in defs %}{{piece}}{% endfor %}
+{% for piece in defs %}
+      <defs id="defs{{ piece.0 }}">
+{%   for item in piece.1 %}{{item}}{% endfor %}
       </defs>
+{% endfor %}
     </svg>
 
 </body>