lib: Improve Homogeneous Coordinate Support

Author: johannes-wolf

cetz-core/src/lib.rs

@@ -3,6 +3,7 @@ use ciborium::ser::into_writer;
 use serde::Deserialize;
 use serde::Serialize;
 use wasm_minimal_protocol::*;
+use std::cmp;
 
 mod layout;
 pub use layout::{InputTree, OutputTree};
@@ -117,15 +118,12 @@ fn aabb(init: Option<Bounds>, pts: Vec<Point>) -> Result<Bounds, String> {
     let mut bounds = match init {
         Some(init) => init,
         None => Bounds {
-            low: pts.first().unwrap().clone(),
-            high: pts.first().unwrap().clone(),
+            low: pts.first().unwrap().clone().iter().take(3).cloned().collect(),
+            high: pts.first().unwrap().iter().take(3).cloned().collect(),
         },
     };
     for pt in pts {
-        if pt.len() != 3 {
-            return Err("Point must have 3 dimensions".to_string());
-        }
-        for dim in 0..pt.len() {
+        for dim in 0..cmp::min(3, pt.len()) {
             if pt[dim] < bounds.low[dim] {
                 bounds.low[dim] = pt[dim];
             }

src/canvas.typ

@@ -145,7 +145,7 @@
       place(top + left, float: false, if drawable.type == "path" {
         let vertices = ()
 
-        let transform-point((x, y, _)) = {
+        let transform-point((x, y, ..)) = {
           (( x - offset-x - segment-x) * length,
            (-y - offset-y - segment-y) * length)
         }

src/mark.typ

@@ -127,7 +127,7 @@
 
   let t = (
     // Translate & rotate to the target coordinate & direction
-    matrix.transform-translate(..pos),
+    matrix.transform-translate(..pos.slice(0, 3)),
     matrix.transform-rotate-dir(dir, up),
     matrix.transform-rotate-z(-90deg),
 
@@ -139,7 +139,7 @@
     }),
 
     // Translate mark to have its anchor (tip, base) at (0,0)
-    matrix.transform-translate(..vector.scale(origin, if reverse {1} else {-1})),
+    matrix.transform-translate(..vector.scale(origin.slice(0, 3), if reverse {1} else {-1})),
 
     // Mirror on x and/or y axis
     if not flip or reverse {

src/matrix.typ

@@ -123,8 +123,8 @@
 /// - up (vector): idk
 /// -> matrix
 #let transform-rotate-dir(dir, up) = {
-  dir = vector.norm(dir)
-  up = vector.norm(up)
+  dir = vector.norm(dir.slice(0, 3))
+  up = vector.norm(up.slice(0, 3))
 
   let (dx, dy, dz) = dir
   let (ux, uy, uz) = up