From 00c1d38b03af2b736085739121f23437b1f7fd19 Mon Sep 17 00:00:00 2001
From: raffitz <raf.a.m.c.gon@gmail.com>
Date: Fri, 26 Mar 2021 16:16:20 +0000
Subject: [PATCH] Minor bugfix and more examples

---
 examples/helix1.solid                   | 14 ++++++++++++++
 examples/ramp.solid                     |  6 ++++++
 examples/rotating_triangle_torus.solid  | 16 ++++++++++++++++
 examples/rotating_triangle_torus2.solid | 16 ++++++++++++++++
 examples/rotating_triangle_torus3.solid | 16 ++++++++++++++++
 examples/rotating_triangle_torus4.solid | 16 ++++++++++++++++
 src/main.rs                             |  2 +-
 7 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 examples/helix1.solid
 create mode 100644 examples/ramp.solid
 create mode 100644 examples/rotating_triangle_torus.solid
 create mode 100644 examples/rotating_triangle_torus2.solid
 create mode 100644 examples/rotating_triangle_torus3.solid
 create mode 100644 examples/rotating_triangle_torus4.solid

diff --git a/examples/helix1.solid b/examples/helix1.solid
new file mode 100644
index 0000000..664bba1
--- /dev/null
+++ b/examples/helix1.solid
@@ -0,0 +1,14 @@
+# Helix with radius s, inner radius 2s
+
+define @b (3 * s) / 2
+define @a @b / π
+
+-5*s <= x <= 5*s
+-5*s <= y <= 5*s
+-s <= z <= 2*s
+
+(ρ - 3*s)^2 + (z - @b  - (@a * φ))^2 <= s^2 \
+∨ \
+(ρ - 3*s)^2 + (z - 3*s - @b  - (@a * φ))^2 <= s^2 \
+∨ \
+(ρ - 3*s)^2 + (z + 3*s - @b  - (@a * φ))^2 <= s^2
diff --git a/examples/ramp.solid b/examples/ramp.solid
new file mode 100644
index 0000000..d18ff4f
--- /dev/null
+++ b/examples/ramp.solid
@@ -0,0 +1,6 @@
+
+-10<x<10
+-10<y<10
+-10*pi<z<10*pi
+
+z < 10*φ
diff --git a/examples/rotating_triangle_torus.solid b/examples/rotating_triangle_torus.solid
new file mode 100644
index 0000000..d9b68ae
--- /dev/null
+++ b/examples/rotating_triangle_torus.solid
@@ -0,0 +1,16 @@
+# Rotating triangle torus
+
+define @angle0 φ
+define @angle1 φ + ⅓π
+define @angle2 φ + 2 * ⅓π
+define @angle3 φ + π
+define @angle4 φ + π + ⅓π
+define @angle5 φ + 2π - ⅓π
+
+-5 * s < x < 5 * s
+-5 * s < y < 5 * s
+-s < z < s
+
+(ρ - (3 * s) - s * (cos @angle0)) * (cos @angle1) + (z - s * (sin @angle0)) * (sin @angle1) < 0
+(ρ - (3 * s) - s * (cos @angle2)) * (cos @angle3) + (z - s * (sin @angle2)) * (sin @angle3) < 0
+(ρ - (3 * s) - s * (cos @angle4)) * (cos @angle5) + (z - s * (sin @angle4)) * (sin @angle5) < 0
diff --git a/examples/rotating_triangle_torus2.solid b/examples/rotating_triangle_torus2.solid
new file mode 100644
index 0000000..33bedb1
--- /dev/null
+++ b/examples/rotating_triangle_torus2.solid
@@ -0,0 +1,16 @@
+# Rotating triangle torus
+
+define @angle0 2 * φ
+define @angle1 2 * φ + ⅓π
+define @angle2 2 * φ + 2 * ⅓π
+define @angle3 2 * φ + π
+define @angle4 2 * φ + π + ⅓π
+define @angle5 2 * φ + 2π - ⅓π
+
+-5 * s < x < 5 * s
+-5 * s < y < 5 * s
+- s < z < s
+
+(ρ - (3 * s) - s * (cos @angle0)) * (cos @angle1) + (z - s * (sin @angle0)) * (sin @angle1) < 0
+(ρ - (3 * s) - s * (cos @angle2)) * (cos @angle3) + (z - s * (sin @angle2)) * (sin @angle3) < 0
+(ρ - (3 * s) - s * (cos @angle4)) * (cos @angle5) + (z - s * (sin @angle4)) * (sin @angle5) < 0
diff --git a/examples/rotating_triangle_torus3.solid b/examples/rotating_triangle_torus3.solid
new file mode 100644
index 0000000..78b732f
--- /dev/null
+++ b/examples/rotating_triangle_torus3.solid
@@ -0,0 +1,16 @@
+# Rotating triangle torus
+
+define @angle0 (1/3) * φ
+define @angle1 (1/3) * φ + ⅓π
+define @angle2 (1/3) * φ + 2 * ⅓π
+define @angle3 (1/3) * φ + π
+define @angle4 (1/3) * φ + π + ⅓π
+define @angle5 (1/3) * φ + 2π - ⅓π
+
+5 * s < x < 5 * s
+5 * s < y < 5 * s
+- s < z < s
+
+(ρ - (3 * s) - s * (cos @angle0)) * (cos @angle1) + (z - s * (sin @angle0)) * (sin @angle1) < 0
+(ρ - (3 * s) - s * (cos @angle2)) * (cos @angle3) + (z - s * (sin @angle2)) * (sin @angle3) < 0
+(ρ - (3 * s) - s * (cos @angle4)) * (cos @angle5) + (z - s * (sin @angle4)) * (sin @angle5) < 0
diff --git a/examples/rotating_triangle_torus4.solid b/examples/rotating_triangle_torus4.solid
new file mode 100644
index 0000000..568c50f
--- /dev/null
+++ b/examples/rotating_triangle_torus4.solid
@@ -0,0 +1,16 @@
+# Rotating triangle torus
+
+define @angle0 (2/3) * φ
+define @angle1 (2/3) * φ + ⅓π
+define @angle2 (2/3) * φ + 2 * ⅓π
+define @angle3 (2/3) * φ + π
+define @angle4 (2/3) * φ + π + ⅓π
+define @angle5 (2/3) * φ + 2π - ⅓π
+
+-5 * s < x < 5 * s
+-5 * s < y < 5 * s
+-s < z < s
+
+(ρ - (3 * s) - s * (cos @angle0)) * (cos @angle1) + (z - s * (sin @angle0)) * (sin @angle1) < 0
+(ρ - (3 * s) - s * (cos @angle2)) * (cos @angle3) + (z - s * (sin @angle2)) * (sin @angle3) < 0
+(ρ - (3 * s) - s * (cos @angle4)) * (cos @angle5) + (z - s * (sin @angle4)) * (sin @angle5) < 0
diff --git a/src/main.rs b/src/main.rs
index 1a3b266..ed898a6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -163,7 +163,7 @@ pomelo! {
 
     %type   #[regex(r"\n+")] LineEnd;
 
-    %type   #[regex("\\\\n", logos::skip)]
+    %type   #[regex(r"\\\n", logos::skip)]
             #[regex("#.*\\n", logos::skip)]
             #[regex("//.*\\n", logos::skip)]
             #[regex(r"[ \t\f]+", logos::skip)]