src/cylinder.rs

Fri, 06 Dec 2024 13:53:09 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Fri, 06 Dec 2024 13:53:09 -0500
changeset 43
5f04fe297b9a
parent 41
56d609b70a3b
child 46
90cc221eb52b
permissions
-rw-r--r--

Cylinder pgfplots code reuse

37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
1 /*!
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
2 Implementation of the surface of a 3D cylinder as a [`ManifoldPoint`].
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
3 */
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
4
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
5 use alg_tools::euclidean::{Euclidean, Dot};
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
6 use serde_repr::*;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
7 use serde::{Serialize, Deserialize};
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
8 use alg_tools::loc::Loc;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
9 use alg_tools::norms::{Norm, L2};
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
10 use alg_tools::types::Float;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
11 use crate::manifold::{ManifoldPoint, EmbeddedManifoldPoint, FacedManifoldPoint};
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
12 use crate::newton::{newton_sym1x1, newton_sym2x2};
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
13
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
14 /// Angle
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
15 pub type Angle = f64;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
16
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
17 /// Cylindrical coordinates in ℝ^3
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
18 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
19 pub struct CylCoords {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
20 pub r : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
21 pub angle : Angle,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
22 pub z : f64
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
23 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
24
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
25 impl CylCoords {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
26 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
27 pub fn to_cartesian(&self) -> Loc<f64, 3> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
28 let &CylCoords{r, angle, z} = self;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
29 [r * angle.cos(), r * angle.sin(), z].into()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
30 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
31
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
32 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
33 #[allow(dead_code)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
34 pub fn from_cartesian(coords : Loc<f64, 3>) -> Self {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
35 let [x, y, z] = coords.into();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
36 let r = (x*x + y*y).sqrt();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
37 let angle = y.atan2(x);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
38 CylCoords {r, angle, z}
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
39 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
40 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
41
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
42 /// Coordinates on a cap
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
43 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
44 pub struct CapPoint {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
45 pub r : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
46 pub angle : Angle
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
47 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
48
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
49 impl CapPoint {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
50 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
51 /// Convert to cylindrical coordinates given z coordinate
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
52 fn cyl_coords(&self, z : f64) -> CylCoords {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
53 let CapPoint { r, angle } = *self;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
54 CylCoords { r, angle, z }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
55 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
56
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
57 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
58 /// Convert to cylindrical coordinates given z coordinate
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
59 fn to_cartesian(&self) -> Loc<f64, 2> {
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
60 let CapPoint { r, angle } = *self;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
61 [r * angle.cos(), r * angle.sin()].into()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
62 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
63
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
64 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
65 #[allow(dead_code)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
66 /// Convert to cylindrical coordinates given z coordinate
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
67 fn from_cartesian(coords : Loc<f64, 2>) -> Self {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
68 let [x, y] = coords.into();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
69 let r = (x*x + y*y).sqrt();
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
70 let angle = normalise_angle(y.atan2(x));
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
71 CapPoint { r, angle }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
72 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
73
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
74 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
75 /// Calculate the vector between two points on the cap
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
76 fn log(&self, other : &CapPoint) -> Loc<f64, 2> {
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
77 other.to_cartesian() - self.to_cartesian()
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
78 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
79
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
80 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
81 /// Calculate partial exponential map until boundary.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
82 /// Returns the final point within the cap as well as a remaining tangent on
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
83 /// the side of the cylinder, if `t` wasn't fully used.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
84 fn partial_exp(&self, r : f64, t : &Tangent) -> (CapPoint, Option<Tangent>) {
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
85 // |p + s t| <= r
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
86 // |p|^2 + s^2 |t|^2 + 2s<p,t> = r^2
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
87 let p = self.to_cartesian();
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
88 let np2 = p.norm2_squared();
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
89 let nt2 = t.norm2_squared();
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
90 let r2 = r * r;
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
91 let d = p.dot(t);
39
3d5c8ea1522c assert tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents: 38
diff changeset
92 assert!(np2 <= r2 + f64::EPSILON, "‖{p}‖ = {} > {r}", np2.sqrt());
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
93 let s = (-d + (d*d + nt2 * (r2 - np2)).sqrt()) / nt2;
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
94 if s < 1.0 {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
95 (Self::from_cartesian(p + s * t), Some((1.0-s) * t))
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
96 } else {
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
97 (Self::from_cartesian(p + t), None)
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
98 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
99 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
100
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
101 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
102 /// Convert tangent from side tangent to cap tangent
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
103 fn tangent_from_side(&self, top : bool, t : Tangent) -> Tangent {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
104 if top {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
105 // The angle is such that down would be rotated to self.angle, counterclockwise
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
106 // The new tangent is R[down + t] - R[down] = Rt.
40
1d865db9d3e4 Move rotate and reflect to alg_tools
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
107 t.rotate(self.angle+f64::PI/2.0)
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
108 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
109 // The angle is such that up would be rotated to self.angle, clockwise
40
1d865db9d3e4 Move rotate and reflect to alg_tools
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
110 t.reflect_y().rotate(self.angle+f64::PI/2.0)
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
111 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
112 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
113
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
114 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
115 /// Convert tangent from cap tangent to tangent tangent
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
116 fn tangent_to_side(&self, top : bool, t : Tangent) -> Tangent {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
117 if top {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
118 // The angle is such that self.angle would be rotated to down, clockwise
40
1d865db9d3e4 Move rotate and reflect to alg_tools
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
119 t.rotate(-self.angle-f64::PI/2.0)
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
120 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
121 // The angle is such that self.angle would be rotated to up, counterclockwise
40
1d865db9d3e4 Move rotate and reflect to alg_tools
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
122 t.rotate(-self.angle-f64::PI/2.0).reflect_y()
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
123 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
124 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
125 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
126
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
127 /// Coordinates on a side
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
128 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
129 pub struct SidePoint {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
130 pub z : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
131 pub angle : Angle
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
132 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
133
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
134 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
135 fn anglediff(mut φ1 : f64, mut φ2 : f64) -> f64 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
136 let π = f64::PI;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
137 φ1 = normalise_angle(φ1);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
138 φ2 = normalise_angle(φ2);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
139 let α = φ2 - φ1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
140 if α >= 0.0 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
141 if α <= π {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
142 α
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
143 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
144 α - 2.0 * π
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
145 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
146 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
147 if α >= -π {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
148 α
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
149 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
150 2.0 * π + α
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
151 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
152 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
153 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
154
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
155 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
156 pub fn normalise_angle(φ : f64) -> f64 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
157 let π = f64::PI;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
158 φ.rem_euclid(2.0 * π)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
159 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
160
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
161 impl SidePoint {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
162 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
163 /// Convert to cylindrical coordinates given radius
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
164 fn cyl_coords(&self, r : f64) -> CylCoords {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
165 let SidePoint { z, angle } = *self;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
166 CylCoords { r, angle, z }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
167 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
168
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
169 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
170 /// Calculate tangent vector between two points on the side, given radius
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
171 fn log(&self, r : f64, other : &SidePoint) -> Loc<f64, 2> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
172 let SidePoint{ z : z1, angle : angle1 } = *self;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
173 let SidePoint{ z : z2, angle : angle2 } = *other;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
174 let φ = anglediff(angle1, angle2);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
175 // TODO: is this correct?
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
176 [r*φ, z2-z1].into()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
177 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
178
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
179 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
180 /// Calculate partial exponential map under boundary
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
181 /// Returns a point on the next face, as well as a remaining tangent on
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
182 /// the side of the cylinder, if `t` wasn't fully used.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
183 fn partial_exp(&self, r : f64, (a, b) : (f64, f64), t : &Tangent)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
184 -> (SidePoint, Option<Tangent>)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
185 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
186 assert!(a <= self.z && self.z <= b);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
187 let Loc([_, h]) = *t;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
188 let s = if h > 0.0 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
189 ((b - self.z)/h).min(1.0)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
190 } else if h < 0.0 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
191 ((a - self.z)/h).min(1.0)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
192 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
193 1.0
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
194 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
195 let d = t * s;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
196 let p = self.unflatten(r, d);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
197 if s < 1.0 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
198 (p, Some(t - d))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
199 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
200 (p, None)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
201 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
202 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
203
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
204 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
205 /// Unflattens another point in the local coordinate system of self
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
206 fn unflatten(&self, r : f64, Loc([v, h]) : Loc<f64, 2>) -> Self {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
207 SidePoint{ z : self.z + h, angle : normalise_angle(self.angle + v / r) }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
208 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
209
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
210 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
211
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
212 /// Point on a [`Cylinder`]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
213 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
214 pub enum Point {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
215 Top(CapPoint),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
216 Bottom(CapPoint),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
217 Side(SidePoint),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
218 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
219
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
220 /// Face on a [`Cylinder`]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
221 #[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize_repr, Deserialize_repr)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
222 #[repr(u8)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
223 pub enum Face {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
224 Top,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
225 Bottom,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
226 Side,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
227 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
228
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
229 #[derive(Clone, Debug, PartialEq)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
230 pub struct OnCylinder<'a> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
231 cylinder : &'a Cylinder,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
232 point : Point,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
233 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
234
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
235
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
236 /// Cylinder configuration
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
237 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
238 pub struct CylinderConfig {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
239 pub newton_iters : usize,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
240 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
241
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
242 impl Default for CylinderConfig {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
243 fn default() -> Self {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
244 CylinderConfig { newton_iters : 10 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
245 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
246 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
247
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
248 /// A cylinder
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
249 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
250 pub struct Cylinder {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
251 /// Radius of the cylinder
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
252 pub radius : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
253 /// Height of the cylinder
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
254 pub height : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
255 /// Configuration for numerical methods
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
256 pub config : CylinderConfig
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
257 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
258
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
259
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
260 impl std::fmt::Display for Face {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
261 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
262 use Face::*;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
263 let s = match *self {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
264 Top => "Top",
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
265 Bottom => "Bottom",
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
266 Side => "Side",
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
267 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
268 write!(f, "{}", s)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
269 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
270 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
271
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
272 impl Point {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
273 fn face(&self) -> Face {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
274 match *self {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
275 Point::Top(..) => Face::Top,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
276 Point::Bottom(_) => Face::Bottom,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
277 Point::Side(_) => Face::Side,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
278 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
279 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
280 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
281
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
282 impl<'a> FacedManifoldPoint for OnCylinder<'a> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
283 type Face = Face;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
284 /// Returns the face of this point.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
285 fn face(&self) -> Face {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
286 self.point.face()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
287 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
288 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
289
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
290 // Tangent vector
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
291 type Tangent = Loc<f64, 2>;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
292
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
293 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
294 fn best_tangent<I>(tangents : I) -> (Tangent, f64)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
295 where I : IntoIterator<Item = Tangent> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
296 tangents.into_iter()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
297 .map(|t| (t, t.norm(L2)))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
298 .reduce(|a@(_, la), b@(_, lb)| if la < lb { a } else { b })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
299 .unwrap()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
300 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
301
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
302 /// Swap the elements of a two-tuple
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
303 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
304 fn swap<A>((a, b) : (A, A)) -> (A, A) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
305 (b, a)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
306 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
307
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
308 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
309 fn indistinguishable(a : f64, b : f64) -> bool {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
310 a > b - f64::EPSILON && a < b + f64::EPSILON
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
311 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
312
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
313 impl Cylinder {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
314 /// Return the cylindrical coordinates of `point` on this cylinder
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
315 fn cyl_coords(&self, point : &Point) -> CylCoords {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
316 match *point {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
317 Point::Top(cap) => { cap.cyl_coords(self.top_z()) },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
318 Point::Bottom(cap) => { cap.cyl_coords(self.bottom_z()) },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
319 Point::Side(side) => { side.cyl_coords(self.radius) },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
320 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
321 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
322
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
323 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
324 pub fn top_z(&self) -> f64 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
325 self.height / 2.0
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
326 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
327
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
328 #[inline]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
329 pub fn bottom_z(&self) -> f64 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
330 -self.height / 2.0
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
331 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
332
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
333 /// Find angle where a geodesic from `side` to `(cap, z)` crosses the cap edge.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
334 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
335 /// Uses `newton_sym1x1`.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
336 fn side_cap_crossing(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
337 &self,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
338 side : &SidePoint,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
339 cap : &CapPoint, z : f64, // `z` is the z coordinate of cap
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
340 ) -> Angle {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
341 let &SidePoint { z : z_1, angle : φ_1 } = side;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
342 let &CapPoint { r : r_2, angle : φ_2 } = cap;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
343 assert_ne!(z, z_1);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
344 let d_1 = z - z_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
345 let d2_1 = d_1 * d_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
346 let r = self.radius;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
347 let r2 = r * r;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
348 let r2_2 = r_2 * r_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
349 let rr_2 = r * r_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
350
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
351 let g = |α_1 : f64| {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
352 let ψ = φ_2 - φ_1 - α_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
353 let ψ_cos = ψ.cos();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
354 let ψ_sin = ψ.sin();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
355 let ψ_sin2 = ψ_sin * ψ_sin;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
356 let ψ_cos2 = ψ_cos * ψ_cos;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
357 let α2_1 = α_1 * α_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
358 let c = d2_1 + r2 * α2_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
359 let e = r2 + r2_2 - 2.0 * rr_2 * ψ_cos;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
360 let g = r2 * α_1 / c.sqrt() - rr_2 * ψ_sin / e.sqrt();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
361 let h = r2 * d2_1 / c.powf(3.0/2.0)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
362 + r * r_2 * ((r2 + r2_2) * ψ_cos - rr_2 * (ψ_sin2 - 2.0 * ψ_cos2))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
363 / e.powf(3.0/2.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
364 (h, g)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
365 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
366
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
367 let α_1 = newton_sym1x1(g, 0.0, self.config.newton_iters);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
368 normalise_angle(φ_1 + α_1)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
369
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
370 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
371
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
372 /// Find angles where the geodesic passing through a cap at height `z` from `side1` to `side2`
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
373 /// crosses the cap edge. **Panics if `side2.angle < side1.angle`.**
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
374 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
375 /// Uses `newton_sym2x2`.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
376 fn side_cap_side_crossing(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
377 &self,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
378 side1 : &SidePoint,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
379 z : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
380 side2 : &SidePoint
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
381 ) -> (Angle, Angle) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
382 let &SidePoint { z : z_1, angle : φ_1 } = side1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
383 let &SidePoint { z : z_2, angle : φ_2 } = side2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
384 assert!(φ_2 >= φ_1);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
385 assert_ne!(z_1, z);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
386 assert_ne!(z_2, z);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
387 let r = self.radius;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
388 let r2 = r * r;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
389 let d_1 = z - z_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
390 let d_2 = z - z_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
391 let d2_1 = d_1 * d_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
392 let d2_2 = d_2 * d_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
393 let g = |α_1 : f64, α_2 : f64| {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
394 let α2_1 = α_1 * α_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
395 let α2_2 = α_2 * α_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
396 let ψ = (α_1 + α_2 + φ_1 - φ_2) / 2.0;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
397 let ψ_sin = ψ.sin();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
398 let ψ_cos = ψ.cos();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
399 let c_1 = d2_1 + r2 * α2_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
400 let c_2 = d2_2 + r2 * α2_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
401 let g_1 = r2 * α_1 / c_1.sqrt() - r * ψ_cos;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
402 let g_2 = r2 * α_2 / c_2.sqrt() - r * ψ_cos;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
403 let h_12 = (r / 2.0) * ψ_sin;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
404 let h_11 = r2 * d2_1 / c_1.powf(3.0 / 2.0) + h_12;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
405 let h_22 = r2 * d2_2 / c_2.powf(3.0 / 2.0) + h_12;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
406 ([h_11, h_12, h_22], [g_1, g_2])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
407 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
408
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
409 let [α_1, α_2] = newton_sym2x2(g, [0.0, 0.0], self.config.newton_iters);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
410 (normalise_angle(φ_1 + α_1), normalise_angle(φ_2 + α_2))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
411
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
412 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
413
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
414 /// Find angles where the geodesic passing through the side from `cap1` at height `z_1`
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
415 /// to `cap2` at height `z_2` crosses the cap edges.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
416 /// **Panics if `cap2.angle < cap1.angle`.**
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
417 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
418 /// Uses `newton_sym2x2`.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
419 fn cap_side_cap_crossing(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
420 &self,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
421 cap1 : &CapPoint, z_1 : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
422 cap2 : &CapPoint, z_2 : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
423 init_by_cap2 : bool
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
424 ) -> (Angle, Angle) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
425 let r = self.radius;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
426 let &CapPoint { r : r_1, angle : φ_1 } = cap1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
427 let &CapPoint { r : r_2, angle : φ_2 } = cap2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
428 assert!(φ_2 >= φ_1);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
429 assert_ne!(r_1, r);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
430 assert_ne!(r_2, r);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
431 assert_ne!(z_2, z_1);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
432 if r_1 == 0.0 && r_2 == 0.0 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
433 // Singular case: both points are in the middle of the caps.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
434 return (φ_1, φ_1)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
435 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
436 let r2 = r * r;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
437 let d = (z_2 - z_1).abs();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
438 let d2 = d * d;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
439 let r2_1 = r_1 * r_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
440 let r2_2 = r_2 * r_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
441 let rr_1 = r * r_1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
442 let rr_2 = r * r_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
443 let f = |α_1 : f64, α_2 : f64| {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
444 let cos_α1 = α_1.cos();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
445 let sin_α1 = α_1.sin();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
446 let cos_α2 = α_2.cos();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
447 let sin_α2 = α_2.sin();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
448 //let cos2_α1 = cos_α1 * cos_α1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
449 let sin2_α1 = sin_α1 * sin_α1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
450 //let cos2_α2 = cos_α2 * cos_α2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
451 let sin2_α2 = sin_α2 * sin_α2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
452 let ψ = φ_2 - φ_1 - α_1 - α_2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
453 let ψ2 = ψ * ψ;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
454 let ψ2r2 = ψ2 * r2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
455 //let r4 = r2 * r2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
456 let b = d2 + ψ2r2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
457 let c = r2 * ψ / b.sqrt();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
458 let e_1 = r2 + r2_1 - 2.0 * rr_1 * cos_α1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
459 let e_2 = r2 + r2_2 - 2.0 * rr_2 * cos_α2;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
460 let g_1 = rr_1 * sin_α1 / e_1.sqrt() - c;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
461 let g_2 = rr_2 * sin_α2 / e_2.sqrt() - c;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
462 let h_12 = r2 * (1.0 - ψ2r2 / b) / b.sqrt();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
463 // let h_11 = rr_1 * ( (r2 + r2_1) * cos_α1 - rr_1 * ( sin2_α1 + 2.0 * cos2_α1) )
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
464 // / e_1.powf(3.0/2.0) + h_12;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
465 // let h_22 = rr_2 * ( (r2 + r2_2) * cos_α2 - rr_2 * ( sin2_α2 + 2.0 * cos2_α2) )
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
466 // / e_2.powf(3.0/2.0) + h_12;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
467 // let h_11 = rr_1 * cos_α1 / e_1.sqrt() - rr_1*rr_1 * sin2_α1 / e_1.powf(3.0/2.0) + h_12;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
468 // let h_22 = rr_2 * cos_α2 / e_2.sqrt() - rr_2*rr_2 * sin2_α2 / e_2.powf(3.0/2.0) + h_12;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
469 let h_11 = rr_1 * (cos_α1 - rr_1 * sin2_α1 / e_1) / e_1.sqrt() + h_12;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
470 let h_22 = rr_2 * (cos_α2 - rr_2 * sin2_α2 / e_2) / e_2.sqrt() + h_12;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
471 ([h_11, h_12, h_22], [g_1, g_2])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
472 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
473
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
474 let α_init = if init_by_cap2 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
475 [φ_2 - φ_1, 0.0]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
476 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
477 [0.0, φ_2 - φ_1]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
478 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
479 let [α_1, α_2] = newton_sym2x2(f, α_init, self.config.newton_iters);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
480 (normalise_angle(φ_1 + α_1), normalise_angle(φ_2 - α_2))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
481 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
482
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
483 fn cap_side_log(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
484 &self,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
485 cap : &CapPoint, (z, top) : (f64, bool),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
486 side : &SidePoint
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
487 ) -> Tangent {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
488 let r = self.radius;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
489 if indistinguishable(side.z, z) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
490 // Degenerate case
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
491 let capedge = CapPoint{ angle : side.angle, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
492 cap.log(&capedge)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
493 } else if indistinguishable(r, cap.r)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
494 && anglediff(side.angle, cap.angle).abs() < f64::PI/2.0 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
495 // Degenerate case
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
496 let sideedge = SidePoint{ angle : cap.angle, z};
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
497 cap.tangent_from_side(top, sideedge.log(r, side))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
498 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
499 let φ = self.side_cap_crossing(side, cap, z);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
500 let capedge = CapPoint{ angle : φ, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
501 let sideedge = SidePoint{ angle : φ, z };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
502 let t1 = cap.log(&capedge);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
503 let t2 = sideedge.log(r, side);
41
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
504 // Either option should give the same result.
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
505 // The first one avoids division, but seems numerically more unstable due to
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
506 // sines and cosines.
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
507 //t1 + capedge.tangent_from_side(top, t2)
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
508 let n = t1.norm(L2);
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
509 if n < f64::EPSILON {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
510 capedge.tangent_from_side(top, t2)
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
511 } else {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
512 (t1/n)*(n + t2.norm(L2))
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
513 }
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
514 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
515 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
516
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
517 fn side_cap_log(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
518 &self,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
519 side : &SidePoint,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
520 cap : &CapPoint, (z, top) : (f64, bool),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
521 ) -> Tangent {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
522 let r = self.radius;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
523 if indistinguishable(side.z, z) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
524 // Degenerate case
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
525 let capedge = CapPoint{ angle : side.angle, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
526 capedge.tangent_to_side(top, capedge.log(cap))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
527 } else if indistinguishable(r, cap.r)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
528 && anglediff(side.angle, cap.angle).abs() < f64::PI/2.0 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
529 // Degenerate case
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
530 side.log(r, &SidePoint{ z, angle : cap.angle })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
531 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
532 let φ = self.side_cap_crossing(side, cap, z);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
533 let capedge = CapPoint{ angle : φ, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
534 let sideedge = SidePoint{ angle : φ, z };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
535 let t1 = side.log(r, &sideedge);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
536 let t2 = capedge.log(cap);
41
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
537 // Either option should give the same result.
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
538 // The first one avoids division, but seems numerically more unstable due to
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
539 // sines and cosines.
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
540 // t1 + capedge.tangent_to_side(top, t2)
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
541 let n = t1.norm(L2);
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
542 if n < f64::EPSILON {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
543 capedge.tangent_to_side(top, t2)
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
544 } else {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
545 (t1/n)*(n + t2.norm(L2))
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
546 }
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
547 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
548 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
549
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
550 fn side_cap_side_log(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
551 &self,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
552 side1 : &SidePoint,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
553 (z, top) : (f64, bool),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
554 side2 : &SidePoint
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
555 ) -> Tangent {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
556 let r = self.radius;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
557 if indistinguishable(side1.z, z) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
558 // Degenerate case
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
559 let capedge1 = CapPoint{ angle : side1.angle, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
560 capedge1.tangent_to_side(top, self.cap_side_log(&capedge1, (z, top), side2))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
561 } else if indistinguishable(side2.z, z) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
562 // Degenerate case
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
563 let capedge2 = CapPoint{ angle : side2.angle, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
564 self.side_cap_log(side1, &capedge2, (z, top))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
565 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
566 let (φ1, φ2) = if side2.angle >= side1.angle {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
567 self.side_cap_side_crossing(side1, z, side2)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
568 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
569 swap(self.side_cap_side_crossing(side2, z, side1))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
570 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
571 let capedge1 = CapPoint{ angle : φ1, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
572 let sideedge1 = SidePoint{ angle : φ1, z };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
573 let capedge2 = CapPoint{ angle : φ2, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
574 let sideedge2 = SidePoint{ angle : φ2, z };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
575 let t1 = side1.log(r, &sideedge1);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
576 let t2 = capedge1.log(&capedge2);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
577 let t3 = sideedge2.log(r, &side2);
41
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
578 // Either option should give the same result.
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
579 // The first one avoids division, but seems numerically more unstable due to
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
580 // sines and cosines.
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
581 //
41
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
582 // t1 + capedge1.tangent_to_side(top, t2 + capedge2.tangent_from_side(top, t3))
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
583 let n = t1.norm(L2);
41
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
584 if n < f64::EPSILON {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
585 let n2 = t2.norm(L2);
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
586 capedge1.tangent_to_side(top,
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
587 if n2 < f64::EPSILON {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
588 capedge2.tangent_from_side(top, t3)
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
589 } else {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
590 (t2/n2)*(n2 + t3.norm(L2))
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
591 }
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
592 )
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
593 } else {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
594 (t1/n)*(n + t2.norm(L2) + t3.norm(L2))
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
595 }
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
596 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
597 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
598
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
599 fn cap_side_cap_log(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
600 &self,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
601 cap1 : &CapPoint, (z1, top1) : (f64, bool),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
602 cap2 : &CapPoint, (z2, top2) : (f64, bool),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
603 init_by_cap2 : bool,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
604 ) -> Tangent {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
605 let r = self.radius;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
606 if indistinguishable(cap1.r, r) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
607 // Degenerate case
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
608 let sideedge1 = SidePoint{ angle : cap1.angle, z : z1 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
609 cap1.tangent_from_side(top1, self.side_cap_log(&sideedge1, cap2, (z2, top2)))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
610 } else if indistinguishable(cap2.r, r) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
611 // Degenerate case
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
612 let sideedge2 = SidePoint{ angle : cap2.angle, z : z2 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
613 self.cap_side_log(cap1, (z1, top1), &sideedge2)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
614 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
615 let (φ1, φ2) = if cap2.angle >= cap1.angle {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
616 self.cap_side_cap_crossing(cap1, z1, cap2, z2, init_by_cap2)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
617 } else {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
618 swap(self.cap_side_cap_crossing(cap2, z2, cap1, z1, !init_by_cap2))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
619 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
620 let sideedge1 = SidePoint{ angle : φ1, z : z1 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
621 let capedge1 = CapPoint{ angle : φ1, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
622 let sideedge2 = SidePoint{ angle : φ2, z : z2};
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
623 let capedge2 = CapPoint{ angle : φ2, r };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
624 let t1 = cap1.log(&capedge1);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
625 let t2 = sideedge1.log(r, &sideedge2);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
626 let t3 = capedge2.log(cap2);
41
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
627 // Either option should give the same result.
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
628 // The first one avoids division, but seems numerically more unstable due to
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
629 // sines and cosines.
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
630 // t1 + capedge1.tangent_from_side(top1, t2 + capedge2.tangent_to_side(top2, t3))
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
631 let n = t1.norm(L2);
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
632 if n < f64::EPSILON {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
633 let n2 = t2.norm(L2);
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
634 capedge1.tangent_from_side(top1,
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
635 if n2 < f64::EPSILON {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
636 capedge2.tangent_to_side(top2, t3)
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
637 } else {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
638 (t2/n2)*(n2 + t3.norm(L2))
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
639 }
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
640 )
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
641 } else {
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
642 (t1/n)*(n + t2.norm(L2) + t3.norm(L2))
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
643 }
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
644 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
645 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
646
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
647 /// Calculates both the logarithmic map and distance to another point
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
648 fn log_dist(&self, source : &Point, destination : &Point) -> (Tangent, f64) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
649 use Point::*;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
650 match (source, destination) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
651 (Top(cap1), Top(cap2)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
652 best_tangent([cap1.log(cap2)])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
653 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
654 (Bottom(cap1), Bottom(cap2)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
655 best_tangent([cap1.log(cap2)])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
656 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
657 (Bottom(cap), Side(side)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
658 best_tangent([self.cap_side_log(cap, (self.bottom_z(), false), side)])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
659 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
660 (Top(cap), Side(side)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
661 best_tangent([self.cap_side_log(cap, (self.top_z(), true), side)])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
662 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
663 (Side(side), Bottom(cap)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
664 best_tangent([self.side_cap_log(side, cap, (self.bottom_z(), false))])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
665 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
666 (Side(side), Top(cap)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
667 best_tangent([self.side_cap_log(side, cap, (self.top_z(), true))])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
668 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
669 (Side(side1), Side(side2)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
670 best_tangent([
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
671 side1.log(self.radius, side2),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
672 self.side_cap_side_log(side1, (self.top_z(), true), side2),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
673 self.side_cap_side_log(side1, (self.bottom_z(), false), side2),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
674 ])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
675 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
676 (Top(cap1), Bottom(cap2)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
677 best_tangent([
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
678 // We try a few possible initialisations for Newton
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
679 self.cap_side_cap_log(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
680 cap1, (self.top_z(), true),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
681 cap2, (self.bottom_z(), false),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
682 false
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
683 ),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
684 self.cap_side_cap_log(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
685 cap1, (self.top_z(), true),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
686 cap2, (self.bottom_z(), false),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
687 true
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
688 ),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
689 ])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
690 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
691 (Bottom(cap1), Top(cap2)) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
692 best_tangent([
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
693 // We try a few possible initialisations for Newton
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
694 self.cap_side_cap_log(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
695 cap1, (self.bottom_z(), false),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
696 cap2, (self.top_z(), true),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
697 false
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
698 ),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
699 self.cap_side_cap_log(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
700 cap1, (self.bottom_z(), false),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
701 cap2, (self.top_z(), true),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
702 true
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
703 ),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
704 ])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
705 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
706 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
707 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
708
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
709 #[allow(unreachable_code)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
710 #[allow(unused_variables)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
711 fn partial_exp(&self, point : Point, t : Tangent) -> (Point, Option<Tangent>) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
712 match point {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
713 Point::Top(cap) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
714 let (cap_new, t_new_basis) = cap.partial_exp(self.radius, &t);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
715 match t_new_basis {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
716 None => (Point::Top(cap_new), None),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
717 Some(t_new) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
718 let side_new = SidePoint{ angle : cap_new.angle, z : self.top_z() };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
719 (Point::Side(side_new), Some(cap_new.tangent_to_side(true, t_new)))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
720 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
721 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
722 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
723 Point::Bottom(cap) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
724 let (cap_new, t_new_basis) = cap.partial_exp(self.radius, &t);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
725 match t_new_basis {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
726 None => (Point::Bottom(cap_new), None),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
727 Some(t_new) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
728 let side_new = SidePoint{ angle : cap_new.angle, z : self.bottom_z() };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
729 (Point::Side(side_new), Some(cap_new.tangent_to_side(false, t_new)))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
730 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
731 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
732 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
733 Point::Side(side) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
734 let lims = (self.bottom_z(), self.top_z());
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
735 let (side_new, t_new_basis) = side.partial_exp(self.radius, lims, &t);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
736 match t_new_basis {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
737 None => (Point::Side(side_new), None),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
738 Some(t_new) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
739 if side_new.z >= self.top_z() - f64::EPSILON {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
740 let cap_new = CapPoint { angle : side_new.angle, r : self.radius };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
741 (Point::Top(cap_new), Some(cap_new.tangent_from_side(true, t_new)))
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
742 } else if side_new.z <= self.bottom_z() + f64::EPSILON {
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
743 let cap_new = CapPoint { angle : side_new.angle, r : self.radius };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
744 (Point::Bottom(cap_new), Some(cap_new.tangent_from_side(false, t_new)))
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
745 } else {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
746 (Point::Side(side_new), None)
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
747 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
748 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
749 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
750 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
751 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
752 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
753
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
754 fn exp(&self, point : &Point, tangent : &Tangent) -> Point {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
755 let mut p = *point;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
756 let mut t = *tangent;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
757 loop {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
758 (p, t) = match self.partial_exp(p, t) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
759 (p, None) => break p,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
760 (p, Some(t)) => (p, t),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
761 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
762 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
763 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
764
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
765 /// Check that `point` has valid coordinates, and normalise angles
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
766 pub fn normalise(&self, point : Point) -> Option<Point> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
767 match point {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
768 Point::Side(side) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
769 let a = self.bottom_z();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
770 let b = self.top_z();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
771 (a <= side.z && side.z <= b).then(|| {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
772 Point::Side(SidePoint{ angle : normalise_angle(side.angle), .. side })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
773 })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
774 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
775 Point::Bottom(cap) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
776 (cap.r <= self.radius).then(|| {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
777 Point::Bottom(CapPoint{ angle : normalise_angle(cap.angle), .. cap })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
778 })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
779 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
780 Point::Top(cap) => {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
781 (cap.r <= self.radius).then(|| {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
782 Point::Top(CapPoint{ angle : normalise_angle(cap.angle), .. cap })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
783 })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
784 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
785 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
786 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
787
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
788 /// Convert `p` into a a point associated with the cylinder.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
789 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
790 /// May panic if the coordinates are invalid.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
791 pub fn point_on(&self, point : Point) -> OnCylinder<'_> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
792 match self.normalise(point) {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
793 None => panic!("{point:?} not on cylinder {self:?}"),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
794 Some(point) => OnCylinder { cylinder : self, point }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
795 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
796 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
797
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
798 /// Convert `p` into a a point on side associated with the cylinder.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
799 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
800 /// May panic if the coordinates are invalid.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
801 pub fn point_on_side(&self, side : SidePoint) -> OnCylinder<'_> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
802 self.point_on(Point::Side(side))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
803 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
804
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
805 /// Convert `p` into a a point on top associated with the cylinder.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
806 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
807 /// May panic if the coordinates are invalid.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
808 pub fn point_on_top(&self, cap : CapPoint) -> OnCylinder<'_> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
809 self.point_on(Point::Top(cap))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
810 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
811
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
812 /// Convert `p` into a a point on bottom associated with the cylinder.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
813 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
814 /// May panic if the coordinates are invalid.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
815 pub fn point_on_bottom(&self, cap : CapPoint) -> OnCylinder<'_> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
816 self.point_on(Point::Bottom(cap))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
817 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
818
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
819 /// Convert `p` into a a point on side associated with the cylinder.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
820 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
821 /// May panic if the coordinates are invalid.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
822 pub fn on_side(&self, angle : Angle, z : f64) -> OnCylinder<'_> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
823 self.point_on_side(SidePoint{ angle, z })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
824 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
825
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
826 /// Convert `p` into a a point on top associated with the cylinder.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
827 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
828 /// May panic if the coordinates are invalid.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
829 pub fn on_top(&self, angle : Angle, r : f64) -> OnCylinder<'_> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
830 self.point_on_top(CapPoint{ angle, r })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
831 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
832
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
833 /// Convert `p` into a a point on bottom associated with the cylinder.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
834 ///
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
835 /// May panic if the coordinates are invalid.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
836 pub fn on_bottom(&self, angle : Angle, r : f64) -> OnCylinder<'_> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
837 self.point_on_bottom(CapPoint{ angle, r })
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
838 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
839 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
840
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
841 impl<'a> OnCylinder<'a> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
842 /// Return the cylindrical coordinates of this point
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
843 pub fn cyl_coords(&self) -> CylCoords {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
844 self.cylinder.cyl_coords(&self.point)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
845 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
846 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
847
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
848 impl<'a> EmbeddedManifoldPoint for OnCylinder<'a> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
849 type EmbeddedCoords = Loc<f64, 3>;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
850
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
851 /// Get embedded 3D coordinates
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
852 fn embedded_coords(&self) -> Loc<f64, 3> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
853 self.cyl_coords().to_cartesian()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
854 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
855 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
856
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
857 impl<'a> ManifoldPoint for OnCylinder<'a> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
858 type Tangent = Tangent;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
859
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
860 fn exp(self, tangent : &Self::Tangent) -> Self {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
861 let cylinder = self.cylinder;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
862 let point = cylinder.exp(&self.point, tangent);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
863 OnCylinder { cylinder, point }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
864 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
865
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
866 fn log(&self, other : &Self) -> Self::Tangent {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
867 assert!(self.cylinder == other.cylinder);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
868 self.cylinder.log_dist(&self.point, &other.point).0
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
869 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
870
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
871 fn dist_to(&self, other : &Self) -> f64 {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
872 assert!(self.cylinder == other.cylinder);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
873 self.cylinder.log_dist(&self.point, &other.point).1
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
874 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
875
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
876 fn tangent_origin(&self) -> Self::Tangent {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
877 Loc([0.0, 0.0])
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
878 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
879 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
880
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
881 #[cfg(test)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
882 mod tests {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
883 use super::*;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
884
41
56d609b70a3b Cylinder numerical stability hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 40
diff changeset
885 static TOL : f64 = 1e-7;
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
886
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
887 macro_rules! check_distance {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
888 ($distance : expr, $expected : expr) => {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
889 assert!(
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
890 ($distance-$expected).abs() < TOL,
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
891 "{} = {}, expected = {}",
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
892 stringify!($distance),
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
893 $distance,
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
894 $expected,
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
895 )
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
896 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
897 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
898
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
899 macro_rules! check_vec_eq {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
900 ($left : expr, $right : expr) => {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
901 let err = ($left-$right).norm(L2);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
902 if err > TOL {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
903 panic!("{:?} != {:?} [error {err}]", $left, $right);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
904 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
905 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
906 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
907
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
908 macro_rules! check_point_eq {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
909 ($left : expr, $right : expr) => {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
910 match ($left, $right) {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
911 (Point::Top(a), Point::Top(b)) | (Point::Bottom(a), Point::Bottom(b))=> {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
912 if (a.angle-b.angle).abs() > TOL || (a.r-b.r).abs() > TOL {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
913 panic!("{:?} != {:?}", a, b)
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
914 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
915 },
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
916 (Point::Side(a), Point::Side(b)) => {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
917 if (a.angle-b.angle).abs() > TOL || (a.z-b.z).abs() > TOL {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
918 panic!("{:?} != {:?}", a, b)
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
919 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
920 },
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
921 (a, b) => {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
922 panic!("{:?} != {:?}", a, b)
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
923 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
924 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
925 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
926 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
927
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
928 static CYL : Cylinder = Cylinder {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
929 radius : 1.0,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
930 height : 1.0,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
931 config : CylinderConfig { newton_iters : 20 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
932 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
933
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
934 #[test]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
935 fn intra_cap_log_dist() {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
936 let π = f64::PI;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
937 let p1 = CYL.on_top(0.0, 0.5);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
938 let p2 = CYL.on_top(π, 0.5);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
939 let p3 = CYL.on_top(π/2.0, 0.5);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
940
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
941 check_distance!(p1.dist_to(&p2), 1.0);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
942 check_distance!(p2.dist_to(&p3), 0.5_f64.sqrt());
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
943 check_distance!(p3.dist_to(&p1), 0.5_f64.sqrt());
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
944 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
945
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
946 #[test]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
947 fn intra_side_log_dist() {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
948 let π = f64::PI;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
949 let p1 = CYL.on_side(0.0, 0.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
950 let p2 = CYL.on_side(0.0, 0.4);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
951 let p3 = CYL.on_side(π/2.0, 0.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
952
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
953 check_distance!(p1.dist_to(&p2), 0.4);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
954 check_distance!(p1.dist_to(&p3), π/2.0*CYL.radius);
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
955 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
956
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
957 #[test]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
958 fn intra_side_over_cap_log_dist() {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
959 let π = f64::PI;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
960 let off = 0.05;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
961 let z = CYL.top_z() - off;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
962 let p1 = CYL.on_side(0.0, z);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
963 let p2 = CYL.on_side(π, z);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
964
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
965 check_distance!(p1.dist_to(&p2), 2.0 * (CYL.radius + off));
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
966 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
967
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
968 #[test]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
969 fn top_bottom_log_dist() {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
970 let π = f64::PI;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
971 let p1 = CYL.on_top(0.0, 0.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
972 let p2 = CYL.on_bottom(0.0, 0.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
973
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
974 check_distance!(p1.dist_to(&p2), 2.0 * CYL.radius + CYL.height);
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
975
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
976 let p1 = CYL.on_top(0.0, CYL.radius / 2.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
977 let p2 = CYL.on_bottom(0.0, CYL.radius / 2.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
978 let p3 = CYL.on_bottom(π, CYL.radius / 2.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
979
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
980 check_distance!(p1.dist_to(&p2), CYL.radius + CYL.height);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
981 check_distance!(p1.dist_to(&p3), 2.0 * CYL.radius + CYL.height);
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
982 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
983
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
984 #[test]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
985 fn top_side_log_dist() {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
986 let p1 = CYL.on_top(0.0, 0.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
987 let p2 = CYL.on_side(0.0, 0.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
988
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
989 check_distance!(p1.dist_to(&p2), CYL.radius + CYL.height / 2.0);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
990 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
991
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
992 #[test]
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
993 fn cap_side_partial_exp() {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
994 let π = f64::PI;
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
995 let angles = [0.0, π/2.0, π*5.0/6.0, π*7.0/5.0];
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
996
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
997 for φ in angles {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
998 let p = CYL.on_top(φ, CYL.radius / 2.0);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
999 let q_target = CYL.on_side(φ, CYL.height / 2.0);
40
1d865db9d3e4 Move rotate and reflect to alg_tools
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
1000 let t = Loc([CYL.radius, 0.0]).rotate(φ);
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1001 let t_target = Loc([0.0, -CYL.radius / 2.0]);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1002 let (q, t_left) = CYL.partial_exp(p.point, t);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1003 check_point_eq!(q, q_target.point);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1004 if let Some(t_left_) = t_left {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1005 check_vec_eq!(t_left_, t_target);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1006 } else {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1007 panic!("No tangent left");
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1008 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1009 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1010
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1011 for φ in angles {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1012 let p = CYL.on_top(φ + π/2.0, CYL.radius);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1013 let q_target = CYL.on_side(φ, CYL.height / 2.0);
40
1d865db9d3e4 Move rotate and reflect to alg_tools
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
1014 let t = 2.0 * Loc([CYL.radius, -CYL.radius]).rotate(φ);
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1015 let t_target = Loc([-CYL.radius, -CYL.radius]);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1016 let (q, t_left) = CYL.partial_exp(p.point, t);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1017 check_point_eq!(q, q_target.point);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1018 if let Some(t_left_) = t_left {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1019 check_vec_eq!(t_left_, t_target);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1020 } else {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1021 panic!("No tangent left");
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1022 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1023 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1024 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1025
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1026 #[test]
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1027 fn side_top_exp() {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1028 let π = f64::PI;
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1029 let angles = [0.0, π/2.0, π*5.0/6.0, π*7.0/5.0];
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1030
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1031 for φ in angles {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1032 let pt = CYL.on_top(φ, CYL.radius);
40
1d865db9d3e4 Move rotate and reflect to alg_tools
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
1033 let t = Loc([0.1, 0.3]).rotate(φ);
38
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1034 let b = pt.clone().exp(&t);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1035 let a = pt.exp(&(-t));
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1036 check_point_eq!(a.exp(&(2.0*t)).point, b.point);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1037 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1038 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1039
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1040 /// Tests that tangent “returned” on edge from cap to top, correctly
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1041 /// sums with a top tangent.
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1042 #[test]
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1043 fn cap_side_log_exp() {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1044 let π = f64::PI;
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1045 let angles = [0.0, π/2.0, π*5.0/6.0, π*7.0/5.0];
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1046
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1047 for top in [true, false] {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1048 for (&φ, &ψ) in angles.iter().zip(angles.iter().rev()) {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1049 let a = if top {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1050 CYL.on_top(φ, CYL.radius/2.0)
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1051 } else {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1052 CYL.on_bottom(φ, CYL.radius/2.0)
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1053 };
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1054 let b = CYL.on_side(ψ, 0.0);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1055 let t = a.log(&b);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1056 let (p@Point::Side(side), Some(tpb)) = CYL.partial_exp(a.point, t) else {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1057 panic!("No tangent or point not on side");
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1058 };
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1059 let pp = CYL.point_on(p);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1060 let tpb2 = pp.log(&b);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1061 let tap = a.log(&pp);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1062 check_vec_eq!(tpb, tpb2);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1063 if top {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1064 assert!(indistinguishable(side.z, CYL.top_z()));
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1065 } else {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1066 assert!(indistinguishable(side.z, CYL.bottom_z()));
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1067 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1068 let cap = CapPoint{ angle : side.angle, r : CYL.radius };
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1069 let tbpcap = cap.tangent_from_side(top, tpb);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1070 check_vec_eq!(tap + tbpcap, t);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1071 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1072 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1073 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1074
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1075
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1076 /// Tests that tangent “returned” on edge from top to side, correctly
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1077 /// sums with a side tangent.
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1078 #[test]
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1079 fn side_cap_log_exp() {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1080 let π = f64::PI;
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1081 let angles = [0.0, π/2.0, π*5.0/6.0, π*7.0/5.0];
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1082
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1083 for top in [true, false] {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1084 for (&φ, &ψ) in angles.iter().zip(angles.iter().rev()) {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1085 let a = CYL.on_side(ψ, 0.0);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1086 let b = if top {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1087 CYL.on_top(φ, CYL.radius/2.0)
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1088 } else {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1089 CYL.on_bottom(φ, CYL.radius/2.0)
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1090 };
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1091 let t = a.log(&b);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1092 let (p, cap, tpb) = match CYL.partial_exp(a.point, t) {
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1093 (p@Point::Top(cap), Some(tpb)) if top => (p, cap, tpb),
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1094 (p@Point::Bottom(cap), Some(tpb)) if !top => (p, cap, tpb),
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1095 _ => panic!("No tangent or point not on correct cap"),
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1096 };
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1097 let pp = CYL.point_on(p);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1098 let tpb2 = pp.log(&b);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1099 let tap = a.log(&pp);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1100 check_vec_eq!(tpb, tpb2);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1101 let tbpside = cap.tangent_to_side(top, tpb);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1102 check_vec_eq!(tap + tbpside, t);
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1103 }
63318d1b4f00 Fixes and unit tests for cylinder
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
1104 }
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
1105 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
1106 }

mercurial