From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 26 Jun 2020 17:03:03 +0000 (+0100)
Subject: pieces from code!
X-Git-Tag: otter-0.2.0~1553
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=75e7b7e07b679a2e3392c34c050ed4022c76090d;p=otter.git

pieces from code!
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 6fa03697..7b3fe4bf 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -54,6 +54,7 @@ fn loading(token : InstanceAccess) -> Result<Template,RE> {
 struct SessionRenderContext {
   clientid : u64,
   defs : Vec<String>,
+  uses : Vec<String>,
 }
 
 #[derive(Deserialize)]
@@ -70,6 +71,7 @@ fn session(form : Json<SessionForm>) -> Result<Template,RE> {
     let client = Client { };
     let clientid : slotmap::KeyData = user.clients.insert(client).into();
 
+    let mut uses = vec![];
     let mut defs = vec![];
     for (gpid, pr) in &g.gs.pieces {
       let id : slotmap::KeyData = gpid.into();
@@ -91,11 +93,17 @@ fn session(form : Json<SessionForm>) -> Result<Template,RE> {
                         pri.id_piece(),
                         pr.p.svg_select(&pri)));
       defs.push(pr.p.svg_x_defs(&pri));
+
+      uses.push(format!(r##"<use href="#{}" data-p="{}" x="{}" y="{}"/>"##,
+                        pri.id_piece(),
+                        pri.id,
+                        pr.pos[0], pr.pos[1]));
     }
 
     SessionRenderContext {
       clientid : clientid.as_ffi(),
       defs,
+      uses,
     }
   };
   Ok(Template::render("test",&c))
diff --git a/templates/test.tera b/templates/test.tera
index ff9a676a..7e88db3f 100644
--- a/templates/test.tera
+++ b/templates/test.tera
@@ -10,6 +10,7 @@
  	 onmousedown="drag_mousedown(event)"
 	 >
       <rect fill="green" x="20" y="20" width="200" height="100"/>
+{% for piece in uses %}{{piece}}{% endfor %}
       <use href="#piece42" data-p="42" x="50" y="80" />
       <use href="#piece43" data-p="43" x="50" y="60" />
       <use href="#select43" x="50" y="60" />