Skip to content

Commit dd5c06f

Browse files
committed
tests(modeling): adjusted tests due to changes in geom3
1 parent d41afaf commit dd5c06f

32 files changed

+173
-173
lines changed

packages/modeling/src/colors/colorize.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test('color (rgba on objects)', (t) => {
3636

3737
test('color (rgba on geometry)', (t) => {
3838
const obj0 = geom2.create([[[0, 0], [1, 0], [0, 1]]])
39-
const obj1 = geom3.fromPoints([[[0, 0, 0], [1, 0, 0], [1, 0, 1]]])
39+
const obj1 = geom3.fromVertices([[[0, 0, 0], [1, 0, 0], [1, 0, 1]]])
4040
const obj2 = path2.fromPoints({ closed: true }, [[0, 0], [1, 0], [1, 1]])
4141
const obj3 = poly3.create([[0, 0, 0], [1, 0, 0], [1, 1, 0]])
4242

packages/modeling/src/operations/booleans/intersectGeom3.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test('intersect: intersect of one or more geom3 objects produces expected geomet
1717

1818
// intersect of one object
1919
const result1 = intersect(geometry1)
20-
let obs = geom3.toPoints(result1)
20+
let obs = geom3.toVertices(result1)
2121
let exp = [
2222
[[2, 0, 0], [1.4142135623730951, -1.414213562373095, 0],
2323
[1.0000000000000002, -1, -1.414213562373095], [1.4142135623730951, 0, -1.414213562373095]],
@@ -78,7 +78,7 @@ test('intersect: intersect of one or more geom3 objects produces expected geomet
7878
const geometry2 = center({ relativeTo: [10, 10, 10] }, cuboid({ size: [4, 4, 4] }))
7979

8080
const result2 = intersect(geometry1, geometry2)
81-
obs = geom3.toPoints(result2)
81+
obs = geom3.toVertices(result2)
8282
t.notThrows(() => geom3.validate(result2))
8383
t.is(measureArea(result2), 0)
8484
t.is(measureVolume(result2), 0)
@@ -88,7 +88,7 @@ test('intersect: intersect of one or more geom3 objects produces expected geomet
8888
const geometry3 = cuboid({ size: [18, 18, 18] })
8989

9090
const result3 = intersect(geometry2, geometry3)
91-
obs = geom3.toPoints(result3)
91+
obs = geom3.toVertices(result3)
9292

9393
// the order changes based on the best plane chosen in Node.js
9494
exp = [
@@ -108,7 +108,7 @@ test('intersect: intersect of one or more geom3 objects produces expected geomet
108108

109109
// intersect of two completely overlapping objects
110110
const result4 = intersect(geometry1, geometry3)
111-
obs = geom3.toPoints(result4)
111+
obs = geom3.toVertices(result4)
112112
t.notThrows.skip(() => geom3.validate(result4))
113113
t.is(measureArea(result4), 44.053756306589825)
114114
t.is(measureVolume(result4), 25.751611331979678)

packages/modeling/src/operations/booleans/subtractGeom3.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test('subtract: subtract of one or more geom3 objects produces expected geometry
1717

1818
// subtract of one object
1919
const result1 = subtract(geometry1)
20-
let obs = geom3.toPoints(result1)
20+
let obs = geom3.toVertices(result1)
2121
let exp = [
2222
[[2, 0, 0], [1.4142135623730951, -1.414213562373095, 0],
2323
[1.0000000000000002, -1, -1.414213562373095], [1.4142135623730951, 0, -1.414213562373095]],
@@ -78,7 +78,7 @@ test('subtract: subtract of one or more geom3 objects produces expected geometry
7878
const geometry2 = center({ relativeTo: [10, 10, 10] }, cuboid({ size: [4, 4, 4] }))
7979

8080
const result2 = subtract(geometry1, geometry2)
81-
obs = geom3.toPoints(result2)
81+
obs = geom3.toVertices(result2)
8282
t.notThrows.skip(() => geom3.validate(result2))
8383
t.is(measureArea(result2), 44.053756306589825)
8484
t.is(measureVolume(result2), 25.751611331979678)
@@ -88,7 +88,7 @@ test('subtract: subtract of one or more geom3 objects produces expected geometry
8888
const geometry3 = cuboid({ size: [18, 18, 18] })
8989

9090
const result3 = subtract(geometry2, geometry3)
91-
obs = geom3.toPoints(result3)
91+
obs = geom3.toVertices(result3)
9292
exp = [
9393
[[12, 8, 8], [12, 12, 8], [12, 12, 12], [12, 8, 12]],
9494
[[8, 12, 8], [8, 12, 12], [12, 12, 12], [12, 12, 8]],
@@ -111,7 +111,7 @@ test('subtract: subtract of one or more geom3 objects produces expected geometry
111111

112112
// subtract of two completely overlapping objects
113113
const result4 = subtract(geometry1, geometry3)
114-
obs = geom3.toPoints(result4)
114+
obs = geom3.toVertices(result4)
115115
t.notThrows(() => geom3.validate(result4))
116116
t.is(measureArea(result4), 0)
117117
t.is(measureVolume(result4), 0)

packages/modeling/src/operations/booleans/unionGeom3.test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test('union of one or more geom3 objects produces expected geometry', (t) => {
1717

1818
// union of one object
1919
const result1 = union(geometry1)
20-
let obs = geom3.toPoints(result1)
20+
let obs = geom3.toVertices(result1)
2121
let exp = [
2222
[[2, 0, 0], [1.4142135623730951, -1.414213562373095, 0],
2323
[1.0000000000000002, -1, -1.414213562373095], [1.4142135623730951, 0, -1.414213562373095]],
@@ -78,7 +78,7 @@ test('union of one or more geom3 objects produces expected geometry', (t) => {
7878
const geometry2 = center({ relativeTo: [10, 10, 10] }, cuboid({ size: [4, 4, 4] }))
7979

8080
const result2 = union(geometry1, geometry2)
81-
obs = geom3.toPoints(result2)
81+
obs = geom3.toVertices(result2)
8282
t.notThrows.skip(() => geom3.validate(result2))
8383
t.is(measureArea(result2), 140.05375630658983)
8484
t.is(measureVolume(result2), 89.75161133197969)
@@ -88,7 +88,7 @@ test('union of one or more geom3 objects produces expected geometry', (t) => {
8888
const geometry3 = cuboid({ size: [18, 18, 18] })
8989

9090
const result3 = union(geometry2, geometry3)
91-
obs = geom3.toPoints(result3)
91+
obs = geom3.toVertices(result3)
9292
exp = [
9393
[[12, 8, 8], [12, 12, 8], [12, 12, 12], [12, 8, 12]],
9494
[[8, 12, 8], [8, 12, 12], [12, 12, 12], [12, 12, 8]],
@@ -117,7 +117,7 @@ test('union of one or more geom3 objects produces expected geometry', (t) => {
117117

118118
// union of two completely overlapping objects
119119
const result4 = union(geometry1, geometry3)
120-
obs = geom3.toPoints(result4)
120+
obs = geom3.toVertices(result4)
121121
exp = [
122122
[[-9, -9, -9], [-9, -9, 9], [-9, 9, 9], [-9, 9, -9]],
123123
[[9, -9, -9], [9, 9, -9], [9, 9, 9], [9, -9, 9]],
@@ -138,7 +138,7 @@ test('union of geom3 with rounding issues #137', (t) => {
138138
const geometry2 = center({ relativeTo: [0, 0, -4.400001] }, cuboid({ size: [44, 26, 1.8] })) // introduce precision error
139139

140140
const result = union(geometry1, geometry2)
141-
const pts = geom3.toPoints(result)
141+
const pts = geom3.toVertices(result)
142142
t.notThrows(() => geom3.validate(result))
143143
t.is(measureArea(result), 3240.00014)
144144
t.is(measureVolume(result), 7779.201144000001)

packages/modeling/src/operations/extrusions/extrudeFromSlices.test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test('extrudeFromSlices (defaults)', (t) => {
1717
const geometry2 = square({ size: 20 })
1818

1919
let geometry3 = extrudeFromSlices({ }, geometry2)
20-
let pts = geom3.toPoints(geometry3)
20+
let pts = geom3.toVertices(geometry3)
2121
const exp = [
2222
[[-10, -10, 0], [10, -10, 0], [10, -10, 1]],
2323
[[-10, -10, 0], [10, -10, 1], [-10, -10, 1]],
@@ -39,7 +39,7 @@ test('extrudeFromSlices (defaults)', (t) => {
3939

4040
const poly2 = poly3.create([[-10, -10, 0], [10, -10, 0], [10, 10, 0], [-10, 10, 0]])
4141
geometry3 = extrudeFromSlices({ }, poly2)
42-
pts = geom3.toPoints(geometry3)
42+
pts = geom3.toVertices(geometry3)
4343

4444
t.notThrows(() => geom3.validate(geometry3))
4545
t.is(measureArea(geometry3), 880)
@@ -75,7 +75,7 @@ test('extrudeFromSlices (torus)', (t) => {
7575
}
7676
}, hex
7777
)
78-
const pts = geom3.toPoints(geometry3)
78+
const pts = geom3.toVertices(geometry3)
7979
t.notThrows(() => geom3.validate(geometry3))
8080
t.is(measureArea(geometry3), 7070.694617452831)
8181
t.is(measureVolume(geometry3), 29393.876913398108)
@@ -96,7 +96,7 @@ test('extrudeFromSlices (same shape, changing dimensions)', (t) => {
9696
}
9797
}, base
9898
)
99-
const pts = geom3.toPoints(geometry3)
99+
const pts = geom3.toVertices(geometry3)
100100
// expected to throw because capEnd is false (non-closed geometry)
101101
t.throws(() => geom3.validate(geometry3))
102102
t.is(measureArea(geometry3), 53.70100297794013)
@@ -117,7 +117,7 @@ test('extrudeFromSlices (changing shape, changing dimensions)', (t) => {
117117
}
118118
}, base
119119
)
120-
const pts = geom3.toPoints(geometry3)
120+
const pts = geom3.toVertices(geometry3)
121121
t.notThrows.skip(() => geom3.validate(geometry3))
122122
t.is(measureArea(geometry3), 1965.8643589631802)
123123
t.is(measureVolume(geometry3), 5260.067107417433)
@@ -130,7 +130,7 @@ test('extrudeFromSlices (holes)', (t) => {
130130
[[-5, -5], [-5, 5], [5, 5], [5, -5]]
131131
])
132132
const geometry3 = extrudeFromSlices({ }, geometry2)
133-
const pts = geom3.toPoints(geometry3)
133+
const pts = geom3.toVertices(geometry3)
134134
const exp = [
135135
[[-10, 10, 0], [-10, -10, 0], [-10, -10, 1]],
136136
[[-10, 10, 0], [-10, -10, 1], [-10, 10, 1]],

packages/modeling/src/operations/extrusions/extrudeLinear.test.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test('extrudeLinear (defaults)', (t) => {
1818
const geometry2 = square({ size: 10 })
1919

2020
const geometry3 = extrudeLinear({ }, geometry2)
21-
const pts = geom3.toPoints(geometry3)
21+
const pts = geom3.toVertices(geometry3)
2222
const exp = [
2323
[[-5, -5, 0], [5, -5, 0], [5, -5, 1]],
2424
[[-5, -5, 0], [5, -5, 1], [-5, -5, 1]],
@@ -55,7 +55,7 @@ test('extrudeLinear (no twist)', (t) => {
5555
const geometry2 = square({ size: 10 })
5656

5757
let geometry3 = extrudeLinear({ height: 15 }, geometry2)
58-
let pts = geom3.toPoints(geometry3)
58+
let pts = geom3.toVertices(geometry3)
5959
let exp = [
6060
[[-5, -5, 0], [5, -5, 0], [5, -5, 15]],
6161
[[-5, -5, 0], [5, -5, 15], [-5, -5, 15]],
@@ -77,7 +77,7 @@ test('extrudeLinear (no twist)', (t) => {
7777
t.true(comparePolygonsAsPoints(pts, exp))
7878

7979
geometry3 = extrudeLinear({ height: -15 }, geometry2)
80-
pts = geom3.toPoints(geometry3)
80+
pts = geom3.toVertices(geometry3)
8181
exp = [
8282
[[-5, 5, 0], [5, 5, 0], [5, 5, -15]],
8383
[[-5, 5, 0], [5, 5, -15], [-5, 5, -15]],
@@ -103,7 +103,7 @@ test('extrudeLinear (twist)', (t) => {
103103
const geometry2 = square({ size: 10 })
104104

105105
let geometry3 = extrudeLinear({ height: 15, twistAngle: -TAU / 8 }, geometry2)
106-
let pts = geom3.toPoints(geometry3)
106+
let pts = geom3.toVertices(geometry3)
107107
let exp = [
108108
[[-5, -5, 0], [5, -5, 0], [4.440892098500626e-16, -7.0710678118654755, 15]],
109109
[[-5, -5, 0], [4.440892098500626e-16, -7.0710678118654755, 15], [-7.0710678118654755, -4.440892098500626e-16, 15]],
@@ -133,7 +133,7 @@ test('extrudeLinear (twist)', (t) => {
133133
t.true(comparePolygonsAsPoints(pts, exp))
134134

135135
geometry3 = extrudeLinear({ height: 15, twistAngle: TAU / 4, twistSteps: 3 }, geometry2)
136-
pts = geom3.toPoints(geometry3)
136+
pts = geom3.toVertices(geometry3)
137137
exp = [
138138
[[-5, -5, 0], [5, -5, 0], [6.830127018922193, -1.830127018922194, 5]],
139139
[[-5, -5, 0], [6.830127018922193, -1.830127018922194, 5], [-1.830127018922194, -6.830127018922193, 5]],
@@ -168,7 +168,7 @@ test('extrudeLinear (twist)', (t) => {
168168
t.true(comparePolygonsAsPoints(pts, exp))
169169

170170
geometry3 = extrudeLinear({ height: 15, twistAngle: TAU / 2, twistSteps: 30 }, geometry2)
171-
pts = geom3.toPoints(geometry3)
171+
pts = geom3.toVertices(geometry3)
172172
t.notThrows(() => geom3.validate(geometry3))
173173
t.is(measureArea(geometry3), 1091.9932843446968)
174174
t.is(measureVolume(geometry3), 1444.9967160503095)
@@ -181,7 +181,7 @@ test('extrudeLinear (holes)', (t) => {
181181
[[-2, -2], [-2, 2], [2, 2], [2, -2]]
182182
])
183183
const geometry3 = extrudeLinear({ height: 15 }, geometry2)
184-
const pts = geom3.toPoints(geometry3)
184+
const pts = geom3.toVertices(geometry3)
185185
const exp = [
186186
[[-5, 5, 0], [-5, -5, 0], [-5, -5, 15]],
187187
[[-5, 5, 0], [-5, -5, 15], [-5, 5, 15]],
@@ -227,7 +227,7 @@ test('extrudeLinear (path2)', (t) => {
227227
const geometry2 = path2.fromPoints({ closed: true }, [[6, 10], [0, 0], [12, 0]])
228228
const geometry3 = extrudeLinear({ height: 15 }, geometry2)
229229
t.notThrows(() => geom3.validate(geometry3))
230-
const pts = geom3.toPoints(geometry3)
230+
const pts = geom3.toVertices(geometry3)
231231
const exp = [
232232
[[6, 10, 0], [0, 0, 0], [0, 0, 15]],
233233
[[6, 10, 0], [0, 0, 15], [6, 10, 15]],

packages/modeling/src/operations/extrusions/extrudeRotate.test.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test('extrudeRotate: (defaults) extruding of a geom2 produces an expected geom3'
1818
const geometry2 = geom2.create([[[10, 8], [10, -8], [26, -8], [26, 8]]])
1919

2020
const geometry3 = extrudeRotate({ }, geometry2)
21-
const pts = geom3.toPoints(geometry3)
21+
const pts = geom3.toVertices(geometry3)
2222
t.notThrows(() => geom3.validate(geometry3))
2323
t.is(measureArea(geometry3), 7033.914479497244)
2424
t.is(measureVolume(geometry3), 27648.000000000007)
@@ -36,7 +36,7 @@ test('extrudeRotate: (angle) extruding of a geom2 produces an expected geom3', (
3636

3737
// test angle
3838
let geometry3 = extrudeRotate({ segments: 4, angle: TAU / 8 }, geometry2)
39-
let pts = geom3.toPoints(geometry3)
39+
let pts = geom3.toVertices(geometry3)
4040
const exp = [
4141
[[26, 0, 8], [26, 0, -8], [18.38477631085024, 18.384776310850235, -8]],
4242
[[26, 0, 8], [18.38477631085024, 18.384776310850235, -8], [18.38477631085024, 18.384776310850235, 8]],
@@ -58,14 +58,14 @@ test('extrudeRotate: (angle) extruding of a geom2 produces an expected geom3', (
5858
t.true(comparePolygonsAsPoints(pts, exp))
5959

6060
geometry3 = extrudeRotate({ segments: 4, angle: -250 * 0.017453292519943295 }, geometry2)
61-
pts = geom3.toPoints(geometry3)
61+
pts = geom3.toVertices(geometry3)
6262
t.notThrows(() => geom3.validate(geometry3))
6363
t.is(measureArea(geometry3), 4525.850393739846)
6464
t.is(measureVolume(geometry3), 13730.527057424617)
6565
t.is(pts.length, 28)
6666

6767
geometry3 = extrudeRotate({ segments: 4, angle: 250 * 0.017453292519943295 }, geometry2)
68-
pts = geom3.toPoints(geometry3)
68+
pts = geom3.toVertices(geometry3)
6969
t.notThrows(() => geom3.validate(geometry3))
7070
t.is(measureArea(geometry3), 4525.8503937398455)
7171
t.is(measureVolume(geometry3), 13730.527057424617)
@@ -77,7 +77,7 @@ test('extrudeRotate: (startAngle) extruding of a geom2 produces an expected geom
7777

7878
// test startAngle
7979
let geometry3 = extrudeRotate({ segments: 5, startAngle: TAU / 8 }, geometry2)
80-
let pts = geom3.toPoints(geometry3)
80+
let pts = geom3.toVertices(geometry3)
8181
let exp = [
8282
[7.0710678118654755, 7.071067811865475, 8],
8383
[18.38477631085024, 18.384776310850235, 8],
@@ -90,7 +90,7 @@ test('extrudeRotate: (startAngle) extruding of a geom2 produces an expected geom
9090
t.true(comparePoints(pts[6], exp))
9191

9292
geometry3 = extrudeRotate({ segments: 5, startAngle: -TAU / 8 }, geometry2)
93-
pts = geom3.toPoints(geometry3)
93+
pts = geom3.toVertices(geometry3)
9494
exp = [
9595
[7.0710678118654755, -7.071067811865475, 8],
9696
[18.38477631085024, -18.384776310850235, 8],
@@ -108,14 +108,14 @@ test('extrudeRotate: (segments) extruding of a geom2 produces an expected geom3'
108108

109109
// test segments
110110
let geometry3 = extrudeRotate({ segments: 4 }, geometry2)
111-
let pts = geom3.toPoints(geometry3)
111+
let pts = geom3.toVertices(geometry3)
112112
t.notThrows(() => geom3.validate(geometry3))
113113
t.is(measureArea(geometry3), 5562.34804770761)
114114
t.is(measureVolume(geometry3), 18432)
115115
t.is(pts.length, 32)
116116

117117
geometry3 = extrudeRotate({ segments: 64 }, geometry2)
118-
pts = geom3.toPoints(geometry3)
118+
pts = geom3.toVertices(geometry3)
119119
t.notThrows(() => geom3.validate(geometry3))
120120
t.is(measureArea(geometry3), 7230.965353920782)
121121
t.is(measureVolume(geometry3), 28906.430888871357)
@@ -124,7 +124,7 @@ test('extrudeRotate: (segments) extruding of a geom2 produces an expected geom3'
124124
// test overlapping edges
125125
geometry2 = geom2.create([[[0, 0], [2, 1], [1, 2], [1, 3], [3, 4], [0, 5]]])
126126
geometry3 = extrudeRotate({ segments: 8 }, geometry2)
127-
pts = geom3.toPoints(geometry3)
127+
pts = geom3.toVertices(geometry3)
128128
t.notThrows(() => geom3.validate(geometry3))
129129
t.is(measureArea(geometry3), 84.28200374166053)
130130
t.is(measureVolume(geometry3), 33.94112549695427)
@@ -133,7 +133,7 @@ test('extrudeRotate: (segments) extruding of a geom2 produces an expected geom3'
133133
// test overlapping edges that produce hollow shape
134134
geometry2 = geom2.create([[[30, 0], [30, 60], [0, 60], [0, 50], [10, 40], [10, 30], [0, 20], [0, 10], [10, 0]]])
135135
geometry3 = extrudeRotate({ segments: 8 }, geometry2)
136-
pts = geom3.toPoints(geometry3)
136+
pts = geom3.toVertices(geometry3)
137137
t.notThrows(() => geom3.validate(geometry3))
138138
t.is(measureArea(geometry3), 17692.315375839215)
139139
t.is(measureVolume(geometry3), 147078.2104868019)
@@ -145,7 +145,7 @@ test('extrudeRotate: (overlap +/-) extruding of a geom2 produces an expected geo
145145
let geometry = geom2.create([[[-1, 8], [-1, -8], [7, -8], [7, 8]]])
146146

147147
let obs = extrudeRotate({ segments: 4, angle: TAU / 4 }, geometry)
148-
let pts = geom3.toPoints(obs)
148+
let pts = geom3.toVertices(obs)
149149
let exp = [
150150
[[0, 0, 8], [7, 0, 8], [0, 7, 8]],
151151
[[7, 0, 8], [7, 0, -8], [0, 7, -8]],
@@ -166,7 +166,7 @@ test('extrudeRotate: (overlap +/-) extruding of a geom2 produces an expected geo
166166
geometry = geom2.create([[[-1, 8], [-2, 4], [-1, -8], [7, -8], [7, 8]]])
167167

168168
obs = extrudeRotate({ segments: 8, angle: TAU / 4 }, geometry)
169-
pts = geom3.toPoints(obs)
169+
pts = geom3.toVertices(obs)
170170
exp = [
171171
[[2, 0, 4], [1, 0, -8], [0.7071067811865476, 0.7071067811865475, -8]],
172172
[[2, 0, 4], [0.7071067811865476, 0.7071067811865475, -8], [1.4142135623730951, 1.414213562373095, 4]],

0 commit comments

Comments
 (0)