From bd7363e130b11a94a117da864949fe376cb160b0 Mon Sep 17 00:00:00 2001
From: branchwelder <htwiggsmith@gmail.com>
Date: Fri, 8 Nov 2024 16:07:43 -0800
Subject: [PATCH] Add blended primitives and update knitscape links

---
 index.html                             | 33 ++++++++++++++++++++-
 projects/blended-primitives/index.html | 40 +++++++++++++++++++++++---
 projects/knitscape/index.html          |  7 ++---
 3 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index 3adec3f..1c85dea 100644
--- a/index.html
+++ b/index.html
@@ -34,6 +34,37 @@
       </div>
       <div class="headline padding-bottom-std">Research</div>
       <section class="projects-section padding-bottom-std">
+        <div class="project-tile">
+            <a href="projects/blended-primitives/">
+              <div class="project-photo-container">
+                <img
+                  class="project-photo padding-bottom-std"
+                  src="projects/blended-primitives/thumbnail.png" />
+              </div>
+            </a>
+            <a href="projects/blended-primitives/">
+              <div class="project-title padding-bottom-std">KnitScape II</div>
+            </a>
+            <div class="project-text">
+              We extended the original KnitScape editor so instruction charts are rasterized from layered vector primitives.
+            </div>
+  
+            <div class="project-links padding-bottom-std">
+              <a
+                target="_blank"
+                rel="noopener noreferrer"
+                href="projects/blended-primitives/"
+                >Project Page</a
+              >
+              <a
+                target="_blank"
+                rel="noopener noreferrer"
+                href="https://dl.acm.org/doi/10.1145/3654777.3676351"
+                >Paper</a
+              >
+            </div>
+          </div>
+
         <div class="project-tile">
           <a href="projects/knitscape/">
             <div class="project-photo-container">
@@ -43,7 +74,7 @@
             </div>
           </a>
           <a href="projects/knitscape/">
-            <div class="project-title padding-bottom-std">KnitScape</div>
+            <div class="project-title padding-bottom-std">KnitScape I</div>
           </a>
           <div class="project-text">
             We built a browser-based tool for exploring the surprising design
diff --git a/projects/blended-primitives/index.html b/projects/blended-primitives/index.html
index 358b2d2..e8a8d71 100644
--- a/projects/blended-primitives/index.html
+++ b/projects/blended-primitives/index.html
@@ -20,20 +20,33 @@
         <span class="author-names">
           Hannah Twigg-Smith, Yuecheng Peng, Emily Whiting, and Nadya Peek
         </span>
-        <!-- <div class="links">
+        <div class="links">
+          <span>Published at UIST 2024.</span>
           <a
-            href="https://knitscape.net/"
+            href="https://dl.acm.org/doi/pdf/10.1145/3654777.3676351"
+            target="_blank"
+            rel="noopener noreferrer">
+            Paper PDF
+          </a>
+          <a
+            href="https://dl.acm.org/doi/10.1145/3654777.3676351"
+            target="_blank"
+            rel="noopener noreferrer">
+            ACM DL
+          </a>
+          <a
+            href="https://machineagency.github.io/blended-primitives/"
             target="_blank"
             rel="noopener noreferrer">
             Live Site
           </a>
           <a
-            href="https://github.com/machineagency/knitscape"
+            href="https://github.com/machineagency/blended-primitives"
             target="_blank"
             rel="noopener noreferrer">
             Source Code Repository
           </a>
-        </div> -->
+        </div>
       </div>
     </section>
     <section class="no-margin-section">
@@ -74,5 +87,24 @@ <h3 class="section-title">Abstract</h3>
         patches.
       </p>
     </section>
+    <iframe
+    class="no-margin-section video-iframe"
+    src="https://www.youtube.com/embed/ILn2TDGkEaM?si=k8RYVv7y9Tzr06MP"
+    frameborder="0"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+    allowfullscreen>
+  </iframe>
+  <section class="margin-section">
+    <h3 class="section-title">Bibtex</h3>
+    <pre class="bibtex">
+@inproceedings{twigg2024blendedprimitives,
+  title={What's in a Cable? Abstracting Knitting Design Elements with Blended Raster/Vector Primitives},
+  author={Twigg-Smith, Hannah and Peng, Yuecheng and Whiting, Emily and Peek, Nadya},
+  booktitle={UIST '24: Proceedings of the 37th Annual ACM Symposium on User Interface Software and Technology},
+  pages={1--20},
+  year={2024}
+}
+</pre>
+  </section>
   </body>
 </html>
diff --git a/projects/knitscape/index.html b/projects/knitscape/index.html
index e360995..ba34592 100644
--- a/projects/knitscape/index.html
+++ b/projects/knitscape/index.html
@@ -38,13 +38,13 @@
             ACM DL
           </a>
           <a
-            href="https://knitscape.net/"
+            href="https://machineagency.github.io/knitscape-2024/"
             target="_blank"
             rel="noopener noreferrer">
             Live Site
           </a>
           <a
-            href="https://github.com/machineagency/knitscape"
+            href="https://github.com/machineagency/knitscape-2024"
             target="_blank"
             rel="noopener noreferrer">
             Source Code Repository
@@ -87,8 +87,7 @@ <h3 class="section-title">Bibtex</h3>
   pages={1--20},
   year={2024}
 }
-</pre
-      >
+</pre>
     </section>
   </body>
 </html>