1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
use std::marker::PhantomData;
use crate::topology::{Cycle, Edge, Face, Vertex};
use super::{stores::Stores, Iter};
pub struct Topology<'r> {
pub(super) stores: Stores,
pub(super) _lifetime: PhantomData<&'r ()>,
}
impl Topology<'_> {
pub fn vertices(&self) -> Iter<Vertex> {
self.stores.vertices.iter()
}
pub fn edges(&self) -> Iter<Edge> {
self.stores.edges.iter()
}
pub fn cycles(&self) -> Iter<Cycle> {
self.stores.cycles.iter()
}
pub fn faces(&self) -> Iter<Face> {
self.stores.faces.iter()
}
}
#[cfg(test)]
mod tests {
use std::ops::{Deref, DerefMut};
use fj_math::{Point, Scalar};
use crate::{
geometry::{Curve, Surface},
shape::{Handle, Shape, ValidationError},
topology::{Cycle, Edge, Face, Vertex},
};
const MIN_DISTANCE: f64 = 5e-7;
#[test]
fn add_vertex() -> anyhow::Result<()> {
let mut shape = Shape::new().with_min_distance(MIN_DISTANCE);
let mut other = Shape::new();
let point = shape.insert(Point::from([0., 0., 0.]))?;
shape.insert(Vertex { point })?;
let point = other.insert(Point::from([1., 0., 0.]))?;
let result = shape.insert(Vertex { point });
assert!(matches!(result, Err(ValidationError::Structural(_))));
let point = shape.insert(Point::from([5e-8, 0., 0.]))?;
let result = shape.insert(Vertex { point });
assert!(matches!(result, Err(ValidationError::Uniqueness)));
let point = shape.insert(Point::from([5e-6, 0., 0.]))?;
shape.insert(Vertex { point })?;
Ok(())
}
#[test]
fn add_edge() -> anyhow::Result<()> {
let mut shape = TestShape::new();
let mut other = TestShape::new();
let curve = other.add_curve();
let a = Vertex::builder(&mut other).build_from_point([1., 0., 0.])?;
let b = Vertex::builder(&mut other).build_from_point([2., 0., 0.])?;
let err = shape
.insert(Edge {
curve: curve.clone(),
vertices: Some([a.clone(), b.clone()]),
})
.unwrap_err();
assert!(err.missing_curve(&curve));
assert!(err.missing_vertex(&a));
assert!(err.missing_vertex(&b));
let curve = shape.add_curve();
let a = Vertex::builder(&mut shape).build_from_point([1., 0., 0.])?;
let b = Vertex::builder(&mut shape).build_from_point([2., 0., 0.])?;
shape.insert(Edge {
curve,
vertices: Some([a, b]),
})?;
Ok(())
}
#[test]
fn add_cycle() -> anyhow::Result<()> {
let mut shape = TestShape::new();
let mut other = TestShape::new();
let edge = other.add_edge()?;
let err = shape
.insert(Cycle {
edges: vec![edge.clone()],
})
.unwrap_err();
assert!(err.missing_edge(&edge));
let edge = shape.add_edge()?;
shape.insert(Cycle { edges: vec![edge] })?;
Ok(())
}
#[test]
fn add_face() -> anyhow::Result<()> {
let mut shape = TestShape::new();
let mut other = TestShape::new();
let surface = other.add_surface();
let cycle = other.add_cycle()?;
let err = shape
.insert(Face::Face {
surface: surface.clone(),
exteriors: vec![cycle.clone()],
interiors: Vec::new(),
color: [255, 0, 0, 255],
})
.unwrap_err();
assert!(err.missing_surface(&surface));
assert!(err.missing_cycle(&cycle));
let surface = shape.add_surface();
let cycle = shape.add_cycle()?;
shape.insert(Face::Face {
surface,
exteriors: vec![cycle],
interiors: Vec::new(),
color: [255, 0, 0, 255],
})?;
Ok(())
}
struct TestShape {
inner: Shape,
next_point: Point<3>,
}
impl TestShape {
fn new() -> Self {
Self {
inner: Shape::new(),
next_point: Point::from([0., 0., 0.]),
}
}
fn add_curve(&mut self) -> Handle<Curve> {
self.insert(Curve::x_axis()).unwrap()
}
fn add_surface(&mut self) -> Handle<Surface> {
self.insert(Surface::x_y_plane()).unwrap()
}
fn add_edge(&mut self) -> anyhow::Result<Handle<Edge>> {
let points = [(); 2].map(|()| {
let point = self.next_point;
self.next_point.x += Scalar::ONE;
point
});
let edge = Edge::builder(&mut self.inner)
.build_line_segment_from_points(points)?;
Ok(edge)
}
fn add_cycle(&mut self) -> anyhow::Result<Handle<Cycle>> {
let edge = self.add_edge()?;
let cycle = self.insert(Cycle { edges: vec![edge] })?;
Ok(cycle)
}
}
impl Deref for TestShape {
type Target = Shape;
fn deref(&self) -> &Self::Target {
&self.inner
}
}
impl DerefMut for TestShape {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.inner
}
}
}