Compare commits
833
Commits
v0.4.0
...
4e0601611c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e0601611c | ||
|
|
07708a4e2a | ||
|
|
a4c4b411e5 | ||
|
|
5eb7640b54 | ||
|
|
003abc2149 | ||
|
|
136a3e9a2f | ||
|
|
e70bd52409 | ||
|
|
132b63d24d | ||
|
|
72b7fc385b | ||
|
|
292747e50b | ||
|
|
2e4266cb0a | ||
|
|
b685b7301f | ||
|
|
8f768b65c8 | ||
|
|
932efbf341 | ||
|
|
b8d7b42808 | ||
|
|
a8e8d82f90 | ||
|
|
33cd031701 | ||
|
|
6422ef84d5 | ||
|
|
7c9f8a5895 | ||
|
|
36b6496ad5 | ||
|
|
48986041ed | ||
|
|
c39bd23d07 | ||
|
|
a33c5a7861 | ||
|
|
5c95b0496d | ||
|
|
72aa77dabd | ||
|
|
243db6cb8f | ||
|
|
83c31d77c4 | ||
|
|
ae6a33bf96 | ||
|
|
675c865431 | ||
|
|
2f31138f9d | ||
|
|
8c503ad1be | ||
|
|
dc40f051b1 | ||
|
|
712b427a9c | ||
|
|
e48e553758 | ||
|
|
dc8edead22 | ||
|
|
2acc344aa4 | ||
|
|
487aa64e10 | ||
|
|
180e62c981 | ||
|
|
11a196e6f8 | ||
|
|
a11446fd17 | ||
|
|
7a3221d2dd | ||
|
|
e8776d8583 | ||
|
|
cb857f1fa7 | ||
|
|
e347f820e6 | ||
|
|
6597ffe072 | ||
|
|
4a70c03deb | ||
|
|
f480898158 | ||
|
|
9be8bb5e6b | ||
|
|
843fa0dac6 | ||
|
|
2c924fd385 | ||
|
|
8be736c33e | ||
|
|
f3494efbbb | ||
|
|
6fe16b790b | ||
|
|
979614e60f | ||
|
|
8a31738fe5 | ||
|
|
f7343e9161 | ||
|
|
72145d4aba | ||
|
|
a6eeb88de0 | ||
|
|
49dda52d09 | ||
|
|
09b3bd0e01 | ||
|
|
c4d2ae87ee | ||
|
|
30ca43de7d | ||
|
|
8a2d142333 | ||
|
|
0a66697da8 | ||
|
|
a000bd69cf | ||
|
|
40abcbc8cf | ||
|
|
b6f9b1deac | ||
|
|
b04e0801d6 | ||
|
|
d1b96100d3 | ||
|
|
2f24878bb0 | ||
|
|
b64edf15d3 | ||
|
|
87d4eb55e5 | ||
|
|
78c6364b02 | ||
|
|
b7eac9220b | ||
|
|
4193ea26ac | ||
|
|
40bdc1132e | ||
|
|
e052d19879 | ||
|
|
fbc00bb2c4 | ||
|
|
6bde126a5c | ||
|
|
7d44359cf6 | ||
|
|
29dfa6bd32 | ||
|
|
8c58efdecf | ||
|
|
44732f8b40 | ||
|
|
3fe6bacea0 | ||
|
|
39758b0cc4 | ||
|
|
172782705a | ||
|
|
186555dbe9 | ||
|
|
fd073620ae | ||
|
|
e49770bd24 | ||
|
|
ccd0b5aab8 | ||
|
|
09188c4586 | ||
|
|
f4ed349410 | ||
|
|
aa9119f922 | ||
|
|
9c07bdd823 | ||
|
|
67d4628753 | ||
|
|
64235ab12a | ||
|
|
c9b8267b9e | ||
|
|
a5003da9d7 | ||
|
|
ff7f3204d5 | ||
|
|
a2245b2f51 | ||
|
|
3eae8c34f6 | ||
|
|
c38992fc09 | ||
|
|
962070e955 | ||
|
|
713111d9df | ||
|
|
2831426c51 | ||
|
|
9ce940b0b1 | ||
|
|
9a4d936b7b | ||
|
|
cd9db57366 | ||
|
|
39850fb6ab | ||
|
|
3689f0d6e5 | ||
|
|
ddc6aa6301 | ||
|
|
7f2ae11a06 | ||
|
|
15a13e2452 | ||
|
|
98ce6a4ee8 | ||
|
|
7ba2d5db47 | ||
|
|
0292fa35e6 | ||
|
|
daf1dc4201 | ||
|
|
221e841d32 | ||
|
|
2abf4e5a7d | ||
|
|
f3b5846e6b | ||
|
|
337564190b | ||
|
|
f350c35414 | ||
|
|
64966bab88 | ||
|
|
fb23bab9af | ||
|
|
ef3bdd3433 | ||
|
|
c599238653 | ||
|
|
a6ca2e8ca1 | ||
|
|
f1183bcd21 | ||
|
|
81ac571fa2 | ||
|
|
dece550164 | ||
|
|
8a03355d2b | ||
|
|
31b73473e9 | ||
|
|
0e1cd4c178 | ||
|
|
c28b7a6229 | ||
|
|
b3d63004f2 | ||
|
|
6be3a5ab90 | ||
|
|
9ec7caf9e6 | ||
|
|
37496198bf | ||
|
|
9de0b9d1f1 | ||
|
|
649ad39a81 | ||
|
|
1ef079dc0a | ||
|
|
8390a31531 | ||
|
|
b53f6bad52 | ||
|
|
eb6abecc3d | ||
|
|
ae92d0238d | ||
|
|
d357bd2073 | ||
|
|
c5f3515073 | ||
|
|
c7bb64dd74 | ||
|
|
bb13799246 | ||
|
|
04b4381b54 | ||
|
|
920ea42fe1 | ||
|
|
8907da5e86 | ||
|
|
a9413fe385 | ||
|
|
45ae1bef95 | ||
|
|
6496ec86ec | ||
|
|
ff7c899840 | ||
|
|
19be7d27e7 | ||
|
|
31b2ddc0cf | ||
|
|
e2667b749d | ||
|
|
da65b4fc8c | ||
|
|
741265f214 | ||
|
|
74ce904142 | ||
|
|
a8a3cea1d0 | ||
|
|
f96aaa2a98 | ||
|
|
53ae46e6b5 | ||
|
|
3f81495514 | ||
|
|
c34e607f5b | ||
|
|
3128762014 | ||
|
|
b25e9c75aa | ||
|
|
7119d60d9d | ||
|
|
f5871608f4 | ||
|
|
8fdf6a61a2 | ||
|
|
8a055afdd6 | ||
|
|
bf4551159e | ||
|
|
6b9501f442 | ||
|
|
7f9074d65c | ||
|
|
201e055259 | ||
|
|
a16226288f | ||
|
|
6232fa33c2 | ||
|
|
88f76adbc2 | ||
|
|
bba03803b7 | ||
|
|
4bacd0cae0 | ||
|
|
3501fa2c54 | ||
|
|
77b33efd8f | ||
|
|
37ebe24839 | ||
|
|
54925cdcd5 | ||
|
|
77bdef2f64 | ||
|
|
2c020dbcbc | ||
|
|
1ded8fdd27 | ||
|
|
4a4911b473 | ||
|
|
737c9358d0 | ||
|
|
dd5278a402 | ||
|
|
838d0e86f2 | ||
|
|
d84d8c3222 | ||
|
|
9194f4be09 | ||
|
|
bcacb7066d | ||
|
|
2ae21143ee | ||
|
|
8207f29fc0 | ||
|
|
45742f79e4 | ||
|
|
04a0283082 | ||
|
|
650ba567e7 | ||
|
|
374ec83505 | ||
|
|
4d58d3bbca | ||
|
|
e93f8c1b84 | ||
|
|
bbd4f29ebb | ||
|
|
3126962cd4 | ||
|
|
64b0b674d2 | ||
|
|
3087363c44 | ||
|
|
d5640b5efb | ||
|
|
9b2a40781c | ||
|
|
9d82b94469 | ||
|
|
a9beb437b3 | ||
|
|
db1fd39139 | ||
|
|
07da7f8065 | ||
|
|
7f79443b46 | ||
|
|
9bb65b4d68 | ||
|
|
18ec44d773 | ||
|
|
9422853cf9 | ||
|
|
f57a62deb7 | ||
|
|
61678654c2 | ||
|
|
25c89a706e | ||
|
|
26bf1af93b | ||
|
|
3707a67cee | ||
|
|
571122c4ba | ||
|
|
dcffab09b1 | ||
|
|
6f270f6259 | ||
|
|
dc6eca6830 | ||
|
|
d29ca29578 | ||
|
|
5e9285ca75 | ||
|
|
371578a06f | ||
|
|
44968dbfe6 | ||
|
|
3333f8a62b | ||
|
|
42d4ebeb16 | ||
|
|
d624e0a171 | ||
|
|
3fe929e91c | ||
|
|
c419dec76c | ||
|
|
f91103c51d | ||
|
|
ac3a25fb5b | ||
|
|
8f5073ff14 | ||
|
|
c5b7009ce3 | ||
|
|
f98c5e350d | ||
|
|
2e5b7b11e4 | ||
|
|
6c1a898e3d | ||
|
|
4d862cd76c | ||
|
|
baf44657c1 | ||
|
|
fdb059cfed | ||
|
|
716107f0e4 | ||
|
|
6220d8f8a6 | ||
|
|
c01a7b9b37 | ||
|
|
556e424bb2 | ||
|
|
ce96e625b4 | ||
|
|
5cfcf7fd03 | ||
|
|
fac3f96bdd | ||
|
|
77bdcc47e9 | ||
|
|
987f0be21e | ||
|
|
bd17eeef0c | ||
|
|
e21c5f06ac | ||
|
|
904bf19e83 | ||
|
|
7ef78f960a | ||
|
|
a422fb1a4b | ||
|
|
daf618c344 | ||
|
|
5165e428cd | ||
|
|
1a0b33fcf3 | ||
|
|
48322f6464 | ||
|
|
5c0351b1f4 | ||
|
|
b20fd3d9d6 | ||
|
|
63accec16e | ||
|
|
d188eea1f4 | ||
|
|
2141a3802a | ||
|
|
723c7b61c4 | ||
|
|
1a55241882 | ||
|
|
b562ab51e1 | ||
|
|
105a3146c0 | ||
|
|
f08ed74617 | ||
|
|
342305705d | ||
|
|
a6742180a9 | ||
|
|
abb15e4b0e | ||
|
|
584bbe923d | ||
|
|
9a07932f20 | ||
|
|
067f2642c2 | ||
|
|
af771b9ceb | ||
|
|
4cbf9cf607 | ||
|
|
c361630954 | ||
|
|
845f4913cf | ||
|
|
78242d67d1 | ||
|
|
2b45635d73 | ||
|
|
4097ac0131 | ||
|
|
96d1ad0ab2 | ||
|
|
3d914c9f15 | ||
|
|
1b5c2b5847 | ||
|
|
7160ff7beb | ||
|
|
b400958c3e | ||
|
|
1c9d6617ad | ||
|
|
f7967b1ff6 | ||
|
|
a519f3cf74 | ||
|
|
b44ada89e5 | ||
|
|
6128a20c5f | ||
|
|
73493b94c3 | ||
|
|
061c0f3333 | ||
|
|
3dd8e2d176 | ||
|
|
a13124acdd | ||
|
|
5823900439 | ||
|
|
843c548589 | ||
|
|
7934edcad4 | ||
|
|
b56648c055 | ||
|
|
6b30326e6d | ||
|
|
39f6d68a50 | ||
|
|
5fbbc13885 | ||
|
|
b6806b16cf | ||
|
|
e20cf1858a | ||
|
|
6ad391fd75 | ||
|
|
2d069ca186 | ||
|
|
02fe495d38 | ||
|
|
1e984c8e46 | ||
|
|
a47e82ba94 | ||
|
|
be985f136d | ||
|
|
e8e2ccc8a9 | ||
|
|
4e10c31fdd | ||
|
|
3047aa60cd | ||
|
|
f0c5bfcdf2 | ||
|
|
d8a088f46a | ||
|
|
17b48d9e7e | ||
|
|
56747edb46 | ||
|
|
aa31e56477 | ||
|
|
ef53bc46f3 | ||
|
|
8b7fa2602e | ||
|
|
fd422a3fc1 | ||
|
|
e382a77350 | ||
|
|
a18bedddf6 | ||
|
|
29e72806f6 | ||
|
|
fb55c1341a | ||
|
|
d4ab9545a1 | ||
|
|
c2ba3657f3 | ||
|
|
d0a4443939 | ||
|
|
2bfec256b7 | ||
|
|
e8c340c59d | ||
|
|
20a7dd8764 | ||
|
|
3fa8fbd162 | ||
|
|
27529d9742 | ||
|
|
d43c414b7b | ||
|
|
8b97b9ed62 | ||
|
|
4c7ea34a68 | ||
|
|
b156b5e09c | ||
|
|
4823c293dd | ||
|
|
762b6fe934 | ||
|
|
073acd295b | ||
|
|
1744fbb262 | ||
|
|
c36a6f9f90 | ||
|
|
6eaf7458ab | ||
|
|
ad30a2350e | ||
|
|
4b3b48388c | ||
|
|
0d99d33c38 | ||
|
|
bbfad166b0 | ||
|
|
e95e32d72a | ||
|
|
6fa9e0d2dd | ||
|
|
8a6332be83 | ||
|
|
4674f0a61c | ||
|
|
6fbb1c5d91 | ||
|
|
d05fe3d4de | ||
|
|
56622e4be8 | ||
|
|
4dc638109b | ||
|
|
d7a4a29ce3 | ||
|
|
9fbbf8dc3a | ||
|
|
5fa8e7d60a | ||
|
|
0872eb959a | ||
|
|
3e13eb6392 | ||
|
|
6f115ad740 | ||
|
|
b3df2c382b | ||
|
|
d824d36821 | ||
|
|
849426e866 | ||
|
|
0ee5e97db5 | ||
|
|
81d9b7e04a | ||
|
|
6ef0b22118 | ||
|
|
873a65fd4d | ||
|
|
1473893b08 | ||
|
|
96356dc544 | ||
|
|
50c5c13f72 | ||
|
|
7195e323bf | ||
|
|
fd19efc6fc | ||
|
|
9eddb1cbd3 | ||
|
|
47517578a8 | ||
|
|
d6f167a88a | ||
|
|
af2f09fac2 | ||
|
|
7391e8ed75 | ||
|
|
1ec33fcdc7 | ||
|
|
faeeff1c64 | ||
|
|
ee9b4b9fb1 | ||
|
|
8535d229ff | ||
|
|
5c2fa3e9ca | ||
|
|
464a6dfad4 | ||
|
|
a026a69182 | ||
|
|
406293fd53 | ||
|
|
bd8db8ea1c | ||
|
|
b4edf05373 | ||
|
|
41f0c3d0c6 | ||
|
|
784648af2a | ||
|
|
38bd16713f | ||
|
|
b1695873f5 | ||
|
|
c008addae2 | ||
|
|
9dc12b4d0f | ||
|
|
2a4907884b | ||
|
|
ed22d663e4 | ||
|
|
d73cd8a177 | ||
|
|
c159a3e277 | ||
|
|
16c49c3e86 | ||
|
|
734f69ad72 | ||
|
|
2e7f41710b | ||
|
|
5c6f70cc00 | ||
|
|
2cab09f65b | ||
|
|
861ab027b6 | ||
|
|
9935133b56 | ||
|
|
a261aaa841 | ||
|
|
e4ef6cfe29 | ||
|
|
1cc65cbc91 | ||
|
|
099d7e298a | ||
|
|
a629236650 | ||
|
|
a4a8b48567 | ||
|
|
78079587ad | ||
|
|
01b1b70586 | ||
|
|
5744b1f327 | ||
|
|
1a67390a53 | ||
|
|
1337404c06 | ||
|
|
8f081679bc | ||
|
|
beb3ea01e7 | ||
|
|
c715986a2a | ||
|
|
d20b0fab65 | ||
|
|
0ddd660089 | ||
|
|
b6e87f0c44 | ||
|
|
731629a422 | ||
|
|
f6a47a49d7 | ||
|
|
289b521a65 | ||
|
|
771a11feab | ||
|
|
95ea05e7c8 | ||
|
|
241dac1542 | ||
|
|
cccbe1255d | ||
|
|
4e74fea3e5 | ||
|
|
229de1484c | ||
|
|
e3459edea8 | ||
|
|
e519fbd14d | ||
|
|
575c037f39 | ||
|
|
a6fbc63746 | ||
|
|
fd12325d90 | ||
|
|
39bc87a8cc | ||
|
|
9b0f028f13 | ||
|
|
764fcaa5a8 | ||
|
|
9a4e8fbd19 | ||
|
|
4cfa9c5d34 | ||
|
|
e489e56f3d | ||
|
|
c3aae64a63 | ||
|
|
c469adf456 | ||
|
|
6de8f6db95 | ||
|
|
37547f8eba | ||
|
|
f425089983 | ||
|
|
94faf9ce1b | ||
|
|
2e6951135a | ||
|
|
2c754c430b | ||
|
|
8f48544021 | ||
|
|
1a456d2d1f | ||
|
|
f79dfe41b6 | ||
|
|
6ebfcd16b6 | ||
|
|
ed943a74e6 | ||
|
|
aa2ace81af | ||
|
|
3dbdb71e59 | ||
|
|
c26da73f5f | ||
|
|
805ea45be6 | ||
|
|
54a8c807bf | ||
|
|
d399effbf7 | ||
|
|
8ea1fd643f | ||
|
|
563bcaff5b | ||
|
|
6df69e9def | ||
|
|
86ea018d05 | ||
|
|
110d00d07e | ||
|
|
d4a7b3abf3 | ||
|
|
a8258eb63a | ||
|
|
1e1722b7e1 | ||
|
|
fbd8ada754 | ||
|
|
d019f2d5bf | ||
|
|
ec64564f21 | ||
|
|
a6928abf48 | ||
|
|
88432d226a | ||
|
|
1ac8bf4aa8 | ||
|
|
dde6d48dd0 | ||
|
|
4dbc0efff9 | ||
|
|
d114c58540 | ||
|
|
b15180bdff | ||
|
|
37113c0c13 | ||
|
|
f2d7b220f7 | ||
|
|
14d928b2c8 | ||
|
|
435ad0fd8c | ||
|
|
7879875d49 | ||
|
|
ec8e739aad | ||
|
|
08b6a8fe0f | ||
|
|
cf93869c4d | ||
|
|
75f1cdd4c9 | ||
|
|
b5efde94c8 | ||
|
|
0897ee3781 | ||
|
|
52fb5ac0e6 | ||
|
|
377e12a059 | ||
|
|
3256fffe35 | ||
|
|
0f4cda0510 | ||
|
|
3341e2d60b | ||
|
|
35e58d18ed | ||
|
|
32d3cf6877 | ||
|
|
27374ca289 | ||
|
|
d506382aca | ||
|
|
626fe6fdee | ||
|
|
01f2c78cd1 | ||
|
|
9ca7d307a4 | ||
|
|
2f91338d3d | ||
|
|
dfbf7dd6a8 | ||
|
|
cf9d7772f1 | ||
|
|
6e84c03946 | ||
|
|
3669d4b3d0 | ||
|
|
345c0882cd | ||
|
|
18347b3d0d | ||
|
|
ac84491638 | ||
|
|
6a67cc8f1e | ||
|
|
6cb3025b72 | ||
|
|
b34d45233d | ||
|
|
47a7f29485 | ||
|
|
9c51f9d433 | ||
|
|
4687e3b073 | ||
|
|
1ff16cc72b | ||
|
|
813bee8914 | ||
|
|
482abb4562 | ||
|
|
7bed28752e | ||
|
|
ea23401710 | ||
|
|
9f76cca8b4 | ||
|
|
d5ff5ea1a5 | ||
|
|
ce902be66c | ||
|
|
63095fedb3 | ||
|
|
00fdcf3e72 | ||
|
|
774a8b1d9a | ||
|
|
97ff7578c2 | ||
|
|
19bf854dc9 | ||
|
|
f204042bf2 | ||
|
|
4bea4c7785 | ||
|
|
09b5da3e9f | ||
|
|
a2c7396160 | ||
|
|
45f92277cb | ||
|
|
587cf865b8 | ||
|
|
c1c813e572 | ||
|
|
7498e3b367 | ||
|
|
f037c92370 | ||
|
|
2b70ed7b72 | ||
|
|
15b5b51bf5 | ||
|
|
abddd67d22 | ||
|
|
78d9aa0153 | ||
|
|
17db109c5d | ||
|
|
d2e409f40c | ||
|
|
8746376ee9 | ||
|
|
5808bcc0f0 | ||
|
|
d23593d3eb | ||
|
|
897b7d93b5 | ||
|
|
7c85970bfc | ||
|
|
8fb5742706 | ||
|
|
aba57f1ca2 | ||
|
|
57d738eac4 | ||
|
|
3f1c023563 | ||
|
|
7da7bbb335 | ||
|
|
2eb292dd4a | ||
|
|
b41ad23e3f | ||
|
|
2dcfea8df7 | ||
|
|
7135407268 | ||
|
|
5f7ce80a93 | ||
|
|
fdaf57daa3 | ||
|
|
7eac1de9ee | ||
|
|
fe07f79387 | ||
|
|
b52d4390a0 | ||
|
|
c616f50bd0 | ||
|
|
6c61442bb2 | ||
|
|
c333889fc0 | ||
|
|
648f0ff768 | ||
|
|
eaab205302 | ||
|
|
eea49922bd | ||
|
|
dd7790a43f | ||
|
|
fe3717f2e4 | ||
|
|
d9237d004e | ||
|
|
d8d54ded0d | ||
|
|
95d394dcab | ||
|
|
7ee351dc91 | ||
|
|
9297f81501 | ||
|
|
2afc10fbd5 | ||
|
|
5c98c1e24a | ||
|
|
0040ce6bf2 | ||
|
|
1f7f37d1ef | ||
|
|
96f6424aec | ||
|
|
3d3f9b626f | ||
|
|
c3ebe13991 | ||
|
|
b69cd2d0b7 | ||
|
|
753b0a2eab | ||
|
|
b702f0efde | ||
|
|
152418b624 | ||
|
|
e99b3bd4e8 | ||
|
|
8319c35a32 | ||
|
|
c3e0ea498a | ||
|
|
b6e3a6c366 | ||
|
|
4d8c80a86d | ||
|
|
ec5d7f9789 | ||
|
|
69050c81d9 | ||
|
|
53238fba5f | ||
|
|
5d661fa2af | ||
|
|
ff7a347013 | ||
|
|
534393ed5a | ||
|
|
200a83a629 | ||
|
|
d302aa1a00 | ||
|
|
9184994721 | ||
|
|
d2676da789 | ||
|
|
6a6a7e2865 | ||
|
|
3ea8562c5e | ||
|
|
e540832626 | ||
|
|
8dd583930e | ||
|
|
9bb18842e9 | ||
|
|
9cabc3532d | ||
|
|
bdcfe3ff1d | ||
|
|
dbfb689f6c | ||
|
|
17b4b9a32c | ||
|
|
c8d668108a | ||
|
|
dd084ec9e1 | ||
|
|
bfbf5f9432 | ||
|
|
facff1050e | ||
|
|
de1479029d | ||
|
|
16766bdbc7 | ||
|
|
d4fd760b0d | ||
|
|
d437c21368 | ||
|
|
a8b3b21fd0 | ||
|
|
be55a49b04 | ||
|
|
293d660d6c | ||
|
|
beca7eb126 | ||
|
|
1a0100cdd9 | ||
|
|
5267c96ab2 | ||
|
|
159f9913c1 | ||
|
|
dfa9e094cd | ||
|
|
8cdefd4cd5 | ||
|
|
7b0a1b296c | ||
|
|
25a3dc501b | ||
|
|
a3dfbaa0b0 | ||
|
|
58af8accfa | ||
|
|
4a989f6e2d | ||
|
|
aae70053ee | ||
|
|
9b5e39844a | ||
|
|
1d30e4e1d2 | ||
|
|
1a5e961362 | ||
|
|
ff609bc320 | ||
|
|
62a7f903f2 | ||
|
|
11c03fb0ab | ||
|
|
6f4a9d96fb | ||
|
|
4112189551 | ||
|
|
2bb24d1d2a | ||
|
|
a1cb8d4d36 | ||
|
|
a513304917 | ||
|
|
d7f5b2435e | ||
|
|
ce5762d873 | ||
|
|
831fa34752 | ||
|
|
11084a5963 | ||
|
|
2c4d197bf4 | ||
|
|
4ff8f3e14d | ||
|
|
eac4d66adc | ||
|
|
cb071bb93b | ||
|
|
0e500cacd3 | ||
|
|
1e4387f3ea | ||
|
|
9ba72e118b | ||
|
|
add4a18961 | ||
|
|
17e42e7b94 | ||
|
|
812669e861 | ||
|
|
c166c64b8e | ||
|
|
0b1e61504d | ||
|
|
7249623855 | ||
|
|
7b34d57b25 | ||
|
|
aa24d9f071 | ||
|
|
319d360c85 | ||
|
|
e10b0b7d22 | ||
|
|
d1a773a684 | ||
|
|
fe1e5f1b95 | ||
|
|
1e18ca9a46 | ||
|
|
5ef1dcba8e | ||
|
|
e30f3c9ebe | ||
|
|
738d532ce6 | ||
|
|
434fbc2d73 | ||
|
|
302dd7e343 | ||
|
|
d2086835c1 | ||
|
|
f5ae72057d | ||
|
|
29258767ce | ||
|
|
392fae1af4 | ||
|
|
8be0f64f5a | ||
|
|
9f6fb735dd | ||
|
|
46e21127dd | ||
|
|
90869732a3 | ||
|
|
24cff445ad | ||
|
|
bb60a95289 | ||
|
|
8d58e3b9f9 | ||
|
|
f0d80a1d7e | ||
|
|
0f0bb09858 | ||
|
|
6d5df4b9b3 | ||
|
|
27f20f97cb | ||
|
|
e67cc0c747 | ||
|
|
bcbfa50eac | ||
|
|
24974e6f37 | ||
|
|
bf962a9989 | ||
|
|
04cfb74c5e | ||
|
|
14635e5d3a | ||
|
|
a2f31f683d | ||
|
|
9089edfb71 | ||
|
|
a4ca1b68db | ||
|
|
94ab54d1f5 | ||
|
|
9e2a1eb993 | ||
|
|
abff7a49bb | ||
|
|
651e8e0853 | ||
|
|
4a86ad5a7c | ||
|
|
5ad8b3966f | ||
|
|
dc060f8b86 | ||
|
|
9c94e1b96d | ||
|
|
2aff1c5303 | ||
|
|
135a63f549 | ||
|
|
2a434d59c3 | ||
|
|
083ddf7722 | ||
|
|
db02a18627 | ||
|
|
c727e2d0c2 | ||
|
|
f9c19ade16 | ||
|
|
711e5508b5 | ||
|
|
913583bfee | ||
|
|
1abd989a67 | ||
|
|
b1740aeee5 | ||
|
|
736d9277b8 | ||
|
|
9283d2b5bb | ||
|
|
c1cd4cf194 | ||
|
|
1a6ff0954e | ||
|
|
88e9661457 | ||
|
|
7a8754bef7 | ||
|
|
6441621b8b | ||
|
|
d7797c3d38 | ||
|
|
b11841b0bc | ||
|
|
a8121215bc | ||
|
|
a69c2928f0 | ||
|
|
7d00df0a3f | ||
|
|
69e54f85d2 | ||
|
|
bf2a9f5541 | ||
|
|
d6af554c6d | ||
|
|
c2a9c71436 | ||
|
|
f93577ad70 | ||
|
|
9f88537927 | ||
|
|
3159fc0dd0 | ||
|
|
340ac0313a | ||
|
|
bb431f7ac2 | ||
|
|
2f7046efac | ||
|
|
aaeb7ceea7 | ||
|
|
10c6b865c7 | ||
|
|
a9879fa668 | ||
|
|
45bc22fc30 | ||
|
|
4aaa5457b3 | ||
|
|
1fd4a2f782 | ||
|
|
00baf1d883 | ||
|
|
91de39d3fe | ||
|
|
219816d282 | ||
|
|
2880525e6b | ||
|
|
aa156f4a9f | ||
|
|
ccc36dc1f9 | ||
|
|
0fe032438f | ||
|
|
72c5d974b8 | ||
|
|
201e9d5f9f | ||
|
|
af0440aaab | ||
|
|
49956c2797 | ||
|
|
b24e478bc1 | ||
|
|
9ab25cfd4a | ||
|
|
1ae6e9beb4 | ||
|
|
fc1d70cc3b | ||
|
|
dd67472252 | ||
|
|
9062c739d8 | ||
|
|
fb4c1d74b9 | ||
|
|
0dee9deec1 | ||
|
|
722bd007c8 | ||
|
|
9e60080b10 | ||
|
|
455ca86a6c | ||
|
|
6fde5ff55b | ||
|
|
7f92093cc8 | ||
|
|
ddd528abaf | ||
|
|
5c7149e57d | ||
|
|
809ecf781e | ||
|
|
01bf0e4eaf | ||
|
|
0d995c6a78 | ||
|
|
006a23a767 | ||
|
|
8e0c3d2794 | ||
|
|
f34ac5881f | ||
|
|
f290382498 | ||
|
|
deb96318a1 | ||
|
|
11ecb64059 | ||
|
|
1d7450b04c | ||
|
|
968a22897c | ||
|
|
0154572580 | ||
|
|
0bb5b7eb09 | ||
|
|
b447adafaa | ||
|
|
3938e267bb | ||
|
|
daed2686bc | ||
|
|
cddbfedb28 | ||
|
|
e56e055fa1 | ||
|
|
296683229d | ||
|
|
27415e4dd7 | ||
|
|
55f2f29fff | ||
|
|
d381d2b7f3 | ||
|
|
c62879b00d | ||
|
|
3c94f59d43 | ||
|
|
829912c6c5 | ||
|
|
6090e89b3f | ||
|
|
f06b76e14f | ||
|
|
4b8872e4d0 | ||
|
|
e7b5b2618e | ||
|
|
ef9bb0db09 | ||
|
|
f538eeb5fa | ||
|
|
d470bfc52a | ||
|
|
f82b6beedb | ||
|
|
80672460ed | ||
|
|
57e6396fbb | ||
|
|
a5cc1243e3 | ||
|
|
afcec4d0bd | ||
|
|
6efbd6ff14 | ||
|
|
c51735c885 | ||
|
|
4eaadf3099 | ||
|
|
882ef0e9c6 | ||
|
|
d15869ab85 | ||
|
|
511d105dcb | ||
|
|
2ebceb6918 | ||
|
|
7db66bb824 | ||
|
|
a7e47fdae6 | ||
|
|
ce226a88eb | ||
|
|
0b122e6d4a | ||
|
|
b2fc6d1fac | ||
|
|
e6a95615a0 | ||
|
|
6dab0fb2c1 | ||
|
|
a04ef4ca59 | ||
|
|
8e87a37511 | ||
|
|
fe4d171e22 | ||
|
|
75a5609b23 | ||
|
|
fc8a5b21cf |
No files matched your search
@@ -0,0 +1,41 @@
|
|||||||
|
# cargo-nextest settings for CI (`cargo xtask test` does not use nextest).
|
||||||
|
# PR runs build the tests once and run them in 4 shards (.github/workflows/ci.yml).
|
||||||
|
|
||||||
|
[profile.ci]
|
||||||
|
# Heavy tests (one to four minutes each on a CI runner) that pull requests skip. They run on
|
||||||
|
# every push to main and nightly (`--ignore-default-filter`), and in `cargo xtask test`. The
|
||||||
|
# boolean_props property tests run only nightly (ci.yml excludes them from pushes to main).
|
||||||
|
# Keep this list in sync with docs/book/src/dev/testing.md and CONTRIBUTING.md.
|
||||||
|
default-filter = """
|
||||||
|
not (
|
||||||
|
(package(solidcraft-engine) & (
|
||||||
|
test(=tests::hostile_params_never_panic)
|
||||||
|
| test(/^tests::robustness::/)
|
||||||
|
| test(/^tests::robustness_goldens::seed_/)
|
||||||
|
| test(=pattern_suppress_tests::enclosure_arc_extinction_keeps_a_real_sharp_inner_lip_after_resize_and_reopen)
|
||||||
|
| test(=pattern_suppress_tests::enclosure_datums_follow_wall_height_and_board_depth_with_material_proofs)
|
||||||
|
| test(=cmd::plastic::tests::enclosure_snap_fit_follows_resized_front_wall)
|
||||||
|
))
|
||||||
|
| (package(solidcraft-kernel) & test(=tests::boolean_identity_on_tangent_primitives))
|
||||||
|
| (package(solidcraft-kernel) & binary(boolean_props))
|
||||||
|
| (package(solidcraft-engine) & binary(atomic_commands))
|
||||||
|
| (package(solidcraft-ui-egui) & binary(scenarios) & test(=acceptance_sensor_enclosure))
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
fail-fast = false
|
||||||
|
# Every test's time in the log, so the slow ones are easy to find.
|
||||||
|
status-level = "pass"
|
||||||
|
final-status-level = "slow"
|
||||||
|
failure-output = "immediate-final"
|
||||||
|
slow-timeout = { period = "60s" }
|
||||||
|
|
||||||
|
[profile.ci.junit]
|
||||||
|
path = "junit.xml"
|
||||||
|
|
||||||
|
# The action matrix sample runs its designs in parallel worker processes, one per CPU. Run with
|
||||||
|
# other tests beside it (the heavy ones on main), a pi-case hole that takes 8 s alone (#952 makes
|
||||||
|
# it a real hole) went past the matrix's 90 s action limit. It runs on its own.
|
||||||
|
[[profile.ci.overrides]]
|
||||||
|
filter = "binary(action_matrix) & test(=action_matrix_sample)"
|
||||||
|
threads-required = "num-cpus"
|
||||||
|
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# These are supported funding model platforms
|
||||||
|
|
||||||
|
github: [bherbruck]
|
||||||
|
ko_fi: bherbruck
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
name: Bug report
|
||||||
|
description: Something in SolidCraft does the wrong thing
|
||||||
|
labels: [bug]
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: |
|
||||||
|
Thanks for taking the time to report this! Inside the app, **Report an Issue** fills most of this in for you, with the command, its settings and your environment.
|
||||||
|
- type: textarea
|
||||||
|
id: what
|
||||||
|
attributes:
|
||||||
|
label: What happened
|
||||||
|
description: What did you expect, and what happened instead?
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: steps
|
||||||
|
attributes:
|
||||||
|
label: Steps to reproduce
|
||||||
|
description: |
|
||||||
|
What you clicked or typed, in order. For a problem on a particular design, `solidcraft-cli script design.solidcraft --out repro.json` turns its history into a script that `solidcraft-cli eval repro.json` replays; attach it, trimmed to the failing step if you can.
|
||||||
|
placeholder: |
|
||||||
|
1. Sketch a circle on the XY plane
|
||||||
|
2. Extrude it 10 mm
|
||||||
|
3. Fillet the top edge with 6 mm
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: input
|
||||||
|
id: version
|
||||||
|
attributes:
|
||||||
|
label: SolidCraft version and OS
|
||||||
|
description: Help → About shows the version.
|
||||||
|
placeholder: 0.15.0, Windows 11
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: media
|
||||||
|
attributes:
|
||||||
|
label: Screenshots or recording
|
||||||
|
description: |
|
||||||
|
For anything you can see in the app, a screenshot or short recording of a small example helps the most. Please leave out private designs and personal details.
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Help reproduce and fix a SolveCraft problem
|
|
||||||
title: ''
|
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
---
|
|
||||||
|
|
||||||
## Behavior
|
|
||||||
|
|
||||||
What did you expect, and what happened instead?
|
|
||||||
|
|
||||||
## Reproduction
|
|
||||||
|
|
||||||
Include steps, SolveCraft version/commit and relevant environment details. Prefer a small example without private design data.
|
|
||||||
|
|
||||||
## Screenshots of the behavior (when observable)
|
|
||||||
|
|
||||||
For observable CAD, UI or model behavior, include actual descriptive screenshots or a short recording from a small reproduction. This includes kernel, geometry, assembly and backend effects that can be shown in the app. Coding agents should run the app and capture the evidence themselves, rather than asking a human for evidence they can produce. Show the actual failure/result, preferably before and after, with brief steps, expected/actual behavior and annotations where helpful.
|
|
||||||
|
|
||||||
Flowcharts and Mermaid diagrams cannot substitute for evidence of visible behavior. Use diagrams for architectural reasoning when actual screenshots cannot illustrate the point. Changes with no useful observable behavior may omit screenshot/video evidence. Exclude private designs and sensitive details; attach media or link to an accessible recording rather than committing generated review artifacts.
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# Blank issues stay on: the app's Report an Issue opens issues/new?title=…&body=… with the report
|
||||||
|
# filled in (crates/ui-egui/src/issue_report.rs), which GitHub drops when blank issues are off.
|
||||||
|
blank_issues_enabled: true
|
||||||
|
contact_links:
|
||||||
|
- name: Questions and chat
|
||||||
|
url: https://discord.gg/FtU4NQNVDH
|
||||||
|
about: Ask questions and talk with users and contributors on the SolidCraft Discord.
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
name: Feature request
|
||||||
|
description: Something SolidCraft should do
|
||||||
|
labels: [enhancement]
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
id: goal
|
||||||
|
attributes:
|
||||||
|
label: What are you trying to do
|
||||||
|
description: The part or workflow you have in mind, and where SolidCraft gets in the way today.
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: idea
|
||||||
|
attributes:
|
||||||
|
label: How you imagine it working
|
||||||
|
description: Optional. Describe the behaviour in your own words; please don't paste another product's documentation.
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
self-hosted-runner:
|
||||||
|
labels:
|
||||||
|
- self-hosted-fast
|
||||||
|
- self-hosted-light
|
||||||
+43
-22
@@ -1,43 +1,64 @@
|
|||||||
SolidCraft is open-source parametric 3D CAD in Rust: sketch, constrain, extrude, and change a
|
SolidCraft is open-source parametric 3D CAD in Rust: sketch, constrain, extrude, and change a
|
||||||
parameter to watch the timeline rebuild. [Documentation](https://bherbruck.github.io/solidcraft/)
|
parameter to watch the timeline rebuild. [Documentation](https://docs.solidcraft.io/)
|
||||||
· [try it in the browser](https://bherbruck.github.io/solidcraft/app/) ·
|
· [try it in the browser](https://solidcraft.io/app) ·
|
||||||
[contributing](https://github.com/bherbruck/solidcraft/blob/main/CONTRIBUTING.md) ·
|
[contributing](https://github.com/bherbruck/solidcraft/blob/main/CONTRIBUTING.md) ·
|
||||||
[issues](https://github.com/bherbruck/solidcraft/issues). AI agents can model with it over MCP:
|
[issues](https://github.com/bherbruck/solidcraft/issues). AI agents can model with it over MCP:
|
||||||
`solvecraft-cli mcp` ([how](https://bherbruck.github.io/solidcraft/guide/mcp.html)).
|
`solidcraft-cli mcp` ([how](https://docs.solidcraft.io/guide/mcp.html)).
|
||||||
|
|
||||||
Compatibility names are unchanged: existing `.solvecraft` designs, `solvecraft-cli`, package
|
**What's new** in SolidCraft {version} is listed below, and the
|
||||||
IDs and archive filenames still work. Published 0.2.0 and 0.2.1 releases keep their original
|
[ROADMAP](https://github.com/bherbruck/solidcraft/blob/main/ROADMAP.md#known-limitations) lists
|
||||||
SolveCraft branding. Documentation, the browser app and the Flatpak feed use the new
|
the known limitations. Designs from every earlier version open in this one.
|
||||||
SolidCraft project Pages URLs; old-name Pages addresses are not permanent aliases.
|
|
||||||
|
**Upgrading from 0.7 or earlier.** 0.8 changed the Linux app ID to `ai.storyteller.solidcraft`:
|
||||||
|
`flatpak update` offers to replace the old app, and the `.deb`, `.rpm` and AppImage remove the old
|
||||||
|
menu entry.
|
||||||
|
|
||||||
|
**Upgrading from 0.5 or earlier.** 0.6 renamed SolveCraft to SolidCraft and made the zip
|
||||||
|
container the default save format. `.solvecraft` designs, old settings folders and
|
||||||
|
`SOLVECRAFT_*` variables are still picked up, and `solvecraft-cli` still forwards to
|
||||||
|
`solidcraft-cli`. Want plain JSON? Use **File ▸ Save As JSON…** or `--save design.json`. On
|
||||||
|
macOS, replace `SolveCraft.app` with `SolidCraft.app`. Details:
|
||||||
|
[compatibility notes](https://github.com/bherbruck/solidcraft/blob/main/docs/compatibility.md).
|
||||||
|
|
||||||
|
Documentation, the browser app and the Flatpak feed use the SolidCraft project Pages URLs.
|
||||||
|
|
||||||
**Which file?**
|
**Which file?**
|
||||||
- **Windows:** `SolveCraft-{version}-windows-x64.exe` runs as is. Or install the `.msi`, or unzip the
|
- **Windows:** `SolidCraft-{version}-windows-x64.exe` runs as is. Or install the `.msi`, or unzip the
|
||||||
`-portable.zip` (x64, x86 and arm64).
|
`-portable.zip` (x64, x86 and arm64).
|
||||||
- **macOS 11+** (Apple silicon and Intel): open the `.dmg` and drag `SolveCraft.app` onto Applications.
|
- **macOS 11+** (Apple silicon and Intel): open the `.dmg` and drag `SolidCraft.app` onto Applications.
|
||||||
The CLI is in `solvecraft-cli-{version}-macos-universal.zip`.
|
The CLI is in `solidcraft-cli-{version}-macos-universal.zip`.
|
||||||
- **Linux** (x86_64 and aarch64, glibc 2.35+): the `.AppImage` (`chmod +x`, then run it), the
|
- **Linux** (x86_64 and aarch64, glibc 2.35+): the `.AppImage` (`chmod +x`, then run it), the
|
||||||
`.deb` or `.rpm`, the `.flatpak` (`flatpak install --user <file>`), or the `.tar.gz`.
|
`.deb` or `.rpm`, the `.flatpak` (`flatpak install --user <file>`), the `.snap`
|
||||||
- **FreeBSD:** `tar -xzf solvecraft-{version}-freebsd-x86_64.tar.gz --strip-components 1 -C /usr/local`.
|
(`sudo snap install --dangerous <file>`, or `sudo snap install solidcraft` from the Snap Store), or the `.tar.gz`.
|
||||||
- **Web:** `solvecraft-web-{version}.zip` is a static site to host yourself.
|
- **FreeBSD:** `tar -xzf solidcraft-{version}-freebsd-x86_64.tar.gz --strip-components 1 -C /usr/local`.
|
||||||
|
- **Web:** `solidcraft-web-{version}.zip` is a static site to host yourself.
|
||||||
- `SHA256SUMS.txt`: `sha256sum -c SHA256SUMS.txt --ignore-missing`.
|
- `SHA256SUMS.txt`: `sha256sum -c SHA256SUMS.txt --ignore-missing`.
|
||||||
|
- Files without a version in the name (`solidcraft-windows-x64.msi`, `solidcraft-linux-x86_64.AppImage`, …)
|
||||||
|
are the same packages under fixed names, for download links that always fetch the latest release.
|
||||||
|
|
||||||
For Flatpak feed installation and updates, add Flathub for the required runtime before
|
For Flatpak feed installation and updates, add Flathub for the required runtime before
|
||||||
installing SolidCraft; keep both remotes in the same user installation:
|
installing SolidCraft; keep both remotes in the same user installation:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||||
flatpak remote-add --user --if-not-exists solvecraft https://bherbruck.github.io/solidcraft/flatpak/solvecraft.flatpakrepo
|
flatpak remote-add --user --if-not-exists solidcraft https://docs.solidcraft.io/flatpak/solidcraft.flatpakrepo
|
||||||
flatpak install --user solvecraft ai.storyteller.solvecraft
|
flatpak install --user solidcraft ai.storyteller.solidcraft
|
||||||
flatpak run ai.storyteller.solvecraft
|
flatpak run ai.storyteller.solidcraft
|
||||||
```
|
```
|
||||||
|
|
||||||
|
A remote added from the old `bherbruck.github.io` address no longer finds updates: run
|
||||||
|
`flatpak remote-modify --user --url=https://docs.solidcraft.io/flatpak/repo/ solidcraft`, then
|
||||||
|
`flatpak update --user`.
|
||||||
|
|
||||||
|
Flatpak installs from 0.7 or earlier use the old ID `ai.storyteller.solvecraft`: `flatpak update --user`
|
||||||
|
offers to replace it with `ai.storyteller.solidcraft`, and settings move along.
|
||||||
|
|
||||||
Single-file `.flatpak` bundles include the runtime repository address; missing runtimes
|
Single-file `.flatpak` bundles include the runtime repository address; missing runtimes
|
||||||
still need an internet connection. [Linux installation details](https://bherbruck.github.io/solidcraft/guide/getting-started.html#linux-flatpak).
|
still need an internet connection. [Linux installation details](https://docs.solidcraft.io/guide/getting-started.html#linux-flatpak).
|
||||||
|
|
||||||
The builds aren't signed yet. On macOS, right-click `SolveCraft.app` in Applications and choose
|
The builds aren't signed yet. On macOS, right-click `SolidCraft.app` in Applications and choose
|
||||||
**Open** the first time (or run `xattr -dr com.apple.quarantine /Applications/SolveCraft.app`).
|
**Open** the first time (or run `xattr -dr com.apple.quarantine /Applications/SolidCraft.app`).
|
||||||
On Windows, SmartScreen may say "Windows protected your PC": **More info**, then **Run anyway**.
|
On Windows, SmartScreen may say "Windows protected your PC": **More info**, then **Run anyway**.
|
||||||
Licences are built in (Help ▸ About ▸ Licences, `solvecraft-cli licences`); the packages also
|
Licences are built in (Help ▸ About ▸ Licences, `solidcraft-cli licences`); the packages also
|
||||||
install `THIRD-PARTY-LICENSES.txt`. Known limitations:
|
install `THIRD-PARTY-LICENSES.txt`.
|
||||||
[ROADMAP.md](https://github.com/bherbruck/solidcraft/blob/main/ROADMAP.md#known-limitations).
|
|
||||||
|
|
||||||
+472
-26
@@ -1,9 +1,41 @@
|
|||||||
# Fast checks always run; native builds run for code/CI changes.
|
# Fast checks always run; native builds run for code/CI changes.
|
||||||
|
# PRs test what they touch; main and nightly test everything. On a pull request the "Select
|
||||||
|
# checks" job maps the changed files to workspace packages (scripts/ci/affected.py), adds the
|
||||||
|
# packages that depend on them, and Clippy, the test archive and the test shards cover only
|
||||||
|
# those. Changes to the lockfile, root manifest, toolchain/cargo/nextest config, .github/,
|
||||||
|
# vendor/, tests/, scripts/ or any file no package owns select the whole workspace, as do
|
||||||
|
# pushes to main, the nightly run and Run workflow.
|
||||||
|
# Tests are built once and run in 4 shards. A few heavy tests (see .config/nextest.toml) are
|
||||||
|
# skipped on pull requests and run on pushes to main and nightly. The Windows jobs (D3D12 shaders
|
||||||
|
# and app startup) run on pull requests only when what they test changes (the GPU crate, the app,
|
||||||
|
# the viewport's GPU glue, the graphics dependencies, their scripts or this file); main and
|
||||||
|
# nightly always run them. Only main saves the build caches; pull requests restore them.
|
||||||
|
# The merge queue runs the full suite on exactly the commit it then puts on main, so a push to
|
||||||
|
# main that a passing merge-queue run already tested runs only the repository checks; a push
|
||||||
|
# that skipped the queue still runs everything. Pull requests run the reference tests when the
|
||||||
|
# command line (or anything it depends on) changes, and doc tests for the affected packages.
|
||||||
# Cross-compilation is opt-in through Run workflow; release builds remain in release.yml.
|
# Cross-compilation is opt-in through Run workflow; release builds remain in release.yml.
|
||||||
|
# Trusted runs use both pools: pushes to main, merge-queue groups and pull requests from a branch
|
||||||
|
# of this repository (people with write access; fork pull requests never run on this machine).
|
||||||
|
# There, Select checks and ci run on the self-hosted light runner (`self-hosted-light`, quick
|
||||||
|
# jobs, so they never wait behind a build), and the repository checks, Clippy, the doc tests,
|
||||||
|
# the reference tests and all four test shards on the self-hosted runners (`self-hosted-fast`, warm
|
||||||
|
# build directories via scripts/ci/warm-target.sh). Fork PRs' Linux jobs run on the isolated, ephemeral
|
||||||
|
# `self-hosted-untrusted` runners (no warm caches); everything else runs on GitHub's runners.
|
||||||
|
# The test archive is always built on GitHub's runners: the self-hosted machine has a newer
|
||||||
|
# glibc, so its binaries wouldn't start on ubuntu-24.04, while the archive runs there unchanged
|
||||||
|
# (same /home/runner/work checkout path). Fork pull requests, the nightly run and Run workflow
|
||||||
|
# use GitHub's runners only; the self-hosted runners refuse any other job.
|
||||||
name: CI
|
name: CI
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
|
# The merge queue: each queued group runs the full suite before it lands on main.
|
||||||
|
merge_group:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
schedule:
|
||||||
|
- cron: "17 6 * * *"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
cross_compile:
|
cross_compile:
|
||||||
@@ -15,18 +47,47 @@ permissions:
|
|||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ci-${{ github.ref }}
|
# A new PR push replaces the old run. Only one run per group may wait, so a busy main would
|
||||||
cancel-in-progress: true
|
# cancel the waiting nightly (or a Run workflow) before it starts: they get groups of their own.
|
||||||
|
group: ci-${{ github.event_name }}-${{ github.ref }}
|
||||||
|
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
|
||||||
|
|
||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
dependency-advisories:
|
||||||
|
name: Dependency advisories
|
||||||
|
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 20
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
- name: Install advisory scanner
|
||||||
|
run: cargo install cargo-deny --version 0.20.2 --locked
|
||||||
|
- name: Check locked dependencies
|
||||||
|
run: cargo deny --locked check --warn unmaintained advisories bans sources
|
||||||
|
|
||||||
changes:
|
changes:
|
||||||
name: Select checks
|
name: Select checks
|
||||||
runs-on: ubuntu-24.04
|
# Trusted runs (see the top of this file) use the self-hosted runners.
|
||||||
|
runs-on: ${{ (github.event_name == 'merge_group' || (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)) && 'self-hosted-light' || 'ubuntu-24.04' }}
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
# To ask whether the merge queue already tested a commit pushed to main.
|
||||||
|
actions: read
|
||||||
outputs:
|
outputs:
|
||||||
native: ${{ steps.paths.outputs.native }}
|
native: ${{ steps.paths.outputs.native }}
|
||||||
|
kernel: ${{ steps.paths.outputs.kernel }}
|
||||||
|
windows: ${{ steps.paths.outputs.windows }}
|
||||||
|
full: ${{ steps.paths.outputs.full }}
|
||||||
|
packages: ${{ steps.paths.outputs.packages }}
|
||||||
|
oracle: ${{ steps.paths.outputs.oracle }}
|
||||||
|
# Whether the other Linux jobs use the self-hosted runners too.
|
||||||
|
# Trusted self-hosted runs only: a fork PR's checks run on the untrusted pool and must never
|
||||||
|
# route the jobs after them to the trusted runners.
|
||||||
|
local: ${{ runner.environment == 'self-hosted' && !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
with:
|
with:
|
||||||
@@ -37,14 +98,43 @@ jobs:
|
|||||||
EVENT_NAME: ${{ github.event_name }}
|
EVENT_NAME: ${{ github.event_name }}
|
||||||
BASE_SHA: ${{ github.event.pull_request.base.sha }}
|
BASE_SHA: ${{ github.event.pull_request.base.sha }}
|
||||||
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
|
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
|
||||||
|
PUSH_SHA: ${{ github.sha }}
|
||||||
|
REPO: ${{ github.repository }}
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
native=false
|
native=false
|
||||||
if [ "$EVENT_NAME" = workflow_dispatch ]; then
|
kernel=false
|
||||||
|
windows=false
|
||||||
|
full=true
|
||||||
|
packages=
|
||||||
|
if [ "$EVENT_NAME" = push ]; then
|
||||||
|
# The queue lands the very commit its merge_group run tested. If that run passed,
|
||||||
|
# testing the push again proves nothing new; otherwise (a merge that skipped the
|
||||||
|
# queue, or the API cannot answer) test everything.
|
||||||
|
# curl and grep only: Select checks of a push runs on the self-hosted runner.
|
||||||
|
tested=$(curl -fsS -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github+json" \
|
||||||
|
"https://api.github.com/repos/$REPO/actions/workflows/ci.yml/runs?event=merge_group&head_sha=$PUSH_SHA&status=success&per_page=1" \
|
||||||
|
| grep -o '"total_count": *[0-9]*' | grep -o '[0-9]*$' || echo 0)
|
||||||
|
if [ "${tested:-0}" -gt 0 ]; then
|
||||||
|
echo "The merge queue already tested $PUSH_SHA: repository checks only."
|
||||||
|
else
|
||||||
|
native=true
|
||||||
|
windows=true
|
||||||
|
fi
|
||||||
|
elif [ "$EVENT_NAME" != pull_request ]; then
|
||||||
native=true
|
native=true
|
||||||
|
windows=true
|
||||||
else
|
else
|
||||||
# Compare both old and new paths of renames; unknown paths run native checks.
|
# Compare both old and new paths of renames; unknown paths run native checks.
|
||||||
git diff --no-renames --name-only -z "$BASE_SHA...$HEAD_SHA" > "$RUNNER_TEMP/ci-paths"
|
git diff --no-renames --name-only -z "$BASE_SHA...$HEAD_SHA" > "$RUNNER_TEMP/ci-paths"
|
||||||
while IFS= read -r -d '' path; do
|
while IFS= read -r -d '' path; do
|
||||||
|
case "$path" in crates/kernel/*|vendor/truck-*) kernel=true ;; esac
|
||||||
|
# What the Windows D3D12 jobs exercise: the GPU crate and its shaders, the app and
|
||||||
|
# its startup, the viewport's wgpu glue, the vendored egui-wgpu, their scripts.
|
||||||
|
case "$path" in
|
||||||
|
crates/gpu/*|apps/solidcraft/*|crates/ui-egui/src/gpu.rs|vendor/egui-wgpu/*) windows=true ;;
|
||||||
|
tools/windows-*.ps1|.github/workflows/ci.yml|rust-toolchain*|.cargo/*) windows=true ;;
|
||||||
|
esac
|
||||||
case "$path" in
|
case "$path" in
|
||||||
.github/workflows/ci.yml) native=true ;;
|
.github/workflows/ci.yml) native=true ;;
|
||||||
*.rs|Cargo.toml|Cargo.lock|*/Cargo.toml|.cargo/*|rust-toolchain*) native=true ;;
|
*.rs|Cargo.toml|Cargo.lock|*/Cargo.toml|.cargo/*|rust-toolchain*) native=true ;;
|
||||||
@@ -52,52 +142,116 @@ jobs:
|
|||||||
*) native=true ;;
|
*) native=true ;;
|
||||||
esac
|
esac
|
||||||
done < "$RUNNER_TEMP/ci-paths"
|
done < "$RUNNER_TEMP/ci-paths"
|
||||||
|
# A lockfile change that moves the graphics stack (wgpu, naga, egui, winit, windows).
|
||||||
|
if [ "$windows" = false ] && grep -qxz 'Cargo.lock' "$RUNNER_TEMP/ci-paths" \
|
||||||
|
&& git diff "$BASE_SHA...$HEAD_SHA" -- Cargo.lock \
|
||||||
|
| grep -Eq '^[ +-]name = "(wgpu[a-z_-]*|naga|egui[a-z_-]*|eframe|winit|windows[a-z_-]*|d3d12)"'; then
|
||||||
|
windows=true
|
||||||
|
fi
|
||||||
|
# Pull requests build and test the touched packages and their dependents.
|
||||||
|
python3 -I scripts/ci/affected.py --paths "$RUNNER_TEMP/ci-paths" > "$RUNNER_TEMP/ci-affected"
|
||||||
|
cat "$RUNNER_TEMP/ci-affected"
|
||||||
|
full=$(sed -n 's/^full=//p' "$RUNNER_TEMP/ci-affected")
|
||||||
|
packages=$(sed -n 's/^packages=//p' "$RUNNER_TEMP/ci-affected")
|
||||||
|
# Code changed but nothing was selected: be safe and test everything.
|
||||||
|
if [ "$native" = true ] && [ "$full" != true ] && [ -z "$packages" ]; then full=true; fi
|
||||||
fi
|
fi
|
||||||
echo "native=$native" >> "$GITHUB_OUTPUT"
|
# The reference tests replay recipes through solidcraft-cli: needed when it, or anything
|
||||||
|
# it depends on, is selected.
|
||||||
|
oracle=$native
|
||||||
|
if [ "$EVENT_NAME" = pull_request ] && [ "$full" != true ]; then
|
||||||
|
case " $packages " in *" solidcraft-cli "*) ;; *) oracle=false ;; esac
|
||||||
|
fi
|
||||||
|
# The pull request fast lane: Windows and the reference tests run on main (and the nightly),
|
||||||
|
# not on every pull request push; a break there is fixed forward on main.
|
||||||
|
if [ "$EVENT_NAME" = pull_request ]; then windows=false; oracle=false; fi
|
||||||
|
{
|
||||||
|
echo "native=$native"
|
||||||
|
echo "kernel=$kernel"
|
||||||
|
echo "windows=$windows"
|
||||||
|
echo "oracle=$oracle"
|
||||||
|
echo "full=$full"
|
||||||
|
echo "packages=$packages"
|
||||||
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
checks:
|
checks:
|
||||||
name: Format and repository checks
|
name: Format and repository checks
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ${{ (github.event_name == 'merge_group' || (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)) && 'self-hosted-fast' || 'ubuntu-24.04' }}
|
||||||
timeout-minutes: 15
|
timeout-minutes: 15
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- name: Warm build directory (self-hosted runner)
|
||||||
|
if: runner.environment == 'self-hosted' && !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
|
||||||
|
run: scripts/ci/warm-target.sh checks
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
with:
|
with:
|
||||||
components: rustfmt
|
components: rustfmt
|
||||||
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
# The trusted self-hosted runners keep their build directory and Cargo home instead; the
|
||||||
|
# untrusted ones (fork pull requests) start empty and restore main's cache, read-only.
|
||||||
|
- if: runner.environment == 'github-hosted' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
|
||||||
|
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
with:
|
with:
|
||||||
key: repo-checks
|
key: repo-checks
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
- name: Format
|
- name: Format
|
||||||
run: cargo fmt --all -- --check
|
run: cargo fmt --all -- --check
|
||||||
- name: Asset attribution
|
- name: Asset attribution
|
||||||
run: cargo xtask assets
|
run: cargo xtask assets
|
||||||
|
- name: UI icon standards and review tool
|
||||||
|
run: cargo xtask icons
|
||||||
- name: Licences
|
- name: Licences
|
||||||
run: cargo xtask licences --check
|
run: cargo xtask licences --check
|
||||||
- name: Dependency layers
|
- name: Dependency layers
|
||||||
run: cargo xtask layers
|
run: cargo xtask layers
|
||||||
|
- name: Sorted lists
|
||||||
|
run: cargo xtask lists
|
||||||
|
- name: Design format pending changes
|
||||||
|
run: bash scripts/test-format-pending.sh
|
||||||
|
- name: Web app offline use and updates (headless Chrome)
|
||||||
|
run: cargo xtask web-offline-test
|
||||||
|
- name: Affected-package selection self-test
|
||||||
|
run: python3 -I scripts/ci/test_affected.py
|
||||||
|
- name: Claim and triage bot tests
|
||||||
|
run: node --test scripts/claim/*.test.js scripts/triage/*.test.js
|
||||||
|
|
||||||
clippy:
|
clippy:
|
||||||
name: Native Linux Clippy
|
name: Native Linux Clippy
|
||||||
needs: changes
|
needs: changes
|
||||||
if: needs.changes.outputs.native == 'true'
|
if: needs.changes.outputs.native == 'true'
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ${{ needs.changes.outputs.local == 'true' && 'self-hosted-fast' || 'ubuntu-24.04' }}
|
||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- name: Warm build directory (self-hosted runner)
|
||||||
|
if: runner.environment == 'self-hosted' && !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
|
||||||
|
run: scripts/ci/warm-target.sh clippy
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
with:
|
with:
|
||||||
components: clippy
|
components: clippy
|
||||||
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
# The trusted self-hosted runners keep their build directory and Cargo home instead; the
|
||||||
|
# untrusted ones (fork pull requests) start empty and restore main's cache, read-only.
|
||||||
|
- if: runner.environment == 'github-hosted' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
|
||||||
|
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
with:
|
with:
|
||||||
key: native-clippy
|
key: native-clippy
|
||||||
- run: cargo clippy --workspace --all-targets --profile ci --locked -- -D warnings
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
|
- name: Clippy
|
||||||
|
env:
|
||||||
|
FULL: ${{ needs.changes.outputs.full }}
|
||||||
|
PACKAGES: ${{ needs.changes.outputs.packages }}
|
||||||
|
run: |
|
||||||
|
# Pull requests lint the affected packages (scripts/ci/affected.py); everything else, all.
|
||||||
|
scope=(--workspace)
|
||||||
|
if [ "$FULL" != true ]; then scope=(); for p in $PACKAGES; do scope+=(-p "$p"); done; fi
|
||||||
|
cargo clippy "${scope[@]}" --all-targets --profile ci --locked -- -D warnings
|
||||||
|
|
||||||
tests:
|
build-tests:
|
||||||
name: Native Linux tests
|
name: Build tests
|
||||||
needs: changes
|
needs: changes
|
||||||
if: needs.changes.outputs.native == 'true'
|
if: needs.changes.outputs.native == 'true'
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'self-hosted-untrusted' || 'ubuntu-24.04' }}
|
||||||
timeout-minutes: 90
|
# Fork builds compile inside gVisor on shared boxes; give them room to finish and upload.
|
||||||
|
timeout-minutes: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 90 || 45 }}
|
||||||
env:
|
env:
|
||||||
CARGO_INCREMENTAL: "0"
|
CARGO_INCREMENTAL: "0"
|
||||||
RUSTC_WRAPPER: sccache
|
RUSTC_WRAPPER: sccache
|
||||||
@@ -109,24 +263,236 @@ jobs:
|
|||||||
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
with:
|
with:
|
||||||
key: native-tests
|
key: native-tests
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
- name: Set up compiler cache
|
- name: Set up compiler cache
|
||||||
uses: mozilla-actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11
|
uses: mozilla-actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11
|
||||||
with:
|
with:
|
||||||
version: v0.16.0
|
version: v0.16.0
|
||||||
- name: Compile tests
|
- uses: taiki-e/install-action@1168f6810a3cb30a3514bf5756a3b7f0422c6df8 # v2.87.28
|
||||||
run: cargo test --workspace --profile ci --locked --no-run
|
with:
|
||||||
- name: Run tests
|
tool: cargo-nextest
|
||||||
# Every test binary at once (cargo test runs them one after another).
|
- name: Compile tests into a nextest archive
|
||||||
run: cargo xtask test --locked
|
env:
|
||||||
|
FULL: ${{ needs.changes.outputs.full }}
|
||||||
|
PACKAGES: ${{ needs.changes.outputs.packages }}
|
||||||
|
run: |
|
||||||
|
# Pull requests archive only the affected packages (scripts/ci/affected.py).
|
||||||
|
scope=(--workspace)
|
||||||
|
if [ "$FULL" != true ]; then scope=(); for p in $PACKAGES; do scope+=(-p "$p"); done; fi
|
||||||
|
cargo nextest archive "${scope[@]}" --cargo-profile ci --locked --archive-file tests.tar.zst
|
||||||
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: nextest-archive
|
||||||
|
path: tests.tar.zst
|
||||||
|
retention-days: 1
|
||||||
|
compression-level: 0
|
||||||
- name: Compiler cache statistics
|
- name: Compiler cache statistics
|
||||||
if: always()
|
if: always()
|
||||||
run: sccache --show-stats
|
run: sccache --show-stats
|
||||||
|
|
||||||
|
tests:
|
||||||
|
name: Native Linux tests (${{ matrix.shard }}/4)
|
||||||
|
needs: [changes, build-tests]
|
||||||
|
runs-on: ${{ needs.changes.outputs.local == 'true' && 'self-hosted-fast' || ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'self-hosted-untrusted' || 'ubuntu-24.04') }}
|
||||||
|
timeout-minutes: 60
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
# Pull requests test their affected crates in 2 shards; main and the nightly use 4.
|
||||||
|
shard: ${{ fromJSON(github.event_name == 'pull_request' && '[1, 2]' || '[1, 2, 3, 4]') }}
|
||||||
|
env:
|
||||||
|
# Pictures (snapshots, screenshots, ui.render, the viewport's offscreen tests) are drawn on
|
||||||
|
# the GPU. The runner has none: Mesa's lavapipe (software Vulkan) draws them, and a test that
|
||||||
|
# would skip for want of an adapter fails instead.
|
||||||
|
SOLIDCRAFT_GPU: software
|
||||||
|
SOLIDCRAFT_REQUIRE_GPU: "1"
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- name: Install a software Vulkan driver (lavapipe)
|
||||||
|
# Preinstalled on the self-hosted runner, which has no sudo.
|
||||||
|
if: runner.environment == 'github-hosted'
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends mesa-vulkan-drivers libvulkan1
|
||||||
|
- uses: taiki-e/install-action@1168f6810a3cb30a3514bf5756a3b7f0422c6df8 # v2.87.28
|
||||||
|
with:
|
||||||
|
tool: cargo-nextest
|
||||||
|
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||||
|
with:
|
||||||
|
name: nextest-archive
|
||||||
|
- name: Run tests
|
||||||
|
env:
|
||||||
|
EVENT_NAME: ${{ github.event_name }}
|
||||||
|
SHARD: ${{ matrix.shard }}
|
||||||
|
SHARDS: ${{ github.event_name == 'pull_request' && 2 || 4 }}
|
||||||
|
run: |
|
||||||
|
# Pull requests skip the heavy tests (default-filter in .config/nextest.toml).
|
||||||
|
all=()
|
||||||
|
# The boolean property tests draw new random inputs every run; they run only in the
|
||||||
|
# nightly property-tests job, so a known kernel bug cannot turn main red at random.
|
||||||
|
if [ "$EVENT_NAME" != pull_request ]; then
|
||||||
|
all=(--ignore-default-filter -E 'not (package(solidcraft-kernel) & binary(boolean_props))')
|
||||||
|
fi
|
||||||
|
# Extract into ./target: tests that run a built binary (env!("CARGO_BIN_EXE_*")) have
|
||||||
|
# the build job's path, which is the same checkout path here.
|
||||||
|
cargo nextest run --archive-file tests.tar.zst --workspace-remap . --extract-to . --extract-overwrite \
|
||||||
|
--profile ci --partition "slice:$SHARD/$SHARDS" --no-tests=pass "${all[@]}"
|
||||||
|
- name: Upload test timings
|
||||||
|
if: always()
|
||||||
|
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: junit-${{ matrix.shard }}
|
||||||
|
path: target/nextest/ci/junit.xml
|
||||||
|
retention-days: 7
|
||||||
|
|
||||||
|
action-matrix:
|
||||||
|
# Every ordinary action on every face, edge, vertex and body of the design corpus, against
|
||||||
|
# tests/action_matrix/baseline.json (docs/action-matrix.md). Every test run checks a sample;
|
||||||
|
# the whole matrix runs nightly (or by hand) in shards of about equal cost, cut by
|
||||||
|
# tests/action_matrix/costs.json. Keep SHARDS in step with the matrix below.
|
||||||
|
name: Action matrix (${{ matrix.shard }}/16)
|
||||||
|
needs: build-tests
|
||||||
|
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 55
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: taiki-e/install-action@1168f6810a3cb30a3514bf5756a3b7f0422c6df8 # v2.87.28
|
||||||
|
with:
|
||||||
|
tool: cargo-nextest
|
||||||
|
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||||
|
with:
|
||||||
|
name: nextest-archive
|
||||||
|
- name: Run one shard of the matrix
|
||||||
|
# A step limit below the job's, so the outcomes so far are still uploaded.
|
||||||
|
timeout-minutes: 45
|
||||||
|
env:
|
||||||
|
SHARDS: 16
|
||||||
|
SHARD: ${{ matrix.shard }}
|
||||||
|
OUT: ${{ github.workspace }}/action-matrix
|
||||||
|
run: |
|
||||||
|
mkdir -p "$OUT"
|
||||||
|
export ACTION_MATRIX_SHARD="$SHARD/$SHARDS" ACTION_MATRIX_RESULTS="$OUT/results-$SHARD.json" \
|
||||||
|
ACTION_MATRIX_TIMINGS="$OUT/timings-$SHARD.jsonl" ACTION_MATRIX_WORKDIR="$OUT/raw-$SHARD"
|
||||||
|
cargo nextest run --archive-file tests.tar.zst --workspace-remap . --extract-to . --extract-overwrite \
|
||||||
|
--profile ci --success-output final --run-ignored only -E "binary(action_matrix) & test(=action_matrix_shard)"
|
||||||
|
- name: Upload the outcomes and timings
|
||||||
|
# `cargo xtask action-matrix --from DIR --bless` (with every shard's files in DIR)
|
||||||
|
# records them in the baseline and costs.json.
|
||||||
|
if: always()
|
||||||
|
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: action-matrix-${{ matrix.shard }}
|
||||||
|
path: action-matrix
|
||||||
|
retention-days: 14
|
||||||
|
|
||||||
|
action-matrix-determinism:
|
||||||
|
# A sample of the matrix run twice on one runner: every action must come out the same.
|
||||||
|
name: Action matrix determinism
|
||||||
|
needs: build-tests
|
||||||
|
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 45
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: taiki-e/install-action@1168f6810a3cb30a3514bf5756a3b7f0422c6df8 # v2.87.28
|
||||||
|
with:
|
||||||
|
tool: cargo-nextest
|
||||||
|
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||||
|
with:
|
||||||
|
name: nextest-archive
|
||||||
|
- name: Run a sample twice
|
||||||
|
run: |
|
||||||
|
cargo nextest run --archive-file tests.tar.zst --workspace-remap . --extract-to . --extract-overwrite \
|
||||||
|
--profile ci --success-output final --run-ignored only -E "binary(action_matrix) & test(=action_matrix_determinism)"
|
||||||
|
|
||||||
|
property-tests:
|
||||||
|
# The boolean property tests and the atomic command tests with many cases. Pull requests skip
|
||||||
|
# them (.config/nextest.toml); pushes to main run atomic_commands with small defaults (seeds
|
||||||
|
# 0..4) and skip boolean_props, whose random inputs would fail main at random.
|
||||||
|
name: Property tests (many cases)
|
||||||
|
needs: build-tests
|
||||||
|
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 60
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: taiki-e/install-action@1168f6810a3cb30a3514bf5756a3b7f0422c6df8 # v2.87.28
|
||||||
|
with:
|
||||||
|
tool: cargo-nextest
|
||||||
|
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||||
|
with:
|
||||||
|
name: nextest-archive
|
||||||
|
- name: Boolean properties and atomic commands
|
||||||
|
# The defaults (8 cases, seeds 0..4) take 159 s and 802 s on a 2-core VM; four times the
|
||||||
|
# cases and twice the seeds are estimated at about 40 minutes there (not yet timed on CI).
|
||||||
|
env:
|
||||||
|
PROPTEST_CASES: "32"
|
||||||
|
ATOMIC_SEEDS: "0..8"
|
||||||
|
run: |
|
||||||
|
cargo nextest run --archive-file tests.tar.zst --workspace-remap . --extract-to . --extract-overwrite \
|
||||||
|
--profile ci --ignore-default-filter --success-output final -E "binary(boolean_props) | binary(atomic_commands)"
|
||||||
|
|
||||||
|
doc-tests:
|
||||||
|
name: Doc tests
|
||||||
|
needs: changes
|
||||||
|
if: needs.changes.outputs.native == 'true'
|
||||||
|
runs-on: ${{ needs.changes.outputs.local == 'true' && 'self-hosted-fast' || 'ubuntu-24.04' }}
|
||||||
|
timeout-minutes: 45
|
||||||
|
env:
|
||||||
|
CARGO_INCREMENTAL: "0"
|
||||||
|
RUSTC_WRAPPER: sccache
|
||||||
|
SCCACHE_GHA_ENABLED: "true"
|
||||||
|
SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- name: Warm build directory (self-hosted runner)
|
||||||
|
if: runner.environment == 'self-hosted' && !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
|
||||||
|
run: scripts/ci/warm-target.sh doc-tests
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
# The trusted self-hosted runners keep their build directory and Cargo home instead; the
|
||||||
|
# untrusted ones (fork pull requests) start empty and restore main's cache, read-only.
|
||||||
|
- if: runner.environment == 'github-hosted' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
|
||||||
|
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
|
with:
|
||||||
|
key: doc-tests
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
|
- name: Set up compiler cache
|
||||||
|
uses: mozilla-actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11
|
||||||
|
with:
|
||||||
|
version: v0.16.0
|
||||||
|
# nextest does not run doc tests.
|
||||||
|
- name: Doc tests
|
||||||
|
env:
|
||||||
|
FULL: ${{ needs.changes.outputs.full }}
|
||||||
|
PACKAGES: ${{ needs.changes.outputs.packages }}
|
||||||
|
run: |
|
||||||
|
# Pull requests test the affected packages that have a library (only libraries have doc
|
||||||
|
# tests); everything else, the whole workspace.
|
||||||
|
scope=(--workspace)
|
||||||
|
if [ "$FULL" != true ]; then
|
||||||
|
scope=()
|
||||||
|
libs=$(cargo metadata --no-deps --format-version 1 --locked \
|
||||||
|
| python3 -I -c 'import json, sys; print(" ".join(p["name"] for p in json.load(sys.stdin)["packages"] if any("lib" in t["kind"] for t in p["targets"])))')
|
||||||
|
for p in $PACKAGES; do
|
||||||
|
case " $libs " in *" $p "*) scope+=(-p "$p") ;; esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
if [ ${#scope[@]} -eq 0 ]; then
|
||||||
|
echo "No affected package has a library: no doc tests to run."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
cargo test "${scope[@]}" --profile ci --locked --doc
|
||||||
|
|
||||||
oracle:
|
oracle:
|
||||||
name: Reference tests
|
name: Reference tests
|
||||||
needs: changes
|
needs: changes
|
||||||
if: needs.changes.outputs.native == 'true'
|
if: needs.changes.outputs.oracle == 'true'
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ${{ needs.changes.outputs.local == 'true' && 'self-hosted-fast' || ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'self-hosted-untrusted' || 'ubuntu-24.04') }}
|
||||||
timeout-minutes: 60
|
timeout-minutes: 60
|
||||||
env:
|
env:
|
||||||
CARGO_INCREMENTAL: "0"
|
CARGO_INCREMENTAL: "0"
|
||||||
@@ -135,18 +501,25 @@ jobs:
|
|||||||
SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
|
SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- name: Warm build directory (self-hosted runner)
|
||||||
|
if: runner.environment == 'self-hosted' && !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
|
||||||
|
run: scripts/ci/warm-target.sh oracle
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
# The trusted self-hosted runners keep their build directory and Cargo home instead; the
|
||||||
|
# untrusted ones (fork pull requests) start empty and restore main's cache, read-only.
|
||||||
|
- if: runner.environment == 'github-hosted' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
|
||||||
|
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
with:
|
with:
|
||||||
key: oracle
|
key: oracle
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
- name: Set up compiler cache
|
- name: Set up compiler cache
|
||||||
uses: mozilla-actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11
|
uses: mozilla-actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11
|
||||||
with:
|
with:
|
||||||
version: v0.16.0
|
version: v0.16.0
|
||||||
- name: Build the command line
|
- name: Build the command line
|
||||||
run: cargo build -p solvecraft-cli --profile ci --locked
|
run: cargo build -p solidcraft-cli --profile ci --locked
|
||||||
- name: Replay tests/oracle and compare with expected.json
|
- name: Replay tests/oracle and compare with expected.json
|
||||||
run: cargo xtask oracle --cli target/ci/solvecraft-cli
|
run: cargo xtask oracle --cli "${CARGO_TARGET_DIR:-target}/ci/solidcraft-cli"
|
||||||
- name: Upload the report
|
- name: Upload the report
|
||||||
if: always()
|
if: always()
|
||||||
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
@@ -154,28 +527,99 @@ jobs:
|
|||||||
name: oracle-report
|
name: oracle-report
|
||||||
path: docs/oracle.md
|
path: docs/oracle.md
|
||||||
|
|
||||||
|
# D3D12's older shader compiler (FXC, used where dxcompiler.dll is absent) is stricter than
|
||||||
|
# DXC, Vulkan and Metal: a shader it cannot compile once crashed the app at startup. Build the
|
||||||
|
# GPU tessellation pipeline with FXC on the runner's WARP software adapter and compare its
|
||||||
|
# results with the CPU, and draw headless pictures with the viewport's pipelines there
|
||||||
|
# (crates/gpu/tests/capture.rs).
|
||||||
|
windows-fxc:
|
||||||
|
name: Windows D3D12 FXC shaders
|
||||||
|
needs: changes
|
||||||
|
if: needs.changes.outputs.windows == 'true'
|
||||||
|
runs-on: windows-latest
|
||||||
|
timeout-minutes: 45
|
||||||
|
env:
|
||||||
|
WGPU_BACKEND: dx12
|
||||||
|
WGPU_DX12_COMPILER: fxc
|
||||||
|
# WARP is a software (Cpu) adapter.
|
||||||
|
SOLIDCRAFT_GPU: software
|
||||||
|
SOLIDCRAFT_REQUIRE_GPU: "1"
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
|
with:
|
||||||
|
key: windows-fxc
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
|
# One test at a time: WARP's shader JIT crashes now and then (a null read in
|
||||||
|
# d3d10warp.dll's JIT optimizer, about 1 run in 60) when several devices compile compute
|
||||||
|
# pipelines at once, which the parallel tests do. Minidumps showed it in WARP itself, not
|
||||||
|
# in SolidCraft or FXC; serial runs never hit it.
|
||||||
|
- run: cargo test -p solidcraft-gpu --profile ci --locked -- --test-threads=1
|
||||||
|
|
||||||
|
# The Windows app starts D3D12 first and only the backend it uses (a Vulkan driver crashed the
|
||||||
|
# app at startup on Intel). Start the real app on the runner (its D3D12 adapter is WARP) with
|
||||||
|
# several saved settings and safe mode, and check each draws a frame and quits cleanly.
|
||||||
|
windows-startup:
|
||||||
|
name: Windows app startup
|
||||||
|
needs: changes
|
||||||
|
if: needs.changes.outputs.windows == 'true'
|
||||||
|
runs-on: windows-latest
|
||||||
|
timeout-minutes: 60
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
|
with:
|
||||||
|
key: windows-startup
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
|
- name: Backend order and probing on Windows
|
||||||
|
run: cargo test -p solidcraft --profile ci --locked -- startup::tests native_crash::tests native_frame::tests
|
||||||
|
- name: Build the app
|
||||||
|
run: cargo build -p solidcraft --profile ci --locked
|
||||||
|
- name: Start the app under different settings
|
||||||
|
shell: pwsh
|
||||||
|
run: tools/windows-startup-smoke.ps1 -Exe target/ci/solidcraft.exe
|
||||||
|
- name: Resize border from the first frame
|
||||||
|
shell: pwsh
|
||||||
|
run: tools/windows-resize-smoke.ps1 -Exe target/ci/solidcraft.exe
|
||||||
|
|
||||||
# Preserve the existing check name for branch protection, including docs-only PRs.
|
# Preserve the existing check name for branch protection, including docs-only PRs.
|
||||||
ci:
|
ci:
|
||||||
needs: [changes, checks, clippy, tests, oracle]
|
needs: [changes, checks, clippy, build-tests, tests, doc-tests, oracle, windows-fxc, windows-startup]
|
||||||
if: always()
|
if: always()
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ${{ needs.changes.outputs.local == 'true' && 'self-hosted-light' || 'ubuntu-24.04' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Verify required checks
|
- name: Verify required checks
|
||||||
env:
|
env:
|
||||||
CHANGES: ${{ needs.changes.result }}
|
CHANGES: ${{ needs.changes.result }}
|
||||||
CHECKS: ${{ needs.checks.result }}
|
CHECKS: ${{ needs.checks.result }}
|
||||||
NATIVE: ${{ needs.changes.outputs.native }}
|
NATIVE: ${{ needs.changes.outputs.native }}
|
||||||
|
WINDOWS: ${{ needs.changes.outputs.windows }}
|
||||||
|
ORACLE_RUN: ${{ needs.changes.outputs.oracle }}
|
||||||
CLIPPY: ${{ needs.clippy.result }}
|
CLIPPY: ${{ needs.clippy.result }}
|
||||||
|
BUILD: ${{ needs.build-tests.result }}
|
||||||
TESTS: ${{ needs.tests.result }}
|
TESTS: ${{ needs.tests.result }}
|
||||||
|
DOCS: ${{ needs.doc-tests.result }}
|
||||||
ORACLE: ${{ needs.oracle.result }}
|
ORACLE: ${{ needs.oracle.result }}
|
||||||
|
WINDOWS_FXC: ${{ needs.windows-fxc.result }}
|
||||||
|
WINDOWS_STARTUP: ${{ needs.windows-startup.result }}
|
||||||
run: |
|
run: |
|
||||||
test "$CHANGES" = success
|
test "$CHANGES" = success
|
||||||
test "$CHECKS" = success
|
test "$CHECKS" = success
|
||||||
if [ "$NATIVE" = true ]; then
|
if [ "$NATIVE" = true ]; then
|
||||||
test "$CLIPPY" = success
|
test "$CLIPPY" = success
|
||||||
|
test "$BUILD" = success
|
||||||
test "$TESTS" = success
|
test "$TESTS" = success
|
||||||
|
test "$DOCS" = success
|
||||||
|
fi
|
||||||
|
if [ "$ORACLE_RUN" = true ]; then
|
||||||
test "$ORACLE" = success
|
test "$ORACLE" = success
|
||||||
fi
|
fi
|
||||||
|
if [ "$WINDOWS" = true ]; then
|
||||||
|
test "$WINDOWS_FXC" = success
|
||||||
|
test "$WINDOWS_STARTUP" = success
|
||||||
|
fi
|
||||||
|
|
||||||
wasm:
|
wasm:
|
||||||
name: Compile WebAssembly (manual)
|
name: Compile WebAssembly (manual)
|
||||||
@@ -190,6 +634,7 @@ jobs:
|
|||||||
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
with:
|
with:
|
||||||
key: wasm
|
key: wasm
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
- run: cargo xtask wasm
|
- run: cargo xtask wasm
|
||||||
|
|
||||||
riscv64-gates:
|
riscv64-gates:
|
||||||
@@ -211,6 +656,7 @@ jobs:
|
|||||||
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
with:
|
with:
|
||||||
key: riscv64
|
key: riscv64
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
- name: Install cross-compilation dependencies
|
- name: Install cross-compilation dependencies
|
||||||
run: |
|
run: |
|
||||||
# Ubuntu's regular archive serves amd64; RISC-V packages live in ports.
|
# Ubuntu's regular archive serves amd64; RISC-V packages live in ports.
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
# `/claim` and `/unclaim` on issues (CONTRIBUTING.md, "Sending a change"), and a daily sweep that
|
||||||
|
# frees claims nobody is working on. A pull request that references an issue (`<summary> (#N)`,
|
||||||
|
# `Fixes #N`) claims it too. The logic is in scripts/claim/claim.js (tested in ci.yml).
|
||||||
|
name: Claim
|
||||||
|
|
||||||
|
on:
|
||||||
|
issue_comment:
|
||||||
|
types: [created]
|
||||||
|
# pull_request_target so PRs from forks can label and assign. It runs the base branch's
|
||||||
|
# scripts/claim and only reads the PR's title, body and author; the PR's code is never checked out.
|
||||||
|
pull_request_target:
|
||||||
|
types: [opened, reopened]
|
||||||
|
schedule:
|
||||||
|
- cron: '17 5 * * *'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read # to check out scripts/claim
|
||||||
|
issues: write
|
||||||
|
pull-requests: read
|
||||||
|
|
||||||
|
# One run at a time per issue, so two simultaneous /claim comments can't both win.
|
||||||
|
concurrency:
|
||||||
|
group: claim-${{ github.event.issue.number || github.event.pull_request.number || 'sweep' }}
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
claim:
|
||||||
|
name: Claim bot
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 10
|
||||||
|
if: >-
|
||||||
|
github.event_name != 'issue_comment' ||
|
||||||
|
(!github.event.issue.pull_request && github.event.comment.user.type != 'Bot' &&
|
||||||
|
(startsWith(github.event.comment.body, '/claim') || startsWith(github.event.comment.body, '/unclaim')))
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
with:
|
||||||
|
sparse-checkout: scripts/claim
|
||||||
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const claim = require('./scripts/claim/claim.js');
|
||||||
|
if (context.eventName === 'issue_comment') {
|
||||||
|
await claim.handleComment({ github, context });
|
||||||
|
} else if (context.eventName === 'pull_request_target') {
|
||||||
|
const claimed = await claim.handlePull({ github, context });
|
||||||
|
core.info(`Claimed: ${claimed.join(', ') || 'none'}`);
|
||||||
|
} else {
|
||||||
|
const released = await claim.sweep({ github, context });
|
||||||
|
core.info(`Released: ${released.join(', ') || 'none'}`);
|
||||||
|
}
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
# The web app as a container image on GitHub's container registry, for self-hosting
|
||||||
|
# (packaging/docker; the book's "Self-hosting with Docker"):
|
||||||
|
#
|
||||||
|
# ghcr.io/<owner>/solidcraft-web:latest the latest published release
|
||||||
|
# ghcr.io/<owner>/solidcraft-web:0.14.0 a release (also 0.14); pre-releases get only their version
|
||||||
|
# ghcr.io/<owner>/solidcraft-web:edge main
|
||||||
|
#
|
||||||
|
# For linux/amd64 and linux/arm64. The site is built here, as Pages and Release build it, and
|
||||||
|
# passed to the Dockerfile as its `site` stage. Pull requests that touch the image build and
|
||||||
|
# smoke-test it without publishing. Releases published by an agent or maintainer trigger this;
|
||||||
|
# the nightly pre-releases (made with GITHUB_TOKEN) do not.
|
||||||
|
name: Docker
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
release:
|
||||||
|
types: [published]
|
||||||
|
pull_request:
|
||||||
|
paths: ["packaging/docker/**", ".github/workflows/docker.yml"]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: docker-${{ github.ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
env:
|
||||||
|
CARGO_TERM_COLOR: always
|
||||||
|
TRUNK_VERSION: v0.21.14
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
image:
|
||||||
|
if: ${{ !github.event.repository.private }}
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 60
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
with:
|
||||||
|
targets: wasm32-unknown-unknown
|
||||||
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
|
with:
|
||||||
|
key: docker-web
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' }}
|
||||||
|
- name: Install trunk
|
||||||
|
run: |
|
||||||
|
mkdir -p "$HOME/.local/bin"
|
||||||
|
curl -fsSL "https://github.com/trunk-rs/trunk/releases/download/${TRUNK_VERSION}/trunk-x86_64-unknown-linux-gnu.tar.gz" | tar -xz -C "$HOME/.local/bin"
|
||||||
|
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
|
||||||
|
- name: Build the web app
|
||||||
|
working-directory: apps/solidcraft-web
|
||||||
|
run: trunk build --release
|
||||||
|
- name: Image name
|
||||||
|
id: image
|
||||||
|
# Registry names are lower case; a fork's owner may not be.
|
||||||
|
run: echo "name=ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/solidcraft-web" >> "$GITHUB_OUTPUT"
|
||||||
|
- uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
|
||||||
|
id: meta
|
||||||
|
with:
|
||||||
|
images: ${{ steps.image.outputs.name }}
|
||||||
|
tags: |
|
||||||
|
type=semver,pattern={{version}}
|
||||||
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
|
type=edge,branch=main
|
||||||
|
type=ref,event=pr
|
||||||
|
labels: |
|
||||||
|
org.opencontainers.image.title=SolidCraft (web)
|
||||||
|
org.opencontainers.image.description=SolidCraft, open-source parametric CAD, in the browser: the web app served by nginx on port 8080
|
||||||
|
org.opencontainers.image.licenses=MIT OR Apache-2.0
|
||||||
|
- uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
|
||||||
|
- name: Build for the smoke test
|
||||||
|
uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: packaging/docker/Dockerfile
|
||||||
|
build-contexts: site=dist/web
|
||||||
|
platforms: linux/amd64
|
||||||
|
load: true
|
||||||
|
tags: solidcraft-web:test
|
||||||
|
- name: Smoke test
|
||||||
|
run: bash packaging/docker/smoke-test.sh solidcraft-web:test
|
||||||
|
- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.actor }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Build and publish
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: packaging/docker/Dockerfile
|
||||||
|
build-contexts: site=dist/web
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
push: true
|
||||||
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
annotations: ${{ steps.meta.outputs.annotations }}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
# Files generated from the code are rewritten here, on main, after each merge, so pull requests
|
||||||
|
# never edit them (two pull requests that each regenerated one would always conflict):
|
||||||
|
# THIRD-PARTY-LICENSES.txt (`cargo xtask licences`) and docs/features.md (`cargo xtask features`).
|
||||||
|
name: Generated files
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
# One run at a time; a burst of merges leaves one run waiting, which sees all of them.
|
||||||
|
concurrency:
|
||||||
|
group: generated-files
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
regenerate:
|
||||||
|
name: Regenerate and commit
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 60
|
||||||
|
steps:
|
||||||
|
# Always main itself, never pull request code, since this job can push.
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
with:
|
||||||
|
ref: main
|
||||||
|
# main goes through the merge queue; this deploy key may push past it.
|
||||||
|
ssh-key: ${{ secrets.GENERATED_FILES_DEPLOY_KEY }}
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
|
with:
|
||||||
|
key: generated-files
|
||||||
|
- name: THIRD-PARTY-LICENSES.txt
|
||||||
|
run: cargo xtask licences
|
||||||
|
- name: docs/features.md
|
||||||
|
run: cargo xtask features
|
||||||
|
- name: Commit if changed
|
||||||
|
run: |
|
||||||
|
if git diff --quiet -- THIRD-PARTY-LICENSES.txt docs/features.md; then echo "unchanged"; exit 0; fi
|
||||||
|
git config user.name "github-actions[bot]"
|
||||||
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
|
git add THIRD-PARTY-LICENSES.txt docs/features.md
|
||||||
|
git commit -m "Regenerate THIRD-PARTY-LICENSES.txt and docs/features.md [skip ci]"
|
||||||
|
for _ in 1 2 3; do
|
||||||
|
git pull --rebase origin main && git push origin HEAD:main && exit 0
|
||||||
|
sleep 10
|
||||||
|
done
|
||||||
|
exit 1
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# Files many pull requests add to are kept so that additions don't conflict: one file per change
|
||||||
|
# or one sorted line per item (CONTRIBUTING.md, "Lists many changes add to"). Fast, no build.
|
||||||
|
# Pull requests get the same checks in CI's "Format and repository checks" job (one runner slot
|
||||||
|
# per PR instead of three); this copy keeps main honest.
|
||||||
|
name: Lists
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
format-changes:
|
||||||
|
name: Design format changes merge cleanly
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 5
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- run: bash scripts/test-format-pending.sh
|
||||||
|
|
||||||
|
sorted:
|
||||||
|
name: Lists are sorted one item per line
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
|
with:
|
||||||
|
key: lists
|
||||||
|
- run: cargo xtask lists
|
||||||
@@ -6,9 +6,9 @@ name: Packaging lint
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
paths: [".github/workflows/**", "packaging/**"]
|
paths: [".github/workflows/**", "packaging/**", "assets/**"]
|
||||||
pull_request:
|
pull_request:
|
||||||
paths: [".github/workflows/**", "packaging/**"]
|
paths: [".github/workflows/**", "packaging/**", "assets/platforms/**"]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
@@ -52,8 +52,14 @@ jobs:
|
|||||||
}
|
}
|
||||||
- name: XML, desktop entry, AppStream, Flatpak manifest
|
- name: XML, desktop entry, AppStream, Flatpak manifest
|
||||||
run: |
|
run: |
|
||||||
xmllint --noout packaging/windows/solvecraft.wxs packaging/windows/solvecraft.en-us.wxl packaging/macos/*.plist* packaging/linux/*.xml*
|
xmllint --noout assets/platforms/windows/solidcraft.wxs assets/platforms/windows/solidcraft.en-us.wxl assets/platforms/macos/*.plist* assets/platforms/linux/*.xml*
|
||||||
desktop-file-validate packaging/linux/ai.storyteller.solvecraft.desktop
|
desktop-file-validate assets/platforms/linux/ai.storyteller.solidcraft.desktop
|
||||||
sed -e 's/@VERSION@/0.0.0/' -e 's/@DATE@/2026-01-01/' packaging/linux/ai.storyteller.solvecraft.metainfo.xml.in >"$RUNNER_TEMP/ai.storyteller.solvecraft.metainfo.xml"
|
# The window's X11 class is its app id; the old id stays only as the rename shims.
|
||||||
appstreamcli validate --no-net --explain "$RUNNER_TEMP/ai.storyteller.solvecraft.metainfo.xml"
|
grep -qx 'StartupWMClass=ai.storyteller.solidcraft' assets/platforms/linux/ai.storyteller.solidcraft.desktop
|
||||||
python3 -c "import yaml; m = yaml.safe_load(open('packaging/linux/flatpak/ai.storyteller.solvecraft.bundle.yml')); assert m['id'] == 'ai.storyteller.solvecraft' and m['command'] == 'solvecraft'"
|
grep -q '<id>ai.storyteller.solvecraft</id>' assets/platforms/linux/ai.storyteller.solidcraft.metainfo.xml.in
|
||||||
|
grep -qF -e '--end-of-life-rebase=' packaging/flatpak-site.sh
|
||||||
|
sed -e 's/@VERSION@/0.0.0/' -e 's/@DATE@/2026-01-01/' assets/platforms/linux/ai.storyteller.solidcraft.metainfo.xml.in >"$RUNNER_TEMP/ai.storyteller.solidcraft.metainfo.xml"
|
||||||
|
appstreamcli validate --no-net --explain "$RUNNER_TEMP/ai.storyteller.solidcraft.metainfo.xml"
|
||||||
|
python3 -c "import yaml; m = yaml.safe_load(open('packaging/linux/flatpak/ai.storyteller.solidcraft.bundle.yml')); assert m['id'] == 'ai.storyteller.solidcraft' and m['command'] == 'solidcraft'"
|
||||||
|
python3 -c "import yaml; m = yaml.safe_load(open('packaging/linux/snap/snapcraft.yaml')); assert m['name'] == 'solidcraft' and m['confinement'] == 'strict' and m['apps']['solidcraft']['command'] == 'usr/bin/solidcraft'"
|
||||||
|
python3 -m py_compile packaging/linux/snap-smoke.py
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# The documentation site on GitHub Pages: the book (docs/book) at /solidcraft/ and the web app
|
# The documentation site on GitHub Pages: the book (docs/book) at https://docs.solidcraft.io/
|
||||||
# at /solidcraft/app/. Needs Settings → Pages → Source = GitHub Actions; skipped while the
|
# and the bundled web app at /app/. Needs Settings → Pages → Source = GitHub Actions; skipped while the
|
||||||
# repository is private.
|
# repository is private.
|
||||||
name: Pages
|
name: Pages
|
||||||
|
|
||||||
@@ -45,11 +45,20 @@ jobs:
|
|||||||
curl -sSL "https://github.com/rust-lang/mdBook/releases/download/${MDBOOK_VERSION}/mdbook-${MDBOOK_VERSION}-x86_64-unknown-linux-gnu.tar.gz" | tar -xz -C "$HOME/.local/bin"
|
curl -sSL "https://github.com/rust-lang/mdBook/releases/download/${MDBOOK_VERSION}/mdbook-${MDBOOK_VERSION}-x86_64-unknown-linux-gnu.tar.gz" | tar -xz -C "$HOME/.local/bin"
|
||||||
curl -sSL "https://github.com/trunk-rs/trunk/releases/download/${TRUNK_VERSION}/trunk-x86_64-unknown-linux-gnu.tar.gz" | tar -xz -C "$HOME/.local/bin"
|
curl -sSL "https://github.com/trunk-rs/trunk/releases/download/${TRUNK_VERSION}/trunk-x86_64-unknown-linux-gnu.tar.gz" | tar -xz -C "$HOME/.local/bin"
|
||||||
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
|
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
|
||||||
|
- name: Install a software Vulkan driver (lavapipe)
|
||||||
|
# The book's pictures are `solidcraft-cli snapshot`s, drawn on the GPU; the runner has none.
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends mesa-vulkan-drivers libvulkan1
|
||||||
- name: Build the book
|
- name: Build the book
|
||||||
|
env:
|
||||||
|
SOLIDCRAFT_GPU: software
|
||||||
run: cargo xtask book
|
run: cargo xtask book
|
||||||
- name: Build the web app
|
- name: Build the web app
|
||||||
working-directory: apps/solvecraft-web
|
working-directory: apps/solidcraft-web
|
||||||
run: trunk build --release --public-url /solidcraft/app/
|
run: trunk build --release --public-url ./
|
||||||
|
- name: Test the web app offline and across an update (headless Chrome)
|
||||||
|
run: cargo xtask web-offline-test --site dist/web
|
||||||
- name: Assemble the site
|
- name: Assemble the site
|
||||||
run: |
|
run: |
|
||||||
mkdir -p site
|
mkdir -p site
|
||||||
|
|||||||
+160
-25
@@ -6,12 +6,16 @@
|
|||||||
# At midnight Eastern, changed main commits build and publish a nightly pre-release.
|
# At midnight Eastern, changed main commits build and publish a nightly pre-release.
|
||||||
# A version with a suffix (0.2.0-rc.1) is a pre-release. Nothing is signed yet.
|
# A version with a suffix (0.2.0-rc.1) is a pre-release. Nothing is signed yet.
|
||||||
#
|
#
|
||||||
# Linux x86_64, aarch64 AppImage (+ .zsync), .deb, .rpm, .flatpak, .tar.gz packaging/linux
|
# Linux x86_64, aarch64 AppImage (+ .zsync), .deb, .rpm, .flatpak, .snap, .tar.gz packaging/linux
|
||||||
# FreeBSD x86_64 .tar.gz (built in a FreeBSD VM) packaging/freebsd
|
# FreeBSD x86_64 .tar.gz (built in a FreeBSD VM) packaging/freebsd
|
||||||
# macOS universal .dmg, and the CLI as a .zip packaging/macos
|
# macOS universal .dmg, and the CLI as a .zip packaging/macos
|
||||||
# Windows x64, x86, arm64 .msi and a portable .zip; x64 also the plain .exe packaging/windows
|
# Windows x64, x86, arm64 .msi and a portable .zip; x64 also the plain .exe packaging/windows
|
||||||
# Web a .zip of the static site packaging/web
|
# Web a .zip of the static site packaging/web
|
||||||
#
|
#
|
||||||
|
# The main installers are also attached without the version in their names
|
||||||
|
# (solidcraft-windows-x64.msi, solidcraft-linux-x86_64.AppImage, ...) so that
|
||||||
|
# releases/latest/download/<name> links in the README keep working across releases.
|
||||||
|
#
|
||||||
# A dry run: dispatch with draft=false (the default). Only the release branch may create drafts.
|
# A dry run: dispatch with draft=false (the default). Only the release branch may create drafts.
|
||||||
name: Release
|
name: Release
|
||||||
|
|
||||||
@@ -79,7 +83,7 @@ jobs:
|
|||||||
{ echo "version=$VERSION"; echo "date=$(date -u +%Y-%m-%d)"; echo "prerelease=$pre"; } >>"$GITHUB_OUTPUT"
|
{ echo "version=$VERSION"; echo "date=$(date -u +%Y-%m-%d)"; echo "prerelease=$pre"; } >>"$GITHUB_OUTPUT"
|
||||||
echo "### SolidCraft v$VERSION (\`${GITHUB_SHA::9}\`)" >>"$GITHUB_STEP_SUMMARY"
|
echo "### SolidCraft v$VERSION (\`${GITHUB_SHA::9}\`)" >>"$GITHUB_STEP_SUMMARY"
|
||||||
|
|
||||||
# The app icon in every size, drawn by solvecraft-cli (no image files are committed), for the
|
# The app icon in every size, drawn by solidcraft-cli (no image files are committed), for the
|
||||||
# Windows jobs: the ARM64 build is cross-compiled and can't run there to draw its own.
|
# Windows jobs: the ARM64 build is cross-compiled and can't run there to draw its own.
|
||||||
icons:
|
icons:
|
||||||
needs: version
|
needs: version
|
||||||
@@ -91,10 +95,10 @@ jobs:
|
|||||||
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
with:
|
with:
|
||||||
key: release-icons
|
key: release-icons
|
||||||
- run: cargo build --release --locked -p solvecraft-cli
|
- run: cargo build --release --locked -p solidcraft-cli
|
||||||
- run: |
|
- run: |
|
||||||
. packaging/env.sh
|
. packaging/env.sh
|
||||||
make_icons target/release/solvecraft-cli icons
|
make_icons target/release/solidcraft-cli icons
|
||||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
with:
|
with:
|
||||||
name: icons
|
name: icons
|
||||||
@@ -114,8 +118,8 @@ jobs:
|
|||||||
- { arch: x86_64, runner: ubuntu-22.04, deb: amd64 }
|
- { arch: x86_64, runner: ubuntu-22.04, deb: amd64 }
|
||||||
- { arch: aarch64, runner: ubuntu-22.04-arm, deb: arm64 }
|
- { arch: aarch64, runner: ubuntu-22.04-arm, deb: arm64 }
|
||||||
env:
|
env:
|
||||||
SOLVECRAFT_VERSION: ${{ needs.version.outputs.version }}
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
SOLVECRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
SOLIDCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
||||||
NFPM_VERSION: 2.47.0
|
NFPM_VERSION: 2.47.0
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
@@ -135,17 +139,22 @@ jobs:
|
|||||||
- name: Check the packages
|
- name: Check the packages
|
||||||
run: |
|
run: |
|
||||||
dpkg-deb --info dist/release/*.deb
|
dpkg-deb --info dist/release/*.deb
|
||||||
dpkg-deb --contents dist/release/*.deb | grep -E 'usr/bin/solvecraft$|usr/bin/solvecraft-cli$|metainfo|applications|THIRD-PARTY-LICENSES.txt'
|
dpkg-deb --contents dist/release/*.deb | grep -E 'usr/bin/solidcraft$|usr/bin/solidcraft-cli$|metainfo|applications|THIRD-PARTY-LICENSES.txt'
|
||||||
|
# Compatibility shims (docs/compatibility.md): the old CLI name and the package rename.
|
||||||
|
dpkg-deb --contents dist/release/*.deb | grep -E 'usr/bin/solvecraft-cli$'
|
||||||
|
dpkg-deb --field dist/release/*.deb Replaces Conflicts Provides | grep -F solvecraft
|
||||||
rpm -qip dist/release/*.rpm
|
rpm -qip dist/release/*.rpm
|
||||||
rpm -qlp dist/release/*.rpm | grep -E '/usr/bin/solvecraft$|THIRD-PARTY-LICENSES.txt'
|
rpm -qlp dist/release/*.rpm | grep -E '/usr/bin/solidcraft$|THIRD-PARTY-LICENSES.txt'
|
||||||
tar -tzf dist/release/*.tar.gz | grep -E '/bin/solvecraft$|THIRD-PARTY-LICENSES.txt'
|
tar -tzf dist/release/*.tar.gz | grep -E '/bin/solidcraft$|THIRD-PARTY-LICENSES.txt'
|
||||||
ldd target/release/solvecraft
|
ldd target/release/solidcraft
|
||||||
for appimage in dist/release/*.AppImage; do
|
for appimage in dist/release/*.AppImage; do
|
||||||
chmod +x "$appimage"
|
chmod +x "$appimage"
|
||||||
APPIMAGE_EXTRACT_AND_RUN=1 "$appimage" --version
|
APPIMAGE_EXTRACT_AND_RUN=1 "$appimage" --version
|
||||||
"$appimage" --appimage-updateinformation | grep -F 'gh-releases-zsync|'
|
"$appimage" --appimage-updateinformation | grep -F 'gh-releases-zsync|'
|
||||||
test -s "$appimage.zsync"
|
test -s "$appimage.zsync"
|
||||||
done
|
done
|
||||||
|
# Legacy AppImage update alias (docs/compatibility.md).
|
||||||
|
ls dist/release/solvecraft-*-linux-*.AppImage.zsync
|
||||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
with:
|
with:
|
||||||
name: release-linux-${{ matrix.arch }}
|
name: release-linux-${{ matrix.arch }}
|
||||||
@@ -166,8 +175,8 @@ jobs:
|
|||||||
- { arch: x86_64, runner: ubuntu-24.04 }
|
- { arch: x86_64, runner: ubuntu-24.04 }
|
||||||
- { arch: aarch64, runner: ubuntu-24.04-arm }
|
- { arch: aarch64, runner: ubuntu-24.04-arm }
|
||||||
env:
|
env:
|
||||||
SOLVECRAFT_VERSION: ${{ needs.version.outputs.version }}
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
SOLVECRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
SOLIDCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||||
@@ -181,7 +190,7 @@ jobs:
|
|||||||
# Ubuntu 24.04's AppArmor blocks the unprivileged user namespaces bubblewrap needs.
|
# Ubuntu 24.04's AppArmor blocks the unprivileged user namespaces bubblewrap needs.
|
||||||
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
|
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
|
||||||
- name: Build the Flatpak bundle
|
- name: Build the Flatpak bundle
|
||||||
run: packaging/linux/flatpak-bundle.sh "dist/linux/solvecraft-$SOLVECRAFT_VERSION-linux-${{ matrix.arch }}.tar.gz"
|
run: packaging/linux/flatpak-bundle.sh "dist/linux/solidcraft-$SOLIDCRAFT_VERSION-linux-${{ matrix.arch }}.tar.gz"
|
||||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
with:
|
with:
|
||||||
name: release-flatpak-${{ matrix.arch }}
|
name: release-flatpak-${{ matrix.arch }}
|
||||||
@@ -190,6 +199,59 @@ jobs:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
snap:
|
||||||
|
name: Snap ${{ matrix.arch }}
|
||||||
|
needs: [version, linux]
|
||||||
|
if: needs.version.outputs.build == 'true'
|
||||||
|
# Repackages the Linux job's tarball, like the Flatpak. On 24.04 because the core24 base is
|
||||||
|
# Ubuntu 24.04, which lets snapcraft build on the runner itself (--destructive-mode).
|
||||||
|
runs-on: ${{ matrix.runner }}
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- { arch: x86_64, runner: ubuntu-24.04 }
|
||||||
|
- { arch: aarch64, runner: ubuntu-24.04-arm }
|
||||||
|
env:
|
||||||
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
|
SOLIDCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||||
|
with:
|
||||||
|
name: release-linux-${{ matrix.arch }}
|
||||||
|
path: dist/linux
|
||||||
|
- name: Install snapcraft and the smoke-test tools
|
||||||
|
run: |
|
||||||
|
sudo snap install snapcraft --classic
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends xvfb xauth weston dbus-x11
|
||||||
|
- name: Build the snap
|
||||||
|
run: |
|
||||||
|
sudo --preserve-env=SOLIDCRAFT_VERSION,SOLIDCRAFT_BUILD_DATE env "PATH=$PATH" \
|
||||||
|
packaging/linux/snap-pack.sh --destructive-mode "dist/linux/solidcraft-$SOLIDCRAFT_VERSION-linux-${{ matrix.arch }}.tar.gz"
|
||||||
|
sudo chown -R "$(id -u):$(id -g)" dist target
|
||||||
|
- name: Install it and start the app on headless X11 and Wayland
|
||||||
|
run: |
|
||||||
|
snap_file="dist/release/solidcraft-$SOLIDCRAFT_VERSION-linux-${{ matrix.arch }}.snap"
|
||||||
|
sudo snap install --dangerous "$snap_file"
|
||||||
|
snap info --verbose "$snap_file" | head -n 12
|
||||||
|
snap connections solidcraft
|
||||||
|
solidcraft.cli --version
|
||||||
|
# Snaps expect the login session's runtime directory, which runners don't create.
|
||||||
|
sudo install -d -m 700 -o "$(id -u)" -g "$(id -g)" "/run/user/$(id -u)"
|
||||||
|
python3 packaging/linux/snap-smoke.py --out snap-smoke
|
||||||
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: snap-smoke-${{ matrix.arch }}
|
||||||
|
path: snap-smoke/*.png
|
||||||
|
if-no-files-found: error
|
||||||
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: release-snap-${{ matrix.arch }}
|
||||||
|
path: dist/release/*.snap
|
||||||
|
if-no-files-found: error
|
||||||
|
|
||||||
freebsd:
|
freebsd:
|
||||||
name: FreeBSD x86_64
|
name: FreeBSD x86_64
|
||||||
needs: version
|
needs: version
|
||||||
@@ -198,8 +260,8 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 180
|
timeout-minutes: 180
|
||||||
env:
|
env:
|
||||||
SOLVECRAFT_VERSION: ${{ needs.version.outputs.version }}
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
SOLVECRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
SOLIDCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
- name: Build and package in a FreeBSD VM (tar.gz)
|
- name: Build and package in a FreeBSD VM (tar.gz)
|
||||||
@@ -211,7 +273,7 @@ jobs:
|
|||||||
cpu: 4
|
cpu: 4
|
||||||
mem: 12288
|
mem: 12288
|
||||||
# Passed into the VM by name; never templated into the script below.
|
# Passed into the VM by name; never templated into the script below.
|
||||||
envs: "SOLVECRAFT_VERSION SOLVECRAFT_BUILD_DATE"
|
envs: "SOLIDCRAFT_VERSION SOLIDCRAFT_BUILD_DATE"
|
||||||
prepare: |
|
prepare: |
|
||||||
pkg install -y bash git curl pkgconf libxkbcommon wayland libX11 libXcursor libXrandr libXi libxcb mesa-libs vulkan-loader
|
pkg install -y bash git curl pkgconf libxkbcommon wayland libX11 libXcursor libXrandr libXi libxcb mesa-libs vulkan-loader
|
||||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable
|
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable
|
||||||
@@ -221,10 +283,10 @@ jobs:
|
|||||||
git config --global --add safe.directory "$PWD"
|
git config --global --add safe.directory "$PWD"
|
||||||
# Build outside the checkout so only dist/ is copied back out of the VM. 4 jobs: more
|
# Build outside the checkout so only dist/ is copied back out of the VM. 4 jobs: more
|
||||||
# runs the VM out of memory.
|
# runs the VM out of memory.
|
||||||
export CARGO_TARGET_DIR=/var/tmp/solvecraft-target CARGO_BUILD_JOBS=4
|
export CARGO_TARGET_DIR=/var/tmp/solidcraft-target CARGO_BUILD_JOBS=4
|
||||||
bash packaging/freebsd/package.sh
|
bash packaging/freebsd/package.sh
|
||||||
tar -tzf dist/release/solvecraft-*-freebsd-x86_64.tar.gz \
|
tar -tzf dist/release/solidcraft-*-freebsd-x86_64.tar.gz \
|
||||||
| grep -E '/bin/solvecraft$|/bin/solvecraft-cli$|/share/applications/ai\.storyteller\.solvecraft\.desktop$|/share/doc/solvecraft/THIRD-PARTY-LICENSES\.txt$'
|
| grep -E '/bin/solidcraft$|/bin/solidcraft-cli$|/share/applications/ai\.storyteller\.solvecraft\.desktop$|/share/doc/solidcraft/THIRD-PARTY-LICENSES\.txt$'
|
||||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
with:
|
with:
|
||||||
name: release-freebsd-x86_64
|
name: release-freebsd-x86_64
|
||||||
@@ -237,8 +299,8 @@ jobs:
|
|||||||
if: needs.version.outputs.build == 'true'
|
if: needs.version.outputs.build == 'true'
|
||||||
runs-on: macos-14
|
runs-on: macos-14
|
||||||
env:
|
env:
|
||||||
SOLVECRAFT_VERSION: ${{ needs.version.outputs.version }}
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
SOLVECRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
SOLIDCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
@@ -269,7 +331,7 @@ jobs:
|
|||||||
# Windows on ARM: cross-compiled on the x64 runner.
|
# Windows on ARM: cross-compiled on the x64 runner.
|
||||||
- { arch: arm64, target: aarch64-pc-windows-msvc }
|
- { arch: arm64, target: aarch64-pc-windows-msvc }
|
||||||
env:
|
env:
|
||||||
SOLVECRAFT_VERSION: ${{ needs.version.outputs.version }}
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||||
@@ -290,7 +352,7 @@ jobs:
|
|||||||
- name: Build and package (msi, portable zip)
|
- name: Build and package (msi, portable zip)
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
env:
|
env:
|
||||||
SOLVECRAFT_ICONS: ${{ github.workspace }}/icons
|
SOLIDCRAFT_ICONS: ${{ github.workspace }}/icons
|
||||||
run: ./packaging/windows/package.ps1 -Arch ${{ matrix.arch }}
|
run: ./packaging/windows/package.ps1 -Arch ${{ matrix.arch }}
|
||||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
with:
|
with:
|
||||||
@@ -304,7 +366,7 @@ jobs:
|
|||||||
if: needs.version.outputs.build == 'true'
|
if: needs.version.outputs.build == 'true'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
SOLVECRAFT_VERSION: ${{ needs.version.outputs.version }}
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
TRUNK_VERSION: 0.21.14
|
TRUNK_VERSION: 0.21.14
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
@@ -328,7 +390,7 @@ jobs:
|
|||||||
|
|
||||||
release:
|
release:
|
||||||
name: GitHub Release or dry-run artifacts
|
name: GitHub Release or dry-run artifacts
|
||||||
needs: [version, linux, flatpak, freebsd, macos, windows, web]
|
needs: [version, linux, flatpak, snap, freebsd, macos, windows, web]
|
||||||
if: needs.version.outputs.build == 'true'
|
if: needs.version.outputs.build == 'true'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
@@ -345,10 +407,54 @@ jobs:
|
|||||||
pattern: release-*
|
pattern: release-*
|
||||||
path: artifacts
|
path: artifacts
|
||||||
merge-multiple: true
|
merge-multiple: true
|
||||||
|
- name: Version-less copies for permanent download links
|
||||||
|
# The README links to releases/latest/download/<name>, which must not change between
|
||||||
|
# releases: solidcraft-<version>-windows-x64.msi is also uploaded as
|
||||||
|
# solidcraft-windows-x64.msi, and so on for the main installers.
|
||||||
|
working-directory: artifacts
|
||||||
|
run: |
|
||||||
|
shopt -s nullglob
|
||||||
|
for f in "solidcraft-$VERSION-"*; do
|
||||||
|
case "$f" in
|
||||||
|
*.msi | *-portable.zip | *.dmg | *.AppImage | *.deb | *.rpm | *.flatpak | *.snap)
|
||||||
|
cp -- "$f" "solidcraft-${f#"solidcraft-$VERSION-"}" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
for f in solidcraft-windows-x64.msi solidcraft-macos-universal.dmg \
|
||||||
|
solidcraft-linux-x86_64.AppImage solidcraft-linux-x86_64.deb solidcraft-linux-x86_64.rpm; do
|
||||||
|
test -s "$f" || { echo "::error::missing version-less copy $f"; exit 1; }
|
||||||
|
done
|
||||||
|
ls -l solidcraft-[!0-9]*
|
||||||
- name: Checksums and notes
|
- name: Checksums and notes
|
||||||
run: |
|
run: |
|
||||||
(cd artifacts && sha256sum -- * | tee SHA256SUMS.txt)
|
(cd artifacts && sha256sum -- * | tee SHA256SUMS.txt)
|
||||||
sed "s/{version}/$VERSION/g" .github/release-notes.md >notes.md
|
sed "s/{version}/$VERSION/g" .github/release-notes.md >notes.md
|
||||||
|
- name: Sign the checksum list for in-app updates
|
||||||
|
# Optional until the UPDATE_SIGNING_KEY secret exists (docs/releasing.md, "Update
|
||||||
|
# signing"). The trusted comment names the release, which the app checks.
|
||||||
|
env:
|
||||||
|
UPDATE_SIGNING_KEY: ${{ secrets.UPDATE_SIGNING_KEY }}
|
||||||
|
run: |
|
||||||
|
# The key the app checks against (crates/ui-egui/src/update/install.rs, PUBLIC_KEY).
|
||||||
|
public_key=$(sed -n 's/^pub const PUBLIC_KEY: Option<&str> = Some("\([^"]*\)");/\1/p' crates/ui-egui/src/update/install.rs)
|
||||||
|
if [ -z "$UPDATE_SIGNING_KEY" ]; then
|
||||||
|
if [ -n "$public_key" ]; then
|
||||||
|
echo "::error::the app expects signed updates (PUBLIC_KEY is set) but the UPDATE_SIGNING_KEY secret is missing"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "UPDATE_SIGNING_KEY isn't set: SHA256SUMS.txt stays unsigned"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
sudo apt-get update -q
|
||||||
|
sudo apt-get install -y --no-install-recommends minisign
|
||||||
|
umask 077
|
||||||
|
printf '%s\n' "$UPDATE_SIGNING_KEY" >"$RUNNER_TEMP/update.key"
|
||||||
|
minisign -S -s "$RUNNER_TEMP/update.key" -m artifacts/SHA256SUMS.txt \
|
||||||
|
-x artifacts/SHA256SUMS.txt.minisig -t "SolidCraft v$VERSION" </dev/null
|
||||||
|
rm -f "$RUNNER_TEMP/update.key"
|
||||||
|
if [ -n "$public_key" ]; then
|
||||||
|
minisign -V -P "$public_key" -m artifacts/SHA256SUMS.txt -x artifacts/SHA256SUMS.txt.minisig
|
||||||
|
fi
|
||||||
- name: Publish nightly pre-release
|
- name: Publish nightly pre-release
|
||||||
if: github.event_name == 'schedule'
|
if: github.event_name == 'schedule'
|
||||||
working-directory: artifacts
|
working-directory: artifacts
|
||||||
@@ -398,6 +504,35 @@ jobs:
|
|||||||
echo
|
echo
|
||||||
sed 's/^/ /' SHA256SUMS.txt
|
sed 's/^/ /' SHA256SUMS.txt
|
||||||
} >>"$GITHUB_STEP_SUMMARY"
|
} >>"$GITHUB_STEP_SUMMARY"
|
||||||
|
# Snap Store: nightlies go to the edge channel and release drafts to candidate, only after
|
||||||
|
# every package built and the GitHub release was staged. Publishing the GitHub release
|
||||||
|
# promotes candidate to stable (snap-store.yml). Dry runs never upload. Skipped until the
|
||||||
|
# owner adds the SNAPCRAFT_STORE_CREDENTIALS secret (docs/releasing.md).
|
||||||
|
- id: snapstore
|
||||||
|
name: Check for Snap Store credentials
|
||||||
|
env:
|
||||||
|
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
|
||||||
|
run: |
|
||||||
|
if [ -n "$SNAPCRAFT_STORE_CREDENTIALS" ]; then
|
||||||
|
echo "configured=true" >>"$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "No SNAPCRAFT_STORE_CREDENTIALS secret: skipping the Snap Store upload."
|
||||||
|
fi
|
||||||
|
- name: Upload the snaps to the Snap Store
|
||||||
|
if: >-
|
||||||
|
steps.snapstore.outputs.configured == 'true' && (github.event_name == 'schedule' ||
|
||||||
|
(github.ref == 'refs/heads/release' && (github.event_name == 'push' || inputs.draft)))
|
||||||
|
env:
|
||||||
|
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
|
||||||
|
working-directory: artifacts
|
||||||
|
run: |
|
||||||
|
sudo snap install snapcraft --classic
|
||||||
|
channel=candidate
|
||||||
|
if [ "$GITHUB_EVENT_NAME" = schedule ]; then channel=edge; fi
|
||||||
|
for arch in x86_64 aarch64; do
|
||||||
|
snapcraft upload --release="$channel" "solidcraft-$VERSION-linux-$arch.snap"
|
||||||
|
done
|
||||||
|
echo "Uploaded the snaps to the Snap Store's $channel channel." >>"$GITHUB_STEP_SUMMARY"
|
||||||
- name: Keep the files (dry run)
|
- name: Keep the files (dry run)
|
||||||
if: github.event_name == 'workflow_dispatch' && !inputs.draft
|
if: github.event_name == 'workflow_dispatch' && !inputs.draft
|
||||||
run: cp notes.md artifacts/release-notes.md
|
run: cp notes.md artifacts/release-notes.md
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# Publishing a GitHub release (not a prerelease) promotes the snaps that release.yml uploaded to
|
||||||
|
# the Snap Store's candidate channel to stable, so `sudo snap install solidcraft` gets it.
|
||||||
|
# Skipped until the owner adds the SNAPCRAFT_STORE_CREDENTIALS secret; see docs/releasing.md.
|
||||||
|
name: Snap Store
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [released]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: snap-store
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
promote:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- id: creds
|
||||||
|
name: Check for Snap Store credentials
|
||||||
|
env:
|
||||||
|
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
|
||||||
|
run: |
|
||||||
|
if [ -n "$SNAPCRAFT_STORE_CREDENTIALS" ]; then
|
||||||
|
echo "configured=true" >>"$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "No SNAPCRAFT_STORE_CREDENTIALS secret: nothing to promote."
|
||||||
|
fi
|
||||||
|
- name: Promote candidate to stable
|
||||||
|
if: steps.creds.outputs.configured == 'true'
|
||||||
|
env:
|
||||||
|
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
|
||||||
|
run: |
|
||||||
|
sudo snap install snapcraft --classic
|
||||||
|
snapcraft status solidcraft
|
||||||
|
snapcraft promote solidcraft --from-channel=latest/candidate --to-channel=latest/stable --yes
|
||||||
|
snapcraft status solidcraft
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
# Labels new issues and PRs from fixed rules, `/triage` for maintainers, asks short bug reports
|
||||||
|
# for reproduction steps (`needs-info`, closed after 14 days unanswered), and a manual backfill
|
||||||
|
# (CONTRIBUTING.md, "Labels and triage"). The logic is in scripts/triage/ (tested in ci.yml).
|
||||||
|
name: Triage
|
||||||
|
|
||||||
|
on:
|
||||||
|
issues:
|
||||||
|
types: [opened, labeled, edited]
|
||||||
|
issue_comment:
|
||||||
|
types: [created]
|
||||||
|
# pull_request_target so PRs from forks can be labelled. It runs the base branch's
|
||||||
|
# scripts/triage and only lists the PR's changed paths; the PR's code is never checked out.
|
||||||
|
pull_request_target:
|
||||||
|
types: [opened]
|
||||||
|
schedule:
|
||||||
|
- cron: '41 5 * * *'
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
dry_run:
|
||||||
|
description: 'Only report what would be labelled'
|
||||||
|
type: boolean
|
||||||
|
default: true
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read # to check out scripts/triage
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: triage-${{ github.event.issue.number || github.event.pull_request.number || 'repo' }}
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
triage:
|
||||||
|
name: Triage bot
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 30
|
||||||
|
# Filtered here so the common events (every comment, every label) start no runner.
|
||||||
|
if: >-
|
||||||
|
(github.event_name == 'issue_comment' &&
|
||||||
|
github.event.comment.user.type != 'Bot' && startsWith(github.event.comment.body, '/triage')) ||
|
||||||
|
((github.event_name == 'issue_comment' || github.event.action == 'edited') &&
|
||||||
|
contains(github.event.issue.labels.*.name, 'needs-info') &&
|
||||||
|
github.event.sender.login == github.event.issue.user.login) ||
|
||||||
|
(github.event.action == 'labeled' && startsWith(github.event.label.name, 'priority:') &&
|
||||||
|
contains(github.event.issue.labels.*.name, 'needs-triage')) ||
|
||||||
|
(github.event_name != 'issue_comment' && github.event.action != 'labeled' && github.event.action != 'edited')
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
with:
|
||||||
|
sparse-checkout: scripts/triage
|
||||||
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
|
env:
|
||||||
|
DRY_RUN: ${{ inputs.dry_run }}
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const triage = require('./scripts/triage/triage.js');
|
||||||
|
const info = require('./scripts/triage/needs-info.js');
|
||||||
|
const event = context.eventName;
|
||||||
|
const action = context.payload.action;
|
||||||
|
const esc = (t) => String(t).replace(/[&<>"]/g, (c) => ({ '&': '&', '<': '<', '>': '>', '"': '"' })[c]);
|
||||||
|
const th = (...names) => names.map((data) => ({ data, header: true }));
|
||||||
|
if (event === 'issue_comment') {
|
||||||
|
core.info(await triage.handleComment({ github, context }));
|
||||||
|
await info.handleReply({ github, context });
|
||||||
|
} else if (event === 'issues' && action === 'labeled') {
|
||||||
|
await triage.handleLabeled({ github, context });
|
||||||
|
} else if (event === 'issues' && action === 'edited') {
|
||||||
|
await info.handleReply({ github, context });
|
||||||
|
} else if (event === 'schedule') {
|
||||||
|
const closed = await info.sweep({ github, context });
|
||||||
|
core.info(`Closed for missing information: ${closed.join(', ') || 'none'}`);
|
||||||
|
} else if (event === 'workflow_dispatch') {
|
||||||
|
const dryRun = process.env.DRY_RUN !== 'false';
|
||||||
|
const plan = await triage.backfill({ github, context, dryRun });
|
||||||
|
const asks = await info.backfill({ github, context, dryRun });
|
||||||
|
await core.summary
|
||||||
|
.addHeading(dryRun ? `Backfill dry run: ${plan.length} unlabelled` : `Backfill: ${plan.length} labelled`)
|
||||||
|
.addTable([th('Item', 'Kind', 'Labels', 'Title'), ...plan.map((p) => [`#${p.number}`, p.pull ? 'PR' : 'issue', esc(p.labels.join(', ') || '—'), esc(p.title)])])
|
||||||
|
.addHeading(dryRun ? `needs-info dry run: ${asks.length} would be asked` : `needs-info: ${asks.length} asked`)
|
||||||
|
.addTable([th('Issue', 'Asks', 'Title'), ...asks.map((p) => [`#${p.number}`, esc(p.asks.join(', ')), esc(p.title)])])
|
||||||
|
.write();
|
||||||
|
} else {
|
||||||
|
core.info(`Labelled: ${(await triage.handleOpened({ github, context })).join(', ') || 'nothing'}`);
|
||||||
|
if (event === 'issues') await info.handleOpened({ github, context });
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
# Publishing a GitHub release (not a prerelease) opens a pull request at microsoft/winget-pkgs
|
||||||
|
# that adds the new version of bherbruck.SolidCraft, so `winget install bherbruck.SolidCraft`
|
||||||
|
# and `winget upgrade` get it. Komac (https://github.com/russellbanks/Komac) downloads the three
|
||||||
|
# versioned MSIs, reads their product codes and copies the rest from the previous manifest.
|
||||||
|
# Skipped until the owner adds the WINGET_TOKEN secret, and while the package isn't in
|
||||||
|
# winget-pkgs yet; see docs/releasing.md.
|
||||||
|
name: WinGet
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [released]
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
tag:
|
||||||
|
description: Published release tag to submit (e.g. v0.11.1)
|
||||||
|
required: true
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: winget
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
env:
|
||||||
|
PACKAGE_ID: bherbruck.SolidCraft
|
||||||
|
KOMAC_VERSION: 2.16.0
|
||||||
|
KOMAC_SHA256: 7d2707fa6210f2789a3702de49fbd150b736dbf426ee0b9bc8e098736f9fd82d
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
submit:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- id: check
|
||||||
|
name: Check for the token and the package
|
||||||
|
env:
|
||||||
|
WINGET_TOKEN: ${{ secrets.WINGET_TOKEN }}
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
TAG: ${{ github.event.release.tag_name || inputs.tag }}
|
||||||
|
run: |
|
||||||
|
if [ -z "$WINGET_TOKEN" ]; then
|
||||||
|
echo "No WINGET_TOKEN secret: nothing to submit."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
case "$TAG" in
|
||||||
|
v[0-9]*.[0-9]*.[0-9]*-*|*nightly*) echo "$TAG is a prerelease: not submitted."; exit 0 ;;
|
||||||
|
v[0-9]*.[0-9]*.[0-9]*) ;;
|
||||||
|
*) echo "::error::Unexpected tag '$TAG'"; exit 1 ;;
|
||||||
|
esac
|
||||||
|
if ! gh api "repos/microsoft/winget-pkgs/contents/manifests/b/bherbruck/SolidCraft" --silent; then
|
||||||
|
echo "$PACKAGE_ID isn't in winget-pkgs yet: nothing to update."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "version=${TAG#v}" >>"$GITHUB_OUTPUT"
|
||||||
|
echo "tag=$TAG" >>"$GITHUB_OUTPUT"
|
||||||
|
- name: Install Komac
|
||||||
|
if: steps.check.outputs.version != ''
|
||||||
|
run: |
|
||||||
|
archive="komac-${KOMAC_VERSION}-x86_64-unknown-linux-gnu.tar.gz"
|
||||||
|
curl -fsSLo "$RUNNER_TEMP/$archive" \
|
||||||
|
"https://github.com/russellbanks/Komac/releases/download/v${KOMAC_VERSION}/$archive"
|
||||||
|
echo "$KOMAC_SHA256 $RUNNER_TEMP/$archive" | sha256sum -c -
|
||||||
|
tar -xzf "$RUNNER_TEMP/$archive" -C "$RUNNER_TEMP" komac
|
||||||
|
- name: Open the winget-pkgs pull request
|
||||||
|
if: steps.check.outputs.version != ''
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.WINGET_TOKEN }}
|
||||||
|
VERSION: ${{ steps.check.outputs.version }}
|
||||||
|
TAG: ${{ steps.check.outputs.tag }}
|
||||||
|
run: |
|
||||||
|
base="https://github.com/${GITHUB_REPOSITORY}/releases/download/$TAG"
|
||||||
|
"$RUNNER_TEMP/komac" update "$PACKAGE_ID" --version "$VERSION" \
|
||||||
|
--urls "$base/solidcraft-$VERSION-windows-x64.msi" \
|
||||||
|
"$base/solidcraft-$VERSION-windows-x86.msi" \
|
||||||
|
"$base/solidcraft-$VERSION-windows-arm64.msi" \
|
||||||
|
--release-notes-url "https://github.com/${GITHUB_REPOSITORY}/releases/tag/$TAG" \
|
||||||
|
--submit
|
||||||
@@ -6,13 +6,13 @@ kernel, and a desktop UI that agents can drive. Projects published by
|
|||||||
[storytold](https://github.com/storytold) can serve as references for implementation conventions.
|
[storytold](https://github.com/storytold) can serve as references for implementation conventions.
|
||||||
Any code adapted from other projects (MIT OR Apache-2.0) is noted in ATTRIBUTION.md.
|
Any code adapted from other projects (MIT OR Apache-2.0) is noted in ATTRIBUTION.md.
|
||||||
|
|
||||||
## Product name and compatibility
|
## Product name
|
||||||
SolidCraft is the displayed product name; `solidcraft` is the repository name. Keep existing
|
SolidCraft everywhere: crates `solidcraft-*`, binaries `solidcraft` and `solidcraft-cli`,
|
||||||
`solvecraft` crate/binary names, `.solvecraft` files, format markers, environment variables,
|
`.solidcraft` designs, the `solidcraft/N` format tag, `SOLIDCRAFT_*` environment variables,
|
||||||
settings/recovery paths and package IDs compatible. Published SolveCraft release artifacts
|
settings and recovery folders, the MCP server name, docs, CI and packaging. The old name
|
||||||
and attribution records keep their historical names. Public docs/web/Flatpak deployments
|
survives only in the explicit compatibility shims listed in `docs/compatibility.md`; don't add
|
||||||
use project Pages `/solidcraft/`; do not add permanent old-name Pages aliases. See README's
|
new uses of it anywhere else. Public docs/web/Flatpak deployments use project Pages
|
||||||
compatibility notes.
|
`/solidcraft/`; do not add permanent old-name Pages aliases.
|
||||||
|
|
||||||
## Start every session here
|
## Start every session here
|
||||||
1. Read `plan/STATUS.md` (current milestone, next task), then the task in `plan/execution-plan.md`
|
1. Read `plan/STATUS.md` (current milestone, next task), then the task in `plan/execution-plan.md`
|
||||||
@@ -27,16 +27,27 @@ compatibility notes.
|
|||||||
## Never crash
|
## Never crash
|
||||||
People trust SolidCraft with their designs; a crash loses their work. **This outranks feature work.**
|
People trust SolidCraft with their designs; a crash loses their work. **This outranks feature work.**
|
||||||
- **No panics in non-test code:** no `unwrap()`, `expect()`, `panic!`, `unreachable!`, `todo!`,
|
- **No panics in non-test code:** no `unwrap()`, `expect()`, `panic!`, `unreachable!`, `todo!`,
|
||||||
`unimplemented!`; no `unsafe` (`unsafe_code = "forbid"`).
|
`unimplemented!`; no `unsafe` (`unsafe_code = "forbid"`). The three exceptions, in the app crate
|
||||||
|
(which denies it instead), have no safe API: two functions in
|
||||||
|
`apps/solidcraft/src/open_documents.rs` (macOS hands Finder files only to an Objective-C
|
||||||
|
method), the Windows-only `apps/solidcraft/src/native_crash.rs` (the exception filter that
|
||||||
|
records crashes inside native code such as graphics drivers) and the Windows-only
|
||||||
|
`apps/solidcraft/src/native_frame.rs` (the window procedure that answers the resize-border hit
|
||||||
|
test of the window without OS decorations).
|
||||||
- **Errors are `Result<T, E>`** through the crate's error type and `?`. An unfinished feature
|
- **Errors are `Result<T, E>`** through the crate's error type and `?`. An unfinished feature
|
||||||
returns an error ("not supported yet: …"); it never panics.
|
returns an error ("not supported yet: …"); it never panics.
|
||||||
- **Input-derived numbers are hostile** (command parameters, design files, control-channel
|
- **Input-derived numbers are hostile** (command parameters, design files, control-channel
|
||||||
input): `get()` not `[i]`, finite checks, caps on sizes and loop counts.
|
input): `get()` not `[i]`, finite checks, caps on sizes and loop counts.
|
||||||
- **Third-party kernel calls are guarded:** everything that calls `truck` goes through
|
- **Third-party kernel calls are guarded:** everything that calls `truck` goes through
|
||||||
`solvecraft_kernel::guard`, which turns a panic into `KernelError::Internal`.
|
`solidcraft_kernel::guard`, which turns a panic into `KernelError::Internal`.
|
||||||
- **Last-resort guard:** `Session::execute` runs every command under `catch_unwind`; an escaped
|
- **Last-resort guard:** `Session::execute` runs every command under `catch_unwind`; an escaped
|
||||||
panic restores the design and reports `EngineError::Internal`.
|
panic restores the design and reports `EngineError::Internal`.
|
||||||
- **Prove it:** every crash fix lands with a regression test (see `hostile_params_never_panic`).
|
- **Crash reports:** the desktop app writes every panic and every unclean exit to a local crash folder,
|
||||||
|
with the design and the commands that reproduce it (`solidcraft_engine::crash`, docs/crash-reports.md).
|
||||||
|
When someone says the app crashed, look there first: `solidcraft-cli crashes`, `crashes show <id>`,
|
||||||
|
`crashes replay <id>` (or the `diagnostics.crash_reports` command / MCP `crash_reports` tool).
|
||||||
|
- **Prove it:** every crash fix lands with a regression test (see `hostile_params_never_panic`); a
|
||||||
|
crash report's `design.solidcraft` + `replay.json` is the test's starting point.
|
||||||
- Every production crate root carries
|
- Every production crate root carries
|
||||||
`#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]`.
|
`#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]`.
|
||||||
|
|
||||||
@@ -54,8 +65,11 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
|
|||||||
nothing from FreeCAD is linked, vendored or shipped.) The sketch solver and the blend
|
nothing from FreeCAD is linked, vendored or shipped.) The sketch solver and the blend
|
||||||
operations are our own.
|
operations are our own.
|
||||||
- **Assets — absolutely essential.** SolidCraft contains **no iconography, images, fonts or
|
- **Assets — absolutely essential.** SolidCraft contains **no iconography, images, fonts or
|
||||||
artwork from commercial CAD products — ever.** Every icon is drawn in code
|
artwork from commercial CAD products — ever.** Command icons are the original SVG masters in
|
||||||
(`crates/ui-egui/src/icons.rs`). Any file asset must be original or openly licensed and **must have a row in ATTRIBUTION.md**
|
`assets/icons/ui/design/svg/`, compiled through `crates/ui-egui/src/icon_svg.rs`.
|
||||||
|
**Before any icon, icon assignment or media edit, read `assets/AGENTS.md`,
|
||||||
|
`assets/icons/ui/AGENTS.md` and `assets/icons/ui/STYLE_GUIDE.md`.** Use the canonical
|
||||||
|
bases and named finished references there; never invent a parallel icon style. Any file asset must be original or openly licensed and **must have a row in ATTRIBUTION.md**
|
||||||
(`cargo xtask assets` enforces it). Screenshots of commercial CAD software are never committed.
|
(`cargo xtask assets` enforces it). Screenshots of commercial CAD software are never committed.
|
||||||
Breaking this rule is the most serious mistake you can make in this repo.
|
Breaking this rule is the most serious mistake you can make in this repo.
|
||||||
- **Everything is a command.** User-visible behaviour = a command in `crates/engine/src/cmd/*`
|
- **Everything is a command.** User-visible behaviour = a command in `crates/engine/src/cmd/*`
|
||||||
@@ -70,7 +84,16 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
|
|||||||
egui/eframe/winit/wgpu/rfd. **The UI crate is swappable.** Only `crates/kernel` may use `truck`.
|
egui/eframe/winit/wgpu/rfd. **The UI crate is swappable.** Only `crates/kernel` may use `truck`.
|
||||||
- **The UI is thin**: panels read engine state and act through `app.run(id, params)` /
|
- **The UI is thin**: panels read engine state and act through `app.run(id, params)` /
|
||||||
`app.start(id)`. Colours come from `theme::Tokens`.
|
`app.start(id)`. Colours come from `theme::Tokens`.
|
||||||
- **Rust only.** Units are millimetres and radians internally; Z is up.
|
- **One set of camera controls**: every page or canvas with a camera (viewport, Render
|
||||||
|
preview, future flat pattern or drawing pages) calls `navigation::handle` with its `NavCaps`
|
||||||
|
(orbit off for flat 2D pages). New canvases must use `navigation::handle`; never hand-roll
|
||||||
|
camera input (a test rejects it).
|
||||||
|
- **Application code is Rust only.** Units are millimetres and radians internally; Z is up.
|
||||||
|
Local asset authoring, lint and review tools use Python 3.11+ as documented in
|
||||||
|
`assets/AGENTS.md`; Python is not an application runtime dependency. The application exception is
|
||||||
|
JavaScript the browser requires: the service worker `apps/solidcraft-web/sw.js` (browsers only
|
||||||
|
run service workers as JavaScript) and the small inline scripts in `apps/solidcraft-web/index.html`.
|
||||||
|
Keep them minimal; `cargo xtask web-offline-test` covers the service worker.
|
||||||
- **Quality gates** before every commit: `cargo xtask ci` (fmt, clippy -D warnings, tests,
|
- **Quality gates** before every commit: `cargo xtask ci` (fmt, clippy -D warnings, tests,
|
||||||
assets, layers). Commit after every feature arc that builds.
|
assets, layers). Commit after every feature arc that builds.
|
||||||
- **Publishing**: `origin` is github.com/bherbruck/solidcraft. Changes land through **pull requests**:
|
- **Publishing**: `origin` is github.com/bherbruck/solidcraft. Changes land through **pull requests**:
|
||||||
@@ -105,6 +128,27 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
|
|||||||
keep monitoring it while the task is active and make its pending status clear at handoff;
|
keep monitoring it while the task is active and make its pending status clear at handoff;
|
||||||
do not claim it merged without checking.
|
do not claim it merged without checking.
|
||||||
|
|
||||||
|
## Claim = a draft PR
|
||||||
|
- Before working on issue #N, check nobody has it: `gh pr list -R bherbruck/solidcraft --state open --search "#N"`.
|
||||||
|
- If none, branch from the latest `origin/main`, `git commit --allow-empty -m "claim: #N"`, push,
|
||||||
|
and open a **draft** PR titled `<summary> (#N)` right away. **The lowest-numbered open PR for an
|
||||||
|
issue wins**; if yours lost, close it. A comment or file edit alone does not replace the draft PR.
|
||||||
|
- After opening the draft PR, comment `/claim` on the issue so the bot records the claimant and
|
||||||
|
adds the `in progress` label. **Do both:** the draft PR establishes ownership and `/claim` marks
|
||||||
|
the issue as taken. Reference `#N` in the PR so the bot can find it.
|
||||||
|
- Push work in progress at least daily. A draft with no pushes for 72 hours may be taken over:
|
||||||
|
comment on it first, then open your own claim (you may start from its branch).
|
||||||
|
This takeover policy is separate from the bot's automatic cleanup deadlines in CONTRIBUTING.md.
|
||||||
|
- On a shared build machine, check the load before a big build (`cut -d' ' -f1 /proc/loadavg`)
|
||||||
|
and wait while it is over 24; build with `nice`.
|
||||||
|
|
||||||
|
## Design file format
|
||||||
|
A change that saves something new in a design adds ONE file, `crates/doc/src/format/pending/<name>.rs`
|
||||||
|
(a `//!` note, and `pub fn step` if older designs must be rewritten). Never edit `FORMAT`,
|
||||||
|
`JSON_STEPS`, the history in `format.rs`, another change's file or a `v<N>/` folder: the build
|
||||||
|
works out the number (the next one while anything is pending), and the release folds pending
|
||||||
|
changes into `v<N>/` with `scripts/fold-format-pending.sh`. See CONTRIBUTING.md.
|
||||||
|
|
||||||
## Application releases
|
## Application releases
|
||||||
Development pushes are not application releases. Follow `docs/releasing.md` when asked to
|
Development pushes are not application releases. Follow `docs/releasing.md` when asked to
|
||||||
prepare or ship a release: choose the version from the actual changes, update Cargo.toml and
|
prepare or ship a release: choose the version from the actual changes, update Cargo.toml and
|
||||||
@@ -115,22 +159,31 @@ version bumps solely from commit prefixes, overwrite published versions, or push
|
|||||||
before the draft is verified.
|
before the draft is verified.
|
||||||
|
|
||||||
## Running and looking at the app
|
## Running and looking at the app
|
||||||
- `cargo run --release -p solvecraft -- --sample --control PORT` (sample design + control channel).
|
- `cargo run --release -p solidcraft -- --sample --control PORT` (sample design + control channel).
|
||||||
Pick a free port. Without a display, run it under `Xvfb :99` with `DISPLAY=:99`.
|
Pick a free port. Without a display, run it under `Xvfb :99` with `DISPLAY=:99`.
|
||||||
- Drive it with JSON lines on `127.0.0.1:PORT` (see `docs/control-protocol.md`):
|
- Drive it with JSON lines on `127.0.0.1:PORT` (see `docs/control-protocol.md`). The first
|
||||||
|
request on a connection carries the launch's token as `"token"`: read it from
|
||||||
|
`~/.local/share/solidcraft/control/PORT.token`, or start the app with
|
||||||
|
`SOLIDCRAFT_CONTROL_TOKEN=$(openssl rand -hex 32)` and send that.
|
||||||
- `{"id":1,"method":"engine.execute","params":{"command":"solid.extrude","params":{"distance":20}}}`
|
- `{"id":1,"method":"engine.execute","params":{"command":"solid.extrude","params":{"distance":20}}}`
|
||||||
- `{"id":2,"method":"ui.start","params":{"command":"sketch.create"}}` then `ui.click {x, y}`
|
- `{"id":2,"method":"ui.start","params":{"command":"sketch.create"}}` then `ui.click {x, y}`
|
||||||
- `{"id":3,"method":"ui.screenshot","params":{"path":"/tmp/shot.png"}}` then read the PNG.
|
- `{"id":3,"method":"ui.screenshot","params":{"path":"/tmp/shot.png"}}` then read the PNG.
|
||||||
- **For UI work, look at the result** (screenshot, read the PNG). Without a window use
|
- **For UI work, look at the result** (screenshot, read the PNG). Without a window use
|
||||||
`ui.render` or `solvecraft-cli snapshot`.
|
`ui.render` or `solidcraft-cli snapshot`.
|
||||||
- Headless: `solvecraft-cli run script.json --out part.step`, `solvecraft-cli eval design.solvecraft`,
|
- Headless: `solidcraft-cli run script.json --out part.step`, `solidcraft-cli eval design.solidcraft`,
|
||||||
`solvecraft-cli snapshot script.json --out shot.png`, `solvecraft-cli commands`.
|
`solidcraft-cli snapshot script.json --out shot.png`, `solidcraft-cli commands`.
|
||||||
- Reference tests: `cargo xtask oracle` replays `tests/oracle/*/recipe.json` and compares with
|
- Reference tests: `cargo xtask oracle` replays `tests/oracle/*/recipe.json` and compares with
|
||||||
each case's `expected.json` (analytic or FreeCAD values; writes `docs/oracle.md`). Expected
|
each case's `expected.json` (analytic or FreeCAD values; writes `docs/oracle.md`). Expected
|
||||||
values never come from a commercial CAD product.
|
values never come from a commercial CAD product.
|
||||||
- Build with `CARGO_TARGET_DIR=<repo>/target`. Windows: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solvecraft`.
|
- Build with `CARGO_TARGET_DIR=<repo>/target`. Windows: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solidcraft`.
|
||||||
|
|
||||||
## Roadmap
|
## Roadmap
|
||||||
`ROADMAP.md` (committed) tracks status, milestones and estimates. Update it whenever a
|
`ROADMAP.md` (committed) tracks status, milestones and estimates. Update it whenever a
|
||||||
milestone task lands. `cargo xtask features` regenerates `docs/features.md` (SolidCraft's
|
milestone task lands. `docs/features.md` (SolidCraft's commands by area, from the registry) and
|
||||||
commands by area, from the registry) when commands are added or renamed.
|
`THIRD-PARTY-LICENSES.txt` are regenerated on `main` after each merge by the Generated files
|
||||||
|
workflow; never regenerate them in a PR.
|
||||||
|
|
||||||
|
## Lists many PRs add to
|
||||||
|
Keep them conflict-free (CONTRIBUTING.md, "Lists many changes add to"): message catalogs sorted
|
||||||
|
(`cargo xtask lists --fix`), `mod` lines in their sorted group, the language list English first
|
||||||
|
then by id, generated files left to `main`, and a design-format change as one new file.
|
||||||
+414
-23
@@ -4,29 +4,49 @@ Every non-code asset in this repository (images, icons, fonts, example parts) is
|
|||||||
its author, source and licence. `cargo xtask assets` (part of `cargo xtask ci`) fails if an asset
|
its author, source and licence. `cargo xtask assets` (part of `cargo xtask ci`) fails if an asset
|
||||||
file is missing from this table.
|
file is missing from this table.
|
||||||
|
|
||||||
**Policy (mandatory):** SolveCraft contains **no Autodesk iconography, images, artwork, fonts,
|
**Policy (mandatory):** SolidCraft contains **no Autodesk iconography, images, artwork, fonts,
|
||||||
templates, materials or help text.** Every asset is original work by SolveCraft contributors or
|
templates, materials or help text.** Every asset is original work by SolidCraft contributors or
|
||||||
third-party material under an open licence. Screenshots of Autodesk software are never committed.
|
third-party material under an open licence. Screenshots of Autodesk software are never committed.
|
||||||
|
|
||||||
Generated-in-code assets are original and have no file to list:
|
Editable drawing code, native projects and shipped exports are collected under `assets/`.
|
||||||
- the UI icon set (`crates/ui-egui/src/icons.rs`);
|
|
||||||
- the axis view, navigation bar and timeline glyphs (`crates/ui-egui/src/viewport.rs`,
|
|
||||||
`crates/ui-egui/src/timeline.rs`).
|
|
||||||
|
|
||||||
## Files
|
## Files
|
||||||
|
|
||||||
| File | Author | Source | Licence |
|
| File | Author | Source | Licence |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| docs/screenshots/sample-plate.png | SolveCraft contributors | screenshot of SolveCraft itself (`solvecraft --sample`) | MIT OR Apache-2.0 |
|
| examples/render-studio.json | SolidCraft contributors | original procedural box/cylinder enclosure script for the integrated Render workspace | MIT OR Apache-2.0 |
|
||||||
| docs/screenshots/enclosure-demo-0.2.1.gif | SolveCraft contributors | original electronics enclosure screen recording of the actual SolveCraft 0.2.1 English desktop UI, generated with examples/demo/record_ui.sh and its original animated pointer overlay (4× playback) | MIT OR Apache-2.0 |
|
| examples/render-opaque-studio.json | SolidCraft contributors | original procedural sphere study varying opaque metal fraction and roughness independently; no external assets or engineering data | MIT OR Apache-2.0 |
|
||||||
| docs/screenshots/enclosure-demo-0.2.1.mp4 | SolveCraft contributors | original electronics enclosure screen recording of the actual SolveCraft 0.2.1 English desktop UI, generated with examples/demo/record_ui.sh and its original animated pointer overlay (4× playback) | MIT OR Apache-2.0 |
|
| crates/gpu/src/pbr.rs | SolidCraft contributors | original WGSL translation of SolidCraft's opaque surface and fixed studio reference, embedded as Rust source; no external shader code | MIT OR Apache-2.0 |
|
||||||
| docs/book/src/generated/sample-plate.png | SolveCraft contributors | copy of docs/screenshots/sample-plate.png made by `cargo xtask book` (gitignored) | MIT OR Apache-2.0 |
|
| assets/icons/app/macos/source/SolidCraft.icon/icon.json | SolidCraft contributors | approved Icon Composer composition and appearance settings for the original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
| docs/book/src/generated/bracket.png | SolveCraft contributors | rendered by `cargo xtask book` (`solvecraft-cli snapshot examples/bracket.json`; gitignored) | MIT OR Apache-2.0 |
|
| assets/icons/app/macos/source/SolidCraft.icon/Assets/02-grid.svg | SolidCraft contributors | original perspective grid with elliptical radial alpha, exported from VectorCraft | MIT OR Apache-2.0 |
|
||||||
| docs/book/src/generated/enclosure.png | SolveCraft contributors | rendered by `cargo xtask book` (`solvecraft-cli snapshot docs/book/scripts/enclosure.json`; gitignored) | MIT OR Apache-2.0 |
|
| assets/icons/app/macos/source/SolidCraft.icon/Assets/02-grid-dark.svg | SolidCraft contributors | original blue perspective grid with elliptical radial alpha, exported from VectorCraft for the Dark appearance | MIT OR Apache-2.0 |
|
||||||
| docs/book/src/generated/revolve.png | SolveCraft contributors | rendered by `cargo xtask book` (`solvecraft-cli snapshot docs/book/scripts/revolve.json`; gitignored) | MIT OR Apache-2.0 |
|
| assets/icons/app/macos/source/SolidCraft.icon/Assets/03-solid-blue-cutout.svg | SolidCraft contributors | original saturated blue CAD solid with transparent topology cutouts, edited and exported with VectorCraft | MIT OR Apache-2.0 |
|
||||||
| docs/book/src/generated/sheet-metal.png | SolveCraft contributors | rendered by `cargo xtask book` (`solvecraft-cli snapshot docs/book/scripts/sheet-metal.json`; gitignored) | MIT OR Apache-2.0 |
|
| assets/icons/app/macos/exports/Assets.car | SolidCraft contributors | Apple actool compilation of assets/icons/app/macos/source/SolidCraft.icon for macOS; contains original artwork only | MIT OR Apache-2.0 |
|
||||||
| crates/sketch/fonts/LiberationSans-Regular.ttf | Red Hat, Inc. (Liberation Fonts 2.x; digitized data Google) | https://github.com/liberationfonts (Debian fonts-liberation), unmodified; licence text in crates/sketch/fonts/OFL.txt; used for sketch Text outlines | SIL OFL 1.1 |
|
| assets/archive/icons/macos-v1/source/icon.vectorcraft | SolidCraft contributors | retained editable historical VectorCraft source, with named face and background layers; redundant exports retired | MIT OR Apache-2.0 |
|
||||||
| apps/solvecraft-web/fonts/BIZUDPGothic-Regular.ttf | The BIZ UDGothic Project Authors | https://github.com/googlefonts/morisawa-biz-ud-gothic (Google Fonts), unmodified; licence text in apps/solvecraft-web/fonts/OFL.txt; used for web UI Japanese font | SIL OFL 1.1 |
|
| assets/icons/app/macos/exports/icon.icns | SolidCraft contributors | macOS fallback compiled by Apple's actool from the approved assets/icons/app/macos/source/SolidCraft.icon composition | MIT OR Apache-2.0 |
|
||||||
|
| docs/screenshots/class-a-blend.png | SolidCraft contributors | screenshot of SolidCraft itself: two boxes bridged by `surface.blend` (a 40x10 sheet, `solidcraft-cli snapshot` of plan/evidence script ev_blend) | MIT OR Apache-2.0 |
|
||||||
|
| docs/screenshots/class-a-crown.png | SolidCraft contributors | screenshot of SolidCraft itself: a patch crowned with `surface.patch crown=0.3` over a saddle rim (`solidcraft-cli snapshot`) | MIT OR Apache-2.0 |
|
||||||
|
| docs/screenshots/class-a-boundary.png | SolidCraft contributors | screenshot of SolidCraft itself: a patch through two sketch lines built by `surface.boundary` with `crown: 0.4` (`solidcraft-cli snapshot`) | MIT OR Apache-2.0 |
|
||||||
|
| docs/screenshots/sample-plate.png | SolidCraft contributors | screenshot of SolidCraft itself (`solidcraft --sample`) | MIT OR Apache-2.0 |
|
||||||
|
| docs/screenshots/demo-0.8.gif | SolidCraft contributors | original screen recording of the actual SolidCraft 0.8 English desktop UI modelling an original Raspberry Pi 4 case (no logos or branding; the engraved text is set in the system's DejaVu Sans Bold), generated with examples/demo/record_ui.sh and its original animated pointer overlay (9× playback) | MIT OR Apache-2.0 |
|
||||||
|
| docs/screenshots/demo-0.8.mp4 | SolidCraft contributors | original screen recording of the actual SolidCraft 0.8 English desktop UI modelling an original Raspberry Pi 4 case (no logos or branding; the engraved text is set in the system's DejaVu Sans Bold), generated with examples/demo/record_ui.sh and its original animated pointer overlay (9× playback) | MIT OR Apache-2.0 |
|
||||||
|
| docs/screenshots/rover-build.gif | 0xlillith (model); SolidCraft contributors (recording) | screen recording of the actual SolidCraft desktop UI replaying the timeline of the SELENE rover (`Rover-recorded.solidcraft` from https://github.com/0xlillith/solidcraft-rover, an original model by 0xlillith built through SolidCraft MCP); the model's lettering follows Ubuntu Light outlines (Canonical Ltd., Ubuntu Font Licence 1.0, as noted in that repository); the emblem is the SolidCraft project icon (2× playback) | MIT OR Apache-2.0 |
|
||||||
|
| docs/screenshots/rover-build.mp4 | 0xlillith (model); SolidCraft contributors (recording) | screen recording of the actual SolidCraft desktop UI replaying the timeline of the SELENE rover (`Rover-recorded.solidcraft` from https://github.com/0xlillith/solidcraft-rover, an original model by 0xlillith built through SolidCraft MCP); the model's lettering follows Ubuntu Light outlines (Canonical Ltd., Ubuntu Font Licence 1.0, as noted in that repository); the emblem is the SolidCraft project icon | MIT OR Apache-2.0 |
|
||||||
|
| docs/design/ux-redesign/model-floating.png | SolidCraft contributors | original UX mockup (Model tab, floating layout) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||||
|
| docs/design/ux-redesign/model-compact.png | SolidCraft contributors | original UX mockup (Model tab, compact docked layout) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||||
|
| docs/design/ux-redesign/sketch.png | SolidCraft contributors | original UX mockup (Sketch tab) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||||
|
| docs/design/ux-redesign/sheet-metal.png | SolidCraft contributors | original UX mockup (Sheet Metal contextual tab) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||||
|
| docs/design/ux-redesign/start-page.png | SolidCraft contributors | original UX mockup (start page (File view)) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||||
|
| docs/design/ux-redesign/workspaces.png | SolidCraft contributors | original UX mockup (workspace switcher) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||||
|
| docs/design/ux-redesign/command-map.png | SolidCraft contributors | original UX mockup (ribbon command map) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||||
|
| assets/branding/web/source/og.png | SolidCraft contributors | original 1280 × 640 social preview card (the SolidCraft mark, name and tagline), served by the docs site for link previews | MIT OR Apache-2.0 |
|
||||||
|
| docs/book/src/generated/sample-plate.png | SolidCraft contributors | copy of docs/screenshots/sample-plate.png made by `cargo xtask book` (gitignored) | MIT OR Apache-2.0 |
|
||||||
|
| docs/book/src/generated/bracket.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot examples/bracket.json`; gitignored) | MIT OR Apache-2.0 |
|
||||||
|
| docs/book/src/generated/enclosure.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/enclosure.json`; gitignored) | MIT OR Apache-2.0 |
|
||||||
|
| docs/book/src/generated/revolve.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/revolve.json`; gitignored) | MIT OR Apache-2.0 |
|
||||||
|
| docs/book/src/generated/sheet-metal.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/sheet-metal.json`; gitignored) | MIT OR Apache-2.0 |
|
||||||
|
| assets/fonts/liberation-sans/LiberationSans-Regular.ttf | Red Hat, Inc. (Liberation Fonts 2.x; digitized data Google) | https://github.com/liberationfonts (Debian fonts-liberation), unmodified; licence text in assets/fonts/liberation-sans/OFL.txt; used for sketch Text outlines | SIL OFL 1.1 |
|
||||||
|
| assets/fonts/biz-udp-gothic/BIZUDPGothic-Regular.ttf | The BIZ UDGothic Project Authors | https://github.com/googlefonts/morisawa-biz-ud-gothic (Google Fonts), unmodified; licence text in assets/fonts/biz-udp-gothic/OFL.txt; used for web UI Japanese font | SIL OFL 1.1 |
|
||||||
| tests/oracle/17-loft/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/17-loft/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
| tests/oracle/17-loft/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/17-loft/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
||||||
| tests/oracle/23-bracket-multifeature/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/23-bracket-multifeature/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
| tests/oracle/23-bracket-multifeature/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/23-bracket-multifeature/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
||||||
| tests/oracle/28-blind-pocket-fillets/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/28-blind-pocket-fillets/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
| tests/oracle/28-blind-pocket-fillets/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/28-blind-pocket-fillets/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
||||||
@@ -48,35 +68,402 @@ Generated-in-code assets are original and have no file to list:
|
|||||||
| tests/oracle/63-hinge-knuckle/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/63-hinge-knuckle/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
| tests/oracle/63-hinge-knuckle/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/63-hinge-knuckle/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
||||||
| tests/oracle/65-sketch-gear-tooth/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/65-sketch-gear-tooth/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
| tests/oracle/65-sketch-gear-tooth/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/65-sketch-gear-tooth/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
| assets/appearances/library.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/fonts/biz-udp-gothic/OFL.txt | The BIZ UDGothic Project Authors | Unmodified accompanying font licence | SIL OFL 1.1 |
|
||||||
|
| assets/fonts/liberation-sans/OFL.txt | Red Hat, Inc.; Liberation Fonts contributors | Unmodified accompanying font licence | SIL OFL 1.1 |
|
||||||
|
| assets/icons/app/linux/exports/hicolor/128x128/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/linux/exports/hicolor/16x16/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/linux/exports/hicolor/24x24/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/linux/exports/hicolor/256x256/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/linux/exports/hicolor/32x32/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/linux/exports/hicolor/48x48/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/linux/exports/hicolor/512x512/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/linux/exports/hicolor/64x64/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/shared/source/app_icon.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/shared/source/windows_ico.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/windows/exports/solidcraft-executable.ico | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/app/windows/exports/solidcraft.ico | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/source/glyphs.rs | SolidCraft / VectorCraft contributors | Original glyphs; caption geometry adapted from VectorCraft titlebar.rs (https://github.com/storytold/vectorcraft) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/source/markers.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/source/navigation.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/source/pointer.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/cs.json | potuzai | Czech translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/de.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/en.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/es.json | jawler | Spanish (Spain) translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/fr.json | rlartot | French translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/gl.json | Pablo López (pablopeza) | Galician translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/it.json | SolidCraft contributors | Original Italian translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/ja.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/ko.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/ru.json | Alex Pro (del000) | Russian translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/pt-BR.json | DuBearte | Brazilian Portuguese translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/tr.json | macrulz54 | Turkish translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/uk.json | Igor Bronovskyi (BrunIF) | Ukrainian translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/zh.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/materials/library.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/platforms/linux/ai.storyteller.solidcraft.desktop | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
|
||||||
|
| assets/platforms/linux/ai.storyteller.solidcraft.metainfo.xml.in | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
|
||||||
|
| assets/platforms/linux/ai.storyteller.solidcraft.mime.xml | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
|
||||||
|
| assets/platforms/macos/Info.plist.in | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
|
||||||
|
| assets/platforms/macos/README.txt | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
|
||||||
|
| assets/platforms/windows/solidcraft.en-us.wxl | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
|
||||||
|
| assets/platforms/windows/solidcraft.wxs | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
|
||||||
|
| assets/shaders/viewport.wgsl | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/styles/ui/palettes.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/styles/web/loading-logo.svg | SolidCraft contributors | Animation of the SolidCraft mark, built from the paths and gradients of assets/icons/app/macos/source/SolidCraft.icon/Assets/03-solid-blue-cutout.svg; original animation | MIT OR Apache-2.0 |
|
||||||
|
| assets/styles/web/loading.css | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| crates/io/src/native_cad/fixtures/block.FCStd | SolidCraft contributors | original 10 × 20 × 30 mm test box saved by FreeCAD 1.1.4 run as an external program (`make_block_fcstd.py` beside it); no third-party geometry | MIT OR Apache-2.0 |
|
||||||
|
| crates/io/src/native_cad/fixtures/block.3dm | SolidCraft contributors | original 10 × 20 × 30 mm test box written with McNeel's MIT-licensed rhino3dm Python package (`make_block_3dm.py` beside it); no third-party geometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/aliases.toml | SolidCraft contributors | icon ids that share a master, original SolidCraft data | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/palette.toml | SolidCraft contributors | icon colour roles (light and dark) and accents, original SolidCraft data | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/bug_report.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/chevron.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/fit.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/folder.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/help.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/home.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/lookat.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/moon.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/nav_settings.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/orbit.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/pan.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/perspective.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/redo.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/save.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/settings.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/spin.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/style.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/undo.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/flat/zoom.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/accessibility.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/activate.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/align.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/appearance.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/arc3.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/arc_center.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/arc_slot.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/arc_tangent.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/as_built.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/auto_constrain.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/axis.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/bendtable.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/blend.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/blend_surface.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/body.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/boss.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/boundary.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/boundary_fill.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/box.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/break.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_coincident.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_collinear.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_concentric.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_equal.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_fix.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_hv.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_midpoint.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_parallel.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_perpendicular.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_polygon.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_smooth.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_symmetry.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/c_tangent.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/camera.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/canvas.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/capture.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/center_of_mass.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/centerline.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/chain.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/chamfer.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/checkpoint.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/circle.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/circle2.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/circle3.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/circle_tt.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/circle_ttt.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/coil.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/combine.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/component.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/compute.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/configuration_table.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/conic.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/constrainer.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/construction.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/convert_sheet.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/copy.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/curvature_comb.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/curvature_map.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/cylinder.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/decal.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/delete.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/dimension.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/dots.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/draft.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/draft_analysis.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/drive.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/dxf.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/edge_continuity.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/edit.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/ellipse.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/emboss.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/environment_map.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/explode.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/export.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/extend.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/extrude.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/eye.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/fastener.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/fillet.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/filter.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/finish.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/fit_section.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/flange.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/flat.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/fold.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/folder.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/graph.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/hem.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/hole.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/import.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/include.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/inspect.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/interference.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/intersect.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/intersection_curve.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/iso_analysis.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/iso_curve.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/joint.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/joint_origin.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/library.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/line.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/line_mid.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/lip.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/list.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/loft.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/material.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/measure.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/min_radius.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/mirror.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/motion_link.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/move.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/new.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/offset.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/offset_face.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/offset_surface.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/open.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/origin.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/params.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/paste.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/patch.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/pattern.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/pattern_circ.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/pattern_path.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/pattern_rect.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/perforate.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/pipe.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/placeholder.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plane.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plane_angle.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plastic_assign.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plastic_rule.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/play.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/point.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/polygon.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/presspull.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/project.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/project_surface.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rect.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rect3.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rect_center.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rect_rounded.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/refold.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rename.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_image.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_scene.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/reorder.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rest.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/restore.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/reverse_normal.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/revert.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/revolve.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rib.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rigid_group.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rollback.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/ruled.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/scale.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/section.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/select.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sheet.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sheet_rules.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/shell.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sketch.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sketch_chamfer.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sketch_fillet.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sketch_mirror.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/slot.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/snap.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sphere.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/spline.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/spline_cv.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/split_body.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/split_face.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/spun.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/star.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/status_error.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/status_warning.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/stitch.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/suppress.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/surface.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/svg.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sweep.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/text.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/thicken.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/thread.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/torus.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/trim.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/unfold.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/unstitch.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/untrim.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/update.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/zebra.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/small/as_built.svg | SolidCraft contributors | small-slot icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/small/component.svg | SolidCraft contributors | small-slot icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/small/curvature_comb.svg | SolidCraft contributors | small-slot icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/small/interference.svg | SolidCraft contributors | small-slot icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/small/iso_analysis.svg | SolidCraft contributors | small-slot icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/small/joint.svg | SolidCraft contributors | small-slot icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/small/pattern.svg | SolidCraft contributors | small-slot icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/small/section.svg | SolidCraft contributors | small-slot icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/workspace/ws_animate.svg | SolidCraft contributors | workspace icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/polygon_circumscribed.svg | SolidCraft contributors | original sketch variant icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/polygon_edge.svg | SolidCraft contributors | original sketch variant icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/slot_overall.svg | SolidCraft contributors | original sketch variant icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/slot_center.svg | SolidCraft contributors | original sketch variant icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/arc_slot_center.svg | SolidCraft contributors | original sketch variant icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sketch_chamfer_angle.svg | SolidCraft contributors | original sketch variant icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/sketch_chamfer_two_distances.svg | SolidCraft contributors | original sketch variant icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/gear.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/rack_pinion.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/screw.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/cam.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/trace.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/agent_chat.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/normal.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/infinite.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/pattern_flip.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/pattern_center.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/reach.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/cut.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/compare.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/web.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/replace_face.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/bounding_solid.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/delete_face.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/snap_fit.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/contact_sets.svg | SolidCraft contributors | original contact icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/contact_all.svg | SolidCraft contributors | original contact icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/contact_off.svg | SolidCraft contributors | original contact icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/contact_new.svg | SolidCraft contributors | original contact icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/axis_through_cylinder.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/axis_normal_to_face.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/axis_two_planes.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/axis_two_points.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/axis_edge.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/point_vertex.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/point_two_edges.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/point_three_planes.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/point_center.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/point_edge_plane.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/point_along_path.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plane_midplane.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plane_two_edges.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plane_three_points.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plane_tangent.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plane_along_path.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/plane_perpendicular.svg | SolidCraft contributors | original construction icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/workspace/ws_design.svg | SolidCraft contributors | workspace icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/workspace/ws_drawing.svg | SolidCraft contributors | workspace icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/workspace/ws_render.svg | SolidCraft contributors | workspace icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/references.toml | SolidCraft contributors | original icon authoring or review tool resource | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/author/bases.py | SolidCraft contributors | original icon authoring or review tool resource | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/author/new_icon.py | SolidCraft contributors | original icon authoring or review tool resource | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/review/index.html | SolidCraft contributors | original icon authoring or review tool resource | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/review/guide.html | SolidCraft contributors | original icon authoring or review tool resource | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/review/review.css | SolidCraft contributors | original icon authoring or review tool resource | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/review/review.js | SolidCraft contributors | original icon authoring or review tool resource | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/icon_palette.py | SolidCraft contributors | Original shared semantic icon palette resolver for repository tools | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/icon_status.py | SolidCraft contributors | icon lint, status page or preview tool (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/lint_icons.py | SolidCraft contributors | icon lint, status page or preview tool (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/preview.py | SolidCraft contributors | icon lint, status page or preview tool (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/review_state.py | SolidCraft contributors | icon review state helper (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/review.json | SolidCraft contributors | icon review state (accepted icons and notes), original SolidCraft data | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/tools/author/lib.py | SolidCraft contributors | icon authoring script (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
| docs/book/src/og.png | SolidCraft contributors | copy of assets/branding/web/source/og.png staged by cargo xtask book (gitignored) | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
## Code adapted from sibling projects
|
## Code adapted from sibling projects
|
||||||
|
|
||||||
| SolveCraft file | Adapted from | Licence |
|
| SolidCraft file | Adapted from | Licence |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| xtask/src/layers.rs | CADCraft `xtask/src/layers.rs` (dependency layering rules and tests) | MIT OR Apache-2.0 |
|
| xtask/src/layers.rs | CADCraft `xtask/src/layers.rs` (dependency layering rules and tests) | MIT OR Apache-2.0 |
|
||||||
| apps/solvecraft/src/control_server.rs | CADCraft `apps/cadcraft/src/control_server.rs` (loopback JSON-lines server) | MIT OR Apache-2.0 |
|
| apps/solidcraft/src/control_server.rs | CADCraft `apps/cadcraft/src/control_server.rs` (loopback JSON-lines server) | MIT OR Apache-2.0 |
|
||||||
| crates/ui-egui/src/lib.rs (screenshot queue, synthetic input) | CADCraft `crates/ui-egui/src/lib.rs` | MIT OR Apache-2.0 |
|
| crates/ui-egui/src/lib.rs (screenshot queue, synthetic input) | CADCraft `crates/ui-egui/src/lib.rs` | MIT OR Apache-2.0 |
|
||||||
| crates/ui-egui/src/control.rs (method dispatch and screenshot saving) | CADCraft `crates/ui-egui/src/control.rs` | MIT OR Apache-2.0 |
|
| crates/ui-egui/src/control.rs (method dispatch and screenshot saving) | CADCraft `crates/ui-egui/src/control.rs` | MIT OR Apache-2.0 |
|
||||||
| crates/ui-egui/src/gpu.rs (paint-callback structure) | CADCraft `crates/ui-egui/src/gpu.rs` | MIT OR Apache-2.0 |
|
| crates/ui-egui/src/gpu.rs (paint-callback structure) | CADCraft `crates/ui-egui/src/gpu.rs` | MIT OR Apache-2.0 |
|
||||||
| crates/mcp/src/server.rs, crates/mcp/src/backend.rs (JSON-RPC framing, MCP lifecycle, control-port bridge) | CADCraft `crates/mcp/src/{server,backend}.rs` | MIT OR Apache-2.0 |
|
| crates/mcp/src/server.rs, crates/mcp/src/backend.rs (JSON-RPC framing, MCP lifecycle, control-port bridge) | CADCraft `crates/mcp/src/{server,backend}.rs` | MIT OR Apache-2.0 |
|
||||||
| crates/mcp/src/tools.rs (tool schema helpers and argument checking) | CADCraft `crates/mcp/src/tools.rs`, GridCraft `crates/mcp/src/tools.rs` | MIT OR Apache-2.0 |
|
| crates/mcp/src/tools.rs (tool schema helpers and argument checking) | CADCraft `crates/mcp/src/tools.rs`, GridCraft `crates/mcp/src/tools.rs` | MIT OR Apache-2.0 |
|
||||||
| crates/io/src/threemf.rs (bounded zip part reading and writing) | GridCraft `crates/xlsx/src/package.rs` | MIT OR Apache-2.0 |
|
| crates/io/src/threemf.rs (bounded zip part reading and writing) | GridCraft `crates/xlsx/src/package.rs` | MIT OR Apache-2.0 |
|
||||||
| crates/ui-egui/src/titlebar.rs (title bar drag, caption buttons, resize zones, their tests) and the window setup in apps/solvecraft/src/main.rs | VectorCraft `crates/ui-egui/src/titlebar.rs`, `apps/vectorcraft/src/main.rs` | MIT OR Apache-2.0 |
|
| crates/ui-egui/src/titlebar.rs (title bar drag, caption buttons, resize zones, their tests) and the window setup in apps/solidcraft/src/main.rs | VectorCraft `crates/ui-egui/src/titlebar.rs`, `apps/vectorcraft/src/main.rs` | MIT OR Apache-2.0 |
|
||||||
|
| apps/solidcraft/src/open_documents.rs (macOS: files opened from Finder and the Dock, its test) | VectorCraft `apps/vectorcraft/src/open_documents.rs` (https://github.com/storytold/vectorcraft) | MIT OR Apache-2.0 |
|
||||||
| LICENSE-MIT, LICENSE-APACHE (licence text) | CADCraft | — |
|
| LICENSE-MIT, LICENSE-APACHE (licence text) | CADCraft | — |
|
||||||
| .github/workflows/release.yml, .github/workflows/packaging-lint.yml and packaging/ (release pipeline: Linux AppImage/deb/rpm/Flatpak/tar.gz, FreeBSD, macOS dmg, Windows MSI/portable zip, web zip; AppRun, nfpm, Flatpak, WiX and Info.plist templates) | PhotoCraft (https://github.com/storytold/photocraft) `.github/workflows/{release,packaging-lint}.yml`, `packaging/` | Apache-2.0 |
|
| .github/workflows/release.yml, .github/workflows/packaging-lint.yml and packaging/ (release pipeline: Linux AppImage/deb/rpm/Flatpak/tar.gz, FreeBSD, macOS dmg, Windows MSI/portable zip, web zip; AppRun, nfpm, Flatpak, WiX and Info.plist templates) | PhotoCraft (https://github.com/storytold/photocraft) `.github/workflows/{release,packaging-lint}.yml`, `packaging/` | Apache-2.0 |
|
||||||
|
|
||||||
|
## Incremental HDR codec adapter
|
||||||
|
|
||||||
|
`crates/render/src/lighting/hdr.rs` adapts the scanline/component/old-RLE decoding
|
||||||
|
state machines from the Radiance decoder in `image` 0.25.10
|
||||||
|
([source](https://docs.rs/crate/image/0.25.10/source/src/codecs/hdr/decoder.rs)),
|
||||||
|
MIT OR Apache-2.0. Metadata parsing still uses that library. The adapter makes row
|
||||||
|
work cooperative and adds checked run lengths, zero-run rejection, width validation,
|
||||||
|
header/input/radiance bounds and cancellation. Original licence texts are retained
|
||||||
|
in THIRD-PARTY-LICENSES.txt; no images or artwork from that project are copied.
|
||||||
|
|
||||||
|
## File-format crates
|
||||||
|
|
||||||
|
| Crate | Used for | Licence |
|
||||||
|
|---|---|---|
|
||||||
|
| gltf 1.4.1, gltf-json 1.4.1, gltf-derive 1.4.1 (https://github.com/gltf-rs/gltf) | glTF 2.0 import (crates/io/src/gltf_in.rs): the JSON document model and its reference checks; the GLB container, buffers and accessors are read by SolidCraft's own code | MIT OR Apache-2.0 |
|
||||||
|
| inflections 1.1.1 (build-time, through gltf-derive) | case conversion in gltf's derive macros | MIT |
|
||||||
|
| lazy_static 1.5.1 (through gltf-json) | | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
The glTF test files are built by the tests themselves (crates/io/src/gltf_in_tests.rs,
|
||||||
|
crates/engine/src/tests/gltf_import.rs); no third-party models are committed.
|
||||||
|
|
||||||
|
## FreeCAD and Rhino import library
|
||||||
|
|
||||||
|
FreeCAD `.FCStd` and Rhino `.3dm` files are read with [cadmpeg](https://github.com/cadmpeg/cadmpeg)
|
||||||
|
0.6.1 (Apache-2.0), linked as the crates `cadmpeg-core`, `cadmpeg-ir`, `cadmpeg-registry`,
|
||||||
|
`cadmpeg-container`, `cadmpeg-codec-freecad`, `cadmpeg-codec-rhino` and `cadmpeg-codec-step`
|
||||||
|
in native builds (`crates/io/src/native_cad.rs`). Only those open-format codecs are built: no
|
||||||
|
default features, so cadmpeg's codecs for commercial CAD formats and its ShapeManager/ACIS
|
||||||
|
codec are not compiled in. Its licence text is in THIRD-PARTY-LICENSES.txt; no code from it is
|
||||||
|
copied into SolidCraft.
|
||||||
|
|
||||||
## Recovered contributions
|
## Recovered contributions
|
||||||
|
|
||||||
| SolveCraft file | Original contribution | Licence |
|
| SolidCraft file | Original contribution | Licence |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| crates/ui-egui/src/viewport.rs (`nearest_quarter_turn`, `axis_view_orbit`) | N3MI-DG's [PR #101](https://github.com/bherbruck/solvecraft/pull/101): [minimal TOP/BOTTOM turns](https://github.com/bherbruck/solvecraft/commit/c28e780f52490784ef5886f094b9d3f6d10c3e3f) and [drag-to-orbit](https://github.com/bherbruck/solvecraft/commit/f30b30be6ecc4e2e6544a851243137c01a354934), adapted to the axis gizmo | MIT OR Apache-2.0 |
|
| crates/ui-egui/src/viewport.rs (`nearest_quarter_turn`, `axis_view_orbit`) | N3MI-DG's [PR #101](https://github.com/bherbruck/solidcraft/pull/101): [minimal TOP/BOTTOM turns](https://github.com/bherbruck/solidcraft/commit/c28e780f52490784ef5886f094b9d3f6d10c3e3f) and [drag-to-orbit](https://github.com/bherbruck/solidcraft/commit/f30b30be6ecc4e2e6544a851243137c01a354934), adapted to the axis gizmo | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
## Vendored third-party code
|
## Vendored third-party code
|
||||||
|
|
||||||
| Directory | Source | Licence | Changes |
|
| Directory | Source | Licence | Changes |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| vendor/truck-meshalgo | truck-meshalgo 0.4.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | meshing: parameter searches kept inside the surface domain (vendor/README.md) |
|
| vendor/truck-meshalgo | truck-meshalgo 0.4.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | meshing: bounded parameter searches, collapsed-boundary projection, subdivision and provisional fixed-grid previews (vendor/README.md) |
|
||||||
| vendor/truck-stepio | truck-stepio 0.3.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | STEP writer: intersection-curve surfaces written at unique ids (vendor/README.md) |
|
| vendor/truck-stepio | truck-stepio 0.3.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | STEP writer: intersection-curve surfaces written at unique ids (vendor/README.md) |
|
||||||
| vendor/truck-shapeops | truck-shapeops 0.4.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | robust meshing and nearest-parameter fallback in booleans; degenerate intersection-curve rejection; face and edge history of booleans; trace macro (vendor/README.md) |
|
| vendor/truck-shapeops | truck-shapeops 0.4.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | robust meshing and nearest-parameter fallback in booleans; degenerate intersection-curve rejection; face and edge history of booleans; trace macro; corner choice at vertices several intersection curves end on (vendor/README.md) |
|
||||||
|
| vendor/truck-geometry | truck-geometry 0.5.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | intersection curves divided from their neighbours' surface parameters; surface second derivatives (vendor/README.md) |
|
||||||
| vendor/matext4cgmath | matext4cgmath 0.1.0, https://github.com/ricosjp/matext4cgmath (RICOS Co. Ltd.) | Apache-2.0 | root refinement stops after 100 Newton steps (vendor/README.md) |
|
| vendor/matext4cgmath | matext4cgmath 0.1.0, https://github.com/ricosjp/matext4cgmath (RICOS Co. Ltd.) | Apache-2.0 | root refinement stops after 100 Newton steps (vendor/README.md) |
|
||||||
|
|
||||||
## Vendored renderer compatibility fix
|
## Vendored renderer compatibility fix
|
||||||
@@ -87,3 +474,7 @@ its original `egui.wgsl` shader are retained; no images or other artwork are cop
|
|||||||
SolidCraft's narrow patch selects a safe 1x MSAA path on the chosen OpenGL adapter
|
SolidCraft's narrow patch selects a safe 1x MSAA path on the chosen OpenGL adapter
|
||||||
and shares that effective count with the surface attachments and CAD callbacks.
|
and shares that effective count with the surface attachments and CAD callbacks.
|
||||||
Vulkan, DirectX 12, Metal and WebGPU retain their requested multisampling.
|
Vulkan, DirectX 12, Metal and WebGPU retain their requested multisampling.
|
||||||
|
A frame whose meshes the GPU refuses to stage (device lost or out of memory) is
|
||||||
|
skipped with a warning instead of panicking (#1469).
|
||||||
|
Paint callbacks are prepared only after a drawable is acquired, so a skipped
|
||||||
|
surface frame cannot strand cached meshes without their GPU initialization.
|
||||||
@@ -6,13 +6,13 @@ kernel, and a desktop UI that agents can drive. Projects published by
|
|||||||
[storytold](https://github.com/storytold) can serve as references for implementation conventions.
|
[storytold](https://github.com/storytold) can serve as references for implementation conventions.
|
||||||
Any code adapted from other projects (MIT OR Apache-2.0) is noted in ATTRIBUTION.md.
|
Any code adapted from other projects (MIT OR Apache-2.0) is noted in ATTRIBUTION.md.
|
||||||
|
|
||||||
## Product name and compatibility
|
## Product name
|
||||||
SolidCraft is the displayed product name; `solidcraft` is the repository name. Keep existing
|
SolidCraft everywhere: crates `solidcraft-*`, binaries `solidcraft` and `solidcraft-cli`,
|
||||||
`solvecraft` crate/binary names, `.solvecraft` files, format markers, environment variables,
|
`.solidcraft` designs, the `solidcraft/N` format tag, `SOLIDCRAFT_*` environment variables,
|
||||||
settings/recovery paths and package IDs compatible. Published SolveCraft release artifacts
|
settings and recovery folders, the MCP server name, docs, CI and packaging. The old name
|
||||||
and attribution records keep their historical names. Public docs/web/Flatpak deployments
|
survives only in the explicit compatibility shims listed in `docs/compatibility.md`; don't add
|
||||||
use project Pages `/solidcraft/`; do not add permanent old-name Pages aliases. See README's
|
new uses of it anywhere else. Public docs/web/Flatpak deployments use project Pages
|
||||||
compatibility notes.
|
`/solidcraft/`; do not add permanent old-name Pages aliases.
|
||||||
|
|
||||||
## Start every session here
|
## Start every session here
|
||||||
1. Read `plan/STATUS.md` (current milestone, next task), then the task in `plan/execution-plan.md`
|
1. Read `plan/STATUS.md` (current milestone, next task), then the task in `plan/execution-plan.md`
|
||||||
@@ -27,16 +27,29 @@ compatibility notes.
|
|||||||
## Never crash
|
## Never crash
|
||||||
People trust SolidCraft with their designs; a crash loses their work. **This outranks feature work.**
|
People trust SolidCraft with their designs; a crash loses their work. **This outranks feature work.**
|
||||||
- **No panics in non-test code:** no `unwrap()`, `expect()`, `panic!`, `unreachable!`, `todo!`,
|
- **No panics in non-test code:** no `unwrap()`, `expect()`, `panic!`, `unreachable!`, `todo!`,
|
||||||
`unimplemented!`; no `unsafe` (`unsafe_code = "forbid"`).
|
`unimplemented!`; no `unsafe` (`unsafe_code = "forbid"`). The exceptions, in the app crate and in
|
||||||
|
`crates/threedx-client` (which deny it instead), have no safe API: the macOS-only
|
||||||
|
`crates/threedx-client/src/macos.rs` (loads the 3Dconnexion driver's client framework at run time
|
||||||
|
and calls through its function pointers), two functions in
|
||||||
|
`apps/solidcraft/src/open_documents.rs` (macOS hands Finder files only to an Objective-C
|
||||||
|
method), the Windows-only `apps/solidcraft/src/native_crash.rs` (the exception filter that
|
||||||
|
records crashes inside native code such as graphics drivers) and the Windows-only
|
||||||
|
`apps/solidcraft/src/native_frame.rs` (the window procedure that answers the resize-border hit
|
||||||
|
test of the window without OS decorations).
|
||||||
- **Errors are `Result<T, E>`** through the crate's error type and `?`. An unfinished feature
|
- **Errors are `Result<T, E>`** through the crate's error type and `?`. An unfinished feature
|
||||||
returns an error ("not supported yet: …"); it never panics.
|
returns an error ("not supported yet: …"); it never panics.
|
||||||
- **Input-derived numbers are hostile** (command parameters, design files, control-channel
|
- **Input-derived numbers are hostile** (command parameters, design files, control-channel
|
||||||
input): `get()` not `[i]`, finite checks, caps on sizes and loop counts.
|
input): `get()` not `[i]`, finite checks, caps on sizes and loop counts.
|
||||||
- **Third-party kernel calls are guarded:** everything that calls `truck` goes through
|
- **Third-party kernel calls are guarded:** everything that calls `truck` goes through
|
||||||
`solvecraft_kernel::guard`, which turns a panic into `KernelError::Internal`.
|
`solidcraft_kernel::guard`, which turns a panic into `KernelError::Internal`.
|
||||||
- **Last-resort guard:** `Session::execute` runs every command under `catch_unwind`; an escaped
|
- **Last-resort guard:** `Session::execute` runs every command under `catch_unwind`; an escaped
|
||||||
panic restores the design and reports `EngineError::Internal`.
|
panic restores the design and reports `EngineError::Internal`.
|
||||||
- **Prove it:** every crash fix lands with a regression test (see `hostile_params_never_panic`).
|
- **Crash reports:** the desktop app writes every panic and every unclean exit to a local crash folder,
|
||||||
|
with the design and the commands that reproduce it (`solidcraft_engine::crash`, docs/crash-reports.md).
|
||||||
|
When someone says the app crashed, look there first: `solidcraft-cli crashes`, `crashes show <id>`,
|
||||||
|
`crashes replay <id>` (or the `diagnostics.crash_reports` command / MCP `crash_reports` tool).
|
||||||
|
- **Prove it:** every crash fix lands with a regression test (see `hostile_params_never_panic`); a
|
||||||
|
crash report's `design.solidcraft` + `replay.json` is the test's starting point.
|
||||||
- Every production crate root carries
|
- Every production crate root carries
|
||||||
`#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]`.
|
`#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]`.
|
||||||
|
|
||||||
@@ -54,8 +67,8 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
|
|||||||
nothing from FreeCAD is linked, vendored or shipped.) The sketch solver and the blend
|
nothing from FreeCAD is linked, vendored or shipped.) The sketch solver and the blend
|
||||||
operations are our own.
|
operations are our own.
|
||||||
- **Assets — absolutely essential.** SolidCraft contains **no iconography, images, fonts or
|
- **Assets — absolutely essential.** SolidCraft contains **no iconography, images, fonts or
|
||||||
artwork from commercial CAD products — ever.** Every icon is drawn in code
|
artwork from commercial CAD products — ever.** Every UI icon is drawn in collected code
|
||||||
(`crates/ui-egui/src/icons.rs`). Any file asset must be original or openly licensed and **must have a row in ATTRIBUTION.md**
|
(`assets/icons/ui/source/`, compiled through `crates/ui-egui/src/icons.rs`). Any file asset must be original or openly licensed and **must have a row in ATTRIBUTION.md**
|
||||||
(`cargo xtask assets` enforces it). Screenshots of commercial CAD software are never committed.
|
(`cargo xtask assets` enforces it). Screenshots of commercial CAD software are never committed.
|
||||||
Breaking this rule is the most serious mistake you can make in this repo.
|
Breaking this rule is the most serious mistake you can make in this repo.
|
||||||
- **Everything is a command.** User-visible behaviour = a command in `crates/engine/src/cmd/*`
|
- **Everything is a command.** User-visible behaviour = a command in `crates/engine/src/cmd/*`
|
||||||
@@ -70,7 +83,14 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
|
|||||||
egui/eframe/winit/wgpu/rfd. **The UI crate is swappable.** Only `crates/kernel` may use `truck`.
|
egui/eframe/winit/wgpu/rfd. **The UI crate is swappable.** Only `crates/kernel` may use `truck`.
|
||||||
- **The UI is thin**: panels read engine state and act through `app.run(id, params)` /
|
- **The UI is thin**: panels read engine state and act through `app.run(id, params)` /
|
||||||
`app.start(id)`. Colours come from `theme::Tokens`.
|
`app.start(id)`. Colours come from `theme::Tokens`.
|
||||||
- **Rust only.** Units are millimetres and radians internally; Z is up.
|
- **One set of camera controls**: every page or canvas with a camera (viewport, Render
|
||||||
|
preview, future flat pattern or drawing pages) calls `navigation::handle` with its `NavCaps`
|
||||||
|
(orbit off for flat 2D pages). New canvases must use `navigation::handle`; never hand-roll
|
||||||
|
camera input (a test rejects it).
|
||||||
|
- **Rust only.** Units are millimetres and radians internally; Z is up. The one exception is
|
||||||
|
JavaScript the browser requires: the service worker `apps/solidcraft-web/sw.js` (browsers only
|
||||||
|
run service workers as JavaScript) and the small inline scripts in `apps/solidcraft-web/index.html`.
|
||||||
|
Keep them minimal; `cargo xtask web-offline-test` covers the service worker.
|
||||||
- **Quality gates** before every commit: `cargo xtask ci` (fmt, clippy -D warnings, tests,
|
- **Quality gates** before every commit: `cargo xtask ci` (fmt, clippy -D warnings, tests,
|
||||||
assets, layers). Commit after every feature arc that builds.
|
assets, layers). Commit after every feature arc that builds.
|
||||||
- **Publishing**: `origin` is github.com/bherbruck/solidcraft. Changes land through **pull requests**:
|
- **Publishing**: `origin` is github.com/bherbruck/solidcraft. Changes land through **pull requests**:
|
||||||
@@ -82,6 +102,47 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
|
|||||||
- **Never break wasm**: everything below the apps must build for `wasm32-unknown-unknown`
|
- **Never break wasm**: everything below the apps must build for `wasm32-unknown-unknown`
|
||||||
(`cargo xtask wasm`, part of `cargo xtask ci`).
|
(`cargo xtask wasm`, part of `cargo xtask ci`).
|
||||||
|
|
||||||
|
## Showing and following through on changes
|
||||||
|
|
||||||
|
- Help reviewers see what is broken or changed. For observable CAD, UI or model behavior,
|
||||||
|
issues and PRs must include actual descriptive screenshots or a short recording from a
|
||||||
|
small reproduction. This includes kernel, geometry, assembly and backend changes whose
|
||||||
|
effects can be shown in the app. Coding agents should run the app and capture this evidence
|
||||||
|
themselves; do not ask a human for evidence the agent can produce. Show the actual failure
|
||||||
|
or result, preferably before and after, with brief reproduction steps, expected/actual
|
||||||
|
behavior and annotations that point out the relevant detail.
|
||||||
|
- Flowcharts and Mermaid diagrams cannot substitute for screenshots or recordings of visible
|
||||||
|
behavior. Use diagrams for architectural reasoning when actual screenshots cannot illustrate
|
||||||
|
the point. Changes with no useful observable behavior do not need screenshot or video evidence.
|
||||||
|
- Use a small public-safe example and check for private designs, paths, account details or
|
||||||
|
other sensitive content before sharing. Attach media to the issue/PR or link to an accessible
|
||||||
|
recording; do not commit generated screenshots or videos just to provide review evidence.
|
||||||
|
- Throughout the work and before handoff, check current upstream commits and the relevant
|
||||||
|
PR's merge status. Keep your branch current with upstream merges, resolve conflicts without
|
||||||
|
discarding others' work, and re-run validation when integration changes the result. Use
|
||||||
|
`git pull --rebase origin main` before pushing as above; never force-push. Report the checked
|
||||||
|
upstream/PR state, any conflicts resolved and the validation performed. If a PR remains open,
|
||||||
|
keep monitoring it while the task is active and make its pending status clear at handoff;
|
||||||
|
do not claim it merged without checking.
|
||||||
|
|
||||||
|
## Claim = a draft PR
|
||||||
|
- Before working on issue #N, check nobody has it: `gh pr list -R bherbruck/solidcraft --state open --search "#N"`.
|
||||||
|
- If none, branch from the latest `origin/main`, `git commit --allow-empty -m "claim: #N"`, push,
|
||||||
|
and open a **draft** PR titled `<summary> (#N)` right away. **The lowest-numbered open PR for an
|
||||||
|
issue wins**; if yours lost, close it. Opening the PR is the claim: the bot assigns you and
|
||||||
|
labels the issue `in progress` (or says on your PR who holds it). Don't claim by editing files.
|
||||||
|
- Push work in progress at least daily. A draft with no pushes for 72 hours may be taken over:
|
||||||
|
comment on it first, then open your own claim (you may start from its branch).
|
||||||
|
- On a shared build machine, check the load before a big build (`cut -d' ' -f1 /proc/loadavg`)
|
||||||
|
and wait while it is over 24; build with `nice`.
|
||||||
|
|
||||||
|
## Design file format
|
||||||
|
A change that saves something new in a design adds ONE file, `crates/doc/src/format/pending/<name>.rs`
|
||||||
|
(a `//!` note, and `pub fn step` if older designs must be rewritten). Never edit `FORMAT`,
|
||||||
|
`JSON_STEPS`, the history in `format.rs`, another change's file or a `v<N>/` folder: the build
|
||||||
|
works out the number (the next one while anything is pending), and the release folds pending
|
||||||
|
changes into `v<N>/` with `scripts/fold-format-pending.sh`. See CONTRIBUTING.md.
|
||||||
|
|
||||||
## Application releases
|
## Application releases
|
||||||
Development pushes are not application releases. Follow `docs/releasing.md` when asked to
|
Development pushes are not application releases. Follow `docs/releasing.md` when asked to
|
||||||
prepare or ship a release: choose the version from the actual changes, update Cargo.toml and
|
prepare or ship a release: choose the version from the actual changes, update Cargo.toml and
|
||||||
@@ -92,22 +153,31 @@ version bumps solely from commit prefixes, overwrite published versions, or push
|
|||||||
before the draft is verified.
|
before the draft is verified.
|
||||||
|
|
||||||
## Running and looking at the app
|
## Running and looking at the app
|
||||||
- `cargo run --release -p solvecraft -- --sample --control PORT` (sample design + control channel).
|
- `cargo run --release -p solidcraft -- --sample --control PORT` (sample design + control channel).
|
||||||
Pick a free port. Without a display, run it under `Xvfb :99` with `DISPLAY=:99`.
|
Pick a free port. Without a display, run it under `Xvfb :99` with `DISPLAY=:99`.
|
||||||
- Drive it with JSON lines on `127.0.0.1:PORT` (see `docs/control-protocol.md`):
|
- Drive it with JSON lines on `127.0.0.1:PORT` (see `docs/control-protocol.md`). The first
|
||||||
|
request on a connection carries the launch's token as `"token"`: read it from
|
||||||
|
`~/.local/share/solidcraft/control/PORT.token`, or start the app with
|
||||||
|
`SOLIDCRAFT_CONTROL_TOKEN=$(openssl rand -hex 32)` and send that.
|
||||||
- `{"id":1,"method":"engine.execute","params":{"command":"solid.extrude","params":{"distance":20}}}`
|
- `{"id":1,"method":"engine.execute","params":{"command":"solid.extrude","params":{"distance":20}}}`
|
||||||
- `{"id":2,"method":"ui.start","params":{"command":"sketch.create"}}` then `ui.click {x, y}`
|
- `{"id":2,"method":"ui.start","params":{"command":"sketch.create"}}` then `ui.click {x, y}`
|
||||||
- `{"id":3,"method":"ui.screenshot","params":{"path":"/tmp/shot.png"}}` then read the PNG.
|
- `{"id":3,"method":"ui.screenshot","params":{"path":"/tmp/shot.png"}}` then read the PNG.
|
||||||
- **For UI work, look at the result** (screenshot, read the PNG). Without a window use
|
- **For UI work, look at the result** (screenshot, read the PNG). Without a window use
|
||||||
`ui.render` or `solvecraft-cli snapshot`.
|
`ui.render` or `solidcraft-cli snapshot`.
|
||||||
- Headless: `solvecraft-cli run script.json --out part.step`, `solvecraft-cli eval design.solvecraft`,
|
- Headless: `solidcraft-cli run script.json --out part.step`, `solidcraft-cli eval design.solidcraft`,
|
||||||
`solvecraft-cli snapshot script.json --out shot.png`, `solvecraft-cli commands`.
|
`solidcraft-cli snapshot script.json --out shot.png`, `solidcraft-cli commands`.
|
||||||
- Reference tests: `cargo xtask oracle` replays `tests/oracle/*/recipe.json` and compares with
|
- Reference tests: `cargo xtask oracle` replays `tests/oracle/*/recipe.json` and compares with
|
||||||
each case's `expected.json` (analytic or FreeCAD values; writes `docs/oracle.md`). Expected
|
each case's `expected.json` (analytic or FreeCAD values; writes `docs/oracle.md`). Expected
|
||||||
values never come from a commercial CAD product.
|
values never come from a commercial CAD product.
|
||||||
- Build with `CARGO_TARGET_DIR=<repo>/target`. Windows: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solvecraft`.
|
- Build with `CARGO_TARGET_DIR=<repo>/target`. Windows: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solidcraft`.
|
||||||
|
|
||||||
## Roadmap
|
## Roadmap
|
||||||
`ROADMAP.md` (committed) tracks status, milestones and estimates. Update it whenever a
|
`ROADMAP.md` (committed) tracks status, milestones and estimates. Update it whenever a
|
||||||
milestone task lands. `cargo xtask features` regenerates `docs/features.md` (SolidCraft's
|
milestone task lands. `docs/features.md` (SolidCraft's commands by area, from the registry) and
|
||||||
commands by area, from the registry) when commands are added or renamed.
|
`THIRD-PARTY-LICENSES.txt` are regenerated on `main` after each merge by the Generated files
|
||||||
|
workflow; never regenerate them in a PR.
|
||||||
|
|
||||||
|
## Lists many PRs add to
|
||||||
|
Keep them conflict-free (CONTRIBUTING.md, "Lists many changes add to"): message catalogs sorted
|
||||||
|
(`cargo xtask lists --fix`), `mod` lines in their sorted group, the language list English first
|
||||||
|
then by id, generated files left to `main`, and a design-format change as one new file.
|
||||||
+151
-25
@@ -10,30 +10,33 @@ Help is welcome, whether that's a one-line fix or owning a whole area. This page
|
|||||||
build it, how the code is laid out, the few rules that aren't negotiable, and where help is
|
build it, how the code is laid out, the few rules that aren't negotiable, and where help is
|
||||||
needed most.
|
needed most.
|
||||||
|
|
||||||
|
Questions, ideas or want to say what you're working on? Join the [Discord](https://discord.gg/FtU4NQNVDH).
|
||||||
|
|
||||||
## Get it running (about 10 minutes on a fast machine)
|
## Get it running (about 10 minutes on a fast machine)
|
||||||
|
|
||||||
You need stable Rust 1.95 or newer (required by egui/eframe 0.36). For the web
|
You need stable Rust 1.95 or newer (required by egui/eframe 0.36). For the web
|
||||||
build you also need `rustup target add wasm32-unknown-unknown` and [`trunk`](https://trunkrs.dev).
|
build you also need `rustup target add wasm32-unknown-unknown` and [`trunk`](https://github.com/trunk-rs/trunk)
|
||||||
|
([documentation](https://trunk-rs.github.io/trunk/)).
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git clone https://github.com/bherbruck/solidcraft && cd solidcraft
|
git clone https://github.com/tangency-labs/solidcraft && cd solidcraft
|
||||||
cargo run --release -p solvecraft -- --sample # desktop app with a sample part
|
cargo run --release -p solidcraft -- --sample # desktop app with a sample part
|
||||||
cargo xtask test # unit, engine and UI-scenario tests
|
cargo xtask test # unit, engine and UI-scenario tests
|
||||||
cargo xtask ci # everything a PR must pass (see below)
|
cargo xtask ci # everything a PR must pass (see below)
|
||||||
```
|
```
|
||||||
|
|
||||||
SolidCraft is the product and repository name. Cargo packages and executables retain
|
SolidCraft is the product, repository, Cargo package and executable name.
|
||||||
their `solvecraft` names for compatibility with existing scripts and MCP clients.
|
Build the desktop app with `cargo build --release -p solidcraft`, or the CLI with
|
||||||
Build the desktop app with `cargo build --release -p solvecraft`, or the CLI with
|
`cargo build --release -p solidcraft-cli`. Run the CLI with
|
||||||
`cargo build --release -p solvecraft-cli`. Run the CLI with
|
`cargo run --release -p solidcraft-cli -- commands` (or `target/release/solidcraft-cli commands`
|
||||||
`cargo run --release -p solvecraft-cli -- commands` (or `target/release/solvecraft-cli commands`
|
after building). The old name appears only in the compatibility shims listed in
|
||||||
after building). There is no Cargo package named `solidcraft`.
|
[docs/compatibility.md](docs/compatibility.md); don't add new uses of it.
|
||||||
|
|
||||||
Web: `cd apps/solvecraft-web && trunk serve --release`, then open the printed URL (`?sample`
|
Web: `cd apps/solidcraft-web && trunk serve --release`, then open the printed URL (`?sample`
|
||||||
opens the sample part, `?webgl` forces WebGL2). Saving and opening files in the browser needs
|
opens the sample part, `?webgl` forces WebGL2). Saving and opening files in the browser needs
|
||||||
HTTPS or localhost, because it uses the Origin Private File System.
|
HTTPS or localhost, because it uses the Origin Private File System.
|
||||||
|
|
||||||
Windows from Linux: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solvecraft`.
|
Windows from Linux: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solidcraft`.
|
||||||
|
|
||||||
### NixOS: `nix develop`
|
### NixOS: `nix develop`
|
||||||
|
|
||||||
@@ -43,7 +46,7 @@ loader wgpu renders through, and libdbus-1, which rfd's file dialogs reach xdg-d
|
|||||||
through (a dialog then never appears and the pick returns no path):
|
through (a dialog then never appears and the pick returns no path):
|
||||||
|
|
||||||
```
|
```
|
||||||
ERROR solvecraft: winit EventLoopError: ... The wayland library could not be loaded
|
ERROR solidcraft: winit EventLoopError: ... The wayland library could not be loaded
|
||||||
ERROR eframe::native::run: Exiting because of error: WGPU error: Failed to create surface for any enabled backend: {}
|
ERROR eframe::native::run: Exiting because of error: WGPU error: Failed to create surface for any enabled backend: {}
|
||||||
ERROR rfd::backend::xdg_desktop_portal::portal::libdbus: Can't connect to a portal: libdbus-1.so not found
|
ERROR rfd::backend::xdg_desktop_portal::portal::libdbus: Can't connect to a portal: libdbus-1.so not found
|
||||||
```
|
```
|
||||||
@@ -59,8 +62,8 @@ The default development shell retains the Rust/C toolchain already on `PATH`;
|
|||||||
To launch, use `nix run .#solidcraft -- --sample`. To install the app's terminal
|
To launch, use `nix run .#solidcraft -- --sample`. To install the app's terminal
|
||||||
commands, desktop entry and generated icons, use `nix profile install .#solidcraft`.
|
commands, desktop entry and generated icons, use `nix profile install .#solidcraft`.
|
||||||
`nix build` alone creates a build result; it does not install a launcher in your
|
`nix build` alone creates a build result; it does not install a launcher in your
|
||||||
desktop menu. The installed `solidcraft` command and compatible `solvecraft`
|
desktop menu. The installed `solidcraft` command runs the wrapped app; `solidcraft-cli` is included as
|
||||||
command run the same wrapped app; `solvecraft-cli` is included as well. See
|
well. See
|
||||||
[Nix installation and troubleshooting](docs/nix.md) for remote-flake commands,
|
[Nix installation and troubleshooting](docs/nix.md) for remote-flake commands,
|
||||||
desktop integration and how to distinguish an old executable on `PATH`.
|
desktop integration and how to distinguish an old executable on `PATH`.
|
||||||
|
|
||||||
@@ -82,7 +85,7 @@ The [README](README.md#architecture) has the layer table. The short version:
|
|||||||
commands.
|
commands.
|
||||||
- `crates/ui-egui`: the desktop/web front end (egui + wgpu). It's swappable; nothing below it
|
- `crates/ui-egui`: the desktop/web front end (egui + wgpu). It's swappable; nothing below it
|
||||||
depends on egui.
|
depends on egui.
|
||||||
- `crates/mcp`, `apps/solvecraft`, `apps/solvecraft-cli`, `apps/solvecraft-web`.
|
- `crates/mcp`, `apps/solidcraft`, `apps/solidcraft-cli`, `apps/solidcraft-web`.
|
||||||
|
|
||||||
`cargo xtask layers` fails the build if a lower layer depends on a higher one.
|
`cargo xtask layers` fails the build if a lower layer depends on a higher one.
|
||||||
|
|
||||||
@@ -98,20 +101,31 @@ The [README](README.md#architecture) has the layer table. The short version:
|
|||||||
MIT OR Apache-2.0, and its solver and blends are written from the maths. (Running an
|
MIT OR Apache-2.0, and its solver and blends are written from the maths. (Running an
|
||||||
open-source application to get reference values for a test is fine; reading its source is
|
open-source application to get reference values for a test is fine; reading its source is
|
||||||
not.) Permissive
|
not.) Permissive
|
||||||
dependencies are fine. Note which one you're adding and why in the PR, and run
|
dependencies are fine. Note which one you're adding and why in the PR. THIRD-PARTY-LICENSES.txt
|
||||||
`cargo xtask licences` so THIRD-PARTY-LICENSES.txt lists it (CI checks that it is current).
|
lists it once the change lands: the Generated files workflow rewrites it on `main`.
|
||||||
|
Nightly/manual CI also scans advisories, bans and sources with cargo-deny; see
|
||||||
|
[the local command and coverage limits](docs/book/src/dev/testing.md#dependency-advisories).
|
||||||
3. **Every asset is original or openly licensed and has a row in
|
3. **Every asset is original or openly licensed and has a row in
|
||||||
[ATTRIBUTION.md](ATTRIBUTION.md).** Icons are drawn in code (`crates/ui-egui/src/icons.rs`).
|
[ATTRIBUTION.md](ATTRIBUTION.md).** Icons are drawn in code (`crates/ui-egui/src/icons.rs`).
|
||||||
`cargo xtask assets` enforces this.
|
`cargo xtask assets` enforces this.
|
||||||
4. **Never crash.** People trust a CAD app with their work.
|
4. **Never crash.** People trust a CAD app with their work.
|
||||||
- Non-test code never uses `unwrap`, `expect`, `panic!` or indexing on input-derived data.
|
- Non-test code never uses `unwrap`, `expect`, `panic!` or indexing on input-derived data.
|
||||||
There's no `unsafe`, and clippy denies it.
|
There's no `unsafe` outside `apps/solidcraft/src/open_documents.rs` (macOS file-open events),
|
||||||
|
`apps/solidcraft/src/native_crash.rs` (Windows native crash capture) and
|
||||||
|
`crates/threedx-client/src/macos.rs` (the 3Dconnexion driver's client API on macOS), and the
|
||||||
|
compiler denies it.
|
||||||
- An unsupported case returns an error ("not supported yet: …"); it never panics.
|
- An unsupported case returns an error ("not supported yet: …"); it never panics.
|
||||||
- Every call into truck goes through `solvecraft_kernel::guard`.
|
- Every call into truck goes through `solidcraft_kernel::guard`.
|
||||||
- Every crash fix comes with a regression test.
|
- Every crash fix comes with a regression test.
|
||||||
5. **Everything is a command, with a test.** A new feature means a `CommandSpec` in
|
5. **Everything is a command, with a test.** A new feature means a `CommandSpec` in
|
||||||
`crates/engine/src/cmd/`, engine tests that measure the result (volume, area,
|
`crates/engine/src/cmd/`, engine tests that measure the result (volume, area,
|
||||||
face/edge/vertex counts against a value you can derive), and for UI work a scenario (below).
|
face/edge/vertex counts against a value you can derive), and for UI work a scenario (below).
|
||||||
|
6. **One set of camera controls.** Every page or canvas that shows a view (the modelling
|
||||||
|
viewport, the Render preview, and any new page such as a flat pattern or drawing) calls
|
||||||
|
`navigation::handle` (`crates/ui-egui/src/navigation.rs`) for its camera input, with
|
||||||
|
`NavCaps` saying whether it can orbit (off for flat 2D pages) and pick. New canvases must use
|
||||||
|
`navigation::handle`; never read drags, the wheel or pinch to move the camera yourself. The
|
||||||
|
`hand_rolled_camera_input_is_rejected` test fails if a page does.
|
||||||
|
|
||||||
[AGENTS.md](AGENTS.md) has the long form of these rules. It's written for AI agents, but it's
|
[AGENTS.md](AGENTS.md) has the long form of these rules. It's written for AI agents, but it's
|
||||||
the most complete description of the house style.
|
the most complete description of the house style.
|
||||||
@@ -153,6 +167,33 @@ in the PR. `cargo xtask test` builds the tests with it and then runs every test
|
|||||||
`cargo xtask test -- shell`. Tests run beside each other on a busy machine, so a test must not
|
`cargo xtask test -- shell`. Tests run beside each other on a busy machine, so a test must not
|
||||||
depend on wall-clock timing.
|
depend on wall-clock timing.
|
||||||
|
|
||||||
|
**PRs test what they touch; main and nightly test everything.** On a pull request, CI maps the
|
||||||
|
changed files to workspace packages and runs Clippy, the test build and the tests for those and
|
||||||
|
the packages that depend on them (`scripts/ci/affected.py`, self-tested in the `checks` job). A
|
||||||
|
change to `Cargo.lock`, the root `Cargo.toml`, `.cargo/`, `.config/`, `.github/`, `vendor/`,
|
||||||
|
`tests/`, `scripts/` or any file outside a package runs the whole workspace, as does every push
|
||||||
|
to `main`, the nightly run and Run workflow.
|
||||||
|
|
||||||
|
**CI shards the tests.** One job builds them into a cargo-nextest archive and four jobs run a
|
||||||
|
quarter each, so every test runs in its own process: don't rely on state left by another test.
|
||||||
|
Pull requests skip a few heavy tests (one to four minutes each), which run on every push to
|
||||||
|
`main` and nightly; check the `main` run after merging. They are listed in
|
||||||
|
`.config/nextest.toml` and the [testing page](docs/book/src/dev/testing.md):
|
||||||
|
|
||||||
|
- `solidcraft-engine`: `tests::hostile_params_never_panic`, everything in `tests::robustness` and
|
||||||
|
the seeds of `tests::robustness_goldens` (`seed_00` … `seed_95`; pull requests that touch `crates/kernel` run every 8th),
|
||||||
|
`pattern_suppress_tests::enclosure_arc_extinction_keeps_a_real_sharp_inner_lip_after_resize_and_reopen`,
|
||||||
|
`pattern_suppress_tests::enclosure_datums_follow_wall_height_and_board_depth_with_material_proofs`,
|
||||||
|
`cmd::plastic::tests::enclosure_snap_fit_follows_resized_front_wall`, the `atomic_commands` contract tests
|
||||||
|
- `solidcraft-kernel`: `tests::boolean_identity_on_tangent_primitives`, and the `boolean_props` property tests
|
||||||
|
(these run only in the nightly "Property tests" job: their inputs are random, so main skips them too)
|
||||||
|
- `solidcraft-ui-egui` scenarios: `acceptance_sensor_enclosure`
|
||||||
|
|
||||||
|
**The action matrix** tries every ordinary action on every face, edge, vertex and body of a
|
||||||
|
corpus of designs against a checked-in ratchet ([docs/action-matrix.md](docs/action-matrix.md)).
|
||||||
|
A pull request that makes an action pass should record it with `cargo xtask action-matrix --bless`;
|
||||||
|
one that makes a passing action fail fails the sample every CI run checks.
|
||||||
|
|
||||||
**The reference tests** are 76 parts in [`tests/oracle/`](tests/oracle/), each a `recipe.json`
|
**The reference tests** are 76 parts in [`tests/oracle/`](tests/oracle/), each a `recipe.json`
|
||||||
in our own format with an `expected.json` beside it. SolidCraft rebuilds the recipe and compares
|
in our own format with an `expected.json` beside it. SolidCraft rebuilds the recipe and compares
|
||||||
body count, volume, area, centre of mass and bounding box (and, where there is a `reference.stl`,
|
body count, volume, area, centre of mass and bounding box (and, where there is a `reference.stl`,
|
||||||
@@ -163,18 +204,80 @@ the current results, and CI runs `cargo xtask oracle` on every pull request. A c
|
|||||||
because of a known bug names its issue in `expected.json` (`"known_failure": "#123"`); never
|
because of a known bug names its issue in `expected.json` (`"known_failure": "#123"`); never
|
||||||
change an expected value to match SolidCraft's output.
|
change an expected value to match SolidCraft's output.
|
||||||
|
|
||||||
|
## Changing the design file format
|
||||||
|
|
||||||
|
A design file says which format it is in (`"format": "solidcraft/N"`). If your change saves
|
||||||
|
something new in a design (a field, a feature type, a new kind of name), or makes older designs
|
||||||
|
mean something else, it needs a format change. **Add one file, and edit nothing shared:**
|
||||||
|
|
||||||
|
1. Create `crates/doc/src/format/pending/<what-it-is>.rs` (lowercase, dashes). Start it with a
|
||||||
|
`//!` note: what is saved, what older designs get without it, and that the last release asks
|
||||||
|
for an update instead of meeting it.
|
||||||
|
2. If older designs must be rewritten as they open, put `pub fn step(v: &mut Value) ->
|
||||||
|
crate::Result<()>` in the same file. Pending steps run in file-name order, after the older
|
||||||
|
formats' steps.
|
||||||
|
3. Don't touch `FORMAT`, `JSON_STEPS`, the history in `crates/doc/src/format.rs`, another
|
||||||
|
change's file, or any `v<N>/` folder: those are fixed once released.
|
||||||
|
|
||||||
|
That's all. The build counts the files: while any are pending it writes the next format number,
|
||||||
|
which no release reads, so a release refuses a design that has your change instead of losing it.
|
||||||
|
A file also lists the pending changes it has (`format_pending`), so a later development build
|
||||||
|
runs only the steps that file is missing. Two pull requests that each add a change merge without
|
||||||
|
a conflict. `crates/doc/src/format/pending/README.md` has an example.
|
||||||
|
|
||||||
|
**At release time** the maintainer runs `scripts/fold-format-pending.sh`, which moves the pending
|
||||||
|
files into `crates/doc/src/format/v<N>/` and fixes that number for good (see
|
||||||
|
[docs/releasing.md](docs/releasing.md)). Never add a file to a `v<N>/` folder afterwards.
|
||||||
|
|
||||||
|
## Lists many changes add to
|
||||||
|
|
||||||
|
Some files gain an item in many pull requests at once. They are kept so that two changes that
|
||||||
|
each add an item only meet when their items are neighbours, which spares everyone a conflict
|
||||||
|
and a fresh CI run:
|
||||||
|
|
||||||
|
- **Message catalogs** (`assets/locales/*.json`): one message per line, sorted by id. Add your
|
||||||
|
message anywhere and run `cargo xtask lists --fix`; `cargo xtask lists` (in `cargo xtask ci`
|
||||||
|
and the Lists workflow) fails on an unsorted catalog or an id that appears twice.
|
||||||
|
- **`mod` lines**: one per line, in the sorted group they belong to (`cargo fmt` keeps each group
|
||||||
|
sorted). Add a new module into the existing group, not as a new group at the end.
|
||||||
|
- **Languages** (`crates/ui-egui/src/i18n.rs`): one per line, English first, then by id (a test
|
||||||
|
checks it).
|
||||||
|
- **Generated files**: `THIRD-PARTY-LICENSES.txt` and `docs/features.md` are rewritten on `main`
|
||||||
|
after each merge by the Generated files workflow (`cargo xtask licences`, `cargo xtask
|
||||||
|
features`). Don't regenerate or edit them in a pull request.
|
||||||
|
- **Design format**: one file per change, never an edit to a shared number (above).
|
||||||
|
|
||||||
## Sending a change
|
## Sending a change
|
||||||
|
|
||||||
1. Work is tracked in [GitHub issues](https://github.com/bherbruck/solidcraft/issues), labelled
|
1. Work is tracked in [GitHub issues](https://github.com/tangency-labs/solidcraft/issues), labelled
|
||||||
by area (`area:kernel`, `area:sketch`, `area:doc`, `area:ui`, `area:infra`). Before starting,
|
by area (`area:kernel`, `area:sketch`, `area:doc`, `area:ui`, `area:infra`). For anything
|
||||||
comment on the issue so it gets the `in progress` label and two people don't build the same
|
bigger than a bug fix that has no issue yet, open one first. **Claim the issue with a draft
|
||||||
thing. For anything bigger than a bug fix that has no issue yet, open one first.
|
PR** before you start, so two people don't build the same thing:
|
||||||
|
- Check nobody has it: `gh pr list -R tangency-labs/solidcraft --state open --search "#N"`.
|
||||||
|
- Branch from the latest `main`, commit `git commit --allow-empty -m "claim: #N"`, push, and
|
||||||
|
open a **draft** PR titled `<summary> (#N)`, e.g. `Fillet: variable radius along a chain (#123)`.
|
||||||
|
- **The lowest-numbered open PR for an issue wins.** If yours lost, close it (or offer to help
|
||||||
|
on the other one).
|
||||||
|
- The bot records the claim when the PR is opened: it assigns you, adds `in progress` and
|
||||||
|
says so on the issue. It reads `#N` in the PR title and `Fixes #N` in the body. If someone
|
||||||
|
already holds the issue, or an older open PR references it, it says so on your PR instead.
|
||||||
|
- Want to stake a claim before you have a branch? Comment `/claim` on the issue (below).
|
||||||
|
- Push work in progress at least daily. A draft with no pushes for 72 hours may be taken over:
|
||||||
|
comment on it first, then open your own claim.
|
||||||
|
- Mark the PR ready for review when it is done.
|
||||||
2. Branch from `main` and keep the PR to one topic.
|
2. Branch from `main` and keep the PR to one topic.
|
||||||
3. Run `cargo xtask ci` before pushing. It runs fmt, the asset, licence and layer checks,
|
3. Run `cargo xtask ci` before pushing. It runs fmt, the asset, licence and layer checks,
|
||||||
clippy (`-D warnings`), then the tests with the wasm build check alongside. A PR has to pass it.
|
clippy (`-D warnings`), then the tests with the wasm build check alongside. A PR has to pass it.
|
||||||
4. Reference the issue (`Fixes #12`). In the PR, say what you tested and how. For geometry work, include the measured numbers (and
|
4. Reference the issue (`Fixes #12`). In the PR, say what you tested and how. For geometry work, include the measured numbers (and
|
||||||
the expected ones).
|
the expected ones).
|
||||||
|
|
||||||
|
Commenting `/claim` assigns you, adds the `in progress` label, and replies with its automatic cleanup
|
||||||
|
deadline. It frees a claim with no linked PR after 72 hours, or a claim with a PR after 14 days
|
||||||
|
without pushes. These automatic cleanup deadlines are separate from the daily progress and
|
||||||
|
72-hour takeover policy above. A draft PR that references the issue claims it the same way.
|
||||||
|
`/unclaim` releases the bot claim early (only you or a maintainer can). Issues a maintainer has
|
||||||
|
taken are never freed automatically.
|
||||||
|
|
||||||
Help reviewers see what the words mean. For observable CAD, UI or model behavior, please
|
Help reviewers see what the words mean. For observable CAD, UI or model behavior, please
|
||||||
include actual descriptive screenshots or a short recording in the issue or PR. This evidence
|
include actual descriptive screenshots or a short recording in the issue or PR. This evidence
|
||||||
is required for changes or bugs that can be demonstrated in the app, including kernel,
|
is required for changes or bugs that can be demonstrated in the app, including kernel,
|
||||||
@@ -201,10 +304,33 @@ owning one area, with a human setting direction and reporting bugs. Their workin
|
|||||||
[AGENTS.md](AGENTS.md). Human contributors are just as welcome. Use whatever tools you like, as
|
[AGENTS.md](AGENTS.md). Human contributors are just as welcome. Use whatever tools you like, as
|
||||||
long as the change meets the rules above.
|
long as the change meets the rules above.
|
||||||
|
|
||||||
|
## Labels and triage
|
||||||
|
|
||||||
|
The triage bot labels every new issue and PR (`.github/workflows/triage.yml`). It only adds labels;
|
||||||
|
correct them freely and it won't put them back.
|
||||||
|
|
||||||
|
- **PRs** get `area:*` from the paths they change (`crates/kernel` and `crates/geom` →
|
||||||
|
`area:kernel`, `crates/ui-egui` and the apps → `area:ui`, `.github/`, `scripts/`, `docs/` →
|
||||||
|
`area:infra`, and so on).
|
||||||
|
- **Issues** get `bug` (in-app reports and the bug template), `enhancement` (feature requests),
|
||||||
|
`priority:P1` for crashes, and an `area:*` from the title or the reported command. Until it has
|
||||||
|
a priority, an issue carries `needs-triage`; setting a priority removes it.
|
||||||
|
- **Maintainers** comment `/triage area:kernel P1` (any existing label; `P0`–`P3` for a
|
||||||
|
priority, which replaces the old one; `-label` removes one) to sort an issue or PR.
|
||||||
|
- **Short bug reports without steps to reproduce** get `needs-info` and one comment asking for
|
||||||
|
the steps (and the version, when it's missing). An app report that arrived empty is asked to
|
||||||
|
paste the report the app copied to the clipboard. The reporter's reply, or an edit that adds the
|
||||||
|
steps, removes the label; an issue that stays in `needs-info` for 14 days is closed, and can be
|
||||||
|
reopened any time. Feature requests, app reports with their details, and maintainers' issues
|
||||||
|
are never asked.
|
||||||
|
- `needs-triage` is the queue: [open issues with it](https://github.com/tangency-labs/solidcraft/issues?q=is%3Aopen+label%3Aneeds-triage).
|
||||||
|
|
||||||
## Where help is wanted most
|
## Where help is wanted most
|
||||||
|
|
||||||
See the [`help wanted`](https://github.com/bherbruck/solidcraft/labels/help%20wanted) and
|
**Kernel speed (slow fillets, booleans, STEP):** please don't rewrite the current kernel code for speed; it is being replaced by [solidcore](https://github.com/bherbruck/solidcore) ([progress](https://tangency-labs.github.io/solidcore/)). Report slow cases with a file under the `kernel-perf` label, and put kernel effort into solidcore instead. See [#1597](https://github.com/tangency-labs/solidcraft/issues/1597).
|
||||||
[`good first issue`](https://github.com/bherbruck/solidcraft/labels/good%20first%20issue) labels.
|
|
||||||
|
See the [`help wanted`](https://github.com/tangency-labs/solidcraft/labels/help%20wanted) and
|
||||||
|
[`good first issue`](https://github.com/tangency-labs/solidcraft/labels/good%20first%20issue) labels.
|
||||||
In order of how much they'd help users:
|
In order of how much they'd help users:
|
||||||
|
|
||||||
1. **Fillet and blend robustness.** Fillets are our own code (truck has no fillet operation).
|
1. **Fillet and blend robustness.** Fillets are our own code (truck has no fillet operation).
|
||||||
|
|||||||
Generated
+1245
-117
File diff suppressed because it is too large.
Load diff
+54
-15
@@ -5,7 +5,7 @@ members = ["crates/*", "apps/*", "xtask"]
|
|||||||
exclude = ["vendor"]
|
exclude = ["vendor"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.4.0"
|
version = "0.15.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
rust-version = "1.95"
|
rust-version = "1.95"
|
||||||
@@ -14,22 +14,32 @@ repository = "https://github.com/bherbruck/solidcraft"
|
|||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
# internal
|
# internal
|
||||||
solvecraft-geom = { path = "crates/geom" }
|
solidcraft-geom = { path = "crates/geom" }
|
||||||
solvecraft-sketch = { path = "crates/sketch" }
|
solidcraft-sketch = { path = "crates/sketch" }
|
||||||
solvecraft-kernel = { path = "crates/kernel" }
|
solidcraft-kernel = { path = "crates/kernel" }
|
||||||
solvecraft-render = { path = "crates/render" }
|
solidcraft-render = { path = "crates/render" }
|
||||||
solvecraft-doc = { path = "crates/doc" }
|
solidcraft-gpu = { path = "crates/gpu" }
|
||||||
solvecraft-io = { path = "crates/io" }
|
solidcraft-doc = { path = "crates/doc" }
|
||||||
solvecraft-engine = { path = "crates/engine" }
|
solidcraft-io = { path = "crates/io" }
|
||||||
solvecraft-ui-egui = { path = "crates/ui-egui" }
|
solidcraft-engine = { path = "crates/engine" }
|
||||||
solvecraft-mcp = { path = "crates/mcp" }
|
solidcraft-ui-egui = { path = "crates/ui-egui" }
|
||||||
|
solidcraft-space-mouse = { path = "crates/space-mouse" }
|
||||||
|
solidcraft-mcp = { path = "crates/mcp" }
|
||||||
|
solidcraft-derive = { path = "crates/derive" }
|
||||||
|
solidcraft-3dx-client = { path = "crates/threedx-client" }
|
||||||
|
|
||||||
# foundation
|
# foundation
|
||||||
thiserror = "2"
|
thiserror = "2"
|
||||||
serde = { version = "1", features = ["derive", "rc"] }
|
serde = { version = "1", features = ["derive", "rc"] }
|
||||||
|
# derive macros (crates/derive); already in the tree through serde_derive
|
||||||
|
proc-macro2 = "1"
|
||||||
|
quote = "1"
|
||||||
|
syn = { version = "2", features = ["full"] }
|
||||||
serde_json = { version = "1", features = ["float_roundtrip"] }
|
serde_json = { version = "1", features = ["float_roundtrip"] }
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
sha2 = "0.10"
|
sha2 = "0.10"
|
||||||
|
moxcms = { version = "0.8.1", default-features = false, features = ["extended_range"] }
|
||||||
|
semver = "1"
|
||||||
|
|
||||||
# geometry kernel (Apache-2.0; see plan/adr/0001-geometry-kernel.md). Only crates/kernel uses it.
|
# geometry kernel (Apache-2.0; see plan/adr/0001-geometry-kernel.md). Only crates/kernel uses it.
|
||||||
truck-modeling = "0.6"
|
truck-modeling = "0.6"
|
||||||
@@ -37,16 +47,38 @@ truck-shapeops = { version = "0.4", default-features = false }
|
|||||||
truck-meshalgo = { version = "0.4", default-features = false, features = ["tessellation", "analyzers"] }
|
truck-meshalgo = { version = "0.4", default-features = false, features = ["tessellation", "analyzers"] }
|
||||||
truck-stepio = { version = "0.3", default-features = false }
|
truck-stepio = { version = "0.3", default-features = false }
|
||||||
truck-topology = "0.6"
|
truck-topology = "0.6"
|
||||||
|
# constrained Delaunay + Ruppert refinement for trimmed faces (MIT OR Apache-2.0); already in the
|
||||||
|
# tree through truck-meshalgo.
|
||||||
|
spade = { version = "2.15", default-features = false, features = ["std"] }
|
||||||
|
rayon = "1.12"
|
||||||
|
|
||||||
# packages (3MF)
|
# packages (3MF)
|
||||||
zip = { version = "3", default-features = false, features = ["deflate"] }
|
zip = { version = "9", default-features = false, features = ["deflate"] }
|
||||||
quick-xml = "0.38"
|
quick-xml = "0.41"
|
||||||
|
# glTF 2.0 import (MIT OR Apache-2.0): the document model and GLB container only; buffers are
|
||||||
|
# read by crates/io itself, so no image decoding or file access comes with it.
|
||||||
|
gltf = { version = "1.4", default-features = false, features = ["names"] }
|
||||||
|
|
||||||
|
# FreeCAD and Rhino import (Apache-2.0, pure Rust apart from zstd; native builds only).
|
||||||
|
# Pinned: its IR and codec APIs change between minor versions. Open formats only: no default
|
||||||
|
# features, so cadmpeg's codecs for commercial formats (f3d, sldprt, inventor, catia, creo, nx)
|
||||||
|
# and its ShapeManager/ACIS `sat` codec are not compiled in. `step` is the writer we restate through.
|
||||||
|
cadmpeg-core = "=0.6.1"
|
||||||
|
cadmpeg-ir = "=0.6.1"
|
||||||
|
cadmpeg-registry = { version = "=0.6.1", default-features = false, features = ["fcstd", "rhino", "step"] }
|
||||||
|
|
||||||
# fonts (sketch text outlines; MIT OR Apache-2.0, pure Rust)
|
# fonts (sketch text outlines; MIT OR Apache-2.0, pure Rust)
|
||||||
ttf-parser = { version = "0.25", default-features = false, features = ["std"] }
|
ttf-parser = { version = "0.25", default-features = false, features = ["std"] }
|
||||||
|
|
||||||
# images
|
# images
|
||||||
image = { version = "0.25", default-features = false, features = ["png"] }
|
image = { version = "0.25", default-features = false, features = ["png", "hdr"] }
|
||||||
|
png = "0.18.1"
|
||||||
|
# LZW for GIF animations (MIT OR Apache-2.0, pure Rust; already in the tree through image's tiff).
|
||||||
|
weezl = "0.1.12"
|
||||||
|
# rasterises the UI icon SVGs (BSD-3-Clause, pure Rust, builds for wasm)
|
||||||
|
tiny-skia = { version = "0.12", default-features = false, features = ["std", "simd"] }
|
||||||
|
# build scripts: reads the icon palette (MIT OR Apache-2.0)
|
||||||
|
toml = "1"
|
||||||
|
|
||||||
# ui
|
# ui
|
||||||
egui = "0.36"
|
egui = "0.36"
|
||||||
@@ -54,6 +86,10 @@ eframe = { version = "0.36", default-features = false, features = ["persistence"
|
|||||||
# Instant/SystemTime that also work in the browser (std panics on wasm32-unknown-unknown).
|
# Instant/SystemTime that also work in the browser (std panics on wasm32-unknown-unknown).
|
||||||
web-time = "1"
|
web-time = "1"
|
||||||
egui-wgpu = "0.36"
|
egui-wgpu = "0.36"
|
||||||
|
# the wgpu egui-wgpu uses, for compute (crates/gpu); backends come from the apps' features
|
||||||
|
wgpu = { version = "30", default-features = false, features = ["std", "wgsl"] }
|
||||||
|
naga = { version = "30", default-features = false }
|
||||||
|
pollster = "0.4"
|
||||||
rfd = "0.17"
|
rfd = "0.17"
|
||||||
|
|
||||||
[workspace.lints.rust]
|
[workspace.lints.rust]
|
||||||
@@ -92,10 +128,13 @@ opt-level = 2
|
|||||||
opt-level = 3
|
opt-level = 3
|
||||||
lto = "thin"
|
lto = "thin"
|
||||||
codegen-units = 16
|
codegen-units = 16
|
||||||
debug = 0
|
# Line tables only: crash reports name file:line in their backtraces (no runtime cost; a larger
|
||||||
|
# binary). See docs/crash-reports.md.
|
||||||
|
debug = "line-tables-only"
|
||||||
|
|
||||||
# truck-shapeops with SolveCraft fixes (Apache-2.0, see vendor/truck-shapeops and ATTRIBUTION.md).
|
# truck-shapeops with SolidCraft fixes (Apache-2.0, see vendor/truck-shapeops and ATTRIBUTION.md).
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
|
truck-geometry = { path = "vendor/truck-geometry" }
|
||||||
truck-shapeops = { path = "vendor/truck-shapeops" }
|
truck-shapeops = { path = "vendor/truck-shapeops" }
|
||||||
truck-stepio = { path = "vendor/truck-stepio" }
|
truck-stepio = { path = "vendor/truck-stepio" }
|
||||||
truck-meshalgo = { path = "vendor/truck-meshalgo" }
|
truck-meshalgo = { path = "vendor/truck-meshalgo" }
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
MIT License
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2026 SolveCraft contributors
|
Copyright (c) 2026 SolidCraft contributors
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
SolveCraft
|
SolidCraft
|
||||||
Copyright (c) 2026 SolveCraft contributors.
|
Copyright (c) 2026 SolidCraft contributors.
|
||||||
Licensed under the MIT License or the Apache License, Version 2.0, at your option
|
Licensed under the MIT License or the Apache License, Version 2.0, at your option
|
||||||
(LICENSE-MIT, LICENSE-APACHE).
|
(LICENSE-MIT, LICENSE-APACHE).
|
||||||
|
|
||||||
@@ -7,10 +7,10 @@ Third-party material
|
|||||||
|
|
||||||
Software dependencies are listed in Cargo.lock; their licences are in THIRD-PARTY-LICENSES.txt
|
Software dependencies are listed in Cargo.lock; their licences are in THIRD-PARTY-LICENSES.txt
|
||||||
(`cargo xtask licences`), which the programs also carry (Help > About > Licences,
|
(`cargo xtask licences`), which the programs also carry (Help > About > Licences,
|
||||||
`solvecraft-cli licences`). The geometry kernel builds on the truck crates
|
`solidcraft-cli licences`). The geometry kernel builds on the truck crates
|
||||||
(truck-modeling, truck-shapeops, truck-meshalgo, truck-stepio, truck-topology and their
|
(truck-modeling, truck-shapeops, truck-meshalgo, truck-stepio, truck-topology and their
|
||||||
dependencies, https://github.com/ricosjp/truck), licensed under the Apache License 2.0 and used
|
dependencies, https://github.com/ricosjp/truck), licensed under the Apache License 2.0 and used
|
||||||
as libraries. truck-shapeops 0.4.0 is vendored in vendor/truck-shapeops with SolveCraft
|
as libraries. truck-shapeops 0.4.0 is vendored in vendor/truck-shapeops with SolidCraft
|
||||||
modifications (listed in vendor/README.md and marked in the source); its licence is in
|
modifications (listed in vendor/README.md and marked in the source); its licence is in
|
||||||
vendor/truck-shapeops/LICENSE. Copyright (c) RICOS Co. Ltd.
|
vendor/truck-shapeops/LICENSE. Copyright (c) RICOS Co. Ltd.
|
||||||
|
|
||||||
@@ -19,10 +19,15 @@ licensed MIT OR Apache-2.0; ATTRIBUTION.md lists the files.
|
|||||||
The release packaging (.github/workflows/release.yml, packaging/) is adapted from PhotoCraft
|
The release packaging (.github/workflows/release.yml, packaging/) is adapted from PhotoCraft
|
||||||
(https://github.com/storytold/photocraft), licensed under the Apache License 2.0.
|
(https://github.com/storytold/photocraft), licensed under the Apache License 2.0.
|
||||||
|
|
||||||
|
The incremental Radiance RGBE row adapter in crates/render/src/lighting/hdr.rs adapts
|
||||||
|
decoding state machines from image 0.25.10 (https://github.com/image-rs/image),
|
||||||
|
MIT OR Apache-2.0. ATTRIBUTION.md describes the bounded/cancellable changes; the
|
||||||
|
original licence texts are included in THIRD-PARTY-LICENSES.txt.
|
||||||
|
|
||||||
Most bundled assets are drawn in code or contributed originally; third-party fonts (Liberation Sans
|
Most bundled assets are drawn in code or contributed originally; third-party fonts (Liberation Sans
|
||||||
for sketch text, BIZ UDPGothic for web Japanese display) are licensed under SIL OFL 1.1. The
|
for sketch text, BIZ UDPGothic for web Japanese display) are licensed under SIL OFL 1.1. The
|
||||||
per-file list is in ATTRIBUTION.md.
|
per-file list is in ATTRIBUTION.md.
|
||||||
|
|
||||||
SolveCraft is an independent project and is not affiliated with, sponsored by or endorsed by
|
SolidCraft is an independent project and is not affiliated with, sponsored by or endorsed by
|
||||||
Autodesk, Inc. Autodesk and Fusion are trademarks of Autodesk, Inc.; they are used here only to
|
Autodesk, Inc. Autodesk and Fusion are trademarks of Autodesk, Inc.; they are used here only to
|
||||||
describe compatibility goals.
|
describe compatibility goals.
|
||||||
@@ -1,43 +1,124 @@
|
|||||||
# SolidCraft
|
<p align="center">
|
||||||
|
<img src="assets/icons/app/linux/exports/hicolor/256x256/apps/ai.storyteller.solidcraft.png" width="96" height="96" alt="SolidCraft" />
|
||||||
|
</p>
|
||||||
|
|
||||||
**An open-source parametric 3D CAD application built in pure Rust.**
|
<h1 align="center">SolidCraft</h1>
|
||||||
|
|
||||||
Sketch, constrain, and build solids with a parametric feature timeline. Change a dimension
|
<p align="center">
|
||||||
and watch your model rebuild. Run it on your desktop, in your browser, or let AI agents
|
<strong>An open-source parametric 3D CAD application built in pure Rust.</strong><br />
|
||||||
model through the built-in MCP server.
|
Sketch, constrain, and build solids with a parametric feature timeline. Change a dimension
|
||||||
|
and watch your model rebuild. Run it on your desktop, in your browser, or let AI agents
|
||||||
|
model through the built-in MCP server.
|
||||||
|
</p>
|
||||||
|
|
||||||

|
<div align="center">
|
||||||
|
|
||||||
*Start with an empty design and draw the original parametric electronics enclosure in the English desktop UI: rounded corners, a shell, a USB port sketched directly on the wall and a four-boss pattern. Change width from 80 → 100 mm and wall thickness from 2 → 3 mm in Parameters and watch it rebuild. Original animated pointer and click cues; 4× playback. [Full video](https://github.com/bherbruck/solidcraft/raw/refs/heads/main/docs/screenshots/enclosure-demo-0.2.1.mp4), generated with the [demo script](examples/demo/record_ui.sh).*
|
[![Download for Windows][badge-windows]][windows-msi]
|
||||||
|
[![Download for macOS][badge-macos]][macos-dmg]
|
||||||
|
[![Download for Linux][badge-linux]][linux-appimage]
|
||||||
|
[![Get it from the Snap Store][badge-snap]][snap-store]
|
||||||
|
[![Try it in your browser][badge-web]][web-app]
|
||||||
|
|
||||||
**Documentation:** the [SolidCraft book](https://bherbruck.github.io/solidcraft/) (user guide,
|
</div>
|
||||||
developer guide and command reference; sources in [docs/book](docs/book)), and the
|
|
||||||
[web app](https://bherbruck.github.io/solidcraft/app/) to try it in the browser.
|
|
||||||
|
|
||||||
Linux Flatpak installation needs the Freedesktop runtime from Flathub as well as the
|
<p align="center">
|
||||||
SolidCraft application feed. See [install and launch commands](https://bherbruck.github.io/solidcraft/guide/getting-started.html#linux-flatpak).
|
<a href="https://solidcraft.io">Website</a> ·
|
||||||
|
<a href="https://solidcraft.io/download">Download</a> ·
|
||||||
|
<a href="https://solidcraft.io/app">Try it in the browser</a> ·
|
||||||
|
<a href="https://docs.solidcraft.io/">Documentation</a> ·
|
||||||
|
<a href="https://discord.gg/FtU4NQNVDH">Discord</a> ·
|
||||||
|
<a href="https://github.com/bherbruck/solidcore">SolidCore</a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<a href="https://github.com/tangency-labs/solidcraft/actions/workflows/ci.yml?query=branch%3Amain"><img src="https://github.com/tangency-labs/solidcraft/actions/workflows/ci.yml/badge.svg?branch=main" alt="CI" /></a>
|
||||||
|
<a href="https://github.com/tangency-labs/solidcraft/releases/latest"><img src="https://img.shields.io/github/v/release/tangency-labs/solidcraft?label=release" alt="Latest release" /></a>
|
||||||
|
<a href="https://github.com/tangency-labs/solidcraft/releases"><img src="https://img.shields.io/github/downloads/tangency-labs/solidcraft/total?label=downloads" alt="Downloads" /></a>
|
||||||
|
<a href="LICENSE"><img src="https://img.shields.io/github/license/tangency-labs/solidcraft" alt="Licence" /></a>
|
||||||
|
<a href="https://discord.gg/FtU4NQNVDH"><img src="https://img.shields.io/badge/Discord-join-5865F2?logo=discord&logoColor=white" alt="Discord" /></a>
|
||||||
|
<a href="https://remade.wiki/projects/solidcraft/"><img src="https://remade.wiki/badges/listed-on-remade-classic.svg" alt="Listed on Remade" /></a>
|
||||||
|
<a href="https://github.com/tangency-labs/solidcraft/stargazers"><img src="https://img.shields.io/github/stars/tangency-labs/solidcraft?style=flat" alt="Stars" /></a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
*A Raspberry Pi 4 case from an empty design: a sketch dimensioned with the board's parameters, extrude, fillet, shell, the rim rounded in one pick, an M2.5 standoff patterned on the 58 × 49 mm hole rectangle, port cut-outs, vent slots, "Pi 4" engraved in DejaVu Sans Bold and a PETG material defined in the design, with its mass in Properties, then height 24 → 32 mm in Parameters and it all rebuilds. 9× playback. [Full video](https://github.com/tangency-labs/solidcraft/raw/refs/heads/main/docs/screenshots/demo-0.8.mp4), recorded with the [demo script](examples/demo/record_ui.sh).*
|
||||||
|
|
||||||
|
## Download
|
||||||
|
|
||||||
|
- **Windows:** download and run the [installer][windows-msi].
|
||||||
|
Also for [ARM64][windows-arm64-msi] and [32-bit][windows-x86-msi] PCs, or as a
|
||||||
|
[portable zip][windows-portable] that runs without installing.
|
||||||
|
With [WinGet](https://learn.microsoft.com/windows/package-manager/winget/):
|
||||||
|
`winget install bherbruck.SolidCraft`.
|
||||||
|
- **macOS:** open the [disk image][macos-dmg] and drag SolidCraft into Applications
|
||||||
|
(Apple silicon and Intel).
|
||||||
|
- **Linux:** download the [AppImage][linux-appimage], allow it to run as a program and open it.
|
||||||
|
Or install the [.deb][linux-deb] (Ubuntu, Debian, Mint) or [.rpm][linux-rpm] (Fedora,
|
||||||
|
openSUSE), or use [Flatpak](https://docs.solidcraft.io/guide/getting-started.html#linux-flatpak).
|
||||||
|
With Snap: `sudo snap install solidcraft` ([Snap Store][snap-store], or the [.snap file][linux-snap]).
|
||||||
|
For ARM64: [AppImage][linux-arm64-appimage], [.deb][linux-arm64-deb], [.rpm][linux-arm64-rpm].
|
||||||
|
- **Web:** [try it in your browser][web-app], no install.
|
||||||
|
|
||||||
|
The downloads aren't signed yet. On Windows, if SmartScreen warns you, choose **More info**, then
|
||||||
|
**Run anyway**. On macOS, the first time, right-click SolidCraft in Applications and choose **Open**.
|
||||||
|
|
||||||
|
**On SolidCraft 0.11 to 0.14?** Its **Update now** can't install 0.15.0 or later, because the
|
||||||
|
releases moved to a new address. Download the new version once from the links above; after that,
|
||||||
|
updating from inside SolidCraft works again ([details](https://docs.solidcraft.io/guide/updates.html#updating-from-011-to-014)).
|
||||||
|
|
||||||
|
Older versions, checksums and other formats are on the [releases page](https://github.com/tangency-labs/solidcraft/releases).
|
||||||
|
Install details, upgrading from earlier builds and building from source are in
|
||||||
|
[Getting started](https://docs.solidcraft.io/guide/getting-started.html).
|
||||||
|
|
||||||
|
[badge-windows]: https://img.shields.io/badge/Windows-Download-0078D6?style=for-the-badge&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0id2hpdGUiPjxwYXRoIGQ9Ik0yIDJoOS41djkuNUgyek0xMi41IDJIMjJ2OS41aC05LjV6TTIgMTIuNWg5LjVWMjJIMnpNMTIuNSAxMi41SDIyVjIyaC05LjV6Ii8%2BPC9zdmc%2B
|
||||||
|
[badge-macos]: https://img.shields.io/badge/macOS-Download-333333?style=for-the-badge&logo=apple&logoColor=white
|
||||||
|
[badge-linux]: https://img.shields.io/badge/Linux-AppImage-E95420?style=for-the-badge&logo=linux&logoColor=white
|
||||||
|
[badge-snap]: https://img.shields.io/badge/Snap-Snap_Store-82BEA0?style=for-the-badge&logo=snapcraft&logoColor=white
|
||||||
|
[badge-web]: https://img.shields.io/badge/Web-Try_in_browser-2EA44F?style=for-the-badge&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSIyIj48Y2lyY2xlIGN4PSIxMiIgY3k9IjEyIiByPSIxMCIvPjxwYXRoIGQ9Ik0yIDEyaDIwTTEyIDJhMTUgMTUgMCAwIDEgMCAyME0xMiAyYTE1IDE1IDAgMCAwIDAgMjAiLz48L3N2Zz4%3D
|
||||||
|
[windows-msi]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-windows-x64.msi
|
||||||
|
[windows-arm64-msi]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-windows-arm64.msi
|
||||||
|
[windows-x86-msi]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-windows-x86.msi
|
||||||
|
[windows-portable]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-windows-x64-portable.zip
|
||||||
|
[macos-dmg]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-macos-universal.dmg
|
||||||
|
[linux-appimage]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-linux-x86_64.AppImage
|
||||||
|
[linux-deb]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-linux-x86_64.deb
|
||||||
|
[linux-rpm]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-linux-x86_64.rpm
|
||||||
|
[linux-arm64-appimage]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-linux-aarch64.AppImage
|
||||||
|
[linux-arm64-deb]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-linux-aarch64.deb
|
||||||
|
[linux-arm64-rpm]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-linux-aarch64.rpm
|
||||||
|
[linux-snap]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-linux-x86_64.snap
|
||||||
|
[snap-store]: https://snapcraft.io/solidcraft
|
||||||
|
[web-app]: https://solidcraft.io/app
|
||||||
|
|
||||||
|
**Documentation:** the [SolidCraft book](https://docs.solidcraft.io/) (user guide,
|
||||||
|
developer guide and command reference; sources in [docs/book](docs/book)).
|
||||||
|
|
||||||
|
**Community:** chat with users and contributors on [Discord](https://discord.gg/FtU4NQNVDH).
|
||||||
|
|
||||||
**Status: early but usable for simple parts.** 75 of 76 public reference parts
|
**Status: early but usable for simple parts.** 75 of 76 public reference parts
|
||||||
match their analytic or FreeCAD-computed volume, area, centre of mass and bounding box
|
match their analytic or FreeCAD-computed volume, area, centre of mass and bounding box
|
||||||
([docs/oracle.md](docs/oracle.md)); the other is a tracked bug.
|
([docs/oracle.md](docs/oracle.md)); the other is a tracked bug.
|
||||||
These checks do not establish complete geometric or workflow equivalence. The commands SolidCraft has
|
These checks do not establish complete geometric or workflow equivalence. The commands SolidCraft has
|
||||||
are listed by area in [docs/features.md](docs/features.md); status and plans are in [ROADMAP.md](ROADMAP.md).
|
are listed by area in [docs/features.md](docs/features.md); status and plans are in [ROADMAP.md](ROADMAP.md).
|
||||||
Open work and known bugs are in [GitHub issues](https://github.com/bherbruck/solidcraft/issues),
|
Open work and known bugs are in [GitHub issues](https://github.com/tangency-labs/solidcraft/issues),
|
||||||
and help is welcome: see [CONTRIBUTING.md](CONTRIBUTING.md).
|
and help is welcome: see [CONTRIBUTING.md](CONTRIBUTING.md).
|
||||||
|
|
||||||
## Name and compatibility
|
## Built with SolidCraft
|
||||||
|
|
||||||
SolidCraft was previously called SolveCraft. The product display name and repository are
|
<a href="https://github.com/0xlillith/solidcraft-rover"><img src="docs/screenshots/rover-build.gif" alt="SELENE, a scientific rover by 0xlillith, assembling itself as the timeline plays through its 3,323 steps in SolidCraft: tub, wheels, electronics, suspension, sampling arm, solar wings, dish and camera turret" loading="lazy"></a>
|
||||||
changing; existing identifiers remain compatible: `.solvecraft` designs, `solvecraft-cli`,
|
|
||||||
Cargo package names, settings/recovery locations and package IDs keep their existing names.
|
|
||||||
Published 0.2.0 and 0.2.1 packages and demo recordings retain their original SolveCraft branding
|
|
||||||
and filenames.
|
|
||||||
|
|
||||||
Use the SolidCraft documentation and web-app URLs above. GitHub redirects links to the
|
*SELENE, a scientific rover built entirely through SolidCraft's MCP server by
|
||||||
renamed repository; old-name Pages and Flatpak URLs are not maintained as permanent aliases.
|
[@0xlillith](https://github.com/0xlillith/solidcraft-rover): 3,323 editable timeline steps that
|
||||||
|
rebuild with no errors, replayed here at 2× speed.
|
||||||
|
[Full video](https://github.com/tangency-labs/solidcraft/raw/refs/heads/main/docs/screenshots/rover-build.mp4)
|
||||||
|
· [download the editable model](https://github.com/0xlillith/solidcraft-rover/releases/tag/v1.0.0).*
|
||||||
|
|
||||||
## What works
|
## What works
|
||||||
|
|
||||||
|
- **Current-view DXF export** from File → Export Current View as DXF, with hidden edges
|
||||||
|
omitted or dashed, shown body placements and the current camera. See [view DXF](docs/view-dxf.md).
|
||||||
|
|
||||||
- **Sketches** on origin planes, offset planes or planar faces: lines, rectangles, circles,
|
- **Sketches** on origin planes, offset planes or planar faces: lines, rectangles, circles,
|
||||||
arcs, polygons, slots, ellipses, fit/control splines, conics and text; construction geometry,
|
arcs, polygons, slots, ellipses, fit/control splines, conics and text; construction geometry,
|
||||||
projection, trimming, fillets and chamfers, including corners at the origin.
|
projection, trimming, fillets and chamfers, including corners at the origin.
|
||||||
@@ -49,13 +130,17 @@ renamed repository; old-name Pages and Flatpak URLs are not maintained as perman
|
|||||||
the boundary and keeps existing extrusions usable.
|
the boundary and keeps existing extrusions usable.
|
||||||
Curve drawing and picking adapt together to zoom and display scale, including small circles
|
Curve drawing and picking adapt together to zoom and display scale, including small circles
|
||||||
at Fit and sketches in placed components.
|
at Fit and sketches in placed components.
|
||||||
- **Constraints and dimensions** solved by our own solver (damped Gauss–Newton with
|
- **Constraints and dimensions** solved by our own solver. Points the constraints fix relative
|
||||||
degree-of-freedom analysis): coincident, horizontal/vertical, parallel, perpendicular, tangent,
|
to known geometry are placed exactly by construction (loci intersections and rigid-cluster
|
||||||
equal, concentric, collinear, midpoint, symmetry, fix; linear, aligned, horizontal, vertical,
|
decomposition, after Owen 1991 and Fudos–Hoffmann 1997); Levenberg–Marquardt solves the rest,
|
||||||
radius, diameter and angle dimensions driven by parameters. Over-constraining edits are
|
and the rank of its Jacobian gives the remaining degrees of freedom. Constraints: coincident,
|
||||||
rejected; fully constrained geometry turns black.
|
point on curve, horizontal/vertical, parallel, perpendicular, tangent, curvature (G2), equal,
|
||||||
|
concentric, collinear, midpoint, symmetry, fix; linear, aligned, horizontal, vertical,
|
||||||
|
point-to-line, radius, diameter, angle, arc sweep, arc length and slot length dimensions driven
|
||||||
|
by parameters. Over-constraining edits are rejected; fully constrained geometry turns black.
|
||||||
|
Dragging solves the sketch every frame and rebuilds the model once, when the drag ends.
|
||||||
Select a line or its two endpoints, type its dimension and press Enter to commit one undo
|
Select a line or its two endpoints, type its dimension and press Enter to commit one undo
|
||||||
step. Fit keeps sketch geometry clear of the palette and navigation controls.
|
step; with Sketch Dimension it's D, click, type, Enter. Fit keeps sketch geometry clear of the palette and navigation controls.
|
||||||
- **Profiles** found automatically, including regions split by lines and holes inside outlines.
|
- **Profiles** found automatically, including regions split by lines and holes inside outlines.
|
||||||
Newly captured complete adaptive boundaries retain their outer and hole source identities
|
Newly captured complete adaptive boundaries retain their outer and hole source identities
|
||||||
when spline span counts change. Partial or ambiguous boundaries do not qualify.
|
when spline span counts change. Partial or ambiguous boundaries do not qualify.
|
||||||
@@ -74,48 +159,117 @@ renamed repository; old-name Pages and Flatpak URLs are not maintained as perman
|
|||||||
retained shallow prismatic pockets, exact line/arc/circle DXF outlines and bend tables;
|
retained shallow prismatic pockets, exact line/arc/circle DXF outlines and bend tables;
|
||||||
plastic enclosure features and rules. Pocket depth and side survive unfold/refold and appear
|
plastic enclosure features and rules. Pocket depth and side survive unfold/refold and appear
|
||||||
separately from through-hole outlines in the flat preview and DXF.
|
separately from through-hole outlines in the flat preview and DXF.
|
||||||
- **Files**: designs as JSON (`.solvecraft`), export to STEP (AP242 with body names, colours and
|
- **Files**: design containers (`.solidcraft`) with lossless binary mesh payloads;
|
||||||
|
plain JSON remains supported for opening, Save As and export. Desktop Open can show a saved
|
||||||
|
provisional picture from warm geometry caches while rebuilding before editing; caches never
|
||||||
|
replace the parametric design. Export to STEP (AP242 with body names, colours and
|
||||||
components as assemblies; revolved faces as native planes, cylinders, cones, spheres and tori),
|
components as assemblies; revolved faces as native planes, cylinders, cones, spheres and tori),
|
||||||
IGES 5.3 (manifold solid B-reps with names and colours), 3MF, STL (binary/ASCII) and OBJ;
|
IGES 5.3 (manifold solid B-reps with names and colours), 3MF, STL (binary/ASCII) and OBJ, and
|
||||||
3MF, STL and OBJ import as mesh bodies (they render, measure, move and export; solid features
|
assemblies with joints as URDF for robot simulators (docs/urdf.md);
|
||||||
need B-rep bodies). Convert Mesh reconstructs supported closed constant-section parts
|
3MF, STL, OBJ and glTF 2.0 (`.glb`/`.gltf`, its node tree as components and its materials as
|
||||||
|
appearances) import as mesh bodies (they render, measure, move and export; solid features
|
||||||
|
need B-rep bodies). The `mesh.convert` command reconstructs supported closed constant-section parts
|
||||||
as parametric solids with planar and circular cylindrical faces;
|
as parametric solids with planar and circular cylindrical faces;
|
||||||
STEP import (AP203/AP214/AP242 solids, assemblies, units, names, colours) and IGES import
|
STEP import (AP203/AP214/AP242 solids, assemblies, units, names, colours) and IGES import
|
||||||
(manifold solid B-reps, or trimmed and bounded surfaces sewn into solids) as a base feature
|
(manifold solid B-reps, or trimmed and bounded surfaces sewn into solids) as a base feature
|
||||||
that later features build on — open a `.step`/`.stp`/`.igs`/`.iges` file, insert one into a
|
that later features build on — open a `.step`/`.stp`/`.igs`/`.iges` file, insert one into a
|
||||||
design, or drop it on the window ([docs/step-import.md](docs/step-import.md)).
|
design, or drop it on the window ([docs/step-import.md](docs/step-import.md)); FreeCAD
|
||||||
|
`.FCStd` and Rhino `.3dm` solids import the same way through
|
||||||
|
[cadmpeg](https://github.com/cadmpeg/cadmpeg) in the desktop app and CLI.
|
||||||
|
- **Render:** opaque surfaces can use metal fraction, roughness and dielectric IOR in the
|
||||||
|
integrated product viewport and CPU preview PNGs. Existing simple colors remain supported.
|
||||||
|
Fixed direct lighting is a preview; HDRI, refraction and texture maps are not implemented.
|
||||||
|
See [opaque surfaces](docs/render-opaque-pbr.md).
|
||||||
|
- **Display meshes** from our own tessellation planner: each face becomes a plan of (u, v)
|
||||||
|
points and triangles that shares its edge nodes with its neighbours, so the mesh is watertight.
|
||||||
|
Facets follow the chord tolerance, the facet angle and a longest side, with cells at most 2:1
|
||||||
|
along straight directions. Box-bounded and four-cornered faces mesh as structured grids.
|
||||||
|
Trimmed faces are cut into four-sided patches: squares around holes, butterflies in round
|
||||||
|
faces, motorcycle traces from concave corners (after Lyon et al. 2019). Each patch then meshes
|
||||||
|
as a Coons grid. Intersection edges are evaluated by Newton on both surfaces. A compute shader
|
||||||
|
evaluates the plans for the whole scene in one dispatch, with a CPU fallback when the GPU
|
||||||
|
can't build it. Planning and evaluating the 78 reference bodies takes about 65 ms, 50–65×
|
||||||
|
faster than the previous mesher.
|
||||||
- **Desktop app** (egui + wgpu): toolbar with workspace tabs, browser, timeline, 3D viewport with
|
- **Desktop app** (egui + wgpu): toolbar with workspace tabs, browser, timeline, 3D viewport with
|
||||||
axis view and navigation bar, sketch tools, feature dialogs, command palette, and a JSON-lines
|
axis view and navigation bar, sketch tools, feature dialogs, command palette, and a JSON-lines
|
||||||
control channel so agents and tests can drive it.
|
control channel so agents and tests can drive it.
|
||||||
Feature errors and Help can open an editable **Create Issue** draft with relevant context
|
Feature errors and Help can open an editable **Create Issue** draft with relevant context
|
||||||
and an optional reviewed screenshot; opening GitHub does not submit the report.
|
and an optional reviewed screenshot; opening GitHub does not submit the report.
|
||||||
- **Headless CLI** `solvecraft-cli`: run command scripts, measure (volume, area, centre of mass,
|
- **Headless CLI** `solidcraft-cli`: run command scripts, measure (volume, area, centre of mass,
|
||||||
face/edge/vertex counts), export, render PNG snapshots and replay reference recipes.
|
face/edge/vertex counts), export, render PNG snapshots and replay reference recipes.
|
||||||
- **MCP server** `solvecraft-cli mcp`: AI agents model, measure and look at parts headless or
|
- **MCP server** `solidcraft-cli mcp`: AI agents model, measure and look at parts headless or
|
||||||
in the running app (see below).
|
in the running app (see below).
|
||||||
|
|
||||||
## Build and run
|
## Build and run
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cargo run --release -p solvecraft -- --sample # desktop app with a sample part
|
cargo run --release -p solidcraft -- --sample # desktop app with a sample part
|
||||||
cargo run --release -p solvecraft-cli -- commands # the command registry
|
cargo run --release -p solidcraft-cli -- commands # the command registry
|
||||||
cargo run --release -p solvecraft-cli -- run examples/bracket.json --out bracket.step
|
cargo run --release -p solidcraft-cli -- run examples/bracket.json --out bracket.step
|
||||||
cargo run --release -p solvecraft-cli -- snapshot examples/bracket.json --out bracket.png
|
cargo run --release -p solidcraft-cli -- snapshot examples/bracket.json --out bracket.png
|
||||||
cargo run --release -p solvecraft -- part.step # open a STEP file as a new design
|
cargo run --release -p solidcraft-cli -- render examples/render-studio.json --out product.png
|
||||||
cargo run --release -p solvecraft-cli -- eval part.step # measure an imported STEP file
|
cargo run --release -p solidcraft -- part.step # open a STEP file as a new design
|
||||||
cargo xtask ci # fmt, clippy, tests, assets, layers, wasm
|
cargo run --release -p solidcraft-cli -- eval part.step # measure an imported STEP file
|
||||||
|
cargo xtask ci # fmt, clippy, tests, icons, assets, layers, wasm
|
||||||
```
|
```
|
||||||
|
|
||||||
Windows builds: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solvecraft`.
|
UI artwork changes follow the [icon specification](assets/icons/ui/STYLE_GUIDE.md).
|
||||||
|
The [included review tool](assets/icons/ui/README.md) discovers new icons and keeps
|
||||||
|
unaccepted artwork Open; run `cargo xtask icons` to check the collection.
|
||||||
|
|
||||||
On Windows, SolidCraft detects a connected 3Dconnexion SpaceNavigator or SpaceMouse through its
|
Windows builds: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solidcraft`.
|
||||||
multi-axis HID interface. Move the cap to pan and zoom, and tilt or twist it to rotate the 3D view.
|
|
||||||
|
On Windows, macOS and Linux, SolidCraft detects a connected 3D mouse through its HID multi-axis
|
||||||
|
controller interface: a 3Dconnexion SpaceNavigator or SpaceMouse, or a homemade device that
|
||||||
|
declares itself one. Move the cap to pan and zoom, and tilt or twist it to rotate the 3D view.
|
||||||
While editing a sketch, the cap pans and zooms without changing the sketch view. The Navigation
|
While editing a sketch, the cap pans and zooms without changing the sketch view. The Navigation
|
||||||
page in Preferences has an on/off switch and a speed control for the 3D mouse.
|
page in Preferences has an on/off switch, a speed control and, for each of the cap's six axes, an
|
||||||
|
invert switch and a speed for the 3D mouse. The web app reads
|
||||||
|
it too, through the browser; Firefox needs a 3DxWare setting first (see
|
||||||
|
[Getting started › 3D mouse in the browser](docs/book/src/guide/getting-started.md#3d-mouse-in-the-browser)).
|
||||||
|
|
||||||
In the browser: `cd apps/solvecraft-web && trunk build --release --public-url ./` (WebGPU, or
|
With 3DxWare on Windows, SolidCraft follows 3DxWare's profile for it when there is one, and
|
||||||
|
3DxWare's object mode (tilt to roll, twist to spin) until there is. The mouse-wheel turns that
|
||||||
|
3DxWare makes from the cap's motion are ignored, so the view doesn't zoom in steps as the cap tilts.
|
||||||
|
|
||||||
|
On Linux SolidCraft reads the 3D mouse through `spacenavd` when that daemon runs (its socket
|
||||||
|
`/var/run/spnav.sock`), so what you set in `spnavcfg` (swapped or inverted axes, sensitivity, dead
|
||||||
|
zones) applies as it does in other programs, and no udev rule is needed. With nothing set there,
|
||||||
|
the motion is the same as without the daemon. Without `spacenavd`, SolidCraft reads `/dev/hidrawN`
|
||||||
|
directly, so the logged-in user needs access to the device. A udev rule that adds the `uaccess`
|
||||||
|
tag does that, for example
|
||||||
|
`/etc/udev/rules.d/70-3d-mouse.rules` for USB devices with 3Dconnexion's vendor id, and for its
|
||||||
|
Bluetooth ones (where `idVendor` isn't set, so the HID id is matched instead):
|
||||||
|
|
||||||
|
```
|
||||||
|
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="256f", TAG+="uaccess"
|
||||||
|
SUBSYSTEM=="hidraw", KERNELS=="0005:256F:*", TAG+="uaccess"
|
||||||
|
```
|
||||||
|
|
||||||
|
Older SpaceNavigators use Logitech's vendor id `046d`, so add a rule with their product id (see
|
||||||
|
`lsusb`) instead of matching every Logitech device. A homemade device needs a rule with its own
|
||||||
|
vendor and product id. Reload with `sudo udevadm control --reload && sudo udevadm trigger`, then
|
||||||
|
replug the device. The Flatpak sandbox does not expose hidraw devices, so the 3D mouse only works
|
||||||
|
with native builds there for now.
|
||||||
|
|
||||||
|
SolidCraft finds the axes from the device's report descriptor, so it doesn't matter how a device
|
||||||
|
lays them out: translation and rotation in separate reports (3Dconnexion's wired devices), all six
|
||||||
|
in one (its wireless ones and most homemade devices), after the buttons, or narrower than 16 bits.
|
||||||
|
Each axis is scaled from the range the descriptor declares.
|
||||||
|
|
||||||
|
On macOS SolidCraft talks to the 3Dconnexion driver (3DxWare) when it is installed, through the
|
||||||
|
driver's client API (`crates/threedx-client`; the framework is loaded at run time, never bundled).
|
||||||
|
The driver keeps the device to itself, and sends it only to a program it can identify: SolidCraft
|
||||||
|
as an `.app` (the packaged app). Without the driver, or with its helper not running, SolidCraft reads the device through IOKit like on Windows.
|
||||||
|
|
||||||
|
SolidCraft does not follow 3DxWare's profile on macOS. Its default is 3DxWare's object mode.
|
||||||
|
|
||||||
|
In the browser: `cd apps/solidcraft-web && trunk build --release --public-url ./` (WebGPU, or
|
||||||
WebGL2 with `?webgl`; `?sample` opens the sample part).
|
WebGL2 with `?webgl`; `?sample` opens the sample part).
|
||||||
|
|
||||||
|
Agents can control the document open in a browser tab through `window.solidcraft.execute(...)`
|
||||||
|
and `window.solidcraft.request(...)`; see the [browser command API](docs/browser-api.md).
|
||||||
|
|
||||||
## Scripts
|
## Scripts
|
||||||
|
|
||||||
A script is a JSON list of commands, the same ones the UI runs:
|
A script is a JSON list of commands, the same ones the UI runs:
|
||||||
@@ -131,12 +285,14 @@ A script is a JSON list of commands, the same ones the UI runs:
|
|||||||
|
|
||||||
## AI agents (MCP)
|
## AI agents (MCP)
|
||||||
|
|
||||||
`solvecraft-cli mcp` is a [Model Context Protocol](https://modelcontextprotocol.io) server on
|
`solidcraft-cli mcp` is a [Model Context Protocol](https://modelcontextprotocol.io) server on
|
||||||
stdio. Headless it runs its own design session; with `--connect 127.0.0.1:PORT` it drives the app
|
stdio. Headless it runs its own design session; with `--connect 127.0.0.1:PORT` it drives the app
|
||||||
started with `solvecraft --control PORT`, so you can watch the agent model. Tools:
|
started with `solidcraft --control PORT`, so you can watch the agent model. Tools:
|
||||||
`list_commands`, `execute`, `batch`, `inspect_design`, `measure`, `body_topology`,
|
`list_commands`, `execute`, `batch`, `inspect_design`, `measure`, `body_topology`,
|
||||||
`set_parameter`, `screenshot` (returns the image), `export`, `undo`, `redo`, `new_design`, `open`,
|
`set_parameter`, `screenshot` (returns the image), `export`, `crash_reports`, `undo`, `redo`,
|
||||||
`save`. Claude Code: `claude mcp add solvecraft -- solvecraft-cli mcp`. Details, client
|
`new_design`, `open`, `save`. Tool calls reach files only in the open design's folder (when it lies inside your home
|
||||||
|
folder, never home itself or a hidden folder), SolidCraft's recovery folder and folders given with
|
||||||
|
`--allow-path DIR`. Claude Code: `claude mcp add solidcraft -- solidcraft-cli mcp`. Details, client
|
||||||
configuration and an example session: [docs/mcp.md](docs/mcp.md).
|
configuration and an example session: [docs/mcp.md](docs/mcp.md).
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
@@ -145,12 +301,12 @@ configuration and an example session: [docs/mcp.md](docs/mcp.md).
|
|||||||
| Layer | Crates | Role |
|
| Layer | Crates | Role |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| L0 | `geom` | vectors, planes, profiles, meshes and their measures |
|
| L0 | `geom` | vectors, planes, profiles, meshes and their measures |
|
||||||
| L1 | `sketch`, `kernel`, `render` | constraint solver and profiles; the B-rep kernel boundary (truck); view math and CPU rasterizer |
|
| L1 | `sketch`, `kernel`, `render` | constraint solver and profiles; the B-rep kernel boundary (truck); view math and the headless scene description |
|
||||||
| L2 | `doc` | parameters, expressions, the feature timeline and its incremental evaluation |
|
| L2 | `doc` | parameters, expressions, the feature timeline and its incremental evaluation |
|
||||||
| L3 | `io` | design files, STL/OBJ/STEP/3MF export, STEP and 3MF/STL import features |
|
| L3 | `io` | design files, STL/OBJ/STEP/3MF export, STEP and 3MF/STL/OBJ/glTF import features |
|
||||||
| L4 | `engine` | the session and the command registry (everything is a command) |
|
| L4 | `engine` | the session and the command registry (everything is a command) |
|
||||||
| L5 | `ui-egui`, `mcp` | the swappable desktop front end; the MCP server (headless or bridged to the app) |
|
| L5 | `gpu`, `ui-egui`, `mcp` | compute-shader evaluation of display tessellation plans; the swappable desktop front end; the MCP server (headless or bridged to the app) |
|
||||||
| apps | `solvecraft`, `solvecraft-cli` | desktop app, headless CLI |
|
| apps | `solidcraft`, `solidcraft-cli` | desktop app, headless CLI |
|
||||||
<!-- ANCHOR_END: architecture -->
|
<!-- ANCHOR_END: architecture -->
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|||||||
+284
-19
@@ -1,15 +1,15 @@
|
|||||||
# SolidCraft roadmap
|
# SolidCraft roadmap
|
||||||
|
|
||||||
Status as of **2026-10-11**. SolidCraft supports parametric modelling (sketch →
|
Status as of **2026-10-14**. SolidCraft supports parametric modelling (sketch →
|
||||||
features → parametric timeline) as an open, pure-Rust, agent-drivable application.
|
features → parametric timeline) as an open, pure-Rust, agent-drivable application.
|
||||||
|
|
||||||
## At a glance
|
## At a glance
|
||||||
|
|
||||||
| Question | Answer |
|
| Question | Answer |
|
||||||
|---|---|
|
|---|---|
|
||||||
| Where are we? | **M0 and M13 done; M1, M2, M5–M7, M9, M10, M14 in progress.** Sketch with solver and the full SKETCH create/modify set; extrude, revolve (two sides, symmetric, to object), fillet/chamfer (variable radius, chord length, a radius per edge, corner patches), holes, threads (cosmetic and modelled), patterns, mirror, shell (inside/outside/both), draft, loft, sweep, coil, split body and split face, delete face, construction planes, axes and points; persistent naming of faces and edges; parameters and configurations; components, joints, motion studies, exploded views; sheet metal and a plastic enclosure subset; STEP/IGES/3MF/STL/OBJ/DXF; autosave and crash recovery; desktop and browser (wasm) app, CLI, MCP server. |
|
| Where are we? | **M0 and M13 done; M1, M2, M5–M7, M9, M10, M14 in progress.** Sketch with solver and the full SKETCH create/modify set; extrude, revolve (two sides, symmetric, to object), fillet/chamfer (variable radius, chord length, a radius per edge, corner patches), holes, threads (cosmetic and modelled), patterns, mirror, shell (inside/outside/both), draft, loft, sweep, coil, split body and split face, delete face, construction planes, axes and points; persistent naming of faces and edges; parameters and configurations; components, joints, motion studies, exploded views; sheet metal and a plastic enclosure subset; STEP/IGES/3MF/STL/OBJ/DXF; FreeCAD/Rhino import; autosave and crash recovery; desktop and browser (wasm) app, CLI, MCP server. |
|
||||||
| Features | Every registered command by area — [docs/features.md](docs/features.md) (`cargo xtask features`); registry breadth does not establish workflow or geometric depth |
|
| Features | Every registered command by area — [docs/features.md](docs/features.md) (`cargo xtask features`); registry breadth does not establish workflow or geometric depth |
|
||||||
| Reference tests | **75 / 76 parts match** — [docs/oracle.md](docs/oracle.md): public cases in `tests/oracle/` with analytic (55) or FreeCAD-computed (21) expected values, run by CI on every PR; 75-sm-bracket-holes fails (#296). |
|
| Reference tests | **82 / 82 parts match** — [docs/oracle.md](docs/oracle.md): public cases in `tests/oracle/` with analytic (61) or FreeCAD-computed (21) expected values, run by CI on every PR. |
|
||||||
| Tests | Solver, profiles, kernel booleans/blends/measures, expressions, timeline, persistent naming, file formats and migrations, assemblies, sheet metal, engine end-to-end, hostile-input fuzz over every command and headless UI scenarios. `cargo xtask ci` reports the current passing counts. |
|
| Tests | Solver, profiles, kernel booleans/blends/measures, expressions, timeline, persistent naming, file formats and migrations, assemblies, sheet metal, engine end-to-end, hostile-input fuzz over every command and headless UI scenarios. `cargo xtask ci` reports the current passing counts. |
|
||||||
| Gates | `cargo xtask ci`: fmt, clippy -D warnings, tests, asset attribution, layering, wasm32 build — green |
|
| Gates | `cargo xtask ci`: fmt, clippy -D warnings, tests, asset attribution, layering, wasm32 build — green |
|
||||||
| Time to a useful alpha (M0–M6) | ≈ **82 agent hours** remain (sum of the M1–M6 estimates below) |
|
| Time to a useful alpha (M0–M6) | ≈ **82 agent hours** remain (sum of the M1–M6 estimates below) |
|
||||||
@@ -21,6 +21,8 @@ offsets and plastic face placements, XZ (+Y normal) with a v6 migration preservi
|
|||||||
designs, interactive angle placement, file-picker sketch imports, Home/recent controls,
|
designs, interactive angle placement, file-picker sketch imports, Home/recent controls,
|
||||||
toolbar overflow, and the remaining component-frame and assembly WIP work. The enclosure
|
toolbar overflow, and the remaining component-frame and assembly WIP work. The enclosure
|
||||||
acceptance scenarios now include board resizes; STEP reopening is automated. See [WIP reconciliation](docs/wip-reconciliation.md).
|
acceptance scenarios now include board resizes; STEP reopening is automated. See [WIP reconciliation](docs/wip-reconciliation.md).
|
||||||
|
Face-based Extrude Join (including outward Press Pull) now defaults to the picked body,
|
||||||
|
so edge-touching assembly neighbours stay separate regardless of body order (#226).
|
||||||
|
|
||||||
In scope, in priority order:
|
In scope, in priority order:
|
||||||
1. SOLID and SKETCH (now).
|
1. SOLID and SKETCH (now).
|
||||||
@@ -36,7 +38,7 @@ In scope, in priority order:
|
|||||||
metal rules (thickness, K-factor, bend radius) (M10).
|
metal rules (thickness, K-factor, bend radius) (M10).
|
||||||
5. A small PLASTIC subset for enclosures, after sheet metal: Boss, Rib, Web, Lip/Groove, Snap Fit.
|
5. A small PLASTIC subset for enclosures, after sheet metal: Boss, Rib, Web, Lip/Groove, Snap Fit.
|
||||||
|
|
||||||
Deferred until further notice: MESH, FORM (T-splines), SURFACE beyond what solids need, PCB / 3D
|
Deferred until further notice: MESH, FORM (T-splines), SURFACE beyond what solids need (scope proposed in #772), PCB / 3D
|
||||||
PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
||||||
|
|
||||||
## Milestones
|
## Milestones
|
||||||
@@ -44,32 +46,170 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
| # | Milestone | Status | Hours left |
|
| # | Milestone | Status | Hours left |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| M0 | Vertical slice | done | — |
|
| M0 | Vertical slice | done | — |
|
||||||
| M1 | Sketch depth: command coverage implemented — projection/intersect/include as linked geometry (auto-project on faces, lost-reference warnings, break link), full SKETCH create/modify set (slots, polygons, tangent arcs/circles, ellipse, fit/control splines, conic, text, trim/extend/break, fillet/chamfer, offset, mirror, patterns, move/scale, blend curve, centerline), constraints incl. curvature and polygon with over-constraint refusal, driven/arc-length/linear-diameter dimensions, AutoConstrain, DXF/SVG insert, 3D sketch curves (Project To Surface, Intersection Curve, Isoparametric Curve, Spun Profile), exact free-form profiles (B-spline/NURBS edges, any spline degree, curves cut by crossings), sweeps and pipes along 3D sketch curves, canvases and decals, curvature combs. Exact free-form Extend and certified associative offsets now preserve geometry and IDs through edits, deletion and reopen. Occurrence-frame 3D wires now store explicit coordinate spaces and retain points and analytic fits through moves, refresh, undo and reopen. Remaining workflow repairs: mixed offset junctions, legacy natural-spline seams, and damaged legacy wire links lacking frame provenance | in progress | 4 |
|
| M1 | Sketch depth: command coverage implemented — projection/intersect/include as linked geometry (auto-project on faces, lost-reference warnings, break link), full SKETCH create/modify set (slots, polygons, tangent arcs/circles, ellipse, fit/control splines, conic, text, trim/extend/break, fillet/chamfer, offset, mirror, patterns, move/scale, blend curve, centerline), constraints incl. curvature and polygon with over-constraint refusal, driven/arc-length/linear-diameter dimensions, AutoConstrain, DXF/SVG insert, 3D sketch curves (Project To Surface, Intersection Curve, Isoparametric Curve, Spun Profile), exact free-form profiles (B-spline/NURBS edges, any spline degree, curves cut by crossings), sweeps and pipes along 3D sketch curves, canvases and decals, curvature combs. Exact free-form Extend and certified associative offsets now preserve geometry and IDs through edits, deletion and reopen. Occurrence-frame 3D wires now store explicit coordinate spaces and retain points and analytic fits through moves, refresh, undo and reopen. Constructive sketch solving (Owen 1991, Fudos & Hoffmann 1997) ahead of the numerical solver: points and rigid clusters are placed on the branch the sketch had, so dimension edits and drags keep their solution; edits that would turn a sketch over are refused; drags re-solve only the sketch per frame. Remaining workflow repairs: mixed offset junctions, legacy natural-spline seams, and damaged legacy wire links lacking frame provenance | in progress | 4 |
|
||||||
| M2 | Robust modelling: coplanar booleans in the kernel, holes (placed on faces and on sketch points), threads (cosmetic, then modelled), patterns, mirror, shell, draft, split, construction geometry | in progress | 16 |
|
| M2 | Robust modelling: coplanar booleans in the kernel, holes (placed on faces and on sketch points), threads (cosmetic, then modelled), patterns, mirror, shell, draft, split, construction geometry | in progress | 16 |
|
||||||
| M3 | General fillets and chamfers (curved edges, chains, vertex blends); saddle rolling-ball surfaces now use continuous seam sections and arc-length fitting with shared contact boundaries and bounded accuracy checks | in progress | 30 |
|
| M3 | General fillets and chamfers (curved edges, chains, vertex blends); saddle rolling-ball surfaces now use continuous seam sections and arc-length fitting with shared contact boundaries and bounded accuracy checks | in progress | 30 |
|
||||||
| M4 | Files: STEP import (done — [docs/step-import.md](docs/step-import.md)), 3MF export and 3MF/STL import as mesh bodies (done), constant-section parametric mesh reconstruction, DXF sketches, OBJ import | in progress | 6 |
|
| M4 | Files: STEP import (done — [docs/step-import.md](docs/step-import.md)), FreeCAD/Rhino solids through cadmpeg (done, desktop and CLI), 3MF export and 3MF/STL import as mesh bodies (done), 3MF with B-rep face tags ([docs/formats/3mf-face-tags.md](docs/formats/3mf-face-tags.md), done), constant-section parametric mesh reconstruction, DXF sketches, OBJ import | in progress | 6 |
|
||||||
| M5 | Persistent naming of faces and edges (docs/book/src/dev/naming.md): faces named from their exact kernel-reported history (sketch curve sides, caps, revolve sections, primitive sides, blends, shell inner walls, pattern/mirror copies; split pieces told apart by the faces around them, lumps of a cut body named after their faces), edges by their faces; fillets/chamfers, sketches on faces, shell/draft/offset/replace faces, hole placements, joint origins and face appearances resolve by name first and warn when the entity split or vanished: done. sheet metal edges by base sketch line and flange side, shell inner faces, sweep and loft roles: done. kernel-reported face history: done (merged faces answer to every name; operations without history yet fall back to geometric names, flagged unverified; format 14 keeps older designs' geometric names). Left: history through sheet metal, plastic, surface and emboss features; FaceSource certificates through history | in progress | 20 |
|
| M5 | Persistent naming of faces and edges (docs/book/src/dev/naming.md): faces named from their exact kernel-reported history (sketch curve sides, caps, revolve sections, primitive sides, blends, shell inner walls, pattern/mirror copies; split pieces told apart by the faces around them, lumps of a cut body named after their faces), edges by their faces; fillets/chamfers, sketches on faces, shell/draft/offset/replace faces, hole placements, joint origins and face appearances resolve by name first and warn when the entity split or vanished: done. sheet metal edges by base sketch line and flange side, shell inner faces, sweep and loft roles: done. kernel-reported face history: done (merged faces answer to every name; operations without history yet fall back to geometric names, flagged unverified; format 14 keeps older designs' geometric names). Left: history through sheet metal, plastic, surface and emboss features; FaceSource certificates through history | in progress | 20 |
|
||||||
| M6 | UI depth: selection feedback and origin (done), timeline editing (done: hover and selection highlight modifier faces, including fillets and chamfers; edit feature, history marker drag, reorder with dependency checks, suppress, rename, delete with dependents, re-resolved references; redefining selections refreshes persistent edge/face references while retaining feature identity and dimension names), right-docked dialogs (done), live previews for every feature dialog (done), keyboard-first commands with on-canvas value boxes and sketch inline dimensions (done), drag manipulators with automatic join/cut (done: extrude incl. two sides, fillet, shell, hole depth, move, pattern spacing, revolve rotator; taper handle open), dark theme (done), right-click menu with Repeat (done), measure tool (done), section analysis (done), selection filter (done), drag-solve of sketch points (done); appearance controls now preserve body/face/component targeting, named transparent looks, reuse/search and override removal; preferences | in progress | 6 |
|
| M6 | UI depth: selection feedback and origin (done), timeline editing (done: hover and selection highlight modifier faces, including fillets and chamfers; edit feature, history marker drag, dependency-checked single and multi-item reorder, suppress, rename, delete with dependents, re-resolved references; redefining selections refreshes persistent edge/face references while retaining feature identity and dimension names; optional compact named left feature history with rollback bar, multi-selection and persistent folders above the parts browser), right-docked dialogs (done), live previews for every feature dialog (done), keyboard-first commands with on-canvas value boxes and sketch inline dimensions (done), drag manipulators with automatic join/cut (done: extrude incl. two sides, fillet, shell, hole depth, move, pattern spacing, revolve rotator; taper handle open), dark theme (done), right-click menu with Repeat (done), measure tool (done), section analysis (done), selection filter (done), drag-solve of sketch points (done); appearance controls now preserve body/face/component targeting, named transparent looks, reuse/search and override removal; preferences | in progress | 6 |
|
||||||
| M7 | Sweep, loft (incl. to a point), rib and web (to next / depth), emboss (planar faces and exact radial emboss/deboss of bounded orthogonal profiles on complete exterior cylinders/sleeves), thread (cosmetic, and modelled M3–M20 outside and inside: the ISO profile screwed in as a faceted cut), coil (smooth B-spline helical walls), pipe, pattern on path, patterns of bodies and components, replace face (parallel), align, remove, feature copy/paste: done. Unique eligible cylindrical targets are inferred for new Emboss features. Left: general curved-face emboss and exact (unfaceted) modelled threads | in progress | 12 |
|
| M7 | Thin extrude (walls along open or closed curves: centre, inside, outside or two sides; mitred corners, crossing walls joined; #721), sweep, loft (incl. to a point), rib and web (to next / depth), emboss (planar faces and exact radial emboss/deboss of bounded orthogonal profiles on complete exterior cylinders/sleeves), thread (cosmetic, and modelled M3–M20 outside and inside: the ISO profile screwed in as a faceted cut), coil (smooth B-spline helical walls), pipe, pattern on path, patterns of bodies and components, replace face (parallel), align, remove, feature copy/paste: done. Unique eligible cylindrical targets are inferred for new Emboss features. Left: general curved-face emboss and exact (unfaceted) modelled threads | in progress | 12 |
|
||||||
| M8 | Surface workspace | deferred | — |
|
| M8 | Surface workspace (#772). Done: Patch (sketch regions; edge loops filled G0, plus `crown`), Stitch, Thicken (planes and cylinders), Extend (straight edges of planar surfaces), Trim (by a plane or a face), Delete Face (healing), Boundary Fill, zebra/draft/curvature-map analysis, Surface Extrude/Revolve/Sweep/Loft from open and closed curves, Offset, Unstitch and Reverse Normal; the continuity-driven core (`kernel/src/bridge.rs`, G0–G3 Hermite rows) with **Blend** (`surface.blend`, #764), **Match** (`surface.match`), **Boundary** (`surface.boundary`, #763 — two sketch curves exact with G0–G3, three or four as the flat patch of their loop, and curve networks: Coons and Gordon surfaces through sketch, 3D-sketch or edge curves, a point for a three-sided side, G1/G2 against the faces along one direction's edges, joined into their body on request; G1/G2 on two sides that meet at a corner waits for the Gregory-type corner), **Fair** (`surface.fair`, CV fairing), **continuity analysis** (`inspect.continuity`, #770; a toolbar tool with edge markers and a legend, and curvature combs along face isocurves) and a multi-section **loft** with per-end continuity and crown. Also in the Class-A pass: G1…G4 blend curves in the sketch, chord and variable-radius fillets on curved edges (with honest refusals where the fit cannot hold), and a G2 corner patch where filleted edges meet (kernel; the command refuses until the patch's sections can be sewn to the blends' contacts). Left: bias/form-factor fillet sections (design recorded), a Gregory-type corner, surface Fillet between separate surface bodies (#769), Ruled (#762), Untrim (#761), curved-face Extend (#760), loft guide rails (#201; sweep guide rails and two-rail sweeps are done, #771), and every remaining #757–#772 item | deferred | — |
|
||||||
| M9 | Components and assemblies: New Component / Create Components from Bodies, active component, per-component origin/bodies/sketches/timeline entries, occurrences with transforms, Copy/Paste vs Paste New, nested Browser tree with visibility and isolate; Ground, Move/Copy of occurrences, joints (rigid, revolute, slider, cylindrical, pin-slot, planar, ball) by joint origins with limits and Drive Joints, As-built Joint, Rigid Group, Contact Sets (driving and motion studies stop where bodies in a set would pass through each other), Motion Study (joint values keyed along a timeline, playback, export of occurrence positions as JSON/CSV), Exploded views (automatic or by hand, shown without changing placements); interference, per-component physical properties; STEP with assembly structure. Physical properties now measure material-aware component/occurrence placements, descendants and repeated instances, including pending moves and body reassignment offsets; contact geometry and automatic exploded centres respect those offsets. Groundwork done: component tree, occurrences with transforms (instances, Paste New), world placement, active component as authoring frame, ground, Capture/Revert Position, moving bodies and sketches. UI: ASSEMBLE panel dialogs for New Component, Joint (snaps on faces, edges, circles and vertices; animated motion preview; offsets, flip, limits), As-built Joint, Joint Origin, Rigid Group, Drive Joints (live slider), Motion Link and Interference (overlaps shown red); joints in the timeline and the Browser | in progress | 32 |
|
| M9 | Components and assemblies: New Component / Create Components from Bodies, active component, per-component origin/bodies/sketches/timeline entries, occurrences with transforms, Copy/Paste vs Paste New, nested Browser tree with visibility and isolate; Ground, Move/Copy of occurrences, joints (rigid, revolute, slider, cylindrical, pin-slot, planar, ball) by joint origins with limits and Drive Joints, closed kinematic loops (four-bar, slider-crank: the loop's other joints follow the driven one on its branch, and driving stops where a loop can no longer close), cams (`joint.cam`: a revolute cam drives a slider or revolute follower along a closed sketch profile or the cam's edges, knife, roller or flat followers, worked out again when the profile changes; drives, studies, closed loops, contact sets), As-built Joint, Rigid Group, Contact Sets (driving and motion studies stop where bodies in a set would pass through each other), Motion Study (joint values keyed along a timeline, playback, export of occurrence positions as JSON/CSV), motion analysis (joint values and a point's path charted over a study as value, velocity and acceleration; the parts that collide along a study, with the steps where they do), Exploded views (automatic or by hand, shown without changing placements); interference, per-component physical properties; STEP with assembly structure; URDF export for robot simulators (links with meshes, mass and inertia; joint chains whose values match Drive Joints; docs/urdf.md). Physical properties now measure material-aware component/occurrence placements, descendants and repeated instances, including pending moves and body reassignment offsets; contact geometry and automatic exploded centres respect those offsets. Groundwork done: component tree, occurrences with transforms (instances, Paste New), world placement, active component as authoring frame, ground, Capture/Revert Position, moving bodies and sketches. UI: ASSEMBLE panel dialogs for New Component, Joint (snaps on faces, edges, circles and vertices; animated motion preview; offsets, flip, limits), As-built Joint, Joint Origin, Rigid Group, Drive Joints (live slider), Motion Link, Cam and Interference (overlaps shown red); joints in the timeline and the Browser | in progress | 32 |
|
||||||
| M10 | Sheet metal: flange (base, edge, contour), hem, unfold/refold, convert, flat pattern + DXF, rules: done. PLASTIC enclosure subset: Boss, Rib, Web, Lip/Groove, Snap Fit, Rest, Plastic Rules (library, edit, assign; rule draft and clearance as feature defaults): done, tested against hand-computed geometry. UI: SHEET METAL and PLASTIC tabs in Fusion's layout with dialogs (live preview, Edit Feature, pre-selection) for Flange, Hem, Unfold/Refold, Convert, Sheet Metal Rules, Create Flat Pattern (flat view with bend lines, bend table CSV/JSON and DXF export with exact circle/arc/line cutouts), Boss, Lip/Groove, Snap Fit, Rest, Manage and Assign Plastic Rules; Fold (bend along a sketch line) | in progress | 36 |
|
| M10 | Sheet metal: flange (base, edge, contour), hem, unfold/refold, convert, flat pattern + DXF, rules: done. PLASTIC enclosure subset: Boss, Rib, Web, Lip/Groove, Snap Fit, Rest, Plastic Rules (library, edit, assign; rule draft and clearance as feature defaults): done, tested against hand-computed geometry. UI: SHEET METAL and PLASTIC tabs in Fusion's layout with dialogs (live preview, Edit Feature, pre-selection) for Flange, Hem, Unfold/Refold, Convert, Sheet Metal Rules, Create Flat Pattern (flat view with bend lines, bend table CSV/JSON and DXF export with exact circle/arc/line cutouts), Boss, Lip/Groove, Snap Fit, Rest, Manage and Assign Plastic Rules; Fold (bend along a sketch line); flanges meeting at a corner closed at any angle with the rule's gap; edge flanges with their own angle and height per edge in one feature; corner reliefs (notch, round, rectangular, tear) chosen by the rule; Convert to Sheet Metal from a solid or shelled body by its bend edges (flat faces, sharp bends) | in progress | 36 |
|
||||||
| M11 | 2D drawings | deferred | — |
|
| M11 | 2D drawings | deferred | — |
|
||||||
| M12 | Release: cross-platform packages, verification and deliberate publication implemented; original current-UI demo refreshed. Trusted distribution signing and broader performance work remain | in progress | 16 |
|
| M12 | Release: cross-platform packages, verification and deliberate publication implemented; original current-UI demo refreshed. Trusted distribution signing and broader performance work remain | in progress | 16 |
|
||||||
| M14 | Configurations: a table of rows (parameter expressions and feature suppressions per row) switched with config.activate (undoable, all or nothing), kept through parameter renames and feature deletes (config.configure, config.table, config.column/row/activate). Per-row body materials and appearances (library looks, custom colour/opacity and clearing overrides), undoable activation and save/reopen: done. Ordered typed configuration rules, atomic validation and structured rule editing: done. Component appearance and certified semantic face style columns, atomic preview/apply and independent-copy remapping: done. Exact constructed sketch-side and immutable imported-face lineage now preserve legacy names and reject retargeting. Left: ambiguous shifted/two-sided caps | in progress | 4 |
|
| M14 | Configurations: a table of rows (parameter expressions and feature suppressions per row) switched with config.activate (undoable, all or nothing), kept through parameter renames and feature deletes (config.configure, config.table, config.column/row/activate). Per-row body materials and appearances (library looks, custom colour/opacity and clearing overrides), undoable activation and save/reopen: done. Ordered typed configuration rules, atomic validation and structured rule editing: done. Component appearance and certified semantic face style columns, atomic preview/apply and independent-copy remapping: done. Exact constructed sketch-side and immutable imported-face lineage now preserve legacy names and reject retargeting. Left: ambiguous shifted/two-sided caps | in progress | 4 |
|
||||||
| M13 | Never lose work: atomic saves (temporary file, flush, rename; a crash at any moment leaves the old file or the new one) with the replaced version kept as `<file>.bak`; autosave of unsaved changes to the recovery folder every 5 minutes (preference) and after big operations, only when something changed; "Recover unsaved design?" on the next launch (`doc.recovery_list`, `doc.recover`, `doc.recovery_discard`); a kill-mid-save test (process killed while saving a 0.5 MB design 25 times). File format: `"format": "solvecraft/12"`, older formats upgraded step by step (`doc::format`), newer ones refused with a message, out-of-range numbers and broken placements refused; a corpus of designs saved by M0, components-era, joints-era and current builds (apps/solvecraft-cli/tests/corpus) that must open and evaluate as saved; damaged and hostile variants (truncation, bit flips, hostile values, removed keys, repeated features, deep nesting) never panic | done | 6 |
|
| M13 | Never lose work: atomic saves (temporary file, flush, rename; a crash at any moment leaves the old file or the new one) with the replaced version kept as `<file>.bak`; autosave of unsaved changes to the recovery folder every 5 minutes (preference) and after big operations, only when something changed; "Recover unsaved design?" on the next launch (`doc.recovery_list`, `doc.recover`, `doc.recovery_discard`); a kill-mid-save test (process killed while saving a 0.5 MB design 25 times). File format: `"format": "solidcraft/12"`, older formats upgraded step by step (`doc::format`), newer ones refused with a message, out-of-range numbers and broken placements refused; a corpus of designs saved by M0, components-era, joints-era and current builds (apps/solidcraft-cli/tests/corpus) that must open and evaluate as saved; damaged and hostile variants (truncation, bit flips, hostile values, removed keys, repeated features, deep nesting) never panic | done | 6 |
|
||||||
|
|
||||||
|
M6 navigation preferences include **Touchpad**: Shift + pointer movement pans, Alt/Option +
|
||||||
|
pointer movement orbits without a mouse button, and vertical scrolling zooms. Other presets
|
||||||
|
retain their saved two-finger scroll preference; camera motion is available through
|
||||||
|
`view.navigate` and modifier-aware `ui.move` automation.
|
||||||
|
|
||||||
|
M11 precursor: File → Export Current View as DXF exports shown placed bodies from the current
|
||||||
|
camera as a 2D millimetre drawing, with hidden edges omitted or dashed. Vector occlusion splits
|
||||||
|
partly hidden edges and includes curved silhouettes. Repeated part meshes and triangle
|
||||||
|
hierarchies are shared; bounded desktop preparation and occlusion use up to eight workers.
|
||||||
|
Curves are approximated; drawing sheets,
|
||||||
|
annotations and exact projected curves remain deferred. See [view DXF](docs/view-dxf.md).
|
||||||
|
|
||||||
|
Drawing foundations: [RFC #860](https://github.com/tangency-labs/solidcraft/issues/860)
|
||||||
|
and the [foundation ledger](docs/drawing-foundations.md) track the bounded implementation
|
||||||
|
packages. The first geometry increment defines validated section records in a plane-local
|
||||||
|
frame; the ledger separates that contract from section producers and the Drawing workspace.
|
||||||
|
|
||||||
|
Desktop view DXF export runs in the file-operation worker with five-stage progress and
|
||||||
|
cooperative cancellation. Curve tolerance (0.0001–1 mm, default 0.01 mm) is remembered alongside
|
||||||
|
the hidden-edge setting. Cancelled exports preserve the model and the previous destination;
|
||||||
|
completed drawings publish atomically. The browser still exports synchronously.
|
||||||
|
|
||||||
|
## Interactive modelling
|
||||||
|
|
||||||
|
- Thread resolves a suggested metric size when a cylindrical face is picked. Diameter and
|
||||||
|
pitch selectors expose the existing metric designation parameter; custom designations stay
|
||||||
|
editable, and Automatic size returns to the face's suggestion. Cosmetic/modelled and
|
||||||
|
full/partial-length options remain available. This does not add tolerance classes or
|
||||||
|
left-hand threads.
|
||||||
|
- New Body extrusion and face-offset previews show completed intermediate geometry while a
|
||||||
|
drag continues, then catch up to the exact final value. Changes to the selected geometry,
|
||||||
|
operation or feature still discard obsolete results. Distance arrows and their value boxes
|
||||||
|
follow the current frame's input.
|
||||||
|
|
||||||
|
## Physical material data
|
||||||
|
|
||||||
|
- Physical material card validation (#923/#922) provides typed SI mechanical and
|
||||||
|
thermal data, per-property sources/conditions and isotropic/orthotropic stability
|
||||||
|
checks through read-only `material.properties.validate`. It does not assign or
|
||||||
|
persist properties, provide a solver or enable rendering; see
|
||||||
|
[the contract and staged follow-ups](docs/physical-material-cards.md).
|
||||||
|
|
||||||
|
- Directional elasticity (#994) queries the validated card in material-local axes
|
||||||
|
through read-only `material.properties.directional`, with source/condition review.
|
||||||
|
It does not assign body frames, predict structural behavior or enable a solver.
|
||||||
|
|
||||||
|
## Library foundations (#785, #786, #787)
|
||||||
|
|
||||||
|
- Local scalar libraries (#846) inspect/export bounded portable catalogs and copy exact
|
||||||
|
selected appearance/material revisions into existing design definitions in one undo step.
|
||||||
|
Appearance offers local loading/search/export; physical materials use existing commands.
|
||||||
|
This slice is independent of the render stack and does not change the document format.
|
||||||
|
See [the contract and limits](docs/book/src/dev/local-libraries.md).
|
||||||
|
|
||||||
|
- Proposed phases cover offline bundled/project/user packs, physical materials and
|
||||||
|
appearances, editable wood mapping, and parameterized component/assembly families.
|
||||||
|
Stable identity/revision, copied design definitions, provenance and resource limits
|
||||||
|
apply from the first implementation. Existing material, appearance and standard-part
|
||||||
|
commands remain the application paths. See [the proposal](docs/book/src/dev/libraries.md)
|
||||||
|
for source/license review and acceptance gates. This is planning only: pack loading,
|
||||||
|
texture rendering and expanded component families are not implemented by this entry.
|
||||||
|
|
||||||
|
## Render foundation
|
||||||
|
|
||||||
|
- Explicit texture normalization (#1218) produces completed float RGBA with
|
||||||
|
role-aware linear color/data semantics, bounded matrix/TRC ICC conversion and
|
||||||
|
opt-in EXIF orientation. It retains high-precision raw samples and records lossy
|
||||||
|
gamut clipping only when explicitly requested. It is not a renderer/resource
|
||||||
|
consumer; see [the supported policy and limits](docs/render-texture-normalization.md).
|
||||||
|
|
||||||
|
- Opt-in opaque PBR (#1046) connects persisted surface parameters to the integrated
|
||||||
|
product viewport and CPU PNG, using a fixed direct-light studio. Geometry and mass
|
||||||
|
stay unchanged. HDRI, transmission and textures remain separate gates.
|
||||||
|
See [the consumer and limitations](docs/render-opaque-pbr.md).
|
||||||
|
|
||||||
|
- Combined integration is tracked in #842, with independent scalar libraries in
|
||||||
|
#863 and richer PBR/material-card transport in #1086. See [phase boundaries and validation gates](docs/render-integration.md).
|
||||||
|
Render/library consumers use the merged asynchronous picker (#1127). Material-card
|
||||||
|
UI (#1094), texture mapping and HDRI lighting remain explicit follow-ups.
|
||||||
|
|
||||||
|
- R4a adds bounded CPU product-image jobs, cancellation and atomic PNG export through
|
||||||
|
engine commands, the Render panel, CLI and persistent MCP. Immutable captures and
|
||||||
|
results stay outside persistence/undo; native workers and cooperative browser tasks
|
||||||
|
share the same work protocol. See [jobs, limits and export](docs/render-jobs.md).
|
||||||
|
|
||||||
|
- R3 adds an overlay-free product scene and the integrated Render workspace, with
|
||||||
|
runtime GPU host capabilities, per-document drafts and named camera/background
|
||||||
|
controls. Design keeps its camera and drawing policy. Raster transparency remains
|
||||||
|
approximate; PBR and environments are later slices. See
|
||||||
|
[workspace and scene contracts](docs/render-workspace.md).
|
||||||
|
|
||||||
|
- R2 adds bounded named render setups in document format 21 and the read/save
|
||||||
|
`render.settings.get/set` commands. Proven render-only changes preserve geometry
|
||||||
|
and prepared world data through undo/redo and checkpoint restore. This slice does
|
||||||
|
not add a Render workspace, PBR, environments or image jobs; see
|
||||||
|
[settings and refresh policy](docs/render-settings.md).
|
||||||
|
- Bounded PNG/JPEG texture admission (#900) validates in-memory sources and returns
|
||||||
|
completed RGBA8 pixels with explicit color/data roles. It is an input utility only:
|
||||||
|
ICC/16-bit normalization, local wood mapping, resource persistence and the renderer
|
||||||
|
consumer remain separate work. See [limits and licensed-file probes](docs/render-texture-input.md).
|
||||||
|
|
||||||
|
- The initial opaque surface numerical contract for #1004 provides bounded linear
|
||||||
|
color/metallic/roughness/IOR admission and an original tested direct-light BRDF.
|
||||||
|
The numerical module alone advertises no capabilities; the installed consumer above
|
||||||
|
provides rendering. See
|
||||||
|
[the model, evidence and remaining consumer gates](docs/render-surface.md).
|
||||||
|
|
||||||
|
- A bounded cooperative Radiance RGBE input utility is available in L1 render;
|
||||||
|
it does not yet enable HDRI/PBR rendering or a document import command. See
|
||||||
|
[the input contract](docs/render-hdr-input.md) and #813 for integration work.
|
||||||
|
- R1 adds renderer-independent backend/profile metadata, strict request resolution and
|
||||||
|
bounded image/scratch admission checks, exposed by the read-only `render.backends`
|
||||||
|
command. It describes the current CPU raster snapshot path without evaluating the model.
|
||||||
|
The legacy Design snapshot route remains unchanged. Later slices above provide the
|
||||||
|
workspace/jobs and opaque PBR; HDRI and optional engines remain future work. See [the contract](docs/render-backends.md)
|
||||||
|
and [the phased proposal (#620)](https://github.com/bherbruck/solidcraft/issues/620).
|
||||||
|
|
||||||
## Dimensioning and error reporting
|
## Dimensioning and error reporting
|
||||||
|
|
||||||
|
- MCP `execute` accepts `verbose: false`, sharing the compact reply helper used by
|
||||||
|
`batch`: body changes and created sketch IDs stay, while repeated lists are omitted.
|
||||||
|
Both tools retain full replies by default.
|
||||||
|
|
||||||
|
- Sketch Create groups drawing variants under Line, Rectangle, Circle, Arc, Slot,
|
||||||
|
Polygon and Spline. Each open part remembers its last interactive choice per family
|
||||||
|
across sketch sessions and document-tab switches; closing the part resets these UI choices.
|
||||||
|
- Inscribed, circumscribed and edge polygon tools preview their actual outline before
|
||||||
|
placement, including orientation and the selected side count.
|
||||||
|
- Construction (X) preserves the active sketch drawing tool, picked anchors and inline
|
||||||
|
dimension values, so line type can change while a shape is in progress.
|
||||||
|
- Planar sketch construction previews and hover feedback keep the same dashed pattern as
|
||||||
|
committed geometry; centerlines retain their dash-dot pattern.
|
||||||
|
|
||||||
|
- Point has a default Sketch CREATE toolbar button alongside the existing drawing tools.
|
||||||
|
Saved custom layouts are preserved; Reset Toolbar restores the default Point button.
|
||||||
- Construction planes cannot take an origin-plane name (XY, XZ, YZ, Top, Front, Right). Plane
|
- Construction planes cannot take an origin-plane name (XY, XZ, YZ, Top, Front, Right). Plane
|
||||||
arguments reject such a name when an older design's construction plane already has it. Use
|
arguments reject such a name when an older design's construction plane already has it. Use
|
||||||
the other alias, the construction feature's numeric ID or an explicit plane; existing
|
the other alias, the construction feature's numeric ID or an explicit plane; existing
|
||||||
stored references keep their saved meaning. Section Analysis uses the same check.
|
stored references keep their saved meaning. Section Analysis uses the same check.
|
||||||
- Sketch text can be edited from a selected outline's context menu or the Edit Text command.
|
- Sketch text can be edited from a letter interior or outline's context menu or the Edit Text command.
|
||||||
|
Interior selection requires every profile boundary to belong to the same text source;
|
||||||
|
the editor highlights the whole source without replacing profile selections.
|
||||||
Content, baseline X/Y, height and rotation update the original text source in one undo step;
|
Content, baseline X/Y, height and rotation update the original text source in one undo step;
|
||||||
cancelling or rejecting an invalid value preserves the sketch. Position and height fields
|
cancelling or rejecting an invalid value preserves the sketch. Position and height fields
|
||||||
use the document units captured when editing starts; generated outlines remain associated
|
use the document units captured when editing starts; generated outlines remain associated
|
||||||
with their text source, and untouched inputs preserve their saved internal values.
|
with their text source, and untouched inputs preserve their saved internal values.
|
||||||
|
Dragging a text outline moves the entire source in one undo step; Escape restores the
|
||||||
|
gesture. Move/Copy on a selected text outline provides unit-aware X/Y distances and rotation
|
||||||
|
about its baseline; copies keep an independent editable text source.
|
||||||
- Repeating the initial point of a planar multi-point sketch drawing tool is neutral: the tool
|
- Repeating the initial point of a planar multi-point sketch drawing tool is neutral: the tool
|
||||||
waits for a distinct point without a degenerate-shape error or history entry. Typed input
|
waits for a distinct point without a degenerate-shape error or history entry. Typed input
|
||||||
and programmatic commands retain their validation.
|
and programmatic commands retain their validation.
|
||||||
@@ -96,6 +236,29 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
- The header exposes **Report a bug**, including an accessible compact control on
|
- The header exposes **Report a bug**, including an accessible compact control on
|
||||||
narrow windows. It opens the same editable report and screenshot review without
|
narrow windows. It opens the same editable report and screenshot review without
|
||||||
changing the active model or a pending dimension.
|
changing the active model or a pending dimension.
|
||||||
|
- Crash reports: every panic (in a command, in the kernel, anywhere else) and every unclean
|
||||||
|
exit (abort, stack overflow, kill: found at the next start through a locked per-run command
|
||||||
|
journal) leaves a local report with the backtrace, version and commit, the command and the
|
||||||
|
design that reproduce it (`solidcraft-cli crashes replay <id>`). Repeats are counted, not
|
||||||
|
rewritten; at most 20 reports, 50 MB and 90 days. The app shows them after a crash (Help >
|
||||||
|
Crash Reports…) with a reviewed issue draft; agents read them through
|
||||||
|
`diagnostics.crash_reports`, the MCP `crash_reports` tool or the CLI. Nothing is sent
|
||||||
|
anywhere. See [crash reports](docs/crash-reports.md).
|
||||||
|
- Agent chat (off by default, desktop): a side panel that drives a coding agent the user
|
||||||
|
already has (Claude Code through its ACP adapter, Codex, Gemini CLI, OpenCode, Grok Build, …) over the
|
||||||
|
Agent Client Protocol, under the user's own login; SolidCraft stores no keys. The agent works
|
||||||
|
through SolidCraft's MCP tools on a gated endpoint of its own: file actions wait for Allow or
|
||||||
|
Deny, crash reports are off limits, 24 changes per message, one undo step per message, and
|
||||||
|
the agent's whole process group ends with the panel or the app. Docks left or right,
|
||||||
|
minimises to a strip. Grok Build discovery includes `~/.grok/bin` and reuses the user's
|
||||||
|
Grok login. See [agent chat](docs/agent-chat.md).
|
||||||
|
- Command scripts from designs (#886): `timeline.export_script` (CLI `solidcraft-cli script`)
|
||||||
|
writes a design's history as a script that `eval` and `run` replay into the same design —
|
||||||
|
user parameters, units, sheet metal and plastic rules and materials as their own commands,
|
||||||
|
then each feature through `timeline.add` with its ids, names and dimension parameters kept,
|
||||||
|
so every feature kind replays exactly and a failing feature fails the same way. Trimming the
|
||||||
|
script after a step gives the design at that step. Appearances, folders, views and
|
||||||
|
configurations are listed as left out; components and joints are not supported yet.
|
||||||
|
|
||||||
## 0.2.0 release batch
|
## 0.2.0 release batch
|
||||||
|
|
||||||
@@ -116,6 +279,25 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
|
|
||||||
## 0.2.1 critical fixes
|
## 0.2.1 critical fixes
|
||||||
|
|
||||||
|
- Separated multi-profile Join/Cut extrusions into one solid target batch their tools using
|
||||||
|
conservative construction bounds, avoiding a Boolean rebuild for every profile. Live
|
||||||
|
extrusion previews build only their tools; confirmation validates the final Boolean.
|
||||||
|
- Coplanar selected body faces share one linked sketch and one extrusion. Automatic Join/Cut
|
||||||
|
keeps the evaluator's participant scope, including parts of an empty imported component. Desktop OK/Enter
|
||||||
|
computes on a scratch session in the background, with atomic acceptance and cancellation.
|
||||||
|
Planar section stitching projects lines/arcs analytically and removes duplicate endpoints.
|
||||||
|
- Imported rotated face groups can check all full start-face seams in one guarded
|
||||||
|
construction. Separated tools may batch a Join when each meets the same single body;
|
||||||
|
nearby uninvolved bodies retain the original contact decisions. Regression comparisons
|
||||||
|
cover all four extrusion operations.
|
||||||
|
- Inward multi-face cuts retain every eligible target and subtract separated tools together.
|
||||||
|
Safe interior classification handles roundoff at shared imported line/arc endpoints.
|
||||||
|
Straight extrusion feedback caches existing face/profile triangles and updates the display
|
||||||
|
directly, including a newly opened STEP's single identity component placement; other
|
||||||
|
extents, moved or repeated components and curved sketch profiles keep the Engine preview.
|
||||||
|
- The extrusion fixes retain tracked Boolean history and the current `solidcraft` packages.
|
||||||
|
Confirmation and tool previews use main's shared background calculation. Main's collapsed
|
||||||
|
blend-wall refusal and its tests are retained, including smaller valid radii and mirrored parts.
|
||||||
- Axis view and navigation controls stay anchored to the viewport when feature dialogs or
|
- Axis view and navigation controls stay anchored to the viewport when feature dialogs or
|
||||||
the command palette open, at normal and enlarged display scales. Fit still accounts for
|
the command palette open, at normal and enlarged display scales. Fit still accounts for
|
||||||
dialog coverage; covered controls do not receive clicks through dialogs.
|
dialog coverage; covered controls do not receive clicks through dialogs.
|
||||||
@@ -137,6 +319,11 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
|
|
||||||
## View navigation
|
## View navigation
|
||||||
|
|
||||||
|
- Desktop Ctrl/Cmd +/- and 0 change or reset the saved UI scale. The scale slider keeps
|
||||||
|
its layout stable during a drag and applies the selected scale on release.
|
||||||
|
|
||||||
|
- OpenSCAD navigation preset: left drag orbits, right/middle drag pans, Shift+right/middle
|
||||||
|
drag zooms, and the wheel zooms. Available in the shared desktop/web Navigation preferences.
|
||||||
- Compact clickable signed X/Y/Z axis tips, smooth drag-to-orbit, and Shift-orbit snapping
|
- Compact clickable signed X/Y/Z axis tips, smooth drag-to-orbit, and Shift-orbit snapping
|
||||||
to 26 standard and diagonal views. Pointer motion accumulates independently of a lightly
|
to 26 standard and diagonal views. Pointer motion accumulates independently of a lightly
|
||||||
damped spring, with a boundary margin to prevent flicker. Z-up/Y-up and the nearest square
|
damped spring, with a boundary margin to prevent flicker. Z-up/Y-up and the nearest square
|
||||||
@@ -144,18 +331,32 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
|
|
||||||
## Known limitations
|
## Known limitations
|
||||||
|
|
||||||
|
- Scheduled and manual CI scan locked dependency advisories, bans and sources with
|
||||||
|
cargo-deny. Vulnerabilities fail the scan; unmaintained crates warn. Local vendored
|
||||||
|
patches require separate upstream review because advisory databases cannot version-match
|
||||||
|
their path dependencies. Pull requests retain the existing licence checks.
|
||||||
|
|
||||||
- Associative shell-face sketches require a unique certified planar source. Nested shell
|
- Associative shell-face sketches require a unique certified planar source. Nested shell
|
||||||
attachments and ambiguous coincident sources remain unsupported.
|
attachments and ambiguous coincident sources remain unsupported.
|
||||||
|
- G2 fillets: exact quintic blends of straight edges between planar faces, with one perpendicular
|
||||||
|
planar end face at each end. The UI and `solid.fillet` expose `curvature` (alias `g2`); the size
|
||||||
|
is an equivalent circular setback. Curved faces/edges, sloped ends and corner junctions remain unsupported.
|
||||||
- Fillets and chamfers: constant, variable-radius and chord-length fillets; a radius per edge,
|
- Fillets and chamfers: constant, variable-radius and chord-length fillets; a radius per edge,
|
||||||
rounds next to earlier rounds of another radius, and smooth corner patches where three rounds
|
rounds next to earlier rounds of another radius, and smooth corner patches where three rounds
|
||||||
meet (a sphere for equal radii); straight edges (convex or concave) between planar faces with perpendicular
|
meet (a sphere for equal radii); perpendicular corner fillets after a closed ring of earlier
|
||||||
|
rounds preserve the ring's radii and the enclosed planar face (#1557);
|
||||||
|
straight edges (convex or concave) between planar faces with perpendicular
|
||||||
planar end faces (equal-distance chamfers also meet sloped planar end faces, including inner
|
planar end faces (equal-distance chamfers also meet sloped planar end faces, including inner
|
||||||
basin rims within the rim width); convex fillets also meet sloped planar ends and reflex
|
basin rims within the rim width); convex fillets also meet sloped planar ends and reflex
|
||||||
corners around pocket rims, with unequal wall slopes and extensions confined to the face;
|
corners around pocket rims, with unequal wall slopes and extensions confined to the face;
|
||||||
connected equal-distance chamfers also trim each other across unequal sloped rim walls;
|
connected equal-distance chamfers also trim each other across unequal sloped rim walls;
|
||||||
|
curved chamfer chains with straight planar ends can terminate across two existing planar
|
||||||
|
bevel faces, splitting their shared seam; picks on the same tangent chain are applied once (#1303);
|
||||||
whole smooth loops of a planar face, picked whole or by one edge (tangent
|
whole smooth loops of a planar face, picked whole or by one edge (tangent
|
||||||
chain), including circles and walls at any angle (boss bases and tops, bores, pocket floors,
|
chain), including circles and walls at any angle (boss bases and tops, bores, pocket floors,
|
||||||
plate outlines), loops with sharp corners between straight edges (the blends meet in mitres), runs of
|
plate outlines), loops with sharp corners between straight or mixed arc/line edges (straight
|
||||||
|
blends meet in mitres; perpendicular curved walls use offset intersections, with D-rim removal
|
||||||
|
checked within 0.1% of analytic offset slices), runs of
|
||||||
neighbouring edges along a planar face's loop (two top edges of a box: mitred, ending square;
|
neighbouring edges along a planar face's loop (two top edges of a box: mitred, ending square;
|
||||||
with the edge between them too, the corner becomes a sphere octant),
|
with the edge between them too, the corner becomes a sphere octant),
|
||||||
rounded corners rounded again (sphere octants, tori at concave corners); every edge of a
|
rounded corners rounded again (sphere octants, tori at concave corners); every edge of a
|
||||||
@@ -163,7 +364,15 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
edges between any two smooth sides (a branch pipe on a main pipe), by a rolling ball (the
|
edges between any two smooth sides (a branch pipe on a main pipe), by a rolling ball (the
|
||||||
blend a rational B-spline through exact arcs), closed or ending at planar faces square to the
|
blend a rational B-spline through exact arcs), closed or ending at planar faces square to the
|
||||||
edges, where straight or curved cap edges are trimmed to the contacts (the straight edge
|
edges, where straight or curved cap edges are trimmed to the contacts (the straight edge
|
||||||
between two overlapping extruded arcs).
|
between two overlapping extruded arcs); knife edges, where the two faces have opposite
|
||||||
|
normals (a wall that runs out tangent into a face: the ball that fits there); an edge that
|
||||||
|
runs out along an end face tangent to one side (the arc top edge of that wall), cut where the
|
||||||
|
blend meets it; rounds that end in an earlier round on curved faces, in any order (the rounds
|
||||||
|
of two edges at a vertex meet in a crease, as on a box), picked together or one after the
|
||||||
|
other, except a round after a round of the edge between the wall and a flat face that it
|
||||||
|
would run over; the three edges at a vertex of any smooth faces, of one radius, end in a
|
||||||
|
piece of sphere. A limiting blend that collapses a side wall into coincident boundary
|
||||||
|
curves is refused as too large rather than returning an unmeshable face (#1113).
|
||||||
- Booleans: prisms along one direction (plates with holes, slots, patterns of them, equal
|
- Booleans: prisms along one direction (plates with holes, slots, patterns of them, equal
|
||||||
sections stacked end to end) are combined exactly in 2D. Qualified axial cuts preserve
|
sections stacked end to end) are combined exactly in 2D. Qualified axial cuts preserve
|
||||||
annular holes with overrun cutters, including inward Press Pull after a joined extrusion;
|
annular holes with overrun cutters, including inward Press Pull after a joined extrusion;
|
||||||
@@ -197,10 +406,20 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
and conics; analytic trim/break also sees free-form cutters. Free-form curves cut at a tangent
|
and conics; analytic trim/break also sees free-form cutters. Free-form curves cut at a tangent
|
||||||
touch (no clean crossing) enter that profile as polylines.
|
touch (no clean crossing) enter that profile as polylines.
|
||||||
Sweeps along 3D sketch curves follow their polyline (smooth walls when the path is smooth).
|
Sweeps along 3D sketch curves follow their polyline (smooth walls when the path is smooth).
|
||||||
|
A sweep with a twist, an end scale or a parallel or direction orientation (#771) follows its
|
||||||
|
path that way too, even along sketch lines and arcs: B-spline walls through stations, ruled
|
||||||
|
walls through denser stations where the path has corners or the profile has holes.
|
||||||
|
Guide rails (one or two, #771) do the same: each station meets every rail once, and the rail
|
||||||
|
turns the profile and scales it (or stretches it across to the rail) against the start; two
|
||||||
|
rails carry it between them. Rails along a path with sharp corners are refused for now.
|
||||||
- Extend intersects exact ellipses and rational/high-degree splines without moving the line or
|
- Extend intersects exact ellipses and rational/high-degree splines without moving the line or
|
||||||
circular support. Associative free-form offsets have a whole-span 0.002 mm normal-distance
|
circular support. Associative free-form offsets have a whole-span 0.002 mm normal-distance
|
||||||
certificate and refine within bounded node limits while retaining existing IDs. Singular,
|
certificate and refine within bounded node limits while retaining existing IDs.
|
||||||
self-intersecting and ambiguous curves refuse atomically; mixed junctions and nonsmooth
|
At the node limit, geometric certificate subdivisions accommodate unequal spline parameter
|
||||||
|
speeds without changing stored nodes or relaxing the distance tolerance (#971).
|
||||||
|
Associated offset fit nodes stay hidden from display, picking and snapping; dragging the
|
||||||
|
editable source updates the derived boundary live. Break Association restores point editing.
|
||||||
|
Singular, self-intersecting and ambiguous curves refuse atomically; mixed junctions and nonsmooth
|
||||||
closed natural-spline seams remain limitations. New explicitly closed fit splines and closed
|
closed natural-spline seams remain limitations. New explicitly closed fit splines and closed
|
||||||
offset outputs use periodic C2 interpolation, supporting repeated certified offsets; older
|
offset outputs use periodic C2 interpolation, supporting repeated certified offsets; older
|
||||||
natural splines are preserved. Clicking the starting fit point deliberately closes a new loop.
|
natural splines are preserved. Clicking the starting fit point deliberately closes a new loop.
|
||||||
@@ -275,6 +494,8 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
record their coordinate frame; legacy wires migrate from known provenance without changing
|
record their coordinate frame; legacy wires migrate from known provenance without changing
|
||||||
coordinates. Broken legacy links with missing provenance can require explicit refresh or relink.
|
coordinates. Broken legacy links with missing provenance can require explicit refresh or relink.
|
||||||
See [occurrence workflows](docs/occurrence-workflows.md).
|
See [occurrence workflows](docs/occurrence-workflows.md).
|
||||||
|
- Toolbar drops on panel labels, gaps and margins append commands with insertion feedback;
|
||||||
|
button drops keep insert-before ordering.
|
||||||
- Parameters and Configurations have distinct actions in the SOLID toolbar's CONFIGURE panel.
|
- Parameters and Configurations have distinct actions in the SOLID toolbar's CONFIGURE panel.
|
||||||
Parameters opens the user/model variable editor; Configurations opens the configuration table.
|
Parameters opens the user/model variable editor; Configurations opens the configuration table.
|
||||||
Configure remains available in the panel dropdown.
|
Configure remains available in the panel dropdown.
|
||||||
@@ -299,12 +520,20 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
|||||||
- Sheet-metal material: inherited holes, crossing edge notches, overlapping cuts and retained
|
- Sheet-metal material: inherited holes, crossing edge notches, overlapping cuts and retained
|
||||||
islands share the same boundaries in flat preview, DXF and unfolded solids. Detached material
|
islands share the same boundaries in flat preview, DXF and unfolded solids. Detached material
|
||||||
pieces survive unfold/refold as one logical sheet group, including split flanged sheets.
|
pieces survive unfold/refold as one logical sheet group, including split flanged sheets.
|
||||||
Circular cuts crossing bends remain unsupported; free-form bases use bounded sampling.
|
Cut-outs made in the flat pattern cross bends at any angle or curved: their edges fold to
|
||||||
|
helices and curves on the bend, their walls square to the sheet. Free-form bases use bounded
|
||||||
|
sampling.
|
||||||
Parallel prismatic partial-depth cuts retain pocket side and depth through transfer and
|
Parallel prismatic partial-depth cuts retain pocket side and depth through transfer and
|
||||||
unfold/refold, with separate pocket contours in preview and DXF. Planar Intersect preserves
|
unfold/refold, with separate pocket contours in preview and DXF. Planar Intersect preserves
|
||||||
exact holes and retained islands, including the union of multiple selected profiles, and
|
exact holes and retained islands, including the union of multiple selected profiles, and
|
||||||
records complementary depth layers as pockets while retaining the stock gauge. Unsupported
|
records complementary depth layers as pockets while retaining the stock gauge. Unsupported
|
||||||
tapered or bend-crossing machining refuses atomically instead of restoring material later.
|
tapered or bend-crossing machining refuses atomically instead of restoring material later.
|
||||||
|
Sketches attach to a sheet's flat faces (base and flanges, either side) by panel, in the
|
||||||
|
flat pattern's coordinates, and follow it through rebuilds and unfold/refold.
|
||||||
|
A flange on another flange's far edge (a return) follows that flange's closed end and keeps
|
||||||
|
clear of the flange beside it, and the returns of one feature are mitred toward each other
|
||||||
|
with the rule's gap where their flanges meet at a corner; returns of separate features, and
|
||||||
|
flanges on returns, are not closed toward each other.
|
||||||
- Rolling-ball fillet accuracy: independent offset-cylinder tee references check surface
|
- Rolling-ball fillet accuracy: independent offset-cylinder tee references check surface
|
||||||
distance, actual trimmed tessellation, supporting-cylinder contacts and tangency at two
|
distance, actual trimmed tessellation, supporting-cylinder contacts and tangency at two
|
||||||
scales. The measured trimmed-part error is below 0.0001 mm; this is an analytic geometry
|
scales. The measured trimmed-part error is below 0.0001 mm; this is an analytic geometry
|
||||||
@@ -328,6 +557,15 @@ editing. Construction planes and points resolve drawn 3D wires without applying
|
|||||||
plane a second time. Curved paths use sampled segments; multi-curve chains, absolute distance
|
plane a second time. Curved paths use sampled segments; multi-curve chains, absolute distance
|
||||||
and reference-object placement remain separate work, as do loft rails and centerlines.
|
and reference-object placement remain separate work, as do loft rails and centerlines.
|
||||||
|
|
||||||
|
## Design properties (#1015)
|
||||||
|
|
||||||
|
- Designs carry project, part number, revision, author, organization, description and licence
|
||||||
|
in an optional `metadata` object (File → Design Properties…, `document.metadata.*`,
|
||||||
|
`inspect_design`). STEP and IGES headers and 3MF model metadata take the fields their format
|
||||||
|
has a place for. Other tools keep their own data under a reverse-DNS key, kept as it is
|
||||||
|
through open, edit and save and never exported. See [design properties](docs/book/src/guide/files.md#design-properties).
|
||||||
|
Per-component properties (a part number per component) can follow with the same type.
|
||||||
|
|
||||||
## Document-opening performance
|
## Document-opening performance
|
||||||
|
|
||||||
- Desktop STEP import prepares consecutive independent solids in bounded batches with up
|
- Desktop STEP import prepares consecutive independent solids in bounded batches with up
|
||||||
@@ -335,6 +573,25 @@ and reference-object placement remain separate work, as do loft rails and center
|
|||||||
The web path remains serial. Original multi-solid fixtures show 64–81% lower complete
|
The web path remains serial. Original multi-solid fixtures show 64–81% lower complete
|
||||||
import times; single-solid assembly parts are not scheduled across nodes. See
|
import times; single-solid assembly parts are not scheduled across nodes. See
|
||||||
[measurements and limits](docs/perf.md#parallel-step-body-preparation-2026-10-12).
|
[measurements and limits](docs/perf.md#parallel-step-body-preparation-2026-10-12).
|
||||||
|
- Design containers (#303, phase one) separate and deduplicate STEP, raw images and
|
||||||
|
lossless binary mesh arrays while keeping plain JSON as a supported Save As/export
|
||||||
|
format. Generated-mesh storage measurements reduce serialization and decoding work;
|
||||||
|
a seekable reader defers original blobs until after provisional display.
|
||||||
|
See [container format](docs/design-container.md) and [performance measurements](docs/perf.md).
|
||||||
|
- Warm saves with explicit `cache: true` can include a versioned native B-rep cache through SolidCraft-owned topology
|
||||||
|
and geometry records, with a separate truck adapter and bounded binary reader. Exact
|
||||||
|
face-source certificates and operation history survive codec round trips. A provisional
|
||||||
|
picture can be generated before original blobs are read; editing and measurement wait
|
||||||
|
for authoritative reconstruction. Cached metadata binds preview and reconstruction to
|
||||||
|
the same document despite concurrent file writes. Default saves omit this cache and never force cold
|
||||||
|
evaluation or meshing; explicit `preview: true` remains a separate warm-mesh option.
|
||||||
|
Keys, resource budgets and document/revision guards reject incompatible, hostile or
|
||||||
|
stale results. A second modelling kernel still requires its own tested adapter.
|
||||||
|
- Warm saves with explicit `cache: true` can also carry a bounded PNG thumbnail from already cached meshes.
|
||||||
|
Home reads it without rebuilding the design when its local picture is missing;
|
||||||
|
mismatched or malformed thumbnails fall back to normal generation. The image is
|
||||||
|
kernel-independent and saving never forces cold meshing to produce it.
|
||||||
|
|
||||||
- Cold rebuild profiling separates parsing, geometry, placement, display meshing and
|
- Cold rebuild profiling separates parsing, geometry, placement, display meshing and
|
||||||
thumbnails. Straight-line closest-point projection and exact curved-surface evaluation
|
thumbnails. Straight-line closest-point projection and exact curved-surface evaluation
|
||||||
reuse reduce repeated work without relaxing geometry checks. Three alternating optimized
|
reuse reduce repeated work without relaxing geometry checks. Three alternating optimized
|
||||||
@@ -354,6 +611,14 @@ and reference-object placement remain separate work, as do loft rails and center
|
|||||||
events by strategy and reports any bounded-log truncation. Existing geometry
|
events by strategy and reports any bounded-log truncation. Existing geometry
|
||||||
acceptance checks remain in force.
|
acceptance checks remain in force.
|
||||||
|
|
||||||
|
- Cylinders of one radius whose axes cross (a second bore across a bore of the same size, a pipe
|
||||||
|
tee of equal pipes) touch at two points, where the mesh intersection cannot trace the curves
|
||||||
|
and a boolean cannot tell the four arms of the crossing apart. When the ordinary boolean fails
|
||||||
|
on such a pair, both faces are split along the line of their cylinder through the touching
|
||||||
|
points (the solids are unchanged), the boolean is taken of those, and its history is composed
|
||||||
|
back over the operands as given (#788). The result keeps the split lines as edges of the bore
|
||||||
|
walls. A crossing the ordinary route fails on and the split faces do not help (a radius of 17.5
|
||||||
|
in a 45 mm block with a tool of 80 mm) is still refused.
|
||||||
- Boolean intersection-curve construction refuses point-only, collapsed and non-finite
|
- Boolean intersection-curve construction refuses point-only, collapsed and non-finite
|
||||||
polylines without panicking. Direct constructor regressions retain valid open endpoints
|
polylines without panicking. Direct constructor regressions retain valid open endpoints
|
||||||
and closed spherical intersections; the original interactive trigger remains unidentified.
|
and closed spherical intersections; the original interactive trigger remains unidentified.
|
||||||
|
|||||||
+32
@@ -0,0 +1,32 @@
|
|||||||
|
# Security policy
|
||||||
|
|
||||||
|
## Supported versions
|
||||||
|
|
||||||
|
SolidCraft is young and moves quickly, so only the latest release gets security fixes. Please
|
||||||
|
update to the [latest release](https://github.com/bherbruck/solidcraft/releases/latest) before
|
||||||
|
reporting, and check whether the problem is still on `main`.
|
||||||
|
|
||||||
|
| Version | Supported |
|
||||||
|
| --- | --- |
|
||||||
|
| Latest release | ✅ |
|
||||||
|
| Nightly builds | ✅ (fixes land here first) |
|
||||||
|
| Older releases | ❌ |
|
||||||
|
|
||||||
|
## Reporting a vulnerability
|
||||||
|
|
||||||
|
Please **don't open a public issue** for a security problem. Report it privately through GitHub:
|
||||||
|
open the repository's [Security tab](https://github.com/bherbruck/solidcraft/security) and choose
|
||||||
|
**Report a vulnerability**
|
||||||
|
([direct link](https://github.com/bherbruck/solidcraft/security/advisories/new)).
|
||||||
|
|
||||||
|
Please include what you found, how to reproduce it (a design file, command or MCP request), the
|
||||||
|
version and platform, and the impact you expect. I'll acknowledge the report as soon as I can,
|
||||||
|
keep you updated in the advisory, and credit you when the fix is published unless you'd rather
|
||||||
|
stay anonymous.
|
||||||
|
|
||||||
|
Areas where reports are especially useful:
|
||||||
|
|
||||||
|
- opening untrusted design, STEP, STL or 3MF files (crashes, excessive memory or CPU, path tricks)
|
||||||
|
- the MCP server and the control API (file access outside the allowed folders, command injection)
|
||||||
|
- the web app (anything reaching beyond the page's own storage)
|
||||||
|
- release packages and the update paths (AppImage, Flatpak, MSI, deb, rpm, snap)
|
||||||
+3254
-574
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,30 @@
|
|||||||
|
[package]
|
||||||
|
name = "solidcraft-cli"
|
||||||
|
description = "SolidCraft headless CLI: run command scripts, measure, export, render snapshots, replay oracle recipes"
|
||||||
|
version.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
license.workspace = true
|
||||||
|
default-run = "solidcraft-cli"
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|
||||||
|
[[bin]]
|
||||||
|
name = "solidcraft-cli"
|
||||||
|
path = "src/main.rs"
|
||||||
|
|
||||||
|
# Compatibility alias for the CLI's former name: forwards to solidcraft-cli with a deprecation
|
||||||
|
# note on stderr. Shipped in every package for at least one release.
|
||||||
|
[[bin]]
|
||||||
|
name = "solvecraft-cli"
|
||||||
|
path = "src/alias.rs"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
solidcraft-engine = { workspace = true }
|
||||||
|
solidcraft-gpu = { workspace = true }
|
||||||
|
solidcraft-mcp = { workspace = true }
|
||||||
|
serde_json = { workspace = true }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
# Snapshot tests decode the pictures to compare them with a tolerance.
|
||||||
|
image = { workspace = true }
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
//! `solvecraft-cli`: the CLI's former name, kept for at least one release so existing scripts
|
||||||
|
//! and MCP client setups (`claude mcp add solvecraft -- solvecraft-cli mcp`) keep working.
|
||||||
|
//! Compatibility shim: it runs `solidcraft-cli` (next to this executable, else on PATH) with the
|
||||||
|
//! same arguments and standard streams, after a one-line deprecation note on stderr (stdout
|
||||||
|
//! stays clean for MCP's JSON-RPC), and exits with its status.
|
||||||
|
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
|
||||||
|
#![forbid(unsafe_code)]
|
||||||
|
|
||||||
|
use std::process::{Command, ExitCode};
|
||||||
|
|
||||||
|
const TARGET: &str = "solidcraft-cli";
|
||||||
|
|
||||||
|
fn main() -> ExitCode {
|
||||||
|
eprintln!("solvecraft-cli is deprecated and will be removed in a later release: use solidcraft-cli");
|
||||||
|
let sibling = std::env::current_exe()
|
||||||
|
.ok()
|
||||||
|
.and_then(|exe| exe.parent().map(|dir| dir.join(format!("{TARGET}{}", std::env::consts::EXE_SUFFIX))))
|
||||||
|
.filter(|p| p.is_file());
|
||||||
|
let program = sibling.map(|p| p.into_os_string()).unwrap_or_else(|| TARGET.into());
|
||||||
|
match Command::new(&program).args(std::env::args_os().skip(1)).status() {
|
||||||
|
Ok(status) => match status.code() {
|
||||||
|
Some(code) => ExitCode::from(u8::try_from(code).unwrap_or(1)),
|
||||||
|
None => ExitCode::FAILURE,
|
||||||
|
},
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("solvecraft-cli: could not run {}: {e}", program.to_string_lossy());
|
||||||
|
ExitCode::FAILURE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,239 @@
|
|||||||
|
//! `bench-agent`: a large design built the way an agent builds one over MCP, one small command
|
||||||
|
//! at a time, timed as it grows and then opened again.
|
||||||
|
//!
|
||||||
|
//! The design is a bicycle of about 1,300 bodies: frame tubes joined at root and then moved into
|
||||||
|
//! a component, two wheels whose spokes and nipples are placed one by one, a chainring with
|
||||||
|
//! patterned teeth, a cassette, a chain of individual links, cockpit, seat and a few hundred
|
||||||
|
//! fasteners. Nothing is read from a file; the script is generated here, so the benchmark needs
|
||||||
|
//! no fixture.
|
||||||
|
//!
|
||||||
|
//! ```text
|
||||||
|
//! solidcraft-cli bench-agent [--scale F] [--script-out script.json] [--save design.solidcraft]
|
||||||
|
//! ```
|
||||||
|
//! prints one JSON line per hundred commands (mean and max milliseconds, bodies so far), then the
|
||||||
|
//! build total, then the phases `bench-open` prints for the saved design.
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use solidcraft_engine::Session;
|
||||||
|
|
||||||
|
struct Script {
|
||||||
|
commands: Vec<Value>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Script {
|
||||||
|
fn c(&mut self, command: &str, params: Value) {
|
||||||
|
self.commands.push(json!({"command": command, "params": params}));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A round tube from `a` to `b` (an agent's frame tube, spoke or post).
|
||||||
|
fn tube(&mut self, a: [f64; 3], b: [f64; 3], radius: f64, body: &str) {
|
||||||
|
let d = [b[0] - a[0], b[1] - a[1], b[2] - a[2]];
|
||||||
|
let len = (d[0] * d[0] + d[1] * d[1] + d[2] * d[2]).sqrt();
|
||||||
|
let axis = [d[0] / len, d[1] / len, d[2] / len];
|
||||||
|
self.c(
|
||||||
|
"solid.cylinder",
|
||||||
|
json!({"radius": radius, "height": round3(len), "base": a.map(round3), "axis": axis.map(round6), "body_name": body}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn component(&mut self, name: &str) {
|
||||||
|
self.c("component.create", json!({"name": name}));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn root(&mut self) {
|
||||||
|
self.c("component.activate", json!({"component": "root"}));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A wheel built at the origin in its own component, then placed where it goes (the
|
||||||
|
/// component's occurrence moved), as an agent builds one part and positions it.
|
||||||
|
fn wheel(&mut self, label: &str, at: f64, spokes: usize) {
|
||||||
|
let cx = 0.0;
|
||||||
|
self.component(&format!("{label} wheel"));
|
||||||
|
self.c("solid.torus", json!({"major": 311, "minor": 12, "center": [cx, 0, 340], "body_name": format!("{label} rim")}));
|
||||||
|
self.c("solid.torus", json!({"major": 330, "minor": 18, "center": [cx, 0, 340], "body_name": format!("{label} tyre")}));
|
||||||
|
self.c("solid.cylinder", json!({"radius": 18, "height": 110, "base": [cx, -55, 340], "axis": "Y", "body_name": format!("{label} hub")}));
|
||||||
|
for k in 0..spokes {
|
||||||
|
let a = std::f64::consts::TAU * k as f64 / spokes as f64;
|
||||||
|
let side = if k % 2 == 1 { 1.0 } else { -1.0 };
|
||||||
|
let hub = [cx + 30.0 * a.cos(), side * 40.0, 340.0 + 30.0 * a.sin()];
|
||||||
|
let (ca, sa) = ((a + 0.12).cos(), (a + 0.12).sin());
|
||||||
|
let rim = [cx + 300.0 * ca, side * 4.0, 340.0 + 300.0 * sa];
|
||||||
|
self.tube(hub, rim, 1.0, &format!("{label} spoke {k}"));
|
||||||
|
let nipple = json!({"radius": 2, "height": 12, "base": rim.map(round3), "axis": [round6(ca), 0, round6(sa)], "body_name": format!("{label} nipple {k}")});
|
||||||
|
self.c("solid.cylinder", nipple);
|
||||||
|
}
|
||||||
|
self.root();
|
||||||
|
self.c("occurrence.move", json!({"occurrence": format!("{label} wheel:1"), "translate": [at, 0, 0]}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn round3(v: f64) -> f64 {
|
||||||
|
(v * 1e3).round() / 1e3
|
||||||
|
}
|
||||||
|
|
||||||
|
fn round6(v: f64) -> f64 {
|
||||||
|
(v * 1e6).round() / 1e6
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The bicycle's command script. `scale` multiplies the counts of repeated parts (spokes,
|
||||||
|
/// chain links, fasteners); 1.0 gives about 1,300 bodies.
|
||||||
|
pub fn bicycle(scale: f64) -> Value {
|
||||||
|
let n = |k: f64| ((k * scale).round() as usize).max(1);
|
||||||
|
let mut s = Script { commands: Vec::new() };
|
||||||
|
// Frame: tubes at root, the main triangle joined, then everything moved into its component.
|
||||||
|
let (bb, head_top, head_bot, seat_top) = ([0.0, 0.0, 300.0], [600.0, 0.0, 860.0], [580.0, 0.0, 740.0], [-150.0, 0.0, 820.0]);
|
||||||
|
s.tube(bb, head_bot, 19.0, "Down tube");
|
||||||
|
s.tube(seat_top, head_top, 16.0, "Top tube");
|
||||||
|
s.tube(bb, seat_top, 16.0, "Seat tube");
|
||||||
|
s.tube(head_bot, head_top, 22.0, "Head tube");
|
||||||
|
for (side, y) in [("L", 60.0), ("R", -60.0)] {
|
||||||
|
s.tube([0.0, y * 0.3, 300.0], [-420.0, y, 340.0], 10.0, &format!("Chainstay {side}"));
|
||||||
|
s.tube([-140.0, y * 0.3, 800.0], [-420.0, y, 340.0], 9.0, &format!("Seatstay {side}"));
|
||||||
|
s.c("solid.box", json!({"length": 20, "width": 6, "height": 40, "corner": [-430.0, y - 3.0, 320], "body_name": format!("Dropout {side}")}));
|
||||||
|
}
|
||||||
|
s.c("solid.cylinder", json!({"radius": 24, "height": 80, "base": [0, -40, 300], "axis": "Y", "body_name": "BB shell"}));
|
||||||
|
s.c("solid.combine", json!({"target": "Down tube", "tools": ["Top tube", "Seat tube", "Head tube", "BB shell"]}));
|
||||||
|
s.component("Frame");
|
||||||
|
s.root();
|
||||||
|
let frame = ["Down tube", "Chainstay L", "Seatstay L", "Dropout L", "Chainstay R", "Seatstay R", "Dropout R"];
|
||||||
|
s.c("component.move_bodies", json!({"bodies": frame, "component": "Frame"}));
|
||||||
|
// Wheels: every spoke and nipple a body of its own.
|
||||||
|
s.wheel("Front", 640.0, n(36.0));
|
||||||
|
s.wheel("Rear", -420.0, n(36.0));
|
||||||
|
// Drivetrain: patterned chainring teeth, a cassette and a chain of separate links.
|
||||||
|
s.component("Drivetrain");
|
||||||
|
s.c("solid.cylinder", json!({"radius": 95, "height": 4, "base": [0, 50, 300], "axis": "Y", "body_name": "Chainring"}));
|
||||||
|
s.c("solid.box", json!({"length": 6, "width": 4, "height": 8, "corner": [-3, 50, 395], "name": "Tooth", "body_name": "Tooth"}));
|
||||||
|
s.c("solid.pattern.circular", json!({"bodies": ["Tooth"], "axis": {"origin": [0, 50, 300], "dir": [0, 1, 0]}, "count": 44}));
|
||||||
|
for g in 0..11 {
|
||||||
|
let r = 22.0 + 3.5 * g as f64;
|
||||||
|
s.c(
|
||||||
|
"solid.cylinder",
|
||||||
|
json!({"radius": r, "height": 2, "base": [-420.0, round3(30.0 + 2.6 * g as f64), 340.0], "axis": "Y", "body_name": format!("Cog {g}")}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let links = n(112.0);
|
||||||
|
for k in 0..links {
|
||||||
|
let a = std::f64::consts::TAU * k as f64 / links as f64;
|
||||||
|
let (x, z) = (round3(-210.0 + 230.0 * a.cos()), round3(320.0 + 80.0 * a.sin()));
|
||||||
|
for (side, y) in [("in", 46), ("out", 56)] {
|
||||||
|
s.c("solid.box", json!({"length": 12, "width": 1, "height": 8, "corner": [round3(x - 6.0), y, round3(z - 4.0)], "body_name": format!("Link {k} {side}")}));
|
||||||
|
}
|
||||||
|
s.c("solid.cylinder", json!({"radius": 3.5, "height": 10, "base": [x, 46, z], "axis": "Y", "body_name": format!("Roller {k}")}));
|
||||||
|
}
|
||||||
|
for (side, y) in [("L", -90.0), ("R", 90.0)] {
|
||||||
|
let x0 = if side == "L" { -15.0 } else { 0.0 };
|
||||||
|
s.c("solid.box", json!({"length": 170, "width": 12, "height": 30, "corner": [x0, y - 6.0, 285], "body_name": format!("Crank {side}")}));
|
||||||
|
let py = if y > 0.0 { y + 8.0 } else { y - 68.0 };
|
||||||
|
s.c("solid.box", json!({"length": 90, "width": 60, "height": 15, "corner": [150.0, py, 280], "body_name": format!("Pedal {side}")}));
|
||||||
|
}
|
||||||
|
s.root();
|
||||||
|
// Cockpit and seat.
|
||||||
|
s.component("Cockpit");
|
||||||
|
s.tube([600.0, 0.0, 860.0], [620.0, 0.0, 940.0], 14.0, "Steerer");
|
||||||
|
s.tube([620.0, 0.0, 940.0], [700.0, 0.0, 950.0], 16.0, "Stem");
|
||||||
|
s.tube([700.0, -380.0, 950.0], [700.0, 380.0, 950.0], 11.0, "Handlebar");
|
||||||
|
s.c("solid.cylinder", json!({"radius": 16, "height": 120, "base": [700, 260, 950], "axis": "Y", "body_name": "Grip R"}));
|
||||||
|
s.c("solid.mirror", json!({"bodies": ["Grip R"], "plane": "XZ"}));
|
||||||
|
s.root();
|
||||||
|
s.component("Seat");
|
||||||
|
s.tube([-150.0, 0.0, 820.0], [-170.0, 0.0, 960.0], 13.0, "Seatpost");
|
||||||
|
s.c("solid.box", json!({"length": 260, "width": 140, "height": 40, "center": [-180, 0, 980], "body_name": "Saddle"}));
|
||||||
|
s.root();
|
||||||
|
// Fasteners: head, shank and washer, each its own body.
|
||||||
|
s.component("Hardware");
|
||||||
|
let bolts = n(240.0);
|
||||||
|
for k in 0..bolts {
|
||||||
|
let a = std::f64::consts::TAU * k as f64 / bolts as f64;
|
||||||
|
let p = [round3(-300.0 + 2.5 * k as f64), round3(120.0 + 10.0 * a.sin()), round3(400.0 + 10.0 * a.cos())];
|
||||||
|
s.c("solid.cylinder", json!({"radius": 5, "height": 4, "base": p, "axis": "Z", "body_name": format!("Bolt {k} head")}));
|
||||||
|
s.c(
|
||||||
|
"solid.cylinder",
|
||||||
|
json!({"radius": 2.5, "height": 16, "base": [p[0], p[1], round3(p[2] - 16.0)], "axis": "Z", "body_name": format!("Bolt {k} shank")}),
|
||||||
|
);
|
||||||
|
s.c(
|
||||||
|
"solid.cylinder",
|
||||||
|
json!({"radius": 4.5, "height": 1, "base": [p[0], p[1], round3(p[2] - 1.0)], "axis": "Z", "body_name": format!("Bolt {k} washer")}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
s.root();
|
||||||
|
json!({"commands": s.commands})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn run(args: &[String]) -> Result<(), String> {
|
||||||
|
let flag = |name: &str| args.iter().position(|a| a == name).and_then(|i| args.get(i + 1));
|
||||||
|
let scale = match flag("--scale") {
|
||||||
|
Some(v) => v.parse::<f64>().ok().filter(|v| v.is_finite() && *v > 0.0 && *v <= 20.0).ok_or("--scale takes a number from 0 to 20")?,
|
||||||
|
None => 1.0,
|
||||||
|
};
|
||||||
|
let script = bicycle(scale);
|
||||||
|
if let Some(path) = flag("--script-out") {
|
||||||
|
let text = serde_json::to_string_pretty(&script).map_err(|e| e.to_string())?;
|
||||||
|
return solidcraft_engine::io::vfs::write(path, text.as_bytes()).map_err(|e| format!("{path}: {e}"));
|
||||||
|
}
|
||||||
|
let commands = script["commands"].as_array().cloned().unwrap_or_default();
|
||||||
|
let mut s = Session::default();
|
||||||
|
let began = std::time::Instant::now();
|
||||||
|
// Per command: the command itself, then what a window needs to draw its result (the
|
||||||
|
// bodies placed in the world and their display meshes).
|
||||||
|
let (mut run, mut shown): (Vec<f64>, Vec<f64>) = (Vec::new(), Vec::new());
|
||||||
|
for (i, c) in commands.iter().enumerate() {
|
||||||
|
let id = c["command"].as_str().unwrap_or_default();
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
s.execute(id, &c["params"]).map_err(|e| format!("command {i} ({id}): {e}"))?;
|
||||||
|
run.push(t.elapsed().as_secs_f64() * 1000.0);
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
s.world_state().warm_meshes(|| true);
|
||||||
|
shown.push(t.elapsed().as_secs_f64() * 1000.0);
|
||||||
|
if run.len() == 100 || i + 1 == commands.len() {
|
||||||
|
let mean = |v: &[f64]| v.iter().sum::<f64>() / v.len().max(1) as f64;
|
||||||
|
let bodies = s.model.state().bodies.len();
|
||||||
|
println!(
|
||||||
|
"{}",
|
||||||
|
json!({"step": "build", "commands": i + 1, "bodies": bodies, "command_ms": mean(&run), "display_ms": mean(&shown),
|
||||||
|
"max_ms": run.iter().zip(&shown).map(|(a, b)| a + b).fold(0.0, f64::max)})
|
||||||
|
);
|
||||||
|
run.clear();
|
||||||
|
shown.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let world = s.world_state();
|
||||||
|
println!(
|
||||||
|
"{}",
|
||||||
|
json!({"step": "built", "ms": began.elapsed().as_secs_f64() * 1000.0, "commands": commands.len(), "features": s.doc.features.len(), "bodies": world.bodies.len()})
|
||||||
|
);
|
||||||
|
let path = match flag("--save") {
|
||||||
|
Some(p) => p.clone(),
|
||||||
|
None => std::env::temp_dir().join(format!("bench-agent-{}.solidcraft", std::process::id())).to_string_lossy().into_owned(),
|
||||||
|
};
|
||||||
|
s.execute("file.save", &json!({"path": path})).map_err(|e| e.to_string())?;
|
||||||
|
let r = crate::cmd_bench_open(std::slice::from_ref(&path));
|
||||||
|
if flag("--save").is_none() {
|
||||||
|
let _ = std::fs::remove_file(&path);
|
||||||
|
let _ = std::fs::remove_file(format!("{path}.bak"));
|
||||||
|
}
|
||||||
|
r
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// The generated commands stay valid as the command set changes: a small bicycle builds
|
||||||
|
/// without a failing command or feature.
|
||||||
|
#[test]
|
||||||
|
fn a_small_bicycle_builds() {
|
||||||
|
let script = bicycle(0.03);
|
||||||
|
let mut s = Session::default();
|
||||||
|
for c in script["commands"].as_array().into_iter().flatten() {
|
||||||
|
let id = c["command"].as_str().unwrap_or_default();
|
||||||
|
if let Err(e) = s.execute(id, &c["params"]) {
|
||||||
|
panic!("{id}: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert!(s.model.results.iter().all(|r| r.error.is_none()));
|
||||||
|
let world = s.world_state();
|
||||||
|
assert!(world.bodies.len() > 40, "{} bodies", world.bodies.len());
|
||||||
|
assert!(world.bodies.iter().any(|b| b.name.contains("spoke")));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
//! `solidcraft-cli crashes`: the crash reports the desktop app wrote on this computer
|
||||||
|
//! (docs/crash-reports.md): list them, show one, replay one, delete them.
|
||||||
|
|
||||||
|
use std::sync::Mutex;
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use solidcraft_engine::crash;
|
||||||
|
|
||||||
|
const USAGE: &str = "usage: solidcraft-cli crashes [list [--json] | show <id> | replay <id> | dir | clear [<id>]]";
|
||||||
|
|
||||||
|
pub fn run(args: &[String]) -> Result<(), String> {
|
||||||
|
let dir = crash::default_dir().ok_or("no crash folder on this system")?;
|
||||||
|
let id = || args.get(1).map(String::as_str).ok_or_else(|| USAGE.to_string());
|
||||||
|
match args.first().map(String::as_str) {
|
||||||
|
None | Some("list") => {
|
||||||
|
let reports = crash::list(&dir);
|
||||||
|
if args.iter().any(|a| a == "--json") {
|
||||||
|
println!("{}", super::pretty(&json!({ "dir": dir.to_string_lossy(), "reports": reports })));
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
println!("crash reports in {}", dir.display());
|
||||||
|
if reports.is_empty() {
|
||||||
|
println!(" (none)");
|
||||||
|
}
|
||||||
|
for r in reports {
|
||||||
|
let times = if r.count > 1 { format!(" ×{}", r.count) } else { String::new() };
|
||||||
|
let cmd = r.command.map(|c| format!(" in {c}")).unwrap_or_default();
|
||||||
|
let replay = if r.replayable { " [replayable]" } else { "" };
|
||||||
|
println!(" {} {}{times}{cmd} v{}{replay}\n {}", r.id, r.kind, r.version, r.message);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Some("show") => {
|
||||||
|
println!("{}", super::pretty(&crash::read(&dir, id()?)?));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Some("replay") => replay(&crash::read(&dir, id()?)?),
|
||||||
|
Some("dir") => {
|
||||||
|
println!("{}", dir.display());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Some("clear") => {
|
||||||
|
println!("deleted {} report(s)", crash::clear(&dir, args.get(1).map(String::as_str)));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
_ => Err(USAGE.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Panics seen while replaying: (location, message).
|
||||||
|
static PANICS: Mutex<Vec<(String, String)>> = Mutex::new(Vec::new());
|
||||||
|
|
||||||
|
/// Run a report's commands on its design and say whether the crash happens again.
|
||||||
|
fn replay(report: &Value) -> Result<(), String> {
|
||||||
|
let id = report["id"].as_str().unwrap_or_default();
|
||||||
|
let replay_path = report["replay_path"].as_str().ok_or_else(|| format!("report {id} cannot be replayed (see its notes)"))?;
|
||||||
|
let script = super::read_json(replay_path)?;
|
||||||
|
let commands = script["commands"].as_array().cloned().unwrap_or_default();
|
||||||
|
let mut s = match report["design_path"].as_str() {
|
||||||
|
Some(d) => super::load(d)?,
|
||||||
|
None => solidcraft_engine::Session::default(),
|
||||||
|
};
|
||||||
|
std::panic::set_hook(Box::new(|info| {
|
||||||
|
let loc = info.location().map_or_else(|| "(unknown)".to_string(), |l| format!("{}:{}", l.file(), l.line()));
|
||||||
|
let msg = info.payload_as_str().unwrap_or("(not a text message)").to_string();
|
||||||
|
if let Ok(mut p) = PANICS.lock() {
|
||||||
|
p.push((loc, msg));
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
if report["kind"] == "unclean_exit" {
|
||||||
|
println!("this crash ended the app without a report: if this process ends abruptly, it reproduced");
|
||||||
|
}
|
||||||
|
println!(
|
||||||
|
"replaying {} command(s) on {}",
|
||||||
|
commands.len(),
|
||||||
|
report["design_path"].as_str().map_or_else(|| "a new design".to_string(), |d| d.to_string())
|
||||||
|
);
|
||||||
|
for (i, c) in commands.iter().enumerate() {
|
||||||
|
let cmd = c["command"].as_str().unwrap_or_default();
|
||||||
|
let r = s.execute(cmd, c.get("params").unwrap_or(&Value::Null));
|
||||||
|
match r {
|
||||||
|
Ok(_) => println!(" {:>3}. {cmd}: ok", i + 1),
|
||||||
|
Err(e) => println!(" {:>3}. {cmd}: {e}", i + 1),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _ = std::panic::take_hook();
|
||||||
|
let seen = PANICS.lock().map(|p| p.clone()).unwrap_or_default();
|
||||||
|
let want = report["signature"].as_str().unwrap_or_default();
|
||||||
|
let same = seen.iter().any(|(l, m)| format!("{:016x}", crash::signature(l, m)) == want);
|
||||||
|
if same {
|
||||||
|
println!(
|
||||||
|
"reproduced: the same internal error ({}) at {}",
|
||||||
|
report["message"].as_str().unwrap_or_default(),
|
||||||
|
report["location"].as_str().unwrap_or_default()
|
||||||
|
);
|
||||||
|
} else if let Some((l, m)) = seen.first() {
|
||||||
|
println!("an internal error happened, but not the reported one: {m} at {l}");
|
||||||
|
println!("(the report says: {} at {})", report["message"].as_str().unwrap_or_default(), report["location"].as_str().unwrap_or_default());
|
||||||
|
} else {
|
||||||
|
println!("did not reproduce: no internal error (fixed, or it depends on something the replay does not have)");
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
//! `solvecraft-cli fuzz`: random modelling sessions and boolean checks (docs/robustness.md).
|
//! `solidcraft-cli fuzz`: random modelling sessions and boolean checks (docs/robustness.md).
|
||||||
//!
|
//!
|
||||||
//! Each seed runs in its own process (`fuzz-one`) with a time limit, so a hang or a hard crash
|
//! Each seed runs in its own process (`fuzz-one`) with a time limit, so a hang or a hard crash
|
||||||
//! is recorded like any other failure.
|
//! is recorded like any other failure.
|
||||||
@@ -9,8 +9,8 @@ use std::process::{Command, Stdio};
|
|||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
use solvecraft_engine::fuzz;
|
use solidcraft_engine::fuzz;
|
||||||
use solvecraft_engine::fuzz::boolean_case;
|
use solidcraft_engine::fuzz::boolean_case;
|
||||||
|
|
||||||
fn flag<T: std::str::FromStr>(args: &[String], name: &str, default: T) -> T {
|
fn flag<T: std::str::FromStr>(args: &[String], name: &str, default: T) -> T {
|
||||||
args.iter().position(|a| a == name).and_then(|i| args.get(i + 1)).and_then(|v| v.parse().ok()).unwrap_or(default)
|
args.iter().position(|a| a == name).and_then(|i| args.get(i + 1)).and_then(|v| v.parse().ok()).unwrap_or(default)
|
||||||
@@ -45,7 +45,7 @@ pub fn one(args: &[String]) -> Result<(), String> {
|
|||||||
design["minimal"] = json!({"outcome": m.outcome, "steps": m.steps.iter().map(|s| s.kind).collect::<Vec<_>>(), "script": m.script()});
|
design["minimal"] = json!({"outcome": m.outcome, "steps": m.steps.iter().map(|s| s.kind).collect::<Vec<_>>(), "script": m.script()});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let (a, b) = solvecraft_engine::fuzz::boolean_shapes(seed);
|
let (a, b) = solidcraft_engine::fuzz::boolean_shapes(seed);
|
||||||
eprintln!("boolean {seed} {} {}", serde_json::to_string(&a).unwrap_or_default(), serde_json::to_string(&b).unwrap_or_default());
|
eprintln!("boolean {seed} {} {}", serde_json::to_string(&a).unwrap_or_default(), serde_json::to_string(&b).unwrap_or_default());
|
||||||
let b = boolean_case(seed);
|
let b = boolean_case(seed);
|
||||||
let bp = PANICS.swap(0, std::sync::atomic::Ordering::SeqCst);
|
let bp = PANICS.swap(0, std::sync::atomic::Ordering::SeqCst);
|
||||||
@@ -0,0 +1,670 @@
|
|||||||
|
//! SolidCraft headless command line.
|
||||||
|
//!
|
||||||
|
//! ```text
|
||||||
|
//! solidcraft-cli run <script.json|design.solidcraft|part.step|mesh.3mf> [--in design|part.step|mesh.3mf] [--out FILE]... [--save FILE] [--quiet] [--results] [--timings] [--profile] [--json-out FILE] [--allow-errors]
|
||||||
|
//! solidcraft-cli eval <script.json|design.solidcraft|part.step> [--json-out FILE] (alias: inspect) measurements as JSON
|
||||||
|
//! solidcraft-cli script <design.solidcraft> [--out script.json] the design's history as a command script
|
||||||
|
//! solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only] [--display LEVEL [--edit NAME EXPR]] loading timings as JSON lines
|
||||||
|
//! solidcraft-cli bench-agent [--scale F] [--save F] [--script-out F] a ~1,300-body design built command by command, timed
|
||||||
|
//! solidcraft-cli snapshot <script|design> [--in design|part.step] --out shot.png [--width W] [--height H] [--view iso|front|top|…|NAME | --camera JSON] [--no-grid] [--no-axes]
|
||||||
|
//! solidcraft-cli exec <command> [json-params] run one command on an empty design
|
||||||
|
//! solidcraft-cli commands the command registry as JSON
|
||||||
|
//! solidcraft-cli recipe <recipe.json> translate an oracle recipe to a script
|
||||||
|
//! solidcraft-cli oracle <case-dir>... replay recipes and compare with expected.json
|
||||||
|
//! solidcraft-cli mcp [--in design|script] [--connect HOST:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]
|
||||||
|
//! MCP server on stdio (docs/mcp.md)
|
||||||
|
//! solidcraft-cli licences SolidCraft's licence and the third-party licences
|
||||||
|
//! solidcraft-cli icon --out F.png|F.ico [--size N] the app icon (packaging; drawn, not a file)
|
||||||
|
//! ```
|
||||||
|
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
|
||||||
|
#![forbid(unsafe_code)]
|
||||||
|
|
||||||
|
mod bench_agent;
|
||||||
|
mod crashes;
|
||||||
|
mod fuzz;
|
||||||
|
mod oracle;
|
||||||
|
mod recipe;
|
||||||
|
mod render;
|
||||||
|
mod spatial;
|
||||||
|
|
||||||
|
use std::process::ExitCode;
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
#[path = "../../../assets/icons/app/shared/source/app_icon.rs"]
|
||||||
|
mod app_icon;
|
||||||
|
|
||||||
|
use solidcraft_engine::Session;
|
||||||
|
use solidcraft_engine::view::Guides;
|
||||||
|
|
||||||
|
const USAGE: &str = "usage:
|
||||||
|
solidcraft-cli run <script.json|design.solidcraft|part.step> [--in design.solidcraft|part.step] [--out FILE]... [--save FILE] [--quiet] [--results] [--timings] [--profile] [--json-out FILE] [--allow-errors]
|
||||||
|
solidcraft-cli run --in <design.solidcraft|part.step> [--out FILE]...
|
||||||
|
(a timeline feature that fails fails the run and nothing is written; --allow-errors writes anyway)
|
||||||
|
(--timings prints {timings: [{index, command, ms}], total_ms} for a script, with --results its results too;
|
||||||
|
--profile adds each command's profile: {boolean_ms, tessellate_ms, other_ms}, the kernel's share)
|
||||||
|
solidcraft-cli eval <script.json|design.solidcraft|part.step> [--json-out FILE] (alias: inspect; or --in FILE)
|
||||||
|
(--json-out FILE writes the JSON that run (with --results, else the measurement) and eval print to FILE instead of stdout,
|
||||||
|
as plain UTF-8: a shell's > can re-encode it, e.g. Windows PowerShell adds a byte-order mark)
|
||||||
|
solidcraft-cli script <design.solidcraft|script.json> [--out script.json]
|
||||||
|
(the design's history as a command script that eval and run replay)
|
||||||
|
solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only] [--display LEVEL [--edit NAME EXPR]]
|
||||||
|
solidcraft-cli bench-agent [--scale F] [--save design.solidcraft] [--script-out script.json]
|
||||||
|
solidcraft-cli snapshot <script|design> [--in design.solidcraft|part.step] --out shot.png [--width W] [--height H] [--view NAME | --camera JSON] [--no-grid] [--no-axes]
|
||||||
|
solidcraft-cli snapshot --in <design.solidcraft|part.step> --out shot.png ...
|
||||||
|
(as with run, --in starts from a design and the script runs on top of it; an option snapshot doesn't take is an error;
|
||||||
|
--view: iso, front, back, top, bottom, left, right, or the name of a view saved in the design with view.save;
|
||||||
|
--camera: {target: [x,y,z], yaw, pitch, distance, fov?} in mm and radians, as the MCP screenshot takes it (docs/mcp.md);
|
||||||
|
--no-grid and --no-axes leave the ground grid (on Z 0) and the origin's axes out of the picture)
|
||||||
|
solidcraft-cli render <script|design> --out image.png [--setup NAME] [--width W] [--height H] [--transparent] [--overwrite] [--timeout SECONDS]
|
||||||
|
solidcraft-cli exec <command> [json-params]
|
||||||
|
solidcraft-cli commands
|
||||||
|
solidcraft-cli recipe <recipe.json>
|
||||||
|
solidcraft-cli oracle <case-dir>... [--json]
|
||||||
|
solidcraft-cli fuzz [--from N] [--count N] [--jobs J] [--timeout S] [--steps N] [--minimise] [--out DIR] [--report FILE]
|
||||||
|
solidcraft-cli mcp [--in design.solidcraft|script.json] [--connect 127.0.0.1:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]
|
||||||
|
solidcraft-cli crashes [list [--json] | show <id> | replay <id> | dir | clear [<id>]]
|
||||||
|
solidcraft-cli licences
|
||||||
|
solidcraft-cli gpu [--policy auto|hardware|software|cpu]
|
||||||
|
(the GPU adapters a headless render can open, best first, the one the policy picks and the tier it
|
||||||
|
lands on: gpu, gpu-software, or the CPU rasterizer (auto with no adapter, or cpu); the policy defaults
|
||||||
|
to SOLIDCRAFT_GPU, else auto; exits with an error when hardware or software finds no such adapter)
|
||||||
|
solidcraft-cli icon --out icon.png [--size 256] | --out icon.ico
|
||||||
|
";
|
||||||
|
|
||||||
|
fn main() -> ExitCode {
|
||||||
|
let args: Vec<String> = std::env::args().skip(1).collect();
|
||||||
|
let r = match args.first().map(String::as_str) {
|
||||||
|
Some("run") => cmd_run(&args[1..]),
|
||||||
|
Some("eval" | "inspect") => cmd_eval(&args[1..]),
|
||||||
|
Some("script") => cmd_script(&args[1..]),
|
||||||
|
Some("snapshot") => cmd_snapshot(&args[1..]),
|
||||||
|
Some("render") => render::run(&args[1..]),
|
||||||
|
Some("exec") => cmd_exec(&args[1..]),
|
||||||
|
Some("gpu") => cmd_gpu(&args[1..]),
|
||||||
|
Some("commands") => {
|
||||||
|
use std::io::Write as _;
|
||||||
|
let mut s = Session::default();
|
||||||
|
s.execute("engine.commands", &json!({})).map_err(|e| e.to_string()).and_then(|v| {
|
||||||
|
// A pipeline consumer may stop early (e.g. `commands | head`).
|
||||||
|
// Unlike println!, writing explicitly lets us handle that without a panic.
|
||||||
|
match writeln!(std::io::stdout().lock(), "{}", pretty(&v)) {
|
||||||
|
Ok(()) => Ok(()),
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
|
||||||
|
Err(e) => Err(format!("stdout: {e}")),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
Some("recipe") => args.get(1).ok_or_else(|| USAGE.to_string()).and_then(|p| {
|
||||||
|
let v = read_json(p)?;
|
||||||
|
recipe::to_script(&v).map(|s| println!("{}", pretty(&s)))
|
||||||
|
}),
|
||||||
|
Some("oracle") => oracle::run(&args[1..]),
|
||||||
|
Some("fuzz") => fuzz::run(&args[1..]),
|
||||||
|
Some("fuzz-one") => fuzz::one(&args[1..]),
|
||||||
|
Some("mcp") => cmd_mcp(&args[1..]),
|
||||||
|
Some("crashes") => crashes::run(&args[1..]),
|
||||||
|
Some("icon") => cmd_icon(&args[1..]),
|
||||||
|
Some("licences" | "licenses") => {
|
||||||
|
// Written, not print!ed: a closed pipe (`| head`) is not a crash.
|
||||||
|
use std::io::Write as _;
|
||||||
|
let _ = std::io::stdout().lock().write_all(solidcraft_engine::licences::all().as_bytes());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
// Hidden, for the kill-mid-save test: save a large design over and over.
|
||||||
|
Some("save-stress") => cmd_save_stress(&args[1..]),
|
||||||
|
// Hidden: time recomputes after parameter edits (docs/perf.md).
|
||||||
|
Some("bench-edit") => cmd_bench_edit(&args[1..]),
|
||||||
|
Some("bench-open") => cmd_bench_open(&args[1..]),
|
||||||
|
// A ~1,300-body design built command by command, as an agent builds one over MCP.
|
||||||
|
Some("bench-agent") => bench_agent::run(&args[1..]),
|
||||||
|
Some("--version" | "-V") => {
|
||||||
|
println!("solidcraft-cli {}", env!("CARGO_PKG_VERSION"));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
_ => Err(USAGE.to_string()),
|
||||||
|
};
|
||||||
|
match r {
|
||||||
|
Ok(()) => ExitCode::SUCCESS,
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("error: {e}");
|
||||||
|
ExitCode::FAILURE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pretty(v: &Value) -> String {
|
||||||
|
serde_json::to_string_pretty(v).unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn read_json(path: &str) -> Result<Value, String> {
|
||||||
|
// Through the engine's file access, which refuses anything that is not a regular file and
|
||||||
|
// reads no more than the cap: a character device or a FIFO would otherwise never end.
|
||||||
|
let s = solidcraft_engine::io::vfs::read_to_string(path, solidcraft_engine::io::MAX_DESIGN_BYTES).map_err(|e| format!("{path}: {e}"))?;
|
||||||
|
serde_json::from_str(&s).map_err(|e| format!("{path}: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A session from a design file, a STEP/3MF/STL file, a command script, or an oracle recipe.
|
||||||
|
pub fn load(path: &str) -> Result<Session, String> {
|
||||||
|
let mut s = Session::default();
|
||||||
|
if solidcraft_engine::io::is_step_path(path) || solidcraft_engine::io::is_mesh_path(path) {
|
||||||
|
s.execute("doc.open", &json!({"path": path})).map_err(|e| e.to_string())?;
|
||||||
|
return Ok(s);
|
||||||
|
}
|
||||||
|
let bytes = solidcraft_engine::io::vfs::read(path, solidcraft_engine::io::MAX_DESIGN_BYTES).map_err(|e| format!("{path}: {e}"))?;
|
||||||
|
if solidcraft_engine::io::is_design_container(&bytes) {
|
||||||
|
let doc = solidcraft_engine::io::read_design(&bytes).map_err(|e| format!("{path}: {e}"))?;
|
||||||
|
let mut session = Session::new(doc);
|
||||||
|
session.path = Some(path.to_owned());
|
||||||
|
return Ok(session);
|
||||||
|
}
|
||||||
|
let v: Value = serde_json::from_slice(&bytes).map_err(|e| format!("{path}: {e}"))?;
|
||||||
|
if v.get("format").and_then(Value::as_str).is_some_and(|f| solidcraft_engine::doc::format::version_of(f).is_some()) {
|
||||||
|
s.execute("doc.open", &json!({"path": path})).map_err(|e| e.to_string())?;
|
||||||
|
} else if v.get("features").is_some() && v.get("commands").is_none() {
|
||||||
|
let script = recipe::to_script(&v)?;
|
||||||
|
s.run_script(&script).map_err(|e| e.to_string())?;
|
||||||
|
} else {
|
||||||
|
s.run_script(&v).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
Ok(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flag<'a>(args: &'a [String], name: &str) -> Option<&'a str> {
|
||||||
|
args.iter().position(|a| a == name).and_then(|i| args.get(i + 1)).map(String::as_str)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flags<'a>(args: &'a [String], name: &str) -> Vec<&'a str> {
|
||||||
|
args.windows(2).filter(|w| w[0] == name).map(|w| w[1].as_str()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The first argument that is not an option or an option's value.
|
||||||
|
fn positional(args: &[String]) -> Option<&String> {
|
||||||
|
let mut i = 0;
|
||||||
|
while let Some(a) = args.get(i) {
|
||||||
|
if a.starts_with("--") {
|
||||||
|
i += if matches!(a.as_str(), "--quiet" | "--results" | "--timings" | "--profile" | "--allow-errors" | "--no-grid" | "--no-axes") {
|
||||||
|
1
|
||||||
|
} else {
|
||||||
|
2
|
||||||
|
};
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
return Some(a);
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `--json-out FILE`: where the JSON a command prints goes instead of stdout.
|
||||||
|
fn json_out(args: &[String]) -> Result<Option<&str>, String> {
|
||||||
|
if !args.iter().any(|a| a == "--json-out") {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
match flag(args, "--json-out") {
|
||||||
|
Some(file) if !file.starts_with("--") => Ok(Some(file)),
|
||||||
|
_ => Err("--json-out needs a FILE".to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `v` as indented JSON with a final newline: on stdout, or in `file`. The file is plain UTF-8
|
||||||
|
/// with no byte-order mark, whatever the platform's shell does to redirected output (Windows
|
||||||
|
/// PowerShell's `>` writes UTF-16, or UTF-8 with a BOM), so strict JSON readers take it.
|
||||||
|
fn print_json(v: &Value, file: Option<&str>) -> Result<(), String> {
|
||||||
|
match file {
|
||||||
|
Some(file) => {
|
||||||
|
let mut text = pretty(v);
|
||||||
|
text.push('\n');
|
||||||
|
std::fs::write(file, text).map_err(|e| format!("{file}: {e}"))
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
println!("{}", pretty(v));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cmd_run(args: &[String]) -> Result<(), String> {
|
||||||
|
install_renderer();
|
||||||
|
let json_out = json_out(args)?;
|
||||||
|
let base = flag(args, "--in");
|
||||||
|
let path = positional(args);
|
||||||
|
if path.is_none() && base.is_none() {
|
||||||
|
return Err(USAGE.to_string());
|
||||||
|
}
|
||||||
|
let want_results = args.iter().any(|a| a == "--results");
|
||||||
|
// `--profile` times each command and splits out its kernel time; it implies `--timings`.
|
||||||
|
let profile = args.iter().any(|a| a == "--profile");
|
||||||
|
let timings = profile || args.iter().any(|a| a == "--timings");
|
||||||
|
let (mut s, results) = if want_results || timings {
|
||||||
|
// Collect every command's result or time (scripts only), then process requested files too.
|
||||||
|
let mut s = match base {
|
||||||
|
Some(b) => load(b)?,
|
||||||
|
None => Session::default(),
|
||||||
|
};
|
||||||
|
let needs = if want_results { "--results needs a script" } else { "--timings needs a script" };
|
||||||
|
let v = read_json(path.ok_or(needs)?)?;
|
||||||
|
let out = if timings {
|
||||||
|
let (r, mut t) = s.run_script_timed(&v, profile).map_err(|e| e.to_string())?;
|
||||||
|
if want_results && let Some(o) = t.as_object_mut() {
|
||||||
|
o.insert("results".into(), Value::Array(r));
|
||||||
|
}
|
||||||
|
t
|
||||||
|
} else {
|
||||||
|
Value::Array(s.run_script(&v).map_err(|e| e.to_string())?)
|
||||||
|
};
|
||||||
|
(s, Some(out))
|
||||||
|
} else {
|
||||||
|
(open(base, path)?, None)
|
||||||
|
};
|
||||||
|
// A feature that fails leaves the bodies as they were before it (a parameter change can
|
||||||
|
// break a feature without failing the command that made it): writing them would hand out
|
||||||
|
// the wrong part with success, so fail the run unless asked to write it anyway.
|
||||||
|
if !args.iter().any(|a| a == "--allow-errors") {
|
||||||
|
timeline_ok(&s)?;
|
||||||
|
}
|
||||||
|
for out in flags(args, "--out") {
|
||||||
|
s.execute("file.export", &json!({"path": out})).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
if let Some(p) = flag(args, "--save") {
|
||||||
|
s.execute("file.save_as", &json!({"path": p})).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
if let Some(results) = results {
|
||||||
|
print_json(&results, json_out)?;
|
||||||
|
} else if json_out.is_some() || !args.iter().any(|a| a == "--quiet") {
|
||||||
|
// `--quiet` silences stdout; a file that was asked for is still written.
|
||||||
|
let m = s.execute("inspect.measure", &json!({})).map_err(|e| e.to_string())?;
|
||||||
|
print_json(&m, json_out)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The session `run` and `snapshot` start from: `--in` (a design or STEP file) with the
|
||||||
|
/// positional script run on top of it, or either one alone.
|
||||||
|
fn open(base: Option<&str>, path: Option<&String>) -> Result<Session, String> {
|
||||||
|
match (base, path) {
|
||||||
|
(Some(b), Some(p)) => {
|
||||||
|
let mut s = load(b)?;
|
||||||
|
s.run_script(&read_json(p)?).map_err(|e| e.to_string())?;
|
||||||
|
Ok(s)
|
||||||
|
}
|
||||||
|
(Some(b), None) => load(b),
|
||||||
|
(None, Some(p)) => load(p),
|
||||||
|
(None, None) => Err(USAGE.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Refuses an option `cmd` doesn't take, and one missing its value: a typo, or another
|
||||||
|
/// command's option, would otherwise be ignored without a word.
|
||||||
|
fn known_flags(cmd: &str, args: &[String], valued: &[&str], switches: &[&str]) -> Result<(), String> {
|
||||||
|
let mut i = 0;
|
||||||
|
while let Some(a) = args.get(i) {
|
||||||
|
if valued.contains(&a.as_str()) {
|
||||||
|
match args.get(i + 1) {
|
||||||
|
Some(v) if !v.starts_with("--") => i += 2,
|
||||||
|
_ => return Err(format!("{cmd}: {a} needs a value")),
|
||||||
|
}
|
||||||
|
} else if a.starts_with("--") && !switches.contains(&a.as_str()) {
|
||||||
|
return Err(format!("{cmd} doesn't take {a} (it takes {})", [valued, switches].concat().join(", ")));
|
||||||
|
} else {
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every failing timeline feature, one per line, as an error; Ok when none fails.
|
||||||
|
fn timeline_ok(s: &Session) -> Result<(), String> {
|
||||||
|
let failed: Vec<String> = s.model.results.iter().filter_map(|r| r.error.as_ref().map(|e| format!(" {}: {e}", r.name))).collect();
|
||||||
|
if failed.is_empty() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
Err(format!(
|
||||||
|
"{} timeline feature(s) failed, so nothing was written (--allow-errors writes the bodies anyway):\n{}",
|
||||||
|
failed.len(),
|
||||||
|
failed.join("\n")
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cmd_eval(args: &[String]) -> Result<(), String> {
|
||||||
|
let json_out = json_out(args)?;
|
||||||
|
let path = flag(args, "--in").or_else(|| positional(args).map(String::as_str)).ok_or_else(|| USAGE.to_string())?;
|
||||||
|
let mut s = load(path)?;
|
||||||
|
let m = s.execute("inspect.measure", &json!({})).map_err(|e| e.to_string())?;
|
||||||
|
let d = s.execute("document.inspect", &json!({})).map_err(|e| e.to_string())?;
|
||||||
|
let out = json!({
|
||||||
|
"body_count": m["body_count"],
|
||||||
|
"bodies": m["bodies"],
|
||||||
|
"total": m["total"],
|
||||||
|
"timeline": d["timeline"],
|
||||||
|
"params": d["params"],
|
||||||
|
"sketches": d["sketches"],
|
||||||
|
});
|
||||||
|
print_json(&out, json_out)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A design's history as a command script (`timeline.export_script`): printed, or written to
|
||||||
|
/// `--out`; what the script leaves out goes to stderr.
|
||||||
|
fn cmd_script(args: &[String]) -> Result<(), String> {
|
||||||
|
let path = positional(args).ok_or_else(|| USAGE.to_string())?;
|
||||||
|
let s = &mut load(path)?;
|
||||||
|
let out = flag(args, "--out");
|
||||||
|
let r = s.execute("timeline.export_script", &json!({"path": out})).map_err(|e| e.to_string())?;
|
||||||
|
for what in r["omitted"].as_array().into_iter().flatten().filter_map(Value::as_str) {
|
||||||
|
eprintln!("note: the script leaves out {what}");
|
||||||
|
}
|
||||||
|
match out {
|
||||||
|
Some(out) => eprintln!("{out}: {} steps", r["steps"]),
|
||||||
|
None => println!("{}", pretty(&r["script"])),
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `gpu`: the headless adapter survey and the policy's pick.
|
||||||
|
fn cmd_gpu(args: &[String]) -> Result<(), String> {
|
||||||
|
use solidcraft_gpu::select::{Policy, survey};
|
||||||
|
let policy = match args {
|
||||||
|
[] => Policy::from_env()?,
|
||||||
|
[flag, v] if flag == "--policy" => Policy::parse(v).ok_or_else(|| format!("--policy must be auto, hardware, software or cpu, not `{v}`"))?,
|
||||||
|
_ => return Err("usage: solidcraft-cli gpu [--policy auto|hardware|software|cpu]".into()),
|
||||||
|
};
|
||||||
|
let s = survey(policy);
|
||||||
|
let chosen = s.chosen.and_then(|i| s.adapters.get(i)).cloned();
|
||||||
|
// The tier pictures land on: a hardware GPU, a software adapter, or the CPU rasterizer.
|
||||||
|
let renderer = s.lands_on.map(|l| l.renderer());
|
||||||
|
println!(
|
||||||
|
"{}",
|
||||||
|
pretty(&json!({
|
||||||
|
"policy": policy.name(),
|
||||||
|
"backends": s.backends,
|
||||||
|
"adapters": s.adapters,
|
||||||
|
"chosen": chosen,
|
||||||
|
"lands_on": s.lands_on,
|
||||||
|
"renderer": renderer,
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
match s.lands_on {
|
||||||
|
Some(solidcraft_gpu::select::Landing::Cpu) => {
|
||||||
|
eprintln!("warning: {}", solidcraft_engine::capture::CPU_WARNING);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Some(_) => Ok(()),
|
||||||
|
None => Err(format!("no adapter qualifies under the {} policy", policy.name())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Draw this process's pictures (snapshots, MCP screenshots, saved thumbnails) on the GPU with the
|
||||||
|
/// viewport's pipelines: the headless device the `SOLIDCRAFT_GPU` policy picks, opened on the first
|
||||||
|
/// picture; under `auto` with no qualifying adapter (or `cpu`), the CPU rasterizer, and the
|
||||||
|
/// picture says so. Under `hardware` or `software` with no such adapter a picture fails with an
|
||||||
|
/// error that names the policy.
|
||||||
|
fn install_renderer() {
|
||||||
|
solidcraft_engine::capture::install(std::sync::Arc::new(|scene, cam, w, h| {
|
||||||
|
let (rgba, renderer) = solidcraft_gpu::capture::headless_rgba(scene, cam, w, h)?;
|
||||||
|
Ok(solidcraft_engine::capture::Picture { rgba, renderer })
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cmd_snapshot(args: &[String]) -> Result<(), String> {
|
||||||
|
install_renderer();
|
||||||
|
known_flags("snapshot", args, &["--in", "--out", "--width", "--height", "--view", "--camera"], &["--no-grid", "--no-axes"])?;
|
||||||
|
if positional(args).is_none() && flag(args, "--in").is_none() {
|
||||||
|
return Err(USAGE.to_string());
|
||||||
|
}
|
||||||
|
let out = flag(args, "--out").ok_or("snapshot needs --out FILE.png")?;
|
||||||
|
let size = |name: &str, default: u32| match flag(args, name) {
|
||||||
|
None => Ok(default),
|
||||||
|
Some(x) => x.parse().ok().filter(|n| (16..=8192).contains(n)).ok_or_else(|| format!("{name} must be 16 to 8192 pixels, not `{x}`")),
|
||||||
|
};
|
||||||
|
let (w, h) = (size("--width", 1280)?, size("--height", 800)?);
|
||||||
|
let mut s = open(flag(args, "--in"), positional(args))?;
|
||||||
|
// The camera choices of the MCP `screenshot`, through the same command (`view.apply`): a
|
||||||
|
// standard view, a view saved in the design, or an explicit camera. A script that applies a
|
||||||
|
// view itself sets the camera too; without any, the iso view framing the model.
|
||||||
|
match (flag(args, "--view"), flag(args, "--camera")) {
|
||||||
|
(Some(_), Some(_)) => return Err("snapshot: give --view or --camera, not both".into()),
|
||||||
|
(Some(v), None) => {
|
||||||
|
let hint = "standard views: iso, front, back, top, bottom, left, right";
|
||||||
|
s.execute("view.apply", &json!({"view": v})).map_err(|e| format!("--view {v}: {e} ({hint}; or a view saved with view.save)"))?;
|
||||||
|
}
|
||||||
|
(None, Some(c)) => {
|
||||||
|
let camera: Value = serde_json::from_str(c).map_err(|e| format!("--camera: not JSON: {e}"))?;
|
||||||
|
s.execute("view.apply", &json!({"camera": camera})).map_err(|e| format!("--camera: {e}"))?;
|
||||||
|
}
|
||||||
|
(None, None) => {}
|
||||||
|
}
|
||||||
|
let cam = s.camera.unwrap_or_else(|| solidcraft_engine::view::home_camera(&s));
|
||||||
|
let guides = Guides { grid: !args.iter().any(|a| a == "--no-grid"), axes: !args.iter().any(|a| a == "--no-axes") };
|
||||||
|
let scene = solidcraft_engine::view::scene_with_guides(&s, &cam, s.section, guides);
|
||||||
|
let png = solidcraft_engine::capture::png(&scene, &cam, w, h)?;
|
||||||
|
std::fs::write(out, &png.bytes).map_err(|e| format!("{out}: {e}"))?;
|
||||||
|
let mut reply = json!({"path": out, "width": w, "height": h, "bytes": png.bytes.len(), "renderer": png.renderer});
|
||||||
|
if let Some(w) = solidcraft_engine::capture::warning(png.renderer) {
|
||||||
|
eprintln!("warning: {w}");
|
||||||
|
reply["warning"] = json!(w);
|
||||||
|
}
|
||||||
|
println!("{}", pretty(&reply));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The app icon: the SolidCraft logo, drawn in code on a transparent background
|
||||||
|
/// (so packages need no committed image). `.ico` holds the Windows sizes as PNGs.
|
||||||
|
fn cmd_icon(args: &[String]) -> Result<(), String> {
|
||||||
|
let out = flag(args, "--out").ok_or("icon needs --out FILE.png or FILE.ico")?;
|
||||||
|
let size: usize = flag(args, "--size").and_then(|x| x.parse().ok()).unwrap_or(256).clamp(8, 2048);
|
||||||
|
let bytes = if out.to_ascii_lowercase().ends_with(".ico") {
|
||||||
|
let pngs: Vec<(usize, Vec<u8>)> =
|
||||||
|
[16, 20, 24, 32, 40, 48, 64, 128, 256].into_iter().map(|s| icon_png(s).map(|p| (s, p))).collect::<Result<_, _>>()?;
|
||||||
|
ico(&pngs)?
|
||||||
|
} else {
|
||||||
|
icon_png(size)?
|
||||||
|
};
|
||||||
|
std::fs::write(out, &bytes).map_err(|e| format!("{out}: {e}"))?;
|
||||||
|
println!("{}", pretty(&json!({"path": out, "bytes": bytes.len()})));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn icon_png(size: usize) -> Result<Vec<u8>, String> {
|
||||||
|
solidcraft_engine::render::png(size, size, app_icon::rgba(size)?).ok_or_else(|| "icon: PNG encoding failed".to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A Windows icon file holding PNG images (Vista and later read these).
|
||||||
|
fn ico(images: &[(usize, Vec<u8>)]) -> Result<Vec<u8>, String> {
|
||||||
|
let n = u16::try_from(images.len()).map_err(|_| "too many icon sizes")?;
|
||||||
|
let mut out = Vec::new();
|
||||||
|
out.extend_from_slice(&[0, 0, 1, 0]);
|
||||||
|
out.extend_from_slice(&n.to_le_bytes());
|
||||||
|
let mut offset = 6 + 16 * images.len();
|
||||||
|
for (size, data) in images {
|
||||||
|
let dim = if *size >= 256 { 0 } else { *size as u8 };
|
||||||
|
out.extend_from_slice(&[dim, dim, 0, 0, 1, 0, 32, 0]);
|
||||||
|
out.extend_from_slice(&u32::try_from(data.len()).map_err(|_| "icon too large")?.to_le_bytes());
|
||||||
|
out.extend_from_slice(&u32::try_from(offset).map_err(|_| "icon too large")?.to_le_bytes());
|
||||||
|
offset += data.len();
|
||||||
|
}
|
||||||
|
for (_, data) in images {
|
||||||
|
out.extend_from_slice(data);
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cmd_exec(args: &[String]) -> Result<(), String> {
|
||||||
|
install_renderer();
|
||||||
|
let id = args.first().ok_or_else(|| USAGE.to_string())?;
|
||||||
|
let p: Value = match args.get(1) {
|
||||||
|
Some(t) => serde_json::from_str(t).map_err(|e| format!("params: {e}"))?,
|
||||||
|
None => json!({}),
|
||||||
|
};
|
||||||
|
let mut s = Session::default();
|
||||||
|
let v = s.execute(id, &p).map_err(|e| e.to_string())?;
|
||||||
|
println!("{}", pretty(&v));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// MCP server on stdio: headless (optionally starting from a design or script) or bridged to
|
||||||
|
/// a running app's control port. stdout carries only protocol messages. Files the agent's tool
|
||||||
|
/// calls reach are confined to `solidcraft_mcp::agent_scope` unless `--allow-any-path` is given.
|
||||||
|
fn cmd_mcp(args: &[String]) -> Result<(), String> {
|
||||||
|
install_renderer();
|
||||||
|
let scope = (!args.iter().any(|a| a == "--allow-any-path"))
|
||||||
|
.then(|| solidcraft_mcp::agent_scope(flags(args, "--allow-path").into_iter().map(std::path::PathBuf::from)));
|
||||||
|
if let Some(s) = &scope {
|
||||||
|
let roots: Vec<String> = s.roots().iter().map(|r| r.display().to_string()).collect();
|
||||||
|
eprintln!(
|
||||||
|
"solidcraft mcp: files limited to {} and the open design's folder (--allow-path DIR adds one, --allow-any-path lifts the limit)",
|
||||||
|
roots.join(", ")
|
||||||
|
);
|
||||||
|
let design_dir = flag(args, "--in")
|
||||||
|
.and_then(|p| std::path::Path::new(p).parent())
|
||||||
|
.map(|d| if d.as_os_str().is_empty() { std::path::Path::new(".") } else { d });
|
||||||
|
if let Some(why) = design_dir.and_then(solidcraft_engine::io::vfs::design_folder_refusal) {
|
||||||
|
eprintln!("solidcraft mcp: the design's folder is left out because {why}; add it with --allow-path if you mean it");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let backend: Box<dyn solidcraft_mcp::Backend> = match (flag(args, "--connect"), flag(args, "--in")) {
|
||||||
|
(Some(_), Some(_)) => return Err("mcp: use either --connect or --in, not both".into()),
|
||||||
|
(Some(addr), None) => {
|
||||||
|
let Some(port) = addr.rsplit_once(':').and_then(|(_, p)| p.parse::<u16>().ok()).filter(|p| *p != 0) else {
|
||||||
|
return Err(format!("mcp: --connect wants HOST:PORT, such as 127.0.0.1:7878, not `{addr}`"));
|
||||||
|
};
|
||||||
|
// Serve without the app too: the tools connect once it runs, and say it isn't until then.
|
||||||
|
let mut remote = solidcraft_mcp::Remote::new(addr, flag(args, "--token"));
|
||||||
|
if let Err(e) = remote.try_connect() {
|
||||||
|
eprintln!(
|
||||||
|
"solidcraft mcp: no SolidCraft app at {addr} yet ({e}); start it with `solidcraft --control {port}` \
|
||||||
|
(or SOLIDCRAFT_CONTROL_PORT={port}), tool calls connect once it runs"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Box::new(remote)
|
||||||
|
}
|
||||||
|
(None, Some(path)) => Box::new(solidcraft_mcp::Headless::new(load(path)?)),
|
||||||
|
(None, None) => Box::new(solidcraft_mcp::Headless::default()),
|
||||||
|
};
|
||||||
|
let stdin = std::io::stdin();
|
||||||
|
let stdout = std::io::stdout();
|
||||||
|
solidcraft_mcp::Server::new(backend).with_path_scope(scope).serve(stdin.lock(), stdout.lock()).map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `save-stress <path> <rounds>`: save a design of a few hundred kilobytes `rounds` times, its
|
||||||
|
/// parameter `save_round` set to the round number each time.
|
||||||
|
fn cmd_save_stress(args: &[String]) -> Result<(), String> {
|
||||||
|
let (Some(path), Some(rounds)) = (args.first(), args.get(1).and_then(|n| n.parse::<u64>().ok())) else {
|
||||||
|
return Err("usage: solidcraft-cli save-stress <path> <rounds>".into());
|
||||||
|
};
|
||||||
|
let mut s = Session::default();
|
||||||
|
let filler = (0..3000).map(|i| solidcraft_engine::doc::Param {
|
||||||
|
name: format!("p{i}"),
|
||||||
|
expr: format!("{i} mm + 0.5 mm"),
|
||||||
|
unit: "mm".into(),
|
||||||
|
comment: "filler to make the file large".into(),
|
||||||
|
model: false,
|
||||||
|
});
|
||||||
|
s.doc_mut().params.extend(filler);
|
||||||
|
for r in 0..rounds {
|
||||||
|
s.doc_mut().set_param("save_round", &r.to_string(), None, None).map_err(|e| e.to_string())?;
|
||||||
|
s.execute("file.save", &json!({ "path": path })).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `bench-edit <script.json|recipe.json> <param> <expr>`: build the design, then time a
|
||||||
|
/// parameter edit, setting it back, undo and redo (ms and features recomputed each).
|
||||||
|
fn cmd_bench_edit(args: &[String]) -> Result<(), String> {
|
||||||
|
let (Some(path), Some(param), Some(expr)) = (args.first(), args.get(1), args.get(2)) else {
|
||||||
|
return Err("usage: solidcraft-cli bench-edit <script.json|recipe.json> <param> <expr>".into());
|
||||||
|
};
|
||||||
|
let v = read_json(path)?;
|
||||||
|
let script = if v.get("features").is_some() { recipe::to_script(&v)? } else { v };
|
||||||
|
let mut s = Session::default();
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
s.run_script(&script).map_err(|e| e.to_string())?;
|
||||||
|
let build = t.elapsed().as_secs_f64() * 1000.0;
|
||||||
|
let old = s.doc.all_param_exprs().into_iter().find(|(n, _, _)| n == param).map(|(_, e, _)| e).ok_or(format!("no parameter `{param}`"))?;
|
||||||
|
let mut out = vec![json!({"step": "build", "ms": build, "features": s.doc.features.len()})];
|
||||||
|
let mut time = |s: &mut Session, step: &str, id: &str, p: Value| -> Result<(), String> {
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
let r = s.execute(id, &p).map_err(|e| format!("{step}: {e}"))?;
|
||||||
|
let n = r.get("recomputed").cloned().unwrap_or_else(|| json!(s.model.last_recomputed));
|
||||||
|
out.push(json!({"step": step, "ms": t.elapsed().as_secs_f64() * 1000.0, "recomputed": n}));
|
||||||
|
Ok(())
|
||||||
|
};
|
||||||
|
let expr = expr.replace("{old}", &old);
|
||||||
|
time(&mut s, "edit", "parameters.change", json!({"name": param, "expression": expr}))?;
|
||||||
|
time(&mut s, "set back", "parameters.change", json!({"name": param, "expression": old}))?;
|
||||||
|
time(&mut s, "undo", "edit.undo", json!({}))?;
|
||||||
|
time(&mut s, "redo", "edit.redo", json!({}))?;
|
||||||
|
println!("{}", pretty(&json!(out)));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Separate file reading, JSON decoding/repair, timeline evaluation and display meshing.
|
||||||
|
pub(crate) fn cmd_bench_open(args: &[String]) -> Result<(), String> {
|
||||||
|
let path = args.first().ok_or("usage: solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only]")?;
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
let step = solidcraft_engine::io::is_step_path(path);
|
||||||
|
let limit = if step { solidcraft_engine::io::MAX_STEP_BYTES } else { solidcraft_engine::io::MAX_DESIGN_BYTES };
|
||||||
|
let bytes = solidcraft_engine::io::vfs::read(path, limit).map_err(|e| format!("{path}: {e}"))?;
|
||||||
|
let read_ms = t.elapsed().as_secs_f64() * 1000.0;
|
||||||
|
println!("{}", json!({"step": "read", "ms": read_ms, "bytes": bytes.len()}));
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
// The file as read, held until the timeline has evaluated it (as the import command does).
|
||||||
|
let mut read = None;
|
||||||
|
let doc = if step {
|
||||||
|
let imported = solidcraft_engine::io::step_import_feature(&bytes, path).map_err(|e| e.to_string())?;
|
||||||
|
let mut doc = solidcraft_engine::doc::Document::new(&imported.name);
|
||||||
|
doc.add_feature(imported.kind, Some(&imported.name)).map_err(|e| e.to_string())?;
|
||||||
|
read = Some(imported.import);
|
||||||
|
doc
|
||||||
|
} else {
|
||||||
|
solidcraft_engine::io::read_design(&bytes).map_err(|e| e.to_string())?
|
||||||
|
};
|
||||||
|
let parse_ms = t.elapsed().as_secs_f64() * 1000.0;
|
||||||
|
println!("{}", json!({"step": "parse", "ms": parse_ms, "features": doc.features.len()}));
|
||||||
|
if args.iter().any(|a| a == "--parse-only") {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
let s = Session::new(doc);
|
||||||
|
drop(read);
|
||||||
|
println!("{}", json!({"step": "evaluate", "ms": t.elapsed().as_secs_f64() * 1000.0}));
|
||||||
|
for r in &s.model.results {
|
||||||
|
println!("{}", json!({"step": "feature", "id": r.id, "name": r.name, "ms": r.ms, "error": r.error}));
|
||||||
|
}
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
let st = s.world_state();
|
||||||
|
// As the desktop app prepares a design it opened.
|
||||||
|
st.warm_meshes(|| true);
|
||||||
|
let triangles: usize = st.bodies.iter().map(|b| b.mesh().triangles.len()).sum();
|
||||||
|
println!("{}", json!({"step": "mesh", "ms": t.elapsed().as_secs_f64() * 1000.0, "bodies": st.bodies.len(), "triangles": triangles}));
|
||||||
|
// `--display LEVEL`: the display plans the viewport draws at that display quality, made as
|
||||||
|
// the GPU viewport makes them; `--edit NAME EXPR` then changes a parameter and times the
|
||||||
|
// evaluation and the plans of the bodies it changed.
|
||||||
|
let flag = |name: &str| args.iter().position(|a| a == name);
|
||||||
|
let Some(level) = flag("--display").and_then(|i| args.get(i + 1)) else { return Ok(()) };
|
||||||
|
let q = solidcraft_engine::doc::display_quality::DisplayQuality::parse(level).ok_or("--display: coarse, normal, fine or ultra")?;
|
||||||
|
let plans = |st: &solidcraft_engine::doc::ModelState| {
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
solidcraft_engine::kernel::for_each_on_threads(&st.bodies, 16, |b| {
|
||||||
|
let _ = b.plan_mesh_at(q);
|
||||||
|
});
|
||||||
|
let triangles: usize = st.bodies.iter().filter_map(|b| b.plan_mesh_at(q)).map(|m| m.triangles.len()).sum();
|
||||||
|
(t.elapsed().as_secs_f64() * 1000.0, triangles)
|
||||||
|
};
|
||||||
|
let (ms, triangles) = plans(&st);
|
||||||
|
println!("{}", json!({"step": "display", "quality": q.id(), "ms": ms, "triangles": triangles}));
|
||||||
|
if let Some(i) = flag("--edit") {
|
||||||
|
let (Some(name), Some(expr)) = (args.get(i + 1), args.get(i + 2)) else { return Err("--edit NAME EXPR".into()) };
|
||||||
|
let mut s = s;
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
s.execute("parameters.change", &json!({"name": name, "expression": expr})).map_err(|e| e.to_string())?;
|
||||||
|
let eval_ms = t.elapsed().as_secs_f64() * 1000.0;
|
||||||
|
let st = s.world_state();
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
st.warm_meshes(|| true);
|
||||||
|
let mesh_ms = t.elapsed().as_secs_f64() * 1000.0;
|
||||||
|
let (ms, triangles) = plans(&st);
|
||||||
|
println!(
|
||||||
|
"{}",
|
||||||
|
json!({"step": "edit", "quality": q.id(), "evaluate_ms": eval_ms, "mesh_ms": mesh_ms, "display_ms": ms, "triangles": triangles})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
#![allow(clippy::needless_range_loop)]
|
#![allow(clippy::needless_range_loop)]
|
||||||
|
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
use solvecraft_engine::geom::Vec3;
|
use solidcraft_engine::geom::Vec3;
|
||||||
|
|
||||||
use crate::spatial::{self, Tri};
|
use crate::spatial::{self, Tri};
|
||||||
use crate::{read_json, recipe};
|
use crate::{read_json, recipe};
|
||||||
@@ -88,7 +88,7 @@ fn check_case(dir: &str) -> Value {
|
|||||||
Ok(s) => s,
|
Ok(s) => s,
|
||||||
Err(e) => return json!({"case": name, "pass": false, "skipped": true, "error": e}),
|
Err(e) => return json!({"case": name, "pass": false, "skipped": true, "error": e}),
|
||||||
};
|
};
|
||||||
let mut s = solvecraft_engine::Session::default();
|
let mut s = solidcraft_engine::Session::default();
|
||||||
if let Err(e) = s.run_script(&script) {
|
if let Err(e) = s.run_script(&script) {
|
||||||
return json!({"case": name, "pass": false, "error": e.to_string(), "source": want.as_ref().map(|w| w["source"].clone())});
|
return json!({"case": name, "pass": false, "error": e.to_string(), "source": want.as_ref().map(|w| w["source"].clone())});
|
||||||
}
|
}
|
||||||
@@ -148,27 +148,27 @@ fn check_case(dir: &str) -> Value {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Export the session's bodies as STEP, validate the file and import it again.
|
/// Export the session's bodies as STEP, validate the file and import it again.
|
||||||
fn step_export_check(s: &solvecraft_engine::Session, volume: f64) -> (bool, String) {
|
fn step_export_check(s: &solidcraft_engine::Session, volume: f64) -> (bool, String) {
|
||||||
let st = s.model.state();
|
let st = s.model.state();
|
||||||
let bytes = match solvecraft_engine::io::export(&st, &[], solvecraft_engine::io::Format::Step, "oracle") {
|
let bytes = match solidcraft_engine::io::export(&st, &[], solidcraft_engine::io::Format::Step, "oracle") {
|
||||||
Ok(b) => b,
|
Ok(b) => b,
|
||||||
Err(e) => return (false, format!("export: {e}")),
|
Err(e) => return (false, format!("export: {e}")),
|
||||||
};
|
};
|
||||||
let text = String::from_utf8_lossy(&bytes);
|
let text = String::from_utf8_lossy(&bytes);
|
||||||
if let Err(e) = solvecraft_engine::kernel::step_validate(&text) {
|
if let Err(e) = solidcraft_engine::kernel::step_validate(&text) {
|
||||||
return (false, format!("invalid: {e}"));
|
return (false, format!("invalid: {e}"));
|
||||||
}
|
}
|
||||||
match solvecraft_engine::kernel::step_orientation_errors(&text) {
|
match solidcraft_engine::kernel::step_orientation_errors(&text) {
|
||||||
Ok(errs) if !errs.is_empty() => return (false, format!("faces inside out: {}", errs.join("; "))),
|
Ok(errs) if !errs.is_empty() => return (false, format!("faces inside out: {}", errs.join("; "))),
|
||||||
Err(e) => return (false, format!("orientation check: {e}")),
|
Err(e) => return (false, format!("orientation check: {e}")),
|
||||||
Ok(_) => {}
|
Ok(_) => {}
|
||||||
}
|
}
|
||||||
match solvecraft_engine::kernel::step_import(&text) {
|
match solidcraft_engine::kernel::step_import(&text) {
|
||||||
Ok(imp) if !imp.warnings.is_empty() => (false, format!("warnings: {}", imp.warnings.join("; "))),
|
Ok(imp) if !imp.warnings.is_empty() => (false, format!("warnings: {}", imp.warnings.join("; "))),
|
||||||
Ok(imp) if imp.bodies.len() != st.bodies.len() => (false, format!("{} bodies back of {}", imp.bodies.len(), st.bodies.len())),
|
Ok(imp) if imp.bodies.len() != st.bodies.len() => (false, format!("{} bodies back of {}", imp.bodies.len(), st.bodies.len())),
|
||||||
Ok(imp) => {
|
Ok(imp) => {
|
||||||
let m: Vec<_> = imp.bodies.iter().filter_map(|b| solvecraft_engine::kernel::measure(&b.body).ok()).collect();
|
let m: Vec<_> = imp.bodies.iter().filter_map(|b| solidcraft_engine::kernel::measure(&b.body).ok()).collect();
|
||||||
let m0: Vec<_> = st.bodies.iter().filter_map(|b| solvecraft_engine::kernel::measure(&b.body).ok()).collect();
|
let m0: Vec<_> = st.bodies.iter().filter_map(|b| solidcraft_engine::kernel::measure(&b.body).ok()).collect();
|
||||||
let v: f64 = m.iter().map(|x| x.volume).sum();
|
let v: f64 = m.iter().map(|x| x.volume).sum();
|
||||||
let (a, a0): (f64, f64) = (m.iter().map(|x| x.area).sum(), m0.iter().map(|x| x.area).sum());
|
let (a, a0): (f64, f64) = (m.iter().map(|x| x.area).sum(), m0.iter().map(|x| x.area).sum());
|
||||||
let faces: usize = imp.bodies.iter().map(|b| b.file_faces).sum();
|
let faces: usize = imp.bodies.iter().map(|b| b.file_faces).sum();
|
||||||
@@ -184,7 +184,7 @@ fn step_export_check(s: &solvecraft_engine::Session, volume: f64) -> (bool, Stri
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Our part as a triangle soup (curved faces refined onto the surface).
|
/// Our part as a triangle soup (curved faces refined onto the surface).
|
||||||
fn our_mesh(s: &solvecraft_engine::Session) -> Result<Vec<Tri>, String> {
|
fn our_mesh(s: &solidcraft_engine::Session) -> Result<Vec<Tri>, String> {
|
||||||
let mut ours: Vec<Tri> = Vec::new();
|
let mut ours: Vec<Tri> = Vec::new();
|
||||||
for b in &s.world_state().bodies {
|
for b in &s.world_state().bodies {
|
||||||
let m = b.body.tessellate_with(MESH_TOL, true).map_err(|e| e.to_string())?;
|
let m = b.body.tessellate_with(MESH_TOL, true).map_err(|e| e.to_string())?;
|
||||||
@@ -201,7 +201,7 @@ fn our_mesh(s: &solvecraft_engine::Session) -> Result<Vec<Tri>, String> {
|
|||||||
/// Compare our part with the reference triangulation: the symmetric surface distance, and the
|
/// Compare our part with the reference triangulation: the symmetric surface distance, and the
|
||||||
/// principal second moments of volume of both meshes (the shape's inertia, independent of how it
|
/// principal second moments of volume of both meshes (the shape's inertia, independent of how it
|
||||||
/// sits in space).
|
/// sits in space).
|
||||||
fn reference_checks(s: &solvecraft_engine::Session, stl: &str, tol: f64, c: &mut Checks) {
|
fn reference_checks(s: &solidcraft_engine::Session, stl: &str, tol: f64, c: &mut Checks) {
|
||||||
let (ours, reference) = match (our_mesh(s), spatial::read_stl(stl)) {
|
let (ours, reference) = match (our_mesh(s), spatial::read_stl(stl)) {
|
||||||
(Ok(o), Ok(r)) if !r.is_empty() => (o, r),
|
(Ok(o), Ok(r)) if !r.is_empty() => (o, r),
|
||||||
(Err(e), _) | (_, Err(e)) => return c.push("surface_distance_mm", json!(e), json!(format!("<= {tol}")), false),
|
(Err(e), _) | (_, Err(e)) => return c.push("surface_distance_mm", json!(e), json!(format!("<= {tol}")), false),
|
||||||
@@ -92,7 +92,7 @@ fn extent(f: &Value, p: &mut Value) {
|
|||||||
"symmetric" => {
|
"symmetric" => {
|
||||||
let full = e.get("is_full_length").and_then(Value::as_bool).unwrap_or(false);
|
let full = e.get("is_full_length").and_then(Value::as_bool).unwrap_or(false);
|
||||||
p["direction"] = json!("symmetric");
|
p["direction"] = json!("symmetric");
|
||||||
p["distance"] = if full { json!(format!("({}) / 2", expr_text(&dist))) } else { dist };
|
p["distance"] = if full { dist } else { json!(format!("({}) * 2", expr_text(&dist))) };
|
||||||
}
|
}
|
||||||
"two_sides" => {
|
"two_sides" => {
|
||||||
p["distance"] = e.get("side1").cloned().unwrap_or(Value::Null);
|
p["distance"] = e.get("side1").cloned().unwrap_or(Value::Null);
|
||||||
@@ -296,6 +296,17 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
|
|||||||
Some("sketch") => sketch_cmds(f, &mut out)?,
|
Some("sketch") => sketch_cmds(f, &mut out)?,
|
||||||
Some("extrude") => {
|
Some("extrude") => {
|
||||||
let mut p = json!({"sketch": profile_sketch(f), "profiles": profiles_of(f), "operation": op(f), "name": name, "body_names": bodies});
|
let mut p = json!({"sketch": profile_sketch(f), "profiles": profiles_of(f), "operation": op(f), "name": name, "body_names": bodies});
|
||||||
|
// Thin: {sketch, curves, thickness, side?, thickness2?} instead of profiles.
|
||||||
|
if let (Some(thin), Some(params)) = (f.get("thin"), p.as_object_mut()) {
|
||||||
|
params.remove("profiles");
|
||||||
|
params.insert("thin".into(), json!(true));
|
||||||
|
params.insert("sketch".into(), thin.get("sketch").cloned().unwrap_or(Value::Null));
|
||||||
|
for key in ["curves", "thickness", "side", "thickness2"] {
|
||||||
|
if let Some(v) = thin.get(key) {
|
||||||
|
params.insert(key.into(), v.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
extent(f, &mut p);
|
extent(f, &mut p);
|
||||||
out.push(json!({"command": "solid.extrude", "params": p}));
|
out.push(json!({"command": "solid.extrude", "params": p}));
|
||||||
}
|
}
|
||||||
@@ -412,6 +423,24 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
|
|||||||
"sketch": profile_sketch(f), "profiles": profiles_of(f), "path_sketch": path.get("sketch"), "path": path.get("curves"),
|
"sketch": profile_sketch(f), "profiles": profiles_of(f), "path_sketch": path.get("sketch"), "path": path.get("curves"),
|
||||||
"operation": op(f), "name": name, "body_names": bodies}}));
|
"operation": op(f), "name": name, "body_names": bodies}}));
|
||||||
}
|
}
|
||||||
|
// A boundary surface: a loop of one sketch's curves (`sketch`, `curves`), or a network
|
||||||
|
// (`u`, `v`), as `surface.boundary` takes them.
|
||||||
|
Some("boundary_surface") => {
|
||||||
|
let mut p = json!({"name": name});
|
||||||
|
for k in ["sketch", "curves", "continuity", "u", "v", "operation"] {
|
||||||
|
if let Some(v) = f.get(k) {
|
||||||
|
p[k] = v.clone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(b) = bodies.as_array().and_then(|a| a.first()) {
|
||||||
|
p["body_name"] = b.clone();
|
||||||
|
}
|
||||||
|
out.push(json!({"command": "surface.boundary", "params": p}));
|
||||||
|
}
|
||||||
|
Some("thicken") => out.push(json!({"command": "surface.thicken", "params": {
|
||||||
|
"bodies": f.get("bodies"), "thickness": f.get("thickness"), "symmetric": f.get("symmetric").cloned().unwrap_or(json!(false)),
|
||||||
|
"operation": op(f), "name": name}})),
|
||||||
|
Some("remove") => out.push(json!({"command": "solid.remove", "params": {"bodies": f.get("bodies"), "name": name}})),
|
||||||
Some("shell") => {
|
Some("shell") => {
|
||||||
let faces: Vec<Value> = f.get("faces_removed").and_then(Value::as_array).into_iter().flatten().filter_map(|x| x.get("point").cloned()).collect();
|
let faces: Vec<Value> = f.get("faces_removed").and_then(Value::as_array).into_iter().flatten().filter_map(|x| x.get("point").cloned()).collect();
|
||||||
out.push(json!({"command": "solid.shell", "params": {"faces": faces, "thickness": f.get("inside_thickness"), "name": name}}));
|
out.push(json!({"command": "solid.shell", "params": {"faces": faces, "thickness": f.get("inside_thickness"), "name": name}}));
|
||||||
@@ -514,7 +543,23 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
|
|||||||
out.push(json!({"command": "solid.mirror", "params": p}));
|
out.push(json!({"command": "solid.mirror", "params": p}));
|
||||||
}
|
}
|
||||||
Some("fillet") => {
|
Some("fillet") => {
|
||||||
out.push(json!({"command": "solid.fillet", "params": {"edges": edge_points(f), "radius": f.get("radius"), "name": name}}))
|
let mut p = json!({"edges": edge_points(f), "radius": f.get("radius"), "name": name});
|
||||||
|
// Constant radius (the default), chord length, or a radius varying along each edge
|
||||||
|
// (`radius` at the end nearest `start`, `radius2` at the other, `mid` between,
|
||||||
|
// `smooth`), or a B-spline along each edge (`radius` its first control radius,
|
||||||
|
// `radii` the rest, `knots`); `fit` for a radius too large for the geometry.
|
||||||
|
match f.get("type").and_then(Value::as_str) {
|
||||||
|
Some("chord_length") => p["type"] = json!("chord"),
|
||||||
|
Some("variable_radius") => p["type"] = json!("variable"),
|
||||||
|
Some("spline_radius") => p["type"] = json!("spline"),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
for key in ["radius2", "start", "mid", "smooth", "fit", "radii", "knots"] {
|
||||||
|
if let Some(v) = f.get(key) {
|
||||||
|
p[key] = v.clone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out.push(json!({"command": "solid.fillet", "params": p}))
|
||||||
}
|
}
|
||||||
Some("chamfer") => {
|
Some("chamfer") => {
|
||||||
out.push(json!({"command": "solid.chamfer", "params": {"edges": edge_points(f), "distance": f.get("distance"), "name": name}}))
|
out.push(json!({"command": "solid.chamfer", "params": {"edges": edge_points(f), "distance": f.get("distance"), "name": name}}))
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
//! Complete headless image-job workflow through the same engine commands as the UI/MCP.
|
||||||
|
use serde_json::json;
|
||||||
|
use solidcraft_engine::{
|
||||||
|
doc::render_settings::RenderSetup,
|
||||||
|
render::job::{CpuHost, JobId, Phase},
|
||||||
|
};
|
||||||
|
|
||||||
|
pub fn run(args: &[String]) -> Result<(), String> {
|
||||||
|
let input = args.first().filter(|p| !p.starts_with('-')).ok_or("render requires an input design or script")?;
|
||||||
|
let mut out = None;
|
||||||
|
let mut setup = None;
|
||||||
|
let mut width = None;
|
||||||
|
let mut height = None;
|
||||||
|
let mut transparent = false;
|
||||||
|
let mut overwrite = false;
|
||||||
|
let mut timeout = 120u64;
|
||||||
|
let mut i = 1;
|
||||||
|
while let Some(arg) = args.get(i) {
|
||||||
|
match arg.as_str() {
|
||||||
|
"--transparent" => transparent = true,
|
||||||
|
"--overwrite" => overwrite = true,
|
||||||
|
"--out" | "--setup" | "--width" | "--height" | "--timeout" => {
|
||||||
|
i += 1;
|
||||||
|
let value = args.get(i).ok_or_else(|| format!("missing value for {arg}"))?;
|
||||||
|
match arg.as_str() {
|
||||||
|
"--out" => out = Some(value.clone()),
|
||||||
|
"--setup" => setup = Some(value.clone()),
|
||||||
|
"--width" => width = Some(value.parse::<u32>().map_err(|_| "invalid width")?),
|
||||||
|
"--height" => height = Some(value.parse::<u32>().map_err(|_| "invalid height")?),
|
||||||
|
_ => timeout = value.parse::<u64>().map_err(|_| "invalid timeout")?,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => return Err(format!("unknown render option: {arg}")),
|
||||||
|
}
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
|
if !(1..=3600).contains(&timeout) {
|
||||||
|
return Err("render timeout must be 1..3600 seconds".into());
|
||||||
|
}
|
||||||
|
let out = out.ok_or("render requires --out FILE.png")?;
|
||||||
|
let mut session = crate::load(input)?;
|
||||||
|
session.set_render_job_host(Some(CpuHost::for_platform().map_err(|e| e.to_string())?)).map_err(|e| e.to_string())?;
|
||||||
|
session.execute("render.scene", &json!({})).map_err(|e| e.to_string())?;
|
||||||
|
let mut settings = if let Some(name) = setup {
|
||||||
|
session.doc.render.setups.get(&name).cloned().ok_or("no saved render setup with that name")?
|
||||||
|
} else {
|
||||||
|
let mut settings = RenderSetup::default();
|
||||||
|
if let Some(camera) = session.camera {
|
||||||
|
settings.camera = camera;
|
||||||
|
} else {
|
||||||
|
settings.camera.fit(&solidcraft_engine::product_scene::extract(&session).map_err(|e| e.to_string())?.bounds);
|
||||||
|
}
|
||||||
|
settings
|
||||||
|
};
|
||||||
|
if let Some(width) = width {
|
||||||
|
settings.width = width;
|
||||||
|
}
|
||||||
|
if let Some(height) = height {
|
||||||
|
settings.height = height;
|
||||||
|
}
|
||||||
|
let params = json!({"settings":settings,"transparent_background":transparent});
|
||||||
|
let preflight = session.execute("render.preflight", ¶ms).map_err(|e| e.to_string())?;
|
||||||
|
let started = session.execute("render.start", ¶ms).map_err(|e| e.to_string())?;
|
||||||
|
let id: JobId = serde_json::from_value(started["job"].clone()).map_err(|e| e.to_string())?;
|
||||||
|
let handle = session.render_job_handle(id).map_err(|e| e.to_string())?;
|
||||||
|
let status = match handle.wait_timeout(std::time::Duration::from_secs(timeout)) {
|
||||||
|
Ok(status) => status,
|
||||||
|
Err(e) => {
|
||||||
|
let _ = session.execute("render.cancel", &json!({"job":id}));
|
||||||
|
return Err(e.to_string());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if status.progress.phase != Phase::Completed {
|
||||||
|
return Err(status.error.map_or_else(|| "render cancelled".into(), |e| e.to_string()));
|
||||||
|
}
|
||||||
|
let exported = session.execute("render.export", &json!({"job":id,"path":out,"overwrite":overwrite})).map_err(|e| e.to_string())?;
|
||||||
|
println!("{}", crate::pretty(&json!({"preflight":preflight,"export":exported})));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
File renamed without changes.
File diff suppressed because it is too large.
Load diff
+2
-2
@@ -4,7 +4,7 @@ use std::process::{Command, Stdio};
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn registry_output_is_complete_json() {
|
fn registry_output_is_complete_json() {
|
||||||
let output = Command::new(env!("CARGO_BIN_EXE_solvecraft-cli")).arg("commands").output().unwrap();
|
let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).arg("commands").output().unwrap();
|
||||||
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
let registry: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap();
|
let registry: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap();
|
||||||
let commands = registry.as_array().unwrap();
|
let commands = registry.as_array().unwrap();
|
||||||
@@ -16,7 +16,7 @@ fn registry_output_is_complete_json() {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn closed_registry_pipe_exits_without_panicking() {
|
fn closed_registry_pipe_exits_without_panicking() {
|
||||||
let mut child = Command::new(env!("CARGO_BIN_EXE_solvecraft-cli")).arg("commands").stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().unwrap();
|
let mut child = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).arg("commands").stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().unwrap();
|
||||||
// Close our read end before waiting. No sleeps or timing threshold are needed:
|
// Close our read end before waiting. No sleeps or timing threshold are needed:
|
||||||
// the registry is larger than the pipe buffer, so it cannot all be written first.
|
// the registry is larger than the pipe buffer, so it cannot all be written first.
|
||||||
drop(child.stdout.take());
|
drop(child.stdout.take());
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# Design file corpus
|
||||||
|
|
||||||
|
Designs saved by older SolidCraft builds. `tests/design_corpus.rs` opens each one with the
|
||||||
|
current build and checks that it evaluates as it did when saved (the `.expected.json` next to
|
||||||
|
it is `solidcraft-cli eval` of that file by the build that saved it: bodies, volumes, areas,
|
||||||
|
world bounding boxes), that it is upgraded to the current file format, and that damaged and
|
||||||
|
hostile variants of it never panic.
|
||||||
|
|
||||||
|
| File | Saved by | Era |
|
||||||
|
|---|---|---|
|
||||||
|
| `m0-box-fillet-hole` | 3714342 | M0: sketch, parameters, extrude, fillet, cut |
|
||||||
|
| `m0-revolve-primitives` | 3714342 | M0: revolve, primitives, combine, chamfer, timeline edit |
|
||||||
|
| `components-arm` | 97d03e3 | components and occurrences: move, copy, Paste New, ground |
|
||||||
|
| `joints-hinge` | c2309eb | joints: revolute hinge driven by a parameter |
|
||||||
|
| `modern-sheet-metal` | bd98035 | sheet metal contour flange (oracle 72) |
|
||||||
|
| `modern-path-pattern` | bd98035 | pattern on path (oracle 53) |
|
||||||
|
| `modern-plastic` | bd98035 | shell, lip, boss, rest, snap fit, plastic rule |
|
||||||
|
| `naming-split-pieces` | 9a979cf | format 13 names: a slot splits the top; fillet, chamfer and offset face name its pieces by number (`F2:top#2`) |
|
||||||
|
| `move-bodies` | 00baf1d | `solid.move` before it could copy: two bodies, one translated in place, one translated and turned 90 deg about Z (no `copy` key anywhere in the file) |
|
||||||
|
| `split-body-pieces` | v0.3.2 (07e263d) | a slot along X cuts a block into two bodies; a fillet, a chamfer and an appearance refer to the pieces by body name (`Body1`, `Body1 (1)`) |
|
||||||
|
| `issue-489-stacked-join` | v0.6.0 (809ecf7), desktop | a 70 × 84 extrude, then a 70 × 62 strip joined on its top face, sketched partly over the face's projected edges (issue #489; expected values from main at 2880525) |
|
||||||
|
| `issue-616-lid-ribs` | v0.7.0 (a9879fa), CLI | a rounded lid with a skirt ring, a window and a slot cut through, then four ribs joined on the plate over the skirt, flush with the window's sides; v0.7.0 displaced the ribs and left a slit through the skirt and plate (issue #616; script `examples/regressions/lid_ribs_flush_with_window.json`, expected values from the fix) |
|
||||||
|
|
||||||
|
The scripts that made them are in `scripts/` (`issue-489-stacked-join` was drawn in the desktop
|
||||||
|
app and has none; `issue-616-lid-ribs` is made by its regression script). Every flat face of every final body must also take an attached sketch and an
|
||||||
|
offset plane; the faces that can't yet are listed with their issues in `design_corpus.rs`.
|
||||||
|
|
||||||
|
Never regenerate a file with a newer build: the point is that it was written by the old one. Add new files for new eras instead.
|
||||||
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/1",
|
"format": "solidcraft/1",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [],
|
"params": [],
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
{
|
||||||
|
"bodies": [
|
||||||
|
{
|
||||||
|
"area_mm2": 25751.999999999945,
|
||||||
|
"bbox": {
|
||||||
|
"max": [
|
||||||
|
35.0,
|
||||||
|
42.0,
|
||||||
|
48.00000000000001
|
||||||
|
],
|
||||||
|
"min": [
|
||||||
|
-35.0,
|
||||||
|
-42.000000000000014,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"center_of_mass": [
|
||||||
|
5.524909928104648e-14,
|
||||||
|
-1.0945382096961234e-12,
|
||||||
|
22.366336633663238
|
||||||
|
],
|
||||||
|
"density_g_cm3": 1.29,
|
||||||
|
"edges": 24,
|
||||||
|
"face_types": {
|
||||||
|
"plane": 10
|
||||||
|
},
|
||||||
|
"faces": 10,
|
||||||
|
"kernel": {
|
||||||
|
"edges": 24,
|
||||||
|
"faces": 10,
|
||||||
|
"shells": 1,
|
||||||
|
"vertices": 16
|
||||||
|
},
|
||||||
|
"mass_g": 328.33079999999734,
|
||||||
|
"material": "Default",
|
||||||
|
"name": "Body1",
|
||||||
|
"vertices": 16,
|
||||||
|
"volume_mm3": 254519.9999999979
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"body_count": 1,
|
||||||
|
"params": [
|
||||||
|
{
|
||||||
|
"comment": "",
|
||||||
|
"error": null,
|
||||||
|
"expression": "84",
|
||||||
|
"model": true,
|
||||||
|
"name": "d1",
|
||||||
|
"unit": "mm",
|
||||||
|
"value": 84.0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"comment": "",
|
||||||
|
"error": null,
|
||||||
|
"expression": "70",
|
||||||
|
"model": true,
|
||||||
|
"name": "d2",
|
||||||
|
"unit": "mm",
|
||||||
|
"value": 70.0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"comment": "",
|
||||||
|
"error": null,
|
||||||
|
"expression": "62",
|
||||||
|
"model": true,
|
||||||
|
"name": "d4",
|
||||||
|
"unit": "mm",
|
||||||
|
"value": 62.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"sketches": [
|
||||||
|
{
|
||||||
|
"curves": 6,
|
||||||
|
"dof": 0,
|
||||||
|
"id": 1,
|
||||||
|
"name": "Sketch1",
|
||||||
|
"profiles": 1,
|
||||||
|
"status": "solved",
|
||||||
|
"visible": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"curves": 10,
|
||||||
|
"dof": 1,
|
||||||
|
"id": 3,
|
||||||
|
"name": "Sketch2",
|
||||||
|
"profiles": 3,
|
||||||
|
"status": "solved",
|
||||||
|
"visible": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"timeline": [
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 1,
|
||||||
|
"ms": 0.131943,
|
||||||
|
"name": "Sketch1",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "Sketch",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 2,
|
||||||
|
"ms": 1.0812709999999999,
|
||||||
|
"name": "Extrude1",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "ExtrudeFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 3,
|
||||||
|
"ms": 0.450002,
|
||||||
|
"name": "Sketch2",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "Sketch",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 4,
|
||||||
|
"ms": 5.191514000000001,
|
||||||
|
"name": "Extrude2",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "ExtrudeFeature",
|
||||||
|
"warning": null
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"total": {
|
||||||
|
"area_mm2": 25751.999999999945,
|
||||||
|
"edges": 24,
|
||||||
|
"faces": 10,
|
||||||
|
"mass_g": 328.33079999999734,
|
||||||
|
"vertices": 16,
|
||||||
|
"volume_mm3": 254519.9999999979
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,539 @@
|
|||||||
|
{
|
||||||
|
"features": [
|
||||||
|
{
|
||||||
|
"id": 1,
|
||||||
|
"name": "Sketch1",
|
||||||
|
"plane": {
|
||||||
|
"name": "XY",
|
||||||
|
"type": "origin"
|
||||||
|
},
|
||||||
|
"sketch": {
|
||||||
|
"constraints": [
|
||||||
|
{
|
||||||
|
"id": "k1",
|
||||||
|
"l": 0,
|
||||||
|
"type": "horizontal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k2",
|
||||||
|
"l": 2,
|
||||||
|
"type": "horizontal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k3",
|
||||||
|
"l": 1,
|
||||||
|
"type": "vertical"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k4",
|
||||||
|
"l": 3,
|
||||||
|
"type": "vertical"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k5",
|
||||||
|
"l": 4,
|
||||||
|
"p": 5,
|
||||||
|
"type": "midpoint"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k6",
|
||||||
|
"p": 0,
|
||||||
|
"q": 5,
|
||||||
|
"type": "coincident"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k7",
|
||||||
|
"l": 1,
|
||||||
|
"param": "d1",
|
||||||
|
"type": "length",
|
||||||
|
"value": 84.0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k8",
|
||||||
|
"l": 0,
|
||||||
|
"param": "d2",
|
||||||
|
"type": "length",
|
||||||
|
"value": 70.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"counters": {
|
||||||
|
"k": 8,
|
||||||
|
"l": 6,
|
||||||
|
"p": 5
|
||||||
|
},
|
||||||
|
"curves": [
|
||||||
|
{
|
||||||
|
"a": 1,
|
||||||
|
"b": 2,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l1",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 2,
|
||||||
|
"b": 3,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l2",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 3,
|
||||||
|
"b": 4,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l3",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 4,
|
||||||
|
"b": 1,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l4",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 1,
|
||||||
|
"b": 3,
|
||||||
|
"construction": true,
|
||||||
|
"id": "l5",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 2,
|
||||||
|
"b": 4,
|
||||||
|
"construction": true,
|
||||||
|
"id": "l6",
|
||||||
|
"type": "line"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"points": [
|
||||||
|
{
|
||||||
|
"fixed": true,
|
||||||
|
"id": "origin",
|
||||||
|
"pos": [
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p1",
|
||||||
|
"pos": [
|
||||||
|
-35.0,
|
||||||
|
-42.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p2",
|
||||||
|
"pos": [
|
||||||
|
35.0,
|
||||||
|
-42.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p3",
|
||||||
|
"pos": [
|
||||||
|
35.0,
|
||||||
|
42.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p4",
|
||||||
|
"pos": [
|
||||||
|
-35.0,
|
||||||
|
42.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p5",
|
||||||
|
"pos": [
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "sketch"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extent": {
|
||||||
|
"direction": "positive",
|
||||||
|
"distance": "30"
|
||||||
|
},
|
||||||
|
"id": 2,
|
||||||
|
"name": "Extrude1",
|
||||||
|
"operation": "new_body",
|
||||||
|
"param_names": [
|
||||||
|
"d3"
|
||||||
|
],
|
||||||
|
"profiles": {
|
||||||
|
"loops": [
|
||||||
|
[
|
||||||
|
"l1",
|
||||||
|
"l2",
|
||||||
|
"l3",
|
||||||
|
"l4"
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"type": "curves"
|
||||||
|
},
|
||||||
|
"sketch": 1,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "extrude"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 3,
|
||||||
|
"name": "Sketch2",
|
||||||
|
"plane": {
|
||||||
|
"anchor": {
|
||||||
|
"author_path": [],
|
||||||
|
"component": 0,
|
||||||
|
"coordinates": [
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
],
|
||||||
|
"path": [],
|
||||||
|
"target": {
|
||||||
|
"body": "Body1",
|
||||||
|
"certificate": {
|
||||||
|
"high": true,
|
||||||
|
"holes": [],
|
||||||
|
"kind": "extrude_cap",
|
||||||
|
"outer": [
|
||||||
|
"l1",
|
||||||
|
"l2",
|
||||||
|
"l3",
|
||||||
|
"l4"
|
||||||
|
],
|
||||||
|
"sketch": 1
|
||||||
|
},
|
||||||
|
"name": "F2:cap:high:ed6121d9bed14d3fd103f347231990d103349f33b7874ad292d3c4d3539266c3",
|
||||||
|
"origin_feature": 2,
|
||||||
|
"point": [
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
30.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"x_axis": [
|
||||||
|
1.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"at": [
|
||||||
|
2.012802880253332,
|
||||||
|
7.4635742926698185,
|
||||||
|
30.000000000000114
|
||||||
|
],
|
||||||
|
"name": "F2:top",
|
||||||
|
"plane": {
|
||||||
|
"origin": [
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
30.0
|
||||||
|
],
|
||||||
|
"x_dir": [
|
||||||
|
1.0,
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
],
|
||||||
|
"y_dir": [
|
||||||
|
0.0,
|
||||||
|
1.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"type": "face"
|
||||||
|
},
|
||||||
|
"sketch": {
|
||||||
|
"constraints": [
|
||||||
|
{
|
||||||
|
"id": "k1",
|
||||||
|
"l": 4,
|
||||||
|
"type": "horizontal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k2",
|
||||||
|
"l": 6,
|
||||||
|
"type": "horizontal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k3",
|
||||||
|
"l": 5,
|
||||||
|
"type": "vertical"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k4",
|
||||||
|
"l": 7,
|
||||||
|
"type": "vertical"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k5",
|
||||||
|
"l": 8,
|
||||||
|
"p": 9,
|
||||||
|
"type": "midpoint"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k6",
|
||||||
|
"p": 0,
|
||||||
|
"q": 9,
|
||||||
|
"type": "coincident"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k7",
|
||||||
|
"p": 7,
|
||||||
|
"param": "d4",
|
||||||
|
"q": 6,
|
||||||
|
"text": [
|
||||||
|
-0.2,
|
||||||
|
9.200000000000003
|
||||||
|
],
|
||||||
|
"type": "distance",
|
||||||
|
"value": 62.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"counters": {
|
||||||
|
"j": 1,
|
||||||
|
"k": 7,
|
||||||
|
"l": 10,
|
||||||
|
"p": 9
|
||||||
|
},
|
||||||
|
"curves": [
|
||||||
|
{
|
||||||
|
"a": 1,
|
||||||
|
"b": 2,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l1",
|
||||||
|
"link": "j1",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 3,
|
||||||
|
"b": 1,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l2",
|
||||||
|
"link": "j1",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 2,
|
||||||
|
"b": 4,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l3",
|
||||||
|
"link": "j1",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 4,
|
||||||
|
"b": 3,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l4",
|
||||||
|
"link": "j1",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 5,
|
||||||
|
"b": 6,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l5",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 6,
|
||||||
|
"b": 7,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l6",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 7,
|
||||||
|
"b": 8,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l7",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 8,
|
||||||
|
"b": 5,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l8",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 5,
|
||||||
|
"b": 7,
|
||||||
|
"construction": true,
|
||||||
|
"id": "l9",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 6,
|
||||||
|
"b": 8,
|
||||||
|
"construction": true,
|
||||||
|
"id": "l10",
|
||||||
|
"type": "line"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"links": [
|
||||||
|
{
|
||||||
|
"auto_face": true,
|
||||||
|
"face_name": "F2:cap:high:ed6121d9bed14d3fd103f347231990d103349f33b7874ad292d3c4d3539266c3",
|
||||||
|
"id": "j1",
|
||||||
|
"kind": "project",
|
||||||
|
"source": {
|
||||||
|
"at": [
|
||||||
|
11.666666666666666,
|
||||||
|
-13.999999999999995,
|
||||||
|
30.0
|
||||||
|
],
|
||||||
|
"body": "Body1",
|
||||||
|
"type": "face"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"points": [
|
||||||
|
{
|
||||||
|
"fixed": true,
|
||||||
|
"id": "origin",
|
||||||
|
"pos": [
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": true,
|
||||||
|
"id": "p1",
|
||||||
|
"link": "j1",
|
||||||
|
"pos": [
|
||||||
|
-35.0,
|
||||||
|
-42.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": true,
|
||||||
|
"id": "p2",
|
||||||
|
"link": "j1",
|
||||||
|
"pos": [
|
||||||
|
-35.0,
|
||||||
|
42.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": true,
|
||||||
|
"id": "p3",
|
||||||
|
"link": "j1",
|
||||||
|
"pos": [
|
||||||
|
35.0,
|
||||||
|
-42.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": true,
|
||||||
|
"id": "p4",
|
||||||
|
"link": "j1",
|
||||||
|
"pos": [
|
||||||
|
35.0,
|
||||||
|
42.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p5",
|
||||||
|
"pos": [
|
||||||
|
-35.0,
|
||||||
|
-31.000000000002185
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p6",
|
||||||
|
"pos": [
|
||||||
|
35.0,
|
||||||
|
-31.00000000000349
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p7",
|
||||||
|
"pos": [
|
||||||
|
35.0,
|
||||||
|
30.99999999999603
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p8",
|
||||||
|
"pos": [
|
||||||
|
-35.0,
|
||||||
|
30.999999999995318
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p9",
|
||||||
|
"pos": [
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "sketch"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extent": {
|
||||||
|
"direction": "positive",
|
||||||
|
"distance": "18"
|
||||||
|
},
|
||||||
|
"id": 4,
|
||||||
|
"name": "Extrude2",
|
||||||
|
"operation": "join",
|
||||||
|
"param_names": [
|
||||||
|
"d5"
|
||||||
|
],
|
||||||
|
"profiles": {
|
||||||
|
"loops": [
|
||||||
|
[
|
||||||
|
"l1",
|
||||||
|
"l5",
|
||||||
|
"l4",
|
||||||
|
"l7"
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"type": "curves"
|
||||||
|
},
|
||||||
|
"sketch": 3,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "extrude"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"format": "solidcraft/14",
|
||||||
|
"name": "Untitled",
|
||||||
|
"next_id": 6,
|
||||||
|
"params": [
|
||||||
|
{
|
||||||
|
"expr": "84",
|
||||||
|
"model": true,
|
||||||
|
"name": "d1",
|
||||||
|
"unit": "mm"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"expr": "70",
|
||||||
|
"model": true,
|
||||||
|
"name": "d2",
|
||||||
|
"unit": "mm"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"expr": "62",
|
||||||
|
"model": true,
|
||||||
|
"name": "d4",
|
||||||
|
"unit": "mm"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"units": "mm"
|
||||||
|
}
|
||||||
@@ -0,0 +1,227 @@
|
|||||||
|
{
|
||||||
|
"bodies": [
|
||||||
|
{
|
||||||
|
"area_mm2": 8430.29544246263,
|
||||||
|
"bbox": {
|
||||||
|
"max": [
|
||||||
|
176.8000000000002,
|
||||||
|
89.30000000000001,
|
||||||
|
14.100000000000001
|
||||||
|
],
|
||||||
|
"min": [
|
||||||
|
99.99999999999991,
|
||||||
|
-1.820765760385257e-14,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"center_of_mass": [
|
||||||
|
138.3999999716193,
|
||||||
|
51.04392591016203,
|
||||||
|
2.0990634391586322
|
||||||
|
],
|
||||||
|
"density_g_cm3": 1.29,
|
||||||
|
"edges": 156,
|
||||||
|
"face_types": {
|
||||||
|
"cylinder": 4,
|
||||||
|
"plane": 50
|
||||||
|
},
|
||||||
|
"faces": 54,
|
||||||
|
"kernel": {
|
||||||
|
"edges": 156,
|
||||||
|
"faces": 54,
|
||||||
|
"shells": 1,
|
||||||
|
"vertices": 104
|
||||||
|
},
|
||||||
|
"mass_g": 9.101726874183207,
|
||||||
|
"material": "Default",
|
||||||
|
"name": "Lid",
|
||||||
|
"vertices": 104,
|
||||||
|
"volume_mm3": 7055.602228048997
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"body_count": 1,
|
||||||
|
"params": [],
|
||||||
|
"sketches": [
|
||||||
|
{
|
||||||
|
"curves": 8,
|
||||||
|
"dof": 8,
|
||||||
|
"id": 3,
|
||||||
|
"name": "Skirt",
|
||||||
|
"profiles": 2,
|
||||||
|
"status": "solved",
|
||||||
|
"visible": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"timeline": [
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 1,
|
||||||
|
"ms": 1.178957,
|
||||||
|
"name": "Box1",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "BoxFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 2,
|
||||||
|
"ms": 83.24342399999999,
|
||||||
|
"name": "Fillet1",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "FilletFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 3,
|
||||||
|
"ms": 0.150889,
|
||||||
|
"name": "Skirt",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "Sketch",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 4,
|
||||||
|
"ms": 94.465481,
|
||||||
|
"name": "Extrude1",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "ExtrudeFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 5,
|
||||||
|
"ms": 50.426736,
|
||||||
|
"name": "Box2",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "BoxFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 6,
|
||||||
|
"ms": 40.383005,
|
||||||
|
"name": "Box3",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "BoxFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 7,
|
||||||
|
"ms": 59.041461000000005,
|
||||||
|
"name": "Box4",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "BoxFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [
|
||||||
|
{
|
||||||
|
"face_shift_mm": 0.0,
|
||||||
|
"rotation_rad": 0.0,
|
||||||
|
"strategy": "planar_fallback",
|
||||||
|
"tolerance_mm": 0.0,
|
||||||
|
"translation_mm": 0.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 8,
|
||||||
|
"ms": 562.5477970000001,
|
||||||
|
"name": "Rib1",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "BoxFeature",
|
||||||
|
"warning": "Boolean retry: exact planar fallback (no displacement)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 9,
|
||||||
|
"ms": 89.56076,
|
||||||
|
"name": "Rib2",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "BoxFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 10,
|
||||||
|
"ms": 65.330634,
|
||||||
|
"name": "Rib3",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "BoxFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 11,
|
||||||
|
"ms": 97.229403,
|
||||||
|
"name": "Rib4",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "BoxFeature",
|
||||||
|
"warning": null
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"total": {
|
||||||
|
"area_mm2": 8430.29544246263,
|
||||||
|
"edges": 156,
|
||||||
|
"faces": 54,
|
||||||
|
"mass_g": 9.101726874183207,
|
||||||
|
"vertices": 104,
|
||||||
|
"volume_mm3": 7055.602228048997
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,507 @@
|
|||||||
|
{
|
||||||
|
"features": [
|
||||||
|
{
|
||||||
|
"body_names": [
|
||||||
|
"Lid"
|
||||||
|
],
|
||||||
|
"corner": [
|
||||||
|
100.0,
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
],
|
||||||
|
"height": "2.4",
|
||||||
|
"id": 1,
|
||||||
|
"length": "76.8",
|
||||||
|
"name": "Box1",
|
||||||
|
"operation": "new_body",
|
||||||
|
"param_names": [
|
||||||
|
"d1",
|
||||||
|
"d2",
|
||||||
|
"d3"
|
||||||
|
],
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "box",
|
||||||
|
"width": "89.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"edge_names": [
|
||||||
|
"F1:-x|F1:-y",
|
||||||
|
"F1:+x|F1:-y",
|
||||||
|
"F1:+y|F1:-x",
|
||||||
|
"F1:+x|F1:+y"
|
||||||
|
],
|
||||||
|
"edge_refs": [
|
||||||
|
{
|
||||||
|
"dir": [
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
-1.0
|
||||||
|
],
|
||||||
|
"max": [
|
||||||
|
176.8,
|
||||||
|
89.3,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"min": [
|
||||||
|
100.0,
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"dir": [
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
1.0
|
||||||
|
],
|
||||||
|
"max": [
|
||||||
|
176.8,
|
||||||
|
89.3,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"min": [
|
||||||
|
100.0,
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"dir": [
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
1.0
|
||||||
|
],
|
||||||
|
"max": [
|
||||||
|
176.8,
|
||||||
|
89.3,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"min": [
|
||||||
|
100.0,
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"dir": [
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
1.0
|
||||||
|
],
|
||||||
|
"max": [
|
||||||
|
176.8,
|
||||||
|
89.3,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"min": [
|
||||||
|
100.0,
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"edges": [
|
||||||
|
[
|
||||||
|
100.0,
|
||||||
|
0.0,
|
||||||
|
1.2
|
||||||
|
],
|
||||||
|
[
|
||||||
|
176.8,
|
||||||
|
0.0,
|
||||||
|
1.2
|
||||||
|
],
|
||||||
|
[
|
||||||
|
100.0,
|
||||||
|
89.3,
|
||||||
|
1.2
|
||||||
|
],
|
||||||
|
[
|
||||||
|
176.8,
|
||||||
|
89.3,
|
||||||
|
1.2
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"id": 2,
|
||||||
|
"name": "Fillet1",
|
||||||
|
"param_names": [
|
||||||
|
"d4"
|
||||||
|
],
|
||||||
|
"radius": "3",
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "fillet"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 3,
|
||||||
|
"name": "Skirt",
|
||||||
|
"param_names": [
|
||||||
|
"d5"
|
||||||
|
],
|
||||||
|
"plane": {
|
||||||
|
"base": {
|
||||||
|
"name": "XY",
|
||||||
|
"type": "origin"
|
||||||
|
},
|
||||||
|
"distance": "2.4",
|
||||||
|
"type": "offset"
|
||||||
|
},
|
||||||
|
"sketch": {
|
||||||
|
"constraints": [
|
||||||
|
{
|
||||||
|
"id": "k1",
|
||||||
|
"l": 0,
|
||||||
|
"type": "horizontal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k2",
|
||||||
|
"l": 2,
|
||||||
|
"type": "horizontal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k3",
|
||||||
|
"l": 1,
|
||||||
|
"type": "vertical"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k4",
|
||||||
|
"l": 3,
|
||||||
|
"type": "vertical"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k5",
|
||||||
|
"l": 4,
|
||||||
|
"type": "horizontal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k6",
|
||||||
|
"l": 6,
|
||||||
|
"type": "horizontal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k7",
|
||||||
|
"l": 5,
|
||||||
|
"type": "vertical"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "k8",
|
||||||
|
"l": 7,
|
||||||
|
"type": "vertical"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"counters": {
|
||||||
|
"k": 8,
|
||||||
|
"l": 8,
|
||||||
|
"p": 8
|
||||||
|
},
|
||||||
|
"curves": [
|
||||||
|
{
|
||||||
|
"a": 1,
|
||||||
|
"b": 2,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l1",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 2,
|
||||||
|
"b": 3,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l2",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 3,
|
||||||
|
"b": 4,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l3",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 4,
|
||||||
|
"b": 1,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l4",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 5,
|
||||||
|
"b": 6,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l5",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 6,
|
||||||
|
"b": 7,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l6",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 7,
|
||||||
|
"b": 8,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l7",
|
||||||
|
"type": "line"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": 8,
|
||||||
|
"b": 5,
|
||||||
|
"construction": false,
|
||||||
|
"id": "l8",
|
||||||
|
"type": "line"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"points": [
|
||||||
|
{
|
||||||
|
"fixed": true,
|
||||||
|
"id": "origin",
|
||||||
|
"pos": [
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p1",
|
||||||
|
"pos": [
|
||||||
|
102.65,
|
||||||
|
2.65
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p2",
|
||||||
|
"pos": [
|
||||||
|
174.15,
|
||||||
|
2.65
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p3",
|
||||||
|
"pos": [
|
||||||
|
174.15,
|
||||||
|
86.65
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p4",
|
||||||
|
"pos": [
|
||||||
|
102.65,
|
||||||
|
86.65
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p5",
|
||||||
|
"pos": [
|
||||||
|
104.15,
|
||||||
|
4.15
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p6",
|
||||||
|
"pos": [
|
||||||
|
172.65,
|
||||||
|
4.15
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p7",
|
||||||
|
"pos": [
|
||||||
|
172.65,
|
||||||
|
85.15
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fixed": false,
|
||||||
|
"id": "p8",
|
||||||
|
"pos": [
|
||||||
|
104.15,
|
||||||
|
85.15
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "sketch"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extent": {
|
||||||
|
"direction": "positive",
|
||||||
|
"distance": "3"
|
||||||
|
},
|
||||||
|
"id": 4,
|
||||||
|
"name": "Extrude1",
|
||||||
|
"operation": "join",
|
||||||
|
"param_names": [
|
||||||
|
"d6"
|
||||||
|
],
|
||||||
|
"profiles": {
|
||||||
|
"loops": [
|
||||||
|
[
|
||||||
|
"l1",
|
||||||
|
"l2",
|
||||||
|
"l3",
|
||||||
|
"l4"
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"type": "curves"
|
||||||
|
},
|
||||||
|
"sketch": 3,
|
||||||
|
"suppressed": false,
|
||||||
|
"targets": [
|
||||||
|
"Lid"
|
||||||
|
],
|
||||||
|
"type": "extrude"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"corner": [
|
||||||
|
104.4,
|
||||||
|
5.4,
|
||||||
|
-1.0
|
||||||
|
],
|
||||||
|
"height": "8",
|
||||||
|
"id": 5,
|
||||||
|
"length": "68",
|
||||||
|
"name": "Box2",
|
||||||
|
"operation": "cut",
|
||||||
|
"param_names": [
|
||||||
|
"d7",
|
||||||
|
"d8",
|
||||||
|
"d9"
|
||||||
|
],
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "box",
|
||||||
|
"width": "61"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"corner": [
|
||||||
|
116.4,
|
||||||
|
72.0,
|
||||||
|
-1.0
|
||||||
|
],
|
||||||
|
"height": "8",
|
||||||
|
"id": 6,
|
||||||
|
"length": "44",
|
||||||
|
"name": "Box3",
|
||||||
|
"operation": "cut",
|
||||||
|
"param_names": [
|
||||||
|
"d10",
|
||||||
|
"d11",
|
||||||
|
"d12"
|
||||||
|
],
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "box",
|
||||||
|
"width": "10"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"corner": [
|
||||||
|
127.4,
|
||||||
|
84.0,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"height": "4",
|
||||||
|
"id": 7,
|
||||||
|
"length": "22",
|
||||||
|
"name": "Box4",
|
||||||
|
"operation": "cut",
|
||||||
|
"param_names": [
|
||||||
|
"d13",
|
||||||
|
"d14",
|
||||||
|
"d15"
|
||||||
|
],
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "box",
|
||||||
|
"width": "6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"corner": [
|
||||||
|
102.8,
|
||||||
|
14.0,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"height": "11.7",
|
||||||
|
"id": 8,
|
||||||
|
"length": "1.6",
|
||||||
|
"name": "Rib1",
|
||||||
|
"operation": "join",
|
||||||
|
"param_names": [
|
||||||
|
"d16",
|
||||||
|
"d17",
|
||||||
|
"d18"
|
||||||
|
],
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "box",
|
||||||
|
"width": "6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"corner": [
|
||||||
|
102.8,
|
||||||
|
48.0,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"height": "11.7",
|
||||||
|
"id": 9,
|
||||||
|
"length": "1.6",
|
||||||
|
"name": "Rib2",
|
||||||
|
"operation": "join",
|
||||||
|
"param_names": [
|
||||||
|
"d19",
|
||||||
|
"d20",
|
||||||
|
"d21"
|
||||||
|
],
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "box",
|
||||||
|
"width": "6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"corner": [
|
||||||
|
172.4,
|
||||||
|
14.0,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"height": "11.7",
|
||||||
|
"id": 10,
|
||||||
|
"length": "1.6",
|
||||||
|
"name": "Rib3",
|
||||||
|
"operation": "join",
|
||||||
|
"param_names": [
|
||||||
|
"d22",
|
||||||
|
"d23",
|
||||||
|
"d24"
|
||||||
|
],
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "box",
|
||||||
|
"width": "6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"corner": [
|
||||||
|
172.4,
|
||||||
|
48.0,
|
||||||
|
2.4
|
||||||
|
],
|
||||||
|
"height": "11.7",
|
||||||
|
"id": 11,
|
||||||
|
"length": "1.6",
|
||||||
|
"name": "Rib4",
|
||||||
|
"operation": "join",
|
||||||
|
"param_names": [
|
||||||
|
"d25",
|
||||||
|
"d26",
|
||||||
|
"d27"
|
||||||
|
],
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "box",
|
||||||
|
"width": "6"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"format": "solidcraft/15",
|
||||||
|
"name": "issue-616-lid-ribs",
|
||||||
|
"next_id": 12,
|
||||||
|
"params": [],
|
||||||
|
"units": "mm"
|
||||||
|
}
|
||||||
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/1",
|
"format": "solidcraft/1",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [
|
"params": [
|
||||||
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/1",
|
"format": "solidcraft/1",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [
|
"params": [
|
||||||
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/1",
|
"format": "solidcraft/1",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [],
|
"params": [],
|
||||||
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/1",
|
"format": "solidcraft/1",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [],
|
"params": [],
|
||||||
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/1",
|
"format": "solidcraft/1",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [
|
"params": [
|
||||||
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/1",
|
"format": "solidcraft/1",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [],
|
"params": [],
|
||||||
@@ -0,0 +1,194 @@
|
|||||||
|
{
|
||||||
|
"bodies": [
|
||||||
|
{
|
||||||
|
"area_mm2": 2400.0,
|
||||||
|
"bbox": {
|
||||||
|
"max": [
|
||||||
|
50.0,
|
||||||
|
20.0,
|
||||||
|
20.0
|
||||||
|
],
|
||||||
|
"min": [
|
||||||
|
30.0,
|
||||||
|
0.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"center_of_mass": [
|
||||||
|
40.0,
|
||||||
|
10.0,
|
||||||
|
10.0
|
||||||
|
],
|
||||||
|
"density_g_cm3": 1.29,
|
||||||
|
"edges": 12,
|
||||||
|
"face_types": {
|
||||||
|
"plane": 6
|
||||||
|
},
|
||||||
|
"faces": 6,
|
||||||
|
"kernel": {
|
||||||
|
"edges": 12,
|
||||||
|
"faces": 6,
|
||||||
|
"shells": 1,
|
||||||
|
"vertices": 8
|
||||||
|
},
|
||||||
|
"mass_g": 10.32,
|
||||||
|
"material": "Default",
|
||||||
|
"name": "Block",
|
||||||
|
"vertices": 8,
|
||||||
|
"volume_mm3": 8000.0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"area_mm2": 600.0,
|
||||||
|
"bbox": {
|
||||||
|
"max": [
|
||||||
|
3.552713678800501e-15,
|
||||||
|
90.0,
|
||||||
|
10.0
|
||||||
|
],
|
||||||
|
"min": [
|
||||||
|
-9.999999999999998,
|
||||||
|
80.0,
|
||||||
|
0.0
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"center_of_mass": [
|
||||||
|
-4.999999999999999,
|
||||||
|
85.0,
|
||||||
|
5.000000000000001
|
||||||
|
],
|
||||||
|
"density_g_cm3": 1.29,
|
||||||
|
"edges": 12,
|
||||||
|
"face_types": {
|
||||||
|
"plane": 6
|
||||||
|
},
|
||||||
|
"faces": 6,
|
||||||
|
"kernel": {
|
||||||
|
"edges": 12,
|
||||||
|
"faces": 6,
|
||||||
|
"shells": 1,
|
||||||
|
"vertices": 8
|
||||||
|
},
|
||||||
|
"mass_g": 1.29,
|
||||||
|
"material": "Default",
|
||||||
|
"name": "Peg",
|
||||||
|
"vertices": 8,
|
||||||
|
"volume_mm3": 1000.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"body_count": 2,
|
||||||
|
"params": [],
|
||||||
|
"sketches": [
|
||||||
|
{
|
||||||
|
"curves": 4,
|
||||||
|
"dof": 2,
|
||||||
|
"id": 1,
|
||||||
|
"name": "Base",
|
||||||
|
"profiles": 1,
|
||||||
|
"status": "solved",
|
||||||
|
"visible": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"curves": 4,
|
||||||
|
"dof": 4,
|
||||||
|
"id": 3,
|
||||||
|
"name": "Peg",
|
||||||
|
"profiles": 1,
|
||||||
|
"status": "solved",
|
||||||
|
"visible": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"timeline": [
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 1,
|
||||||
|
"ms": 0.204585,
|
||||||
|
"name": "Base",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "Sketch",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 2,
|
||||||
|
"ms": 2.318662,
|
||||||
|
"name": "Extrude1",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "ExtrudeFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 3,
|
||||||
|
"ms": 0.109196,
|
||||||
|
"name": "Peg",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "Sketch",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 4,
|
||||||
|
"ms": 0.338859,
|
||||||
|
"name": "Extrude2",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "ExtrudeFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 5,
|
||||||
|
"ms": 0.312259,
|
||||||
|
"name": "Move1",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "MoveFeature",
|
||||||
|
"warning": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"boolean_diagnostics": {
|
||||||
|
"events": [],
|
||||||
|
"truncated": false
|
||||||
|
},
|
||||||
|
"error": null,
|
||||||
|
"id": 6,
|
||||||
|
"ms": 0.23144699999999999,
|
||||||
|
"name": "Move2",
|
||||||
|
"rolled_back": false,
|
||||||
|
"suppressed": false,
|
||||||
|
"type": "MoveFeature",
|
||||||
|
"warning": null
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"total": {
|
||||||
|
"area_mm2": 3000.0,
|
||||||
|
"edges": 24,
|
||||||
|
"faces": 12,
|
||||||
|
"mass_g": 11.61,
|
||||||
|
"vertices": 16,
|
||||||
|
"volume_mm3": 9000.0
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"features":[{"id":1,"name":"Base","plane":{"name":"XY","type":"origin"},"sketch":{"constraints":[{"id":"k1","l":0,"type":"horizontal"},{"id":"k2","l":2,"type":"horizontal"},{"id":"k3","l":1,"type":"vertical"},{"id":"k4","l":3,"type":"vertical"},{"id":"k5","p":0,"q":1,"type":"coincident"}],"counters":{"k":5,"l":4,"p":4},"curves":[{"a":1,"b":2,"construction":false,"id":"l1","type":"line"},{"a":2,"b":3,"construction":false,"id":"l2","type":"line"},{"a":3,"b":4,"construction":false,"id":"l3","type":"line"},{"a":4,"b":1,"construction":false,"id":"l4","type":"line"}],"points":[{"fixed":true,"id":"origin","pos":[0.0,0.0]},{"fixed":false,"id":"p1","pos":[0.0,0.0]},{"fixed":false,"id":"p2","pos":[20.0,0.0]},{"fixed":false,"id":"p3","pos":[20.0,20.0]},{"fixed":false,"id":"p4","pos":[0.0,20.0]}]},"suppressed":false,"type":"sketch"},{"body_names":["Block"],"extent":{"direction":"positive","distance":"20"},"id":2,"name":"Extrude1","operation":"new_body","param_names":["d1"],"profiles":{"type":"all"},"sketch":1,"suppressed":false,"type":"extrude"},{"id":3,"name":"Peg","plane":{"name":"XY","type":"origin"},"sketch":{"constraints":[{"id":"k1","l":0,"type":"horizontal"},{"id":"k2","l":2,"type":"horizontal"},{"id":"k3","l":1,"type":"vertical"},{"id":"k4","l":3,"type":"vertical"}],"counters":{"k":4,"l":4,"p":4},"curves":[{"a":1,"b":2,"construction":false,"id":"l1","type":"line"},{"a":2,"b":3,"construction":false,"id":"l2","type":"line"},{"a":3,"b":4,"construction":false,"id":"l3","type":"line"},{"a":4,"b":1,"construction":false,"id":"l4","type":"line"}],"points":[{"fixed":true,"id":"origin","pos":[0.0,0.0]},{"fixed":false,"id":"p1","pos":[40.0,0.0]},{"fixed":false,"id":"p2","pos":[50.0,0.0]},{"fixed":false,"id":"p3","pos":[50.0,10.0]},{"fixed":false,"id":"p4","pos":[40.0,10.0]}]},"suppressed":false,"type":"sketch"},{"body_names":["Peg"],"extent":{"direction":"positive","distance":"10"},"id":4,"name":"Extrude2","operation":"new_body","param_names":["d2"],"profiles":{"type":"all"},"sketch":3,"suppressed":false,"type":"extrude"},{"bodies":["Block"],"id":5,"name":"Move1","param_names":["d3","d4","d5"],"suppressed":false,"translate":["30","0","0"],"type":"move"},{"angle":"90 deg","bodies":["Peg"],"id":6,"name":"Move2","param_names":["d6","d7","d8","d9"],"rotate_axis":[0.0,0.0,1.0],"suppressed":false,"translate":["0","40","0"],"type":"move"}],"format":"solidcraft/15","name":"old-move-bodies","next_id":7,"params":[],"units":"mm"}
|
||||||
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/13",
|
"format": "solidcraft/13",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [],
|
"params": [],
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"commands": [
|
||||||
|
{"command": "sketch.create", "params": {"plane": "XY", "name": "Base"}},
|
||||||
|
{"command": "sketch.rectangle.two_point", "params": {"p0": [0, 0], "p1": [20, 20]}},
|
||||||
|
{"command": "sketch.finish", "params": {}},
|
||||||
|
{"command": "solid.extrude", "params": {"distance": 20, "body_name": "Block"}},
|
||||||
|
{"command": "sketch.create", "params": {"plane": "XY", "name": "Peg"}},
|
||||||
|
{"command": "sketch.rectangle.two_point", "params": {"p0": [40, 0], "p1": [50, 10]}},
|
||||||
|
{"command": "sketch.finish", "params": {}},
|
||||||
|
{"command": "solid.extrude", "params": {"distance": 10, "operation": "new", "body_name": "Peg"}},
|
||||||
|
{"command": "solid.move", "params": {"bodies": ["Block"], "translate": [30, 0, 0]}},
|
||||||
|
{"command": "solid.move", "params": {"bodies": ["Peg"], "translate": [0, 40, 0], "axis": [0, 0, 1], "angle": "90 deg"}}
|
||||||
|
]
|
||||||
|
}
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"format": "solvecraft/13",
|
"format": "solidcraft/13",
|
||||||
"name": "Untitled",
|
"name": "Untitled",
|
||||||
"units": "mm",
|
"units": "mm",
|
||||||
"params": [],
|
"params": [],
|
||||||
+145
-11
@@ -1,15 +1,15 @@
|
|||||||
//! Designs saved by older SolveCraft builds (tests/corpus, see its README) open and evaluate as
|
//! Designs saved by older SolidCraft builds (tests/corpus, see its README) open and evaluate as
|
||||||
//! they did when they were saved; damaged and hostile design files never panic.
|
//! they did when they were saved; damaged and hostile design files never panic.
|
||||||
|
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
use solvecraft_engine::Session;
|
use solidcraft_engine::Session;
|
||||||
|
|
||||||
fn corpus() -> Vec<PathBuf> {
|
fn corpus() -> Vec<PathBuf> {
|
||||||
let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus");
|
let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus");
|
||||||
let mut v: Vec<PathBuf> =
|
let mut v: Vec<PathBuf> =
|
||||||
std::fs::read_dir(&dir).unwrap().flatten().map(|e| e.path()).filter(|p| p.extension().is_some_and(|x| x == "solvecraft")).collect();
|
std::fs::read_dir(&dir).unwrap().flatten().map(|e| e.path()).filter(|p| p.extension().is_some_and(|x| x == "solidcraft")).collect();
|
||||||
v.sort();
|
v.sort();
|
||||||
assert!(v.len() >= 7, "corpus files in {}", dir.display());
|
assert!(v.len() >= 7, "corpus files in {}", dir.display());
|
||||||
v
|
v
|
||||||
@@ -56,7 +56,7 @@ fn old_designs_open_and_evaluate_as_saved() {
|
|||||||
problems.push(format!("{name}: feature {}: {e}", r.id));
|
problems.push(format!("{name}: feature {}: {e}", r.id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
assert_eq!(s.doc.format, solvecraft_engine::doc::format::format_string(solvecraft_engine::doc::format::FORMAT), "{name}: upgraded");
|
assert_eq!(s.doc.format, solidcraft_engine::doc::format::format_string(solidcraft_engine::doc::format::FORMAT), "{name}: upgraded");
|
||||||
let got = s.execute("inspect.measure", &json!({})).unwrap();
|
let got = s.execute("inspect.measure", &json!({})).unwrap();
|
||||||
if got["body_count"] != want["body_count"] && !known(&name, "body_count") {
|
if got["body_count"] != want["body_count"] && !known(&name, "body_count") {
|
||||||
problems.push(format!("{name}: {} bodies, saved with {}", got["body_count"], want["body_count"]));
|
problems.push(format!("{name}: {} bodies, saved with {}", got["body_count"], want["body_count"]));
|
||||||
@@ -84,8 +84,11 @@ fn old_designs_open_and_evaluate_as_saved() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Saved again, it reads back the same.
|
// Saved again, it reads back the same.
|
||||||
let again = solvecraft_engine::doc::Document::from_json(&s.doc.to_json()).unwrap();
|
let again = solidcraft_engine::doc::Document::from_json(&s.doc.to_json()).unwrap();
|
||||||
assert_eq!(again, *s.doc, "{name}: round trip");
|
assert_eq!(again, *s.doc, "{name}: round trip");
|
||||||
|
let package = solidcraft_engine::io::write_design_container(&s.doc).unwrap();
|
||||||
|
let packaged = solidcraft_engine::io::read_design(&package).unwrap();
|
||||||
|
assert_eq!(packaged, *s.doc, "{name}: container round trip after migration");
|
||||||
}
|
}
|
||||||
assert!(problems.is_empty(), "{}", problems.join("\n"));
|
assert!(problems.is_empty(), "{}", problems.join("\n"));
|
||||||
}
|
}
|
||||||
@@ -95,7 +98,7 @@ fn old_designs_open_and_evaluate_as_saved() {
|
|||||||
/// they are found as the build that saved them found them, without new notes.
|
/// they are found as the build that saved them found them, without new notes.
|
||||||
#[test]
|
#[test]
|
||||||
fn names_saved_before_exact_history_find_the_faces_they_named() {
|
fn names_saved_before_exact_history_find_the_faces_they_named() {
|
||||||
let path = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus/naming-split-pieces.solvecraft");
|
let path = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus/naming-split-pieces.solidcraft");
|
||||||
let s = open(&path);
|
let s = open(&path);
|
||||||
let feature = |name: &str| s.doc.features.iter().find(|f| f.name == name).unwrap_or_else(|| panic!("{name}"));
|
let feature = |name: &str| s.doc.features.iter().find(|f| f.name == name).unwrap_or_else(|| panic!("{name}"));
|
||||||
assert_eq!(feature("Round").edge_names, vec!["?F2:side:l2|F2:top#2".to_string()]);
|
assert_eq!(feature("Round").edge_names, vec!["?F2:side:l2|F2:top#2".to_string()]);
|
||||||
@@ -106,7 +109,7 @@ fn names_saved_before_exact_history_find_the_faces_they_named() {
|
|||||||
}
|
}
|
||||||
// The raised piece is the left one, as saved (the stored point is on it).
|
// The raised piece is the left one, as saved (the stored point is on it).
|
||||||
let state = s.model.state();
|
let state = s.model.state();
|
||||||
let solid = |p: [f64; 3]| state.bodies.iter().any(|b| b.body.contains(solvecraft_engine::geom::Vec3::new(p[0], p[1], p[2])));
|
let solid = |p: [f64; 3]| state.bodies.iter().any(|b| b.body.contains(solidcraft_engine::geom::Vec3::new(p[0], p[1], p[2])));
|
||||||
assert!(solid([7.0, 15.0, 11.0]) && !solid([32.0, 15.0, 11.0]));
|
assert!(solid([7.0, 15.0, 11.0]) && !solid([32.0, 15.0, 11.0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,7 +118,7 @@ fn names_saved_before_exact_history_find_the_faces_they_named() {
|
|||||||
/// the far one stays `Body1` (chamfered), the near one `Body1 (1)` (filleted, coloured).
|
/// the far one stays `Body1` (chamfered), the near one `Body1 (1)` (filleted, coloured).
|
||||||
#[test]
|
#[test]
|
||||||
fn body_names_saved_before_exact_history_keep_their_pieces() {
|
fn body_names_saved_before_exact_history_keep_their_pieces() {
|
||||||
let path = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus/split-body-pieces.solvecraft");
|
let path = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus/split-body-pieces.solidcraft");
|
||||||
let s = open(&path);
|
let s = open(&path);
|
||||||
assert!(s.doc.features.iter().all(|f| f.shell_piece_order), "every saved feature keeps the shell order");
|
assert!(s.doc.features.iter().all(|f| f.shell_piece_order), "every saved feature keeps the shell order");
|
||||||
for r in &s.model.results {
|
for r in &s.model.results {
|
||||||
@@ -123,11 +126,142 @@ fn body_names_saved_before_exact_history_keep_their_pieces() {
|
|||||||
}
|
}
|
||||||
let state = s.model.state();
|
let state = s.model.state();
|
||||||
let piece = |name: &str| state.bodies.iter().find(|b| b.name == name).unwrap_or_else(|| panic!("{name}"));
|
let piece = |name: &str| state.bodies.iter().find(|b| b.name == name).unwrap_or_else(|| panic!("{name}"));
|
||||||
let solid = |name: &str, p: [f64; 3]| piece(name).body.contains(solvecraft_engine::geom::Vec3::new(p[0], p[1], p[2]));
|
let solid = |name: &str, p: [f64; 3]| piece(name).body.contains(solidcraft_engine::geom::Vec3::new(p[0], p[1], p[2]));
|
||||||
assert!(solid("Body1", [20.0, 24.0, 5.0]) && solid("Body1 (1)", [20.0, 6.0, 5.0]));
|
assert!(solid("Body1", [20.0, 24.0, 5.0]) && solid("Body1 (1)", [20.0, 6.0, 5.0]));
|
||||||
assert!(s.doc.appearances.bodies.contains_key("Body1 (1)"));
|
assert!(s.doc.appearances.bodies.contains_key("Body1 (1)"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Flat faces that can't take an attached sketch yet, by cause: (design, body, the faces'
|
||||||
|
/// planes as outward normal and distance from the origin, or every flat face of the body,
|
||||||
|
/// issue). Face indices are not used: they can change between builds. Each issue has an
|
||||||
|
/// ignored test below that checks its faces; a listed plane whose face attaches fails the main
|
||||||
|
/// check until it is removed from here.
|
||||||
|
type Planes = &'static [([f64; 3], f64)];
|
||||||
|
const NO_ATTACHMENT_YET: [(&str, &str, Option<Planes>, u32); 1] = [("issue-616-lid-ribs", "Lid", None, 628)];
|
||||||
|
|
||||||
|
/// The issue a face is listed under, and whether it is listed by its plane (not as every face).
|
||||||
|
fn known_without_attachment(design: &str, body: &str, normal: [f64; 3], distance: f64) -> Option<(u32, bool)> {
|
||||||
|
let same = |(n, d): &([f64; 3], f64)| (0..3).all(|i| (n[i] - normal[i]).abs() < 1e-6) && (d - distance).abs() < 1e-4;
|
||||||
|
NO_ATTACHMENT_YET.iter().find_map(|(d, b, planes, issue)| {
|
||||||
|
if *d != design || *b != body {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
match planes {
|
||||||
|
None => Some((*issue, false)),
|
||||||
|
Some(planes) => planes.iter().any(same).then_some((*issue, true)),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn undo_to(s: &mut Session, features: usize) {
|
||||||
|
for _ in 0..4 {
|
||||||
|
if s.doc.features.len() <= features {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
s.execute("edit.undo", &json!({})).unwrap();
|
||||||
|
}
|
||||||
|
assert_eq!(s.doc.features.len(), features, "undo did not remove the added feature");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Try a sketch and an offset plane on every flat face of every final body of every corpus
|
||||||
|
/// design, through the same face pick the desktop sends (body, face index, occurrence path, a
|
||||||
|
/// point on it), without `fixed`. Undo leaves the design as it was for the next face. Returns
|
||||||
|
/// (design, body, face, issue it is known under, what went wrong or None).
|
||||||
|
fn flat_face_attachments() -> Vec<(String, String, usize, Option<(u32, bool)>, Option<String>)> {
|
||||||
|
use solidcraft_engine::doc::{FaceAttachmentStatus, apply_point};
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for p in corpus() {
|
||||||
|
let name = p.file_stem().unwrap_or_default().to_string_lossy().to_string();
|
||||||
|
let mut s = open(&p);
|
||||||
|
let state = s.model.state();
|
||||||
|
let placed = s.placed_document();
|
||||||
|
let mut picks = Vec::new();
|
||||||
|
for (world, definition, component, path, frame) in placed.body_frames_with_source(&state) {
|
||||||
|
let Some(body) = state.bodies.iter().find(|b| b.definition_name() == definition && placed.model_body_component(b) == component) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let mesh = body.body.tessellate(0.01).unwrap();
|
||||||
|
for index in 0..body.body.face_count() {
|
||||||
|
if body.body.planar_face(index).is_none() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// The middle of the face's largest triangle: well inside the face.
|
||||||
|
let point = mesh
|
||||||
|
.triangles
|
||||||
|
.iter()
|
||||||
|
.zip(&mesh.tri_face)
|
||||||
|
.filter(|(_, f)| **f as usize == index)
|
||||||
|
.filter_map(|(t, _)| mesh.tri(t))
|
||||||
|
.max_by(|[a, b, c], [d, e, f]| (*b - *a).cross(*c - *a).len().total_cmp(&(*e - *d).cross(*f - *d).len()))
|
||||||
|
.map(|[a, b, c]| (a + b + c) * (1.0 / 3.0));
|
||||||
|
let Some(point) = point else { continue };
|
||||||
|
let point = apply_point(&frame, point);
|
||||||
|
let normal =
|
||||||
|
body.body.planar_face(index).map(|plane| solidcraft_engine::doc::apply_vector(&frame, plane.normal())).unwrap_or_default();
|
||||||
|
let key = ([normal.x, normal.y, normal.z], normal.dot(point));
|
||||||
|
picks.push((world.clone(), index, key, json!({"face": point, "body": world, "index": index, "path": path})));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let before = s.doc.features.len();
|
||||||
|
for (body, index, (normal, distance), plane) in picks {
|
||||||
|
let mut problem = None;
|
||||||
|
match s.execute("sketch.create", &json!({"plane": plane})) {
|
||||||
|
Ok(created) => {
|
||||||
|
let id = created["sketch"].as_u64().unwrap_or(0);
|
||||||
|
match s.placed_document().sketch_face_attachment(id, &s.model) {
|
||||||
|
FaceAttachmentStatus::Healthy { .. } | FaceAttachmentStatus::Sheet { .. } => {}
|
||||||
|
other => problem = Some(format!("sketch attachment {other:?}")),
|
||||||
|
}
|
||||||
|
s.execute("sketch.finish", &json!({})).unwrap();
|
||||||
|
undo_to(&mut s, before);
|
||||||
|
}
|
||||||
|
Err(e) => problem = Some(format!("sketch.create: {e}")),
|
||||||
|
}
|
||||||
|
match s.execute("construct.plane.offset", &json!({"base": plane, "offset": 5})) {
|
||||||
|
Ok(_) => undo_to(&mut s, before),
|
||||||
|
Err(e) => problem = Some(problem.map_or(String::new(), |p| p + "; ") + &format!("construct.plane.offset: {e}")),
|
||||||
|
}
|
||||||
|
let known = known_without_attachment(&name, &body, normal, distance);
|
||||||
|
out.push((name.clone(), body, index, known, problem));
|
||||||
|
}
|
||||||
|
assert!(s.model.results.iter().all(|r| r.error.is_none()), "{name}: left with errors after undo");
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every flat face of every corpus design takes a durable attachment (issue #489: the top face
|
||||||
|
/// of an extrude sketched over a face's projected boundary had "no exact planar source"),
|
||||||
|
/// except the faces listed in [`NO_ATTACHMENT_YET`] under their open issues.
|
||||||
|
#[test]
|
||||||
|
fn every_flat_face_of_every_corpus_design_takes_an_attached_sketch() {
|
||||||
|
let all = flat_face_attachments();
|
||||||
|
assert!(all.len() > 50, "only {} faces checked", all.len());
|
||||||
|
let problems: Vec<String> = all
|
||||||
|
.iter()
|
||||||
|
.filter_map(|(design, body, face, known, problem)| match (known, problem) {
|
||||||
|
(None, Some(problem)) => Some(format!("{design}: {body} face {face}: {problem}")),
|
||||||
|
(Some((issue, true)), None) => Some(format!("{design}: {body} face {face} attaches now: remove it from NO_ATTACHMENT_YET (#{issue})")),
|
||||||
|
_ => None,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
assert!(problems.is_empty(), "{} of {} faces:\n{}", problems.len(), all.len(), problems.join("\n"));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn known_faces_attach(issue: u32) {
|
||||||
|
let problems: Vec<String> = flat_face_attachments()
|
||||||
|
.into_iter()
|
||||||
|
.filter(|(.., known, problem)| known.is_some_and(|(known, _)| known == issue) && problem.is_some())
|
||||||
|
.map(|(design, body, face, _, problem)| format!("{design}: {body} face {face}: {}", problem.unwrap_or_default()))
|
||||||
|
.collect();
|
||||||
|
assert!(problems.is_empty(), "{}", problems.join("\n"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore = "fails until #628 is fixed"]
|
||||||
|
fn faces_of_a_lid_with_joined_ribs_take_an_attached_sketch() {
|
||||||
|
known_faces_attach(628);
|
||||||
|
}
|
||||||
|
|
||||||
/// A small deterministic generator (xorshift).
|
/// A small deterministic generator (xorshift).
|
||||||
struct Rng(u64);
|
struct Rng(u64);
|
||||||
impl Rng {
|
impl Rng {
|
||||||
@@ -181,7 +315,7 @@ fn at_mut<'a>(v: &'a mut Value, path: &[Value]) -> Option<&'a mut Value> {
|
|||||||
|
|
||||||
/// Open a file's bytes as File → Open does and evaluate them; any panic is a failure.
|
/// Open a file's bytes as File → Open does and evaluate them; any panic is a failure.
|
||||||
fn try_bytes(bytes: &[u8]) {
|
fn try_bytes(bytes: &[u8]) {
|
||||||
if let Ok(doc) = solvecraft_engine::io::read_design(bytes) {
|
if let Ok(doc) = solidcraft_engine::io::read_design(bytes) {
|
||||||
let mut s = Session::new(doc);
|
let mut s = Session::new(doc);
|
||||||
let _ = s.execute("inspect.measure", &json!({}));
|
let _ = s.execute("inspect.measure", &json!({}));
|
||||||
let _ = s.execute("document.inspect", &json!({}));
|
let _ = s.execute("document.inspect", &json!({}));
|
||||||
@@ -197,7 +331,7 @@ fn generated() -> Vec<(String, Vec<u8>)> {
|
|||||||
"plane": {"type": "midplane", "a": side, "b": {"type": "plane", "plane": {"type": "origin", "name": "XZ"}}}})
|
"plane": {"type": "midplane", "a": side, "b": {"type": "plane", "plane": {"type": "origin", "name": "XZ"}}}})
|
||||||
};
|
};
|
||||||
let design = |name: &str, features: Value| {
|
let design = |name: &str, features: Value| {
|
||||||
json!({"format": "solvecraft/11", "name": name, "units": "mm", "params": [], "next_id": 9, "features": features}).to_string().into_bytes()
|
json!({"format": "solidcraft/11", "name": name, "units": "mm", "params": [], "next_id": 9, "features": features}).to_string().into_bytes()
|
||||||
};
|
};
|
||||||
// A sketch past the caps interactive editing enforces: solving it would size dense matrices
|
// A sketch past the caps interactive editing enforces: solving it would size dense matrices
|
||||||
// by the point count and abort on the allocation.
|
// by the point count and abort on the allocation.
|
||||||
@@ -5,7 +5,7 @@ use std::process::Command;
|
|||||||
#[test]
|
#[test]
|
||||||
fn overflowing_seed_range_is_an_error_not_a_panic() {
|
fn overflowing_seed_range_is_an_error_not_a_panic() {
|
||||||
let output =
|
let output =
|
||||||
Command::new(env!("CARGO_BIN_EXE_solvecraft-cli")).args(["fuzz", "--from", "18446744073709551615", "--count", "2"]).output().unwrap();
|
Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(["fuzz", "--from", "18446744073709551615", "--count", "2"]).output().unwrap();
|
||||||
assert_eq!(output.status.code(), Some(1));
|
assert_eq!(output.status.code(), Some(1));
|
||||||
let stderr = String::from_utf8_lossy(&output.stderr);
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
assert!(stderr.contains("seed range exceeds u64::MAX"), "{stderr}");
|
assert!(stderr.contains("seed range exceeds u64::MAX"), "{stderr}");
|
||||||
@@ -15,14 +15,14 @@ fn overflowing_seed_range_is_an_error_not_a_panic() {
|
|||||||
#[test]
|
#[test]
|
||||||
fn empty_seed_range_at_maximum_is_valid() {
|
fn empty_seed_range_at_maximum_is_valid() {
|
||||||
let output =
|
let output =
|
||||||
Command::new(env!("CARGO_BIN_EXE_solvecraft-cli")).args(["fuzz", "--from", "18446744073709551615", "--count", "0"]).output().unwrap();
|
Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(["fuzz", "--from", "18446744073709551615", "--count", "0"]).output().unwrap();
|
||||||
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
assert!(String::from_utf8_lossy(&output.stdout).starts_with("0 seeds, 0 design steps,"));
|
assert!(String::from_utf8_lossy(&output.stdout).starts_with("0 seeds, 0 design steps,"));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn maximum_seed_runs_once_without_wrapping() {
|
fn maximum_seed_runs_once_without_wrapping() {
|
||||||
let output = Command::new(env!("CARGO_BIN_EXE_solvecraft-cli"))
|
let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
|
||||||
.args(["fuzz", "--from", "18446744073709551615", "--count", "1", "--steps", "0", "--timeout", "0"])
|
.args(["fuzz", "--from", "18446744073709551615", "--count", "1", "--steps", "0", "--timeout", "0"])
|
||||||
.output()
|
.output()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
//! `--json-out FILE` writes the JSON `run` and `eval` would print to a file the CLI makes
|
||||||
|
//! itself. A shell's `>` can re-encode stdout (Windows PowerShell writes UTF-16, or UTF-8 with a
|
||||||
|
//! byte-order mark), which strict JSON readers refuse; the file is plain UTF-8.
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::{Command, Output};
|
||||||
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
|
static NEXT: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
|
struct Scratch(PathBuf);
|
||||||
|
|
||||||
|
impl Scratch {
|
||||||
|
fn new() -> Self {
|
||||||
|
let dir = std::env::temp_dir().join(format!("solidcraft-json-out-{}-{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed)));
|
||||||
|
std::fs::create_dir(&dir).unwrap();
|
||||||
|
Self(dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A box, and a parameter whose comment has a character outside ASCII.
|
||||||
|
fn script(&self) -> PathBuf {
|
||||||
|
let path = self.0.join("box.json");
|
||||||
|
let script = json!({"commands": [
|
||||||
|
{"command": "parameters.add", "params": {"name": "bore", "expression": "5 mm", "comment": "\u{d8} of the bore"}},
|
||||||
|
{"command": "solid.box", "params": {"length": 2, "width": 3, "height": 4}},
|
||||||
|
]});
|
||||||
|
std::fs::write(&path, script.to_string()).unwrap();
|
||||||
|
path
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A filleted box whose fillet a later parameter change makes impossible: every command
|
||||||
|
/// succeeds, the timeline ends with a failing feature.
|
||||||
|
fn broken_script(&self) -> PathBuf {
|
||||||
|
let path = self.0.join("broken.json");
|
||||||
|
let script = json!({"commands": [
|
||||||
|
{"command": "parameters.add", "params": {"name": "r", "expression": "2 mm"}},
|
||||||
|
{"command": "solid.box", "params": {"length": 20, "width": 20, "height": 10}},
|
||||||
|
{"command": "solid.fillet", "params": {"edges": [[10, 0, 10]], "radius": "r"}},
|
||||||
|
{"command": "parameters.change", "params": {"name": "r", "expression": "50 mm"}},
|
||||||
|
]});
|
||||||
|
std::fs::write(&path, script.to_string()).unwrap();
|
||||||
|
path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Scratch {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let _ = std::fs::remove_dir_all(&self.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cli() -> Command {
|
||||||
|
Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stdout_of(output: Output) -> Vec<u8> {
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
output.stdout
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Timings differ from one run to the next.
|
||||||
|
fn without_timings(v: &mut Value) {
|
||||||
|
match v {
|
||||||
|
Value::Object(map) => {
|
||||||
|
map.remove("ms");
|
||||||
|
map.values_mut().for_each(without_timings);
|
||||||
|
}
|
||||||
|
Value::Array(items) => items.iter_mut().for_each(without_timings),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The file holds what stdout carried in the same command without `--json-out`: the same JSON,
|
||||||
|
/// laid out the same way, in UTF-8 with no byte-order mark (UTF-8's or UTF-16's), so a strict
|
||||||
|
/// reader accepts it.
|
||||||
|
fn assert_plain_utf8_json(file: &Path, stdout: &[u8]) -> Value {
|
||||||
|
let bytes = std::fs::read(file).unwrap();
|
||||||
|
assert!(matches!(bytes.first(), Some(b'{' | b'[')), "the file starts with the JSON itself, not a mark");
|
||||||
|
assert_eq!(bytes.last(), Some(&b'\n'), "like stdout, the file ends with a newline");
|
||||||
|
let lines = |b: &[u8]| b.iter().filter(|c| **c == b'\n').count();
|
||||||
|
assert_eq!(lines(&bytes), lines(stdout), "laid out like stdout");
|
||||||
|
let mut value: Value = serde_json::from_str(std::str::from_utf8(&bytes).unwrap()).unwrap();
|
||||||
|
let mut printed: Value = serde_json::from_slice(stdout).unwrap();
|
||||||
|
without_timings(&mut value);
|
||||||
|
without_timings(&mut printed);
|
||||||
|
assert_eq!(value, printed, "the file is what stdout would have carried");
|
||||||
|
value
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn run_results_json_out_holds_what_stdout_would() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script();
|
||||||
|
let file = dir.0.join("results.json");
|
||||||
|
let on_stdout = stdout_of(cli().arg("run").arg(&script).arg("--results").output().unwrap());
|
||||||
|
let output = cli().arg("run").arg(&script).arg("--results").arg("--json-out").arg(&file).output().unwrap();
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
assert!(output.stdout.is_empty(), "the JSON goes to the file, not to stdout");
|
||||||
|
let results = assert_plain_utf8_json(&file, &on_stdout);
|
||||||
|
assert_eq!(results.as_array().map(Vec::len), Some(2));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn run_json_out_without_results_holds_the_measurement_even_when_quiet() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script();
|
||||||
|
let on_stdout = stdout_of(cli().arg("run").arg(&script).output().unwrap());
|
||||||
|
for (name, extra) in [("plain", &[][..]), ("quiet", &["--quiet"][..])] {
|
||||||
|
let file = dir.0.join(format!("measure-{name}.json"));
|
||||||
|
let output = cli().arg("run").arg(&script).args(extra).arg("--json-out").arg(&file).output().unwrap();
|
||||||
|
assert!(output.status.success(), "{name}: {}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
assert!(output.stdout.is_empty(), "{name}");
|
||||||
|
let measure = assert_plain_utf8_json(&file, &on_stdout);
|
||||||
|
assert_eq!(measure["body_count"], 1, "{name}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn eval_json_out_holds_what_stdout_would() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script();
|
||||||
|
let on_stdout = stdout_of(cli().arg("eval").arg(&script).output().unwrap());
|
||||||
|
// The option may come before the file to evaluate, and `inspect` is the same command.
|
||||||
|
for name in ["eval", "inspect"] {
|
||||||
|
let file = dir.0.join(format!("{name}.json"));
|
||||||
|
let output = cli().arg(name).arg("--json-out").arg(&file).arg(&script).output().unwrap();
|
||||||
|
assert!(output.status.success(), "{name}: {}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
assert!(output.stdout.is_empty(), "{name}");
|
||||||
|
let measured = assert_plain_utf8_json(&file, &on_stdout);
|
||||||
|
assert_eq!(measured["body_count"], 1, "{name}");
|
||||||
|
// A character outside ASCII is written as it is, in UTF-8.
|
||||||
|
assert!(std::fs::read_to_string(&file).unwrap().contains("\u{d8} of the bore"), "{name}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn json_out_needs_a_file_and_fails_when_it_cannot_write() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script();
|
||||||
|
for cmd in ["run", "eval"] {
|
||||||
|
let output = cli().arg(cmd).arg(&script).arg("--json-out").output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{cmd}");
|
||||||
|
assert!(String::from_utf8_lossy(&output.stderr).contains("--json-out needs a FILE"), "{cmd}");
|
||||||
|
assert!(output.stdout.is_empty(), "{cmd}");
|
||||||
|
|
||||||
|
let missing = dir.0.join("missing").join("out.json");
|
||||||
|
let output = cli().arg(cmd).arg(&script).arg("--json-out").arg(&missing).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{cmd}");
|
||||||
|
assert!(!output.stderr.is_empty(), "{cmd}");
|
||||||
|
assert!(output.stdout.is_empty(), "{cmd}");
|
||||||
|
assert!(!missing.exists(), "{cmd}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn run_json_out_is_not_written_when_a_feature_fails() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.broken_script();
|
||||||
|
for (name, extra) in [("plain", &[][..]), ("results", &["--results"][..])] {
|
||||||
|
let file = dir.0.join(format!("failed-{name}.json"));
|
||||||
|
let output = cli().arg("run").arg(&script).args(extra).arg("--json-out").arg(&file).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{name}");
|
||||||
|
assert!(String::from_utf8_lossy(&output.stderr).contains("nothing was written"), "{name}");
|
||||||
|
assert!(!file.exists(), "{name}");
|
||||||
|
}
|
||||||
|
}
|
||||||
+5
-5
@@ -6,17 +6,17 @@ use std::time::Duration;
|
|||||||
|
|
||||||
fn round_of(path: &std::path::Path) -> Option<String> {
|
fn round_of(path: &std::path::Path) -> Option<String> {
|
||||||
let bytes = std::fs::read(path).ok()?;
|
let bytes = std::fs::read(path).ok()?;
|
||||||
let doc = solvecraft_engine::io::read_design(&bytes).ok()?;
|
let doc = solidcraft_engine::io::read_design(&bytes).ok()?;
|
||||||
doc.params.iter().find(|p| p.name == "save_round").map(|p| p.expr.clone())
|
doc.params.iter().find(|p| p.name == "save_round").map(|p| p.expr.clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn killed_mid_save_the_old_file_survives() {
|
fn killed_mid_save_the_old_file_survives() {
|
||||||
let exe = env!("CARGO_BIN_EXE_solvecraft-cli");
|
let exe = env!("CARGO_BIN_EXE_solidcraft-cli");
|
||||||
let dir = std::env::temp_dir().join(format!("solvecraft-kill-mid-save-{}", std::process::id()));
|
let dir = std::env::temp_dir().join(format!("solidcraft-kill-mid-save-{}", std::process::id()));
|
||||||
let _ = std::fs::remove_dir_all(&dir);
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
std::fs::create_dir_all(&dir).unwrap();
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
let path = dir.join("design.solvecraft");
|
let path = dir.join("design.solidcraft");
|
||||||
let ok = Command::new(exe).args(["save-stress", &path.to_string_lossy(), "1"]).status().unwrap();
|
let ok = Command::new(exe).args(["save-stress", &path.to_string_lossy(), "1"]).status().unwrap();
|
||||||
assert!(ok.success());
|
assert!(ok.success());
|
||||||
assert_eq!(round_of(&path).as_deref(), Some("0"));
|
assert_eq!(round_of(&path).as_deref(), Some("0"));
|
||||||
@@ -44,7 +44,7 @@ fn killed_mid_save_the_old_file_survives() {
|
|||||||
let round = round_of(&path);
|
let round = round_of(&path);
|
||||||
assert!(round.is_some(), "after kill {i} the design file is torn or missing");
|
assert!(round.is_some(), "after kill {i} the design file is torn or missing");
|
||||||
seen.insert(round);
|
seen.insert(round);
|
||||||
let bak = solvecraft_engine::io::backup_path(&path);
|
let bak = solidcraft_engine::io::backup_path(&path);
|
||||||
if bak.exists() {
|
if bak.exists() {
|
||||||
assert!(round_of(&bak).is_some(), "after kill {i} the backup is torn");
|
assert!(round_of(&bak).is_some(), "after kill {i} the backup is torn");
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
//! The `solvecraft-cli` compatibility alias forwards to `solidcraft-cli`.
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn legacy_alias_forwards_with_a_deprecation_note() {
|
||||||
|
let out = Command::new(env!("CARGO_BIN_EXE_solvecraft-cli")).arg("--version").output().unwrap();
|
||||||
|
assert!(out.status.success(), "{out:?}");
|
||||||
|
let stdout = String::from_utf8_lossy(&out.stdout);
|
||||||
|
assert_eq!(stdout.trim(), format!("solidcraft-cli {}", env!("CARGO_PKG_VERSION")));
|
||||||
|
let stderr = String::from_utf8_lossy(&out.stderr);
|
||||||
|
assert!(stderr.contains("deprecated") && stderr.contains("solidcraft-cli"), "{stderr}");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn legacy_alias_passes_the_exit_status_through() {
|
||||||
|
let alias = Command::new(env!("CARGO_BIN_EXE_solvecraft-cli")).arg("no-such-command").output().unwrap();
|
||||||
|
let real = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).arg("no-such-command").output().unwrap();
|
||||||
|
assert_eq!(alias.status.code(), real.status.code());
|
||||||
|
assert_eq!(alias.stdout, real.stdout);
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
//! `mcp --connect` to a port where no app listens yet (#270): the server still starts, its tools
|
||||||
|
//! say how to start the app, and once the app runs they reach it with that launch's token.
|
||||||
|
|
||||||
|
use std::io::{BufRead, BufReader, Write};
|
||||||
|
use std::net::TcpListener;
|
||||||
|
use std::process::{Command, Stdio};
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mcp_connect_serves_before_the_app_runs_and_reaches_it_once_it_does() {
|
||||||
|
// This test needs the port closed until its second phase. A port obtained
|
||||||
|
// with bind(:0) and released can immediately be reused by another parallel
|
||||||
|
// test's mock server. Stay below the usual ephemeral ranges,
|
||||||
|
// with a process-specific starting point, and skip any occupied ports.
|
||||||
|
let port = (0..512u32)
|
||||||
|
.find_map(|offset| {
|
||||||
|
let port = 16000 + (std::process::id() + offset) % 16000;
|
||||||
|
TcpListener::bind(("127.0.0.1", port as u16)).ok().map(|listener| listener.local_addr().unwrap().port())
|
||||||
|
})
|
||||||
|
.expect("an unused non-ephemeral test port");
|
||||||
|
let addr = format!("127.0.0.1:{port}");
|
||||||
|
let control_dir = std::env::temp_dir().join(format!("solidcraft-mcp-connect-{}-{port}", std::process::id()));
|
||||||
|
std::fs::create_dir_all(&control_dir).unwrap();
|
||||||
|
let mut child = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
|
||||||
|
.args(["mcp", "--connect", &addr, "--allow-any-path"])
|
||||||
|
.env("SOLIDCRAFT_CONTROL_DIR", &control_dir)
|
||||||
|
.env_remove("SOLIDCRAFT_CONTROL_TOKEN")
|
||||||
|
.stdin(Stdio::piped())
|
||||||
|
.stdout(Stdio::piped())
|
||||||
|
.stderr(Stdio::null())
|
||||||
|
.spawn()
|
||||||
|
.unwrap();
|
||||||
|
let mut stdin = child.stdin.take().unwrap();
|
||||||
|
let mut stdout = BufReader::new(child.stdout.take().unwrap());
|
||||||
|
let mut ask = |id: u64, method: &str, params: Value| -> Value {
|
||||||
|
writeln!(stdin, "{}", json!({"jsonrpc": "2.0", "id": id, "method": method, "params": params})).unwrap();
|
||||||
|
let mut line = String::new();
|
||||||
|
stdout.read_line(&mut line).unwrap();
|
||||||
|
serde_json::from_str(&line).unwrap_or_else(|e| panic!("{e}: {line:?}"))
|
||||||
|
};
|
||||||
|
let measure = json!({"name": "measure", "arguments": {}});
|
||||||
|
let text = |r: &Value| r["result"]["content"][0]["text"].as_str().unwrap_or_default().to_string();
|
||||||
|
|
||||||
|
// The server answers without the app, and its instructions say the app isn't running.
|
||||||
|
let init = ask(1, "initialize", json!({"protocolVersion": "2025-06-18"}));
|
||||||
|
let instructions = init["result"]["instructions"].as_str().unwrap_or_default();
|
||||||
|
assert!(instructions.contains("not running") && instructions.contains(&format!("--control {port}")), "{instructions}");
|
||||||
|
let tools = ask(2, "tools/list", json!({}));
|
||||||
|
assert!(tools["result"]["tools"].as_array().is_some_and(|t| !t.is_empty()), "{tools}");
|
||||||
|
|
||||||
|
// A tool call says the app is not running and how to start it.
|
||||||
|
let r = ask(3, "tools/call", measure.clone());
|
||||||
|
assert_eq!(r["result"]["isError"], true, "{r}");
|
||||||
|
assert!(text(&r).contains("not running") && text(&r).contains(&format!("solidcraft --control {port}")), "{r}");
|
||||||
|
|
||||||
|
// The app starts: a token file for this launch, and its control port.
|
||||||
|
let token = "0123456789abcdef".repeat(4);
|
||||||
|
std::fs::write(control_dir.join(format!("{port}.token")), &token).unwrap();
|
||||||
|
let listener = TcpListener::bind(&addr).unwrap();
|
||||||
|
let app = std::thread::spawn(move || {
|
||||||
|
let (stream, _) = listener.accept().unwrap();
|
||||||
|
let mut line = String::new();
|
||||||
|
BufReader::new(stream.try_clone().unwrap()).read_line(&mut line).unwrap();
|
||||||
|
let req: Value = serde_json::from_str(&line).unwrap();
|
||||||
|
let reply = if req["token"] == json!(token) {
|
||||||
|
json!({"id": req["id"], "ok": true, "result": {"bodies": [], "method": req["method"]}})
|
||||||
|
} else {
|
||||||
|
json!({"id": req["id"], "ok": false, "error": format!("unauthorized: token {}", req["token"])})
|
||||||
|
};
|
||||||
|
writeln!(&stream, "{reply}").unwrap();
|
||||||
|
});
|
||||||
|
let r = ask(4, "tools/call", measure);
|
||||||
|
assert_ne!(r["result"]["isError"], true, "{r}");
|
||||||
|
assert!(text(&r).contains("engine.execute"), "{r}");
|
||||||
|
app.join().unwrap();
|
||||||
|
|
||||||
|
drop(stdin);
|
||||||
|
assert!(child.wait().unwrap().success());
|
||||||
|
std::fs::remove_dir_all(&control_dir).ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mcp_connect_without_a_port_is_refused_at_start() {
|
||||||
|
for addr in ["localhost", "127.0.0.1:0"] {
|
||||||
|
let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(["mcp", "--connect", addr]).stdin(Stdio::null()).output().unwrap();
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert!(!output.status.success(), "{addr}: {stderr}");
|
||||||
|
assert!(stderr.contains("HOST:PORT"), "{addr}: {stderr}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
//! A parameter change gives the same topology as building at the new value from scratch, and
|
||||||
|
//! changing it back gives the original topology: no stale splits, no faces added to regions
|
||||||
|
//! nothing touched. Over the design corpus (`tests/corpus`, `tests/action_matrix/designs`), and
|
||||||
|
//! the README demo's Raspberry Pi case pinned step by step.
|
||||||
|
|
||||||
|
use std::collections::BTreeMap;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use solidcraft_engine::Session;
|
||||||
|
use solidcraft_engine::doc::kernel::{FaceSurface, face_surface};
|
||||||
|
|
||||||
|
fn root() -> PathBuf {
|
||||||
|
Path::new(env!("CARGO_MANIFEST_DIR")).join("../..").canonicalize().unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A folder of its own for test `name` (tests run side by side).
|
||||||
|
fn scratch_dir(name: &str) -> PathBuf {
|
||||||
|
let d = std::env::temp_dir().join(format!("solidcraft-rebuild-topology-{name}-{}", std::process::id()));
|
||||||
|
std::fs::create_dir_all(&d).unwrap();
|
||||||
|
d
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A body's topology: its face and edge counts, and how many faces lie in each plane.
|
||||||
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
|
struct Topology {
|
||||||
|
faces: usize,
|
||||||
|
edges: usize,
|
||||||
|
planes: BTreeMap<[i64; 4], usize>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every solid body's topology, by name.
|
||||||
|
fn topology(s: &Session) -> BTreeMap<String, Topology> {
|
||||||
|
let st = s.world_state();
|
||||||
|
st.bodies
|
||||||
|
.iter()
|
||||||
|
.filter(|b| !b.body.is_mesh())
|
||||||
|
.map(|b| {
|
||||||
|
let mut planes = BTreeMap::new();
|
||||||
|
for i in 0..b.body.face_count() {
|
||||||
|
if let Some(FaceSurface::Plane { normal, point }) = face_surface(&b.body, i) {
|
||||||
|
let key = [normal.x, normal.y, normal.z, normal.dot(point) / 100.].map(|x| (x * 1e4).round() as i64);
|
||||||
|
*planes.entry(key).or_insert(0) += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(b.name.clone(), Topology { faces: b.body.face_count(), edges: b.body.edge_count(), planes })
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn open(path: &Path) -> Session {
|
||||||
|
let mut s = Session::default();
|
||||||
|
s.execute("doc.open", &json!({"path": path.to_string_lossy()})).unwrap_or_else(|e| panic!("{}: {e}", path.display()));
|
||||||
|
s
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The design built from scratch: saved as it is (timeline only, no cached geometry) and
|
||||||
|
/// opened again.
|
||||||
|
fn rebuilt(s: &Session, path: &Path) -> Session {
|
||||||
|
let mut t = s.scratch();
|
||||||
|
t.execute("file.save", &json!({"path": path.to_string_lossy(), "format": "json"})).unwrap();
|
||||||
|
open(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn errors(s: &Session) -> Vec<u64> {
|
||||||
|
s.model.results.iter().filter(|r| r.error.is_some()).map(|r| r.id).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The corpus's designs, as sessions.
|
||||||
|
fn designs() -> Vec<(String, Session)> {
|
||||||
|
let root = root();
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for dir in ["apps/solidcraft-cli/tests/corpus", "tests/action_matrix/designs"] {
|
||||||
|
let mut files: Vec<PathBuf> = std::fs::read_dir(root.join(dir))
|
||||||
|
.unwrap()
|
||||||
|
.flatten()
|
||||||
|
.map(|e| e.path())
|
||||||
|
.filter(|p| p.extension().is_some_and(|x| x == "solidcraft" || x == "json") && !p.to_string_lossy().ends_with(".expected.json"))
|
||||||
|
.collect();
|
||||||
|
files.sort();
|
||||||
|
for p in files {
|
||||||
|
let name = p.file_stem().unwrap_or_default().to_string_lossy().to_string();
|
||||||
|
let s = if p.extension().is_some_and(|x| x == "solidcraft") {
|
||||||
|
open(&p)
|
||||||
|
} else {
|
||||||
|
let mut s = Session::default();
|
||||||
|
let script: Value = serde_json::from_slice(&std::fs::read(&p).unwrap()).unwrap();
|
||||||
|
s.run_script(&script).unwrap_or_else(|e| panic!("{name}: {e}"));
|
||||||
|
if s.active_sketch.is_some() {
|
||||||
|
let _ = s.execute("sketch.finish", &json!({}));
|
||||||
|
}
|
||||||
|
s
|
||||||
|
};
|
||||||
|
out.push((name, s));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// For each design and its first length parameter that edits cleanly (the user's first): the parameter
|
||||||
|
/// scaled by 1.1 gives what a fresh build at that value gives, and setting it back gives the
|
||||||
|
/// original topology.
|
||||||
|
#[test]
|
||||||
|
fn a_parameter_edit_rebuilds_like_a_fresh_build_and_reverts_exactly() {
|
||||||
|
let dir = scratch_dir("corpus");
|
||||||
|
let mut problems = Vec::new();
|
||||||
|
let mut checked = 0;
|
||||||
|
for (name, s) in designs() {
|
||||||
|
let original = topology(&s);
|
||||||
|
let before = errors(&s);
|
||||||
|
let mut params: Vec<_> = s.doc.params.iter().filter(|p| p.unit == "mm").cloned().collect();
|
||||||
|
params.sort_by_key(|p| p.model);
|
||||||
|
let mut tried = 0;
|
||||||
|
for p in params {
|
||||||
|
if tried == 1 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let mut t = s.scratch();
|
||||||
|
let expr = format!("({}) * 1.1", p.expr);
|
||||||
|
if t.execute("parameters.change", &json!({"name": p.name, "expression": expr})).is_err() || errors(&t) != before {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
tried += 1;
|
||||||
|
checked += 1;
|
||||||
|
let edited = topology(&t);
|
||||||
|
let fresh = topology(&rebuilt(&t, &dir.join(format!("{name}-{}.solidcraft", p.name))));
|
||||||
|
if edited != fresh {
|
||||||
|
problems.push(format!("{name}: {} = {expr}: edited {edited:?}\n fresh {fresh:?}", p.name));
|
||||||
|
}
|
||||||
|
t.execute("parameters.change", &json!({"name": p.name, "expression": p.expr})).unwrap();
|
||||||
|
let back = topology(&t);
|
||||||
|
if back != original {
|
||||||
|
problems.push(format!("{name}: {} back to {}: {back:?}\n original {original:?}", p.name, p.expr));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
assert!(checked >= 8, "only {checked} parameter edits checked");
|
||||||
|
assert!(problems.is_empty(), "{}", problems.join("\n"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The README demo's Raspberry Pi case (`examples/demo/enclosure_ui_mcp.py --story pi`): its
|
||||||
|
/// face count after each feature, and each outer side (the four walls and the bottom) one face
|
||||||
|
/// throughout: (a) built at height 24, (b) built at 24 and changed to 32 in Parameters, (c)
|
||||||
|
/// built at 32. The port cut-outs and the floor vents used to split the long wall (or the end
|
||||||
|
/// wall at 24) into strips along the openings' tops and bottoms.
|
||||||
|
#[test]
|
||||||
|
fn pi_case_faces_per_step_at_both_heights() {
|
||||||
|
// Sketch1 (1) .. RectangularPattern2 (14): the faces once features 1..=k are built.
|
||||||
|
const FACES: [(usize, usize); 13] =
|
||||||
|
[(2, 6), (3, 10), (4, 19), (5, 19), (6, 25), (7, 43), (8, 43), (9, 55), (10, 55), (11, 59), (12, 59), (13, 63), (14, 79)];
|
||||||
|
let dir = scratch_dir("pi");
|
||||||
|
let design: Value = serde_json::from_slice(&std::fs::read(root().join("tests/action_matrix/designs/pi-case.solidcraft")).unwrap()).unwrap();
|
||||||
|
let at = |height: &str, file: &str| {
|
||||||
|
let mut d = design.clone();
|
||||||
|
for p in d["params"].as_array_mut().unwrap() {
|
||||||
|
if p["name"] == "height" {
|
||||||
|
p["expr"] = json!(height);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let path = dir.join(file);
|
||||||
|
std::fs::write(&path, serde_json::to_vec(&d).unwrap()).unwrap();
|
||||||
|
open(&path)
|
||||||
|
};
|
||||||
|
let a = at("24 mm", "pi-24.solidcraft");
|
||||||
|
let mut b = at("24 mm", "pi-24-to-32.solidcraft");
|
||||||
|
b.execute("parameters.change", &json!({"name": "height", "expression": "32 mm"})).unwrap();
|
||||||
|
let c = at("32 mm", "pi-32.solidcraft");
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
let mut per_case = Vec::new();
|
||||||
|
for (case, s, h) in [("(a) at 24", a, 24.), ("(b) 24 changed to 32", b, 32.), ("(c) at 32", c, 32.)] {
|
||||||
|
assert!(errors(&s).is_empty(), "{case}: features fail: {:?}", errors(&s));
|
||||||
|
let mut steps = Vec::new();
|
||||||
|
for (k, want) in FACES {
|
||||||
|
let mut t = s.scratch();
|
||||||
|
t.execute("timeline.rollback", &json!({"position": k})).unwrap();
|
||||||
|
let st = t.world_state();
|
||||||
|
let body = st.bodies.iter().find(|b| b.name == "Body1").unwrap();
|
||||||
|
assert_eq!(body.body.face_count(), want, "{case}: faces after feature {k}");
|
||||||
|
// Each outer side: the faces in its plane.
|
||||||
|
for (n, d) in [([0., -1., 0.], 33.), ([0., 1., 0.], 33.), ([-1., 0., 0.], 47.5), ([1., 0., 0.], 47.5), ([0., 0., -1.], 0.)] {
|
||||||
|
let on = (0..body.body.face_count())
|
||||||
|
.filter(|&i| match face_surface(&body.body, i) {
|
||||||
|
Some(FaceSurface::Plane { normal, point }) => {
|
||||||
|
(normal.x - n[0]).abs() + (normal.y - n[1]).abs() + (normal.z - n[2]).abs() < 1e-6 && (normal.dot(point) - d).abs() < 1e-6
|
||||||
|
}
|
||||||
|
_ => false,
|
||||||
|
})
|
||||||
|
.count();
|
||||||
|
assert_eq!(on, 1, "{case}: after feature {k} the outer side facing {n:?} is {on} faces");
|
||||||
|
}
|
||||||
|
let bbox_top = body.mesh().bounds().max.z;
|
||||||
|
assert!((bbox_top - h).abs() < 1e-6, "{case}: height {bbox_top}");
|
||||||
|
steps.push(topology(&t));
|
||||||
|
}
|
||||||
|
per_case.push((case, steps));
|
||||||
|
}
|
||||||
|
// (b) and (c): the same topology after every feature.
|
||||||
|
let (b, c) = (&per_case[1].1, &per_case[2].1);
|
||||||
|
for (k, (x, y)) in b.iter().zip(c).enumerate() {
|
||||||
|
assert_eq!(x, y, "after feature {}: (b) differs from (c)", k + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,211 @@
|
|||||||
|
//! Result reporting must not skip requested files or execute a script twice.
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::{Command, Output};
|
||||||
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
|
static NEXT: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
|
struct Scratch(PathBuf);
|
||||||
|
|
||||||
|
impl Scratch {
|
||||||
|
fn new() -> Self {
|
||||||
|
let dir = std::env::temp_dir().join(format!("solidcraft-run-results-{}-{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed)));
|
||||||
|
std::fs::create_dir(&dir).unwrap();
|
||||||
|
Self(dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn script(&self) -> PathBuf {
|
||||||
|
let path = self.0.join("box.json");
|
||||||
|
std::fs::write(&path, json!({"commands": [{"command": "solid.box", "params": {"length": 2, "width": 3, "height": 4}}]}).to_string()).unwrap();
|
||||||
|
path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Scratch {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let _ = std::fs::remove_dir_all(&self.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cli() -> Command {
|
||||||
|
Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn json_output(output: Output) -> Value {
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
serde_json::from_slice(&output.stdout).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn body_count(path: &Path) -> Value {
|
||||||
|
json_output(cli().arg("eval").arg(path).output().unwrap())["body_count"].clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn cli_loads_both_design_encodings_by_contents() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
for extension in ["solidcraft", "solvecraft", "json"] {
|
||||||
|
let saved = dir.0.join(format!("box.{extension}"));
|
||||||
|
json_output(cli().arg("run").arg(dir.script()).arg("--save").arg(&saved).output().unwrap());
|
||||||
|
let bytes = std::fs::read(&saved).unwrap();
|
||||||
|
assert_eq!(solidcraft_engine::io::is_design_container(&bytes), extension != "json");
|
||||||
|
let renamed = dir.0.join(format!("{extension}.unusual"));
|
||||||
|
std::fs::write(&renamed, bytes).unwrap();
|
||||||
|
let measured = json_output(cli().arg("eval").arg(&renamed).output().unwrap());
|
||||||
|
assert_eq!(measured["body_count"], 1);
|
||||||
|
assert!((measured["bodies"][0]["volume_mm3"].as_f64().unwrap() - 24.0).abs() < 1e-6);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn results_still_save_and_export_the_script_once() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
// JSON is explicit here because the fixture edits its saved format tag.
|
||||||
|
let saved = dir.0.join("box.json");
|
||||||
|
let stl = dir.0.join("box.stl");
|
||||||
|
let obj = dir.0.join("box.obj");
|
||||||
|
let result = json_output(
|
||||||
|
cli().arg("run").arg(dir.script()).arg("--results").arg("--save").arg(&saved).arg("--out").arg(&stl).arg("--out").arg(&obj).output().unwrap(),
|
||||||
|
);
|
||||||
|
assert_eq!(result.as_array().unwrap().len(), 1);
|
||||||
|
assert_eq!(body_count(&saved), 1);
|
||||||
|
for exported in [&stl, &obj] {
|
||||||
|
assert!(std::fs::metadata(exported).unwrap().len() > 0);
|
||||||
|
assert_eq!(body_count(exported), 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn results_with_base_design_and_quiet_still_report_and_save() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script();
|
||||||
|
let base = dir.0.join("base.solidcraft");
|
||||||
|
let saved = dir.0.join("combined.solidcraft");
|
||||||
|
json_output(cli().arg("run").arg(&script).arg("--save").arg(&base).output().unwrap());
|
||||||
|
let result = json_output(cli().args(["run", "--results", "--quiet", "--in"]).arg(&base).arg(&script).arg("--save").arg(&saved).output().unwrap());
|
||||||
|
assert_eq!(result.as_array().unwrap().len(), 1);
|
||||||
|
assert_eq!(body_count(&saved), 2);
|
||||||
|
assert_eq!(body_count(&base), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn results_propagate_output_errors() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
for flag in ["--save", "--out"] {
|
||||||
|
let path = dir.0.join("missing").join(if flag == "--save" { "box.solidcraft" } else { "box.stl" });
|
||||||
|
let output = cli().arg("run").arg(dir.script()).arg("--results").arg(flag).arg(&path).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
assert!(!output.stderr.is_empty());
|
||||||
|
assert!(output.stdout.is_empty());
|
||||||
|
assert!(!path.exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn results_without_script_still_fail() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let base = dir.0.join("base.solidcraft");
|
||||||
|
json_output(cli().arg("run").arg(dir.script()).arg("--save").arg(&base).output().unwrap());
|
||||||
|
let output = cli().args(["run", "--results", "--in"]).arg(&base).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
assert!(String::from_utf8_lossy(&output.stderr).contains("--results needs a script"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Compatibility shim (docs/compatibility.md): a design saved before the rename, with the
|
||||||
|
/// legacy extension and format tag, still opens; re-saving writes the current tag.
|
||||||
|
#[test]
|
||||||
|
fn legacy_extension_and_format_tag_still_open() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
// JSON is explicit here because the fixture edits its saved format tag.
|
||||||
|
let saved = dir.0.join("box.json");
|
||||||
|
json_output(cli().arg("run").arg(dir.script()).arg("--save").arg(&saved).output().unwrap());
|
||||||
|
let text = std::fs::read_to_string(&saved).unwrap();
|
||||||
|
assert!(text.contains("\"solidcraft/"), "new designs carry the current tag");
|
||||||
|
let legacy = dir.0.join("old.solvecraft");
|
||||||
|
std::fs::write(&legacy, text.replace("\"solidcraft/", "\"solvecraft/")).unwrap();
|
||||||
|
assert_eq!(body_count(&legacy), 1);
|
||||||
|
let resaved = dir.0.join("resaved.solidcraft");
|
||||||
|
json_output(cli().args(["run", "--in"]).arg(&legacy).arg(dir.script()).arg("--save").arg(&resaved).output().unwrap());
|
||||||
|
assert_eq!(body_count(&resaved), 2);
|
||||||
|
let reopened = solidcraft_engine::io::read_design(&std::fs::read(&resaved).unwrap()).unwrap();
|
||||||
|
assert!(reopened.to_json().contains("\"solidcraft/"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `snapshot` starts from `--in` as `run` does (its script runs on that design), and refuses an
|
||||||
|
/// option it doesn't take rather than ignoring it.
|
||||||
|
#[test]
|
||||||
|
fn snapshot_runs_its_script_on_the_in_design() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let base = dir.0.join("base.solidcraft");
|
||||||
|
json_output(cli().arg("run").arg(dir.script()).arg("--save").arg(&base).output().unwrap());
|
||||||
|
let shifted = dir.0.join("shifted.json");
|
||||||
|
std::fs::write(
|
||||||
|
&shifted,
|
||||||
|
json!({"commands": [{"command": "solid.box", "params": {"length": 2, "width": 3, "height": 4, "corner": [10, 0, 0]}}]}).to_string(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let shot = |name: &str, args: &[&std::ffi::OsStr]| {
|
||||||
|
let png = dir.0.join(name);
|
||||||
|
json_output(cli().arg("snapshot").args(args).arg("--out").arg(&png).args(["--width", "64", "--height", "48"]).output().unwrap());
|
||||||
|
std::fs::read(&png).unwrap()
|
||||||
|
};
|
||||||
|
// Pictures are drawn on the GPU: without an adapter only the option checks below run.
|
||||||
|
match solidcraft_gpu::capture::shared() {
|
||||||
|
Ok(_) => {
|
||||||
|
let alone = shot("alone.png", &[shifted.as_os_str()]);
|
||||||
|
let on_base = shot("on_base.png", &[shifted.as_os_str(), "--in".as_ref(), base.as_os_str()]);
|
||||||
|
let base_only = shot("base.png", &["--in".as_ref(), base.as_os_str()]);
|
||||||
|
assert_ne!(alone, on_base, "the script ran on the --in design");
|
||||||
|
assert_ne!(base_only, on_base);
|
||||||
|
}
|
||||||
|
Err(e @ solidcraft_gpu::GpuError::NoAdapter(_)) if std::env::var_os("SOLIDCRAFT_REQUIRE_GPU").is_none() => {
|
||||||
|
eprintln!("pictures left out: {e}")
|
||||||
|
}
|
||||||
|
Err(e) => panic!("{e}"),
|
||||||
|
}
|
||||||
|
for (bad, says) in [(["--frobnicate", "1"], "doesn't take --frobnicate"), (["--width", "wide"], "--width must be 16 to 8192")] {
|
||||||
|
let output = cli().arg("snapshot").arg(&base).arg("--out").arg(dir.0.join("x.png")).args(bad).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
assert!(String::from_utf8_lossy(&output.stderr).contains(says), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An unknown command's error suggests the id that was meant.
|
||||||
|
#[test]
|
||||||
|
fn unknown_command_suggests_the_closest_id() {
|
||||||
|
let output = cli().args(["exec", "file.open"]).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
assert!(String::from_utf8_lossy(&output.stderr).contains("did you mean `doc.open`?"), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// #1833: `--timings` reports each command's time instead of the measurement, `--profile` adds
|
||||||
|
/// the kernel's share, `--results` puts the results beside them, and files are still written.
|
||||||
|
#[test]
|
||||||
|
fn timings_and_profile_report_each_command() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let saved = dir.0.join("timed.solidcraft");
|
||||||
|
let t = json_output(cli().arg("run").arg(dir.script()).arg("--timings").arg("--save").arg(&saved).output().unwrap());
|
||||||
|
let rows = t["timings"].as_array().unwrap();
|
||||||
|
assert_eq!(rows.len(), 1);
|
||||||
|
assert_eq!((rows[0]["index"].as_u64(), rows[0]["command"].as_str()), (Some(0), Some("solid.box")));
|
||||||
|
assert!(rows[0]["ms"].as_f64().is_some() && t["total_ms"].as_f64().is_some(), "{t}");
|
||||||
|
assert!(rows[0].get("profile").is_none() && t.get("results").is_none(), "{t}");
|
||||||
|
assert_eq!(body_count(&saved), 1);
|
||||||
|
|
||||||
|
// --profile alone implies --timings; a flag before the script doesn't eat it.
|
||||||
|
let t = json_output(cli().arg("run").arg("--profile").arg(dir.script()).arg("--results").output().unwrap());
|
||||||
|
let p = &t["timings"][0]["profile"];
|
||||||
|
for k in ["boolean_ms", "tessellate_ms", "other_ms"] {
|
||||||
|
assert!(p[k].as_f64().is_some_and(|ms| ms >= 0.0), "{k}: {t}");
|
||||||
|
}
|
||||||
|
assert_eq!(t["results"].as_array().map(Vec::len), Some(1), "{t}");
|
||||||
|
|
||||||
|
// --results alone stays a plain array.
|
||||||
|
assert!(json_output(cli().arg("run").arg(dir.script()).arg("--results").output().unwrap()).is_array());
|
||||||
|
|
||||||
|
let output = cli().arg("run").arg("--in").arg(&saved).arg("--timings").output().unwrap();
|
||||||
|
assert!(!output.status.success());
|
||||||
|
assert!(String::from_utf8_lossy(&output.stderr).contains("--timings needs a script"));
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
//! A timeline feature that fails fails `run`, and nothing is written: the bodies lack what the
|
||||||
|
//! feature should have made, and handing them out with exit 0 hides the failure.
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::process::Command;
|
||||||
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
|
static NEXT: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
|
struct Scratch(PathBuf);
|
||||||
|
|
||||||
|
impl Scratch {
|
||||||
|
fn new() -> Self {
|
||||||
|
let dir = std::env::temp_dir().join(format!("solidcraft-run-strict-{}-{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed)));
|
||||||
|
std::fs::create_dir(&dir).unwrap();
|
||||||
|
Self(dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A filleted box whose fillet a later parameter change makes impossible: every command
|
||||||
|
/// succeeds, the timeline ends with a failing feature.
|
||||||
|
fn broken_script(&self) -> PathBuf {
|
||||||
|
let path = self.0.join("broken.json");
|
||||||
|
let script = json!({"commands": [
|
||||||
|
{"command": "parameters.add", "params": {"name": "r", "expression": "2 mm"}},
|
||||||
|
{"command": "solid.box", "params": {"length": 20, "width": 20, "height": 10}},
|
||||||
|
{"command": "solid.fillet", "params": {"edges": [[10, 0, 10]], "radius": "r"}},
|
||||||
|
{"command": "parameters.change", "params": {"name": "r", "expression": "50 mm"}},
|
||||||
|
]});
|
||||||
|
std::fs::write(&path, script.to_string()).unwrap();
|
||||||
|
path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Scratch {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let _ = std::fs::remove_dir_all(&self.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cli() -> Command {
|
||||||
|
Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_failing_feature_fails_the_run_and_writes_nothing() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.broken_script();
|
||||||
|
let (step, saved) = (dir.0.join("part.step"), dir.0.join("part.solidcraft"));
|
||||||
|
for extra in [&[][..], &["--results"][..], &["--quiet"][..]] {
|
||||||
|
let output = cli().arg("run").arg(&script).args(extra).arg("--out").arg(&step).arg("--save").arg(&saved).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{extra:?}");
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert!(stderr.contains("Fillet1") && stderr.contains("nothing was written"), "{stderr}");
|
||||||
|
assert!(output.stdout.is_empty(), "{extra:?}");
|
||||||
|
assert!(!step.exists() && !saved.exists(), "{extra:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn allow_errors_writes_anyway_and_a_saved_design_keeps_failing() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let (step, saved) = (dir.0.join("part.step"), dir.0.join("part.solidcraft"));
|
||||||
|
let output = cli().arg("run").arg(dir.broken_script()).arg("--allow-errors").arg("--out").arg(&step).arg("--save").arg(&saved).output().unwrap();
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
let measured: Value = serde_json::from_slice(&output.stdout).unwrap();
|
||||||
|
assert_eq!(measured["total"]["volume_mm3"], json!(4000.0), "the box without its fillet");
|
||||||
|
assert!(std::fs::metadata(&step).unwrap().len() > 0);
|
||||||
|
// The saved design still holds the failing feature: running it fails too, `eval` reports it.
|
||||||
|
let again = dir.0.join("again.step");
|
||||||
|
let output = cli().arg("run").arg(&saved).arg("--out").arg(&again).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
assert!(!again.exists());
|
||||||
|
let output = cli().arg("eval").arg(&saved).output().unwrap();
|
||||||
|
assert!(output.status.success());
|
||||||
|
let report: Value = serde_json::from_slice(&output.stdout).unwrap();
|
||||||
|
assert!(report["timeline"].as_array().unwrap().iter().any(|f| f["error"].is_string()), "{}", report["timeline"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_clean_timeline_still_writes() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.0.join("box.json");
|
||||||
|
std::fs::write(&script, json!({"commands": [{"command": "solid.box", "params": {"length": 2, "width": 3, "height": 4}}]}).to_string()).unwrap();
|
||||||
|
let step = dir.0.join("box.step");
|
||||||
|
let output = cli().arg("run").arg(&script).arg("--out").arg(&step).arg("--quiet").output().unwrap();
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
assert!(std::fs::metadata(&step).unwrap().len() > 0);
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
//! A design's command script (`timeline.export_script`, #886) replays into the same design:
|
||||||
|
//! every corpus design that the script supports comes back with the same timeline, parameters,
|
||||||
|
//! settings and bodies.
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use solidcraft_engine::Session;
|
||||||
|
|
||||||
|
fn corpus() -> Vec<PathBuf> {
|
||||||
|
let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus");
|
||||||
|
let mut v: Vec<PathBuf> =
|
||||||
|
std::fs::read_dir(&dir).unwrap().flatten().map(|e| e.path()).filter(|p| p.extension().is_some_and(|x| x == "solidcraft")).collect();
|
||||||
|
v.sort();
|
||||||
|
assert!(v.len() >= 7, "corpus files in {}", dir.display());
|
||||||
|
v
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Designs with components or joints, which scripts do not support yet.
|
||||||
|
const ASSEMBLIES: [&str; 2] = ["components-arm", "joints-hinge"];
|
||||||
|
|
||||||
|
fn bodies(s: &mut Session) -> Vec<(String, f64, f64, Value)> {
|
||||||
|
let m = s.execute("inspect.measure", &json!({})).unwrap();
|
||||||
|
let mut v: Vec<_> = m["bodies"]
|
||||||
|
.as_array()
|
||||||
|
.into_iter()
|
||||||
|
.flatten()
|
||||||
|
.map(|b| {
|
||||||
|
(
|
||||||
|
b["name"].as_str().unwrap_or_default().to_string(),
|
||||||
|
b["volume_mm3"].as_f64().unwrap(),
|
||||||
|
b["area_mm2"].as_f64().unwrap(),
|
||||||
|
b["faces"].clone(),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
v.sort_by(|a, b| a.0.cmp(&b.0));
|
||||||
|
v
|
||||||
|
}
|
||||||
|
|
||||||
|
fn errors(s: &Session) -> Vec<(u64, Option<String>)> {
|
||||||
|
s.model.results.iter().map(|r| (r.id, r.error.clone())).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn params(s: &Session) -> Vec<solidcraft_engine::doc::Param> {
|
||||||
|
let mut v = s.doc.params.clone();
|
||||||
|
v.sort_by(|a, b| a.name.cmp(&b.name));
|
||||||
|
v
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn corpus_designs_replay_from_their_scripts() {
|
||||||
|
let mut replayed = 0;
|
||||||
|
for p in corpus() {
|
||||||
|
let name = p.file_stem().unwrap_or_default().to_string_lossy().to_string();
|
||||||
|
let mut s = Session::default();
|
||||||
|
s.execute("doc.open", &json!({"path": p.to_string_lossy()})).unwrap();
|
||||||
|
let r = match s.execute("timeline.export_script", &json!({})) {
|
||||||
|
Ok(r) => r,
|
||||||
|
Err(e) => {
|
||||||
|
assert!(ASSEMBLIES.contains(&name.as_str()), "{name}: {e}");
|
||||||
|
assert!(e.to_string().contains("not supported yet"), "{name}: {e}");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
assert!(!ASSEMBLIES.contains(&name.as_str()), "{name} has components: the script should refuse it");
|
||||||
|
// Through text, as a script file would carry it.
|
||||||
|
let script: Value = serde_json::from_str(&r["script"].to_string()).unwrap();
|
||||||
|
let mut t = Session::default();
|
||||||
|
t.run_script(&script).unwrap_or_else(|e| panic!("{name}: {e}"));
|
||||||
|
assert_eq!(t.doc.features, s.doc.features, "{name}: timeline");
|
||||||
|
assert_eq!(params(&t), params(&s), "{name}: parameters");
|
||||||
|
assert_eq!(t.doc.marker, s.doc.marker, "{name}: marker");
|
||||||
|
assert_eq!(t.doc.units, s.doc.units, "{name}: units");
|
||||||
|
assert_eq!(t.doc.sheet, s.doc.sheet, "{name}: sheet metal rules");
|
||||||
|
assert_eq!(t.doc.plastic, s.doc.plastic, "{name}: plastic rules");
|
||||||
|
assert_eq!(t.doc.materials, s.doc.materials, "{name}: materials");
|
||||||
|
assert_eq!(t.doc.user_materials, s.doc.user_materials, "{name}: user materials");
|
||||||
|
assert_eq!(t.doc.favorites, s.doc.favorites, "{name}: favourites");
|
||||||
|
assert_eq!(t.doc.param_comments, s.doc.param_comments, "{name}: comments");
|
||||||
|
assert_eq!(errors(&t), errors(&s), "{name}: feature results");
|
||||||
|
assert_eq!(bodies(&mut t), bodies(&mut s), "{name}: bodies");
|
||||||
|
replayed += 1;
|
||||||
|
}
|
||||||
|
assert!(replayed >= 7, "replayed {replayed} corpus designs");
|
||||||
|
}
|
||||||
@@ -0,0 +1,412 @@
|
|||||||
|
//! `snapshot` frames its picture like the MCP `screenshot`: from a camera, a view saved in the
|
||||||
|
//! design or one the script applies itself, and without the ground grid and the origin's axes
|
||||||
|
//! when asked (the grid lies on Z 0 and cuts through a part that straddles it). Pictures are drawn
|
||||||
|
//! on the GPU and compared with a tolerance; without a GPU adapter the tests that draw are skipped
|
||||||
|
//! with the reason printed (`SOLIDCRAFT_REQUIRE_GPU=1` makes that a failure).
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::{Command, Output};
|
||||||
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use solidcraft_engine::Session;
|
||||||
|
use solidcraft_mcp::{Headless, Server};
|
||||||
|
|
||||||
|
static NEXT: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
|
/// Whether pictures can be drawn here; installs the renderer the CLI installs, so the MCP
|
||||||
|
/// `screenshot` in this process draws as `solidcraft-cli mcp` does.
|
||||||
|
fn gpu() -> bool {
|
||||||
|
match solidcraft_gpu::capture::shared() {
|
||||||
|
Ok(c) => {
|
||||||
|
solidcraft_engine::capture::install(std::sync::Arc::new(move |scene, cam, w, h| {
|
||||||
|
c.rgba(scene, cam, w, h).map(|rgba| solidcraft_engine::capture::Picture { rgba, renderer: c.renderer() }).map_err(|e| e.to_string())
|
||||||
|
}));
|
||||||
|
true
|
||||||
|
}
|
||||||
|
Err(e @ solidcraft_gpu::GpuError::NoAdapter(_)) if std::env::var_os("SOLIDCRAFT_REQUIRE_GPU").is_none() => {
|
||||||
|
eprintln!("skipping: {e}");
|
||||||
|
false
|
||||||
|
}
|
||||||
|
Err(e) => panic!("{e}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A PNG's size and RGBA pixels.
|
||||||
|
fn decode(png: &[u8]) -> (u32, u32, Vec<u8>) {
|
||||||
|
let img = image::load_from_memory_with_format(png, image::ImageFormat::Png).unwrap().to_rgba8();
|
||||||
|
(img.width(), img.height(), img.into_raw())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Pixels of two same-sized pictures that differ by more than a little in some channel.
|
||||||
|
fn differing(a: &[u8], b: &[u8]) -> usize {
|
||||||
|
let ((wa, ha, a), (wb, hb, b)) = (decode(a), decode(b));
|
||||||
|
assert_eq!((wa, ha), (wb, hb), "pictures of different sizes");
|
||||||
|
a.as_chunks::<4>().0.iter().zip(b.as_chunks::<4>().0).filter(|(p, q)| p.iter().zip(q.iter()).any(|(x, y)| x.abs_diff(*y) > 16)).count()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The same picture: GPU output may differ by a few levels or a stray edge pixel between drivers.
|
||||||
|
#[track_caller]
|
||||||
|
fn assert_same(a: &[u8], b: &[u8], what: &str) {
|
||||||
|
let (n, total) = (differing(a, b), (SIZE.0 * SIZE.1) as usize);
|
||||||
|
assert!(n * 500 <= total, "{what}: {n} of {total} pixels differ");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Different pictures: more than stray pixels differ.
|
||||||
|
#[track_caller]
|
||||||
|
fn assert_differs(a: &[u8], b: &[u8], what: &str) {
|
||||||
|
let n = differing(a, b);
|
||||||
|
assert!(n >= 20, "{what}: only {n} pixels differ");
|
||||||
|
}
|
||||||
|
|
||||||
|
const SIZE: (u32, u32) = (160, 100);
|
||||||
|
|
||||||
|
fn camera() -> Value {
|
||||||
|
json!({"target": [20, 0, 0], "yaw": 0.6, "pitch": 0.25, "distance": 100})
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Scratch(PathBuf);
|
||||||
|
|
||||||
|
impl Scratch {
|
||||||
|
fn new() -> Self {
|
||||||
|
let dir = std::env::temp_dir().join(format!("solidcraft-snapshot-camera-{}-{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed)));
|
||||||
|
std::fs::create_dir(&dir).unwrap();
|
||||||
|
Self(dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A box that straddles Z 0 and keeps clear of the origin (its axes show beside it), with a view
|
||||||
|
/// saved in the design, plus `more` steps.
|
||||||
|
fn script(&self, name: &str, more: &[Value]) -> PathBuf {
|
||||||
|
let mut steps = vec![
|
||||||
|
json!({"command": "solid.box", "params": {"length": 60, "width": 40, "height": 30, "corner": [10, -20, -15]}}),
|
||||||
|
json!({"command": "view.save", "params": {"name": "Detail", "camera": camera()}}),
|
||||||
|
];
|
||||||
|
steps.extend(more.iter().cloned());
|
||||||
|
let path = self.0.join(name);
|
||||||
|
std::fs::write(&path, json!({"commands": steps}).to_string()).unwrap();
|
||||||
|
path
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(&self, script: &Path, out: &str, extra: &[&str]) -> Output {
|
||||||
|
let (w, h) = (SIZE.0.to_string(), SIZE.1.to_string());
|
||||||
|
Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
|
||||||
|
.arg("snapshot")
|
||||||
|
.arg(script)
|
||||||
|
.arg("--out")
|
||||||
|
.arg(self.0.join(out))
|
||||||
|
.args(["--width", &w, "--height", &h])
|
||||||
|
.args(extra)
|
||||||
|
.output()
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The PNG `snapshot` writes.
|
||||||
|
fn snapshot(&self, script: &Path, out: &str, extra: &[&str]) -> Vec<u8> {
|
||||||
|
let output = self.run(script, out, extra);
|
||||||
|
assert!(output.status.success(), "{extra:?}: {}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
let png = std::fs::read(self.0.join(out)).unwrap();
|
||||||
|
assert!(png.starts_with(b"\x89PNG"), "{extra:?}");
|
||||||
|
png
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The PNG the MCP `screenshot` tool writes for the same design.
|
||||||
|
fn mcp(&self, script: &Path, out: &str, arguments: Value) -> Vec<u8> {
|
||||||
|
let mut session = Session::default();
|
||||||
|
session.run_script(&serde_json::from_slice(&std::fs::read(script).unwrap()).unwrap()).unwrap();
|
||||||
|
let mut server = Server::new(Box::new(Headless::new(session)));
|
||||||
|
let mut arguments = arguments;
|
||||||
|
arguments["path"] = json!(self.0.join(out).to_string_lossy());
|
||||||
|
arguments["width"] = json!(SIZE.0);
|
||||||
|
arguments["height"] = json!(SIZE.1);
|
||||||
|
let call = json!({"jsonrpc": "2.0", "id": 1, "method": "tools/call", "params": {"name": "screenshot", "arguments": arguments}});
|
||||||
|
let reply: Value = serde_json::from_str(&server.handle_line(&call.to_string()).unwrap()).unwrap();
|
||||||
|
assert!(reply.get("error").is_none() && reply["result"]["isError"] != json!(true), "{reply}");
|
||||||
|
std::fs::read(self.0.join(out)).unwrap()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Scratch {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let _ = std::fs::remove_dir_all(&self.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The picture of `--camera` is the picture of the MCP `screenshot` with the same camera, and
|
||||||
|
/// not the home view the option used to be ignored for.
|
||||||
|
#[test]
|
||||||
|
fn a_camera_frames_the_picture_as_the_mcp_screenshot_does() {
|
||||||
|
if !gpu() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script("part.json", &[]);
|
||||||
|
let home = dir.snapshot(&script, "home.png", &[]);
|
||||||
|
let json = camera().to_string();
|
||||||
|
let shot = dir.snapshot(&script, "camera.png", &["--camera", &json]);
|
||||||
|
assert_differs(&shot, &home, "--camera was ignored");
|
||||||
|
assert_same(&shot, &dir.mcp(&script, "mcp-camera.png", json!({"camera": camera()})), "the MCP screenshot");
|
||||||
|
// A perspective camera too, and a different eye gives a different picture.
|
||||||
|
let mut near = camera();
|
||||||
|
near["fov"] = json!(0.6);
|
||||||
|
let perspective = dir.snapshot(&script, "perspective.png", &["--camera", &near.to_string()]);
|
||||||
|
assert_differs(&perspective, &shot, "perspective");
|
||||||
|
assert_same(&perspective, &dir.mcp(&script, "mcp-perspective.png", json!({"camera": near})), "the MCP perspective screenshot");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `--view` also takes a view saved in the design, which is the camera it was saved with; a
|
||||||
|
/// standard view still looks as it did.
|
||||||
|
#[test]
|
||||||
|
fn a_saved_view_is_its_camera_and_a_standard_view_is_unchanged() {
|
||||||
|
if !gpu() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script("part.json", &[]);
|
||||||
|
let json = camera().to_string();
|
||||||
|
let by_camera = dir.snapshot(&script, "camera.png", &["--camera", &json]);
|
||||||
|
let saved = dir.snapshot(&script, "saved.png", &["--view", "Detail"]);
|
||||||
|
assert_same(&saved, &by_camera, "the saved view");
|
||||||
|
assert_same(&saved, &dir.mcp(&script, "mcp-saved.png", json!({"view": "Detail"})), "the MCP saved view");
|
||||||
|
// A standard view frames the model from its direction, as before: the home camera turned.
|
||||||
|
let top = dir.snapshot(&script, "top.png", &["--view", "top"]);
|
||||||
|
let mut s = Session::default();
|
||||||
|
s.run_script(&serde_json::from_slice(&std::fs::read(&script).unwrap()).unwrap()).unwrap();
|
||||||
|
let mut cam = solidcraft_engine::view::home_camera(&s);
|
||||||
|
cam.set_view(solidcraft_engine::render::StandardView::Top);
|
||||||
|
let scene = solidcraft_engine::view::scene(&s, &cam);
|
||||||
|
assert_same(&top, &solidcraft_engine::capture::png(&scene, &cam, SIZE.0, SIZE.1).unwrap().bytes, "the home camera turned to the top");
|
||||||
|
assert_same(&top, &dir.mcp(&script, "mcp-top.png", json!({"view": "top"})), "the MCP top view");
|
||||||
|
assert_differs(&top, &saved, "top and the saved view");
|
||||||
|
let iso = dir.snapshot(&script, "iso.png", &["--view", "iso"]);
|
||||||
|
assert_same(&iso, &dir.snapshot(&script, "home.png", &[]), "iso is home");
|
||||||
|
assert_differs(&iso, &top, "iso and top");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A script that applies a view itself (as an MCP `execute` of `view.apply` does) sets the camera
|
||||||
|
/// of its snapshot; `--view` and `--camera` still decide when given.
|
||||||
|
#[test]
|
||||||
|
fn a_script_can_carry_its_camera() {
|
||||||
|
if !gpu() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script("carried.json", &[json!({"command": "view.apply", "params": {"camera": camera()}})]);
|
||||||
|
let plain = dir.script("plain.json", &[]);
|
||||||
|
let carried = dir.snapshot(&script, "carried.png", &[]);
|
||||||
|
assert_same(&carried, &dir.snapshot(&plain, "by-camera.png", &["--camera", &camera().to_string()]), "the carried camera");
|
||||||
|
assert_differs(&carried, &dir.snapshot(&plain, "home.png", &[]), "the carried camera and home");
|
||||||
|
let top = dir.snapshot(&script, "top.png", &["--view", "top"]);
|
||||||
|
assert_same(&top, &dir.snapshot(&plain, "plain-top.png", &["--view", "top"]), "--view decides");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The grid and the axes each go when asked, and a render without both from any side shows the
|
||||||
|
/// model alone: an empty design is then the same blank picture from every camera.
|
||||||
|
#[test]
|
||||||
|
fn the_grid_and_the_axes_can_be_left_out() {
|
||||||
|
if !gpu() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script("part.json", &[]);
|
||||||
|
let json = camera().to_string();
|
||||||
|
for view in [&["--view", "front"][..], &["--camera", &json][..]] {
|
||||||
|
let with = |extra: &[&str], out: &str| dir.snapshot(&script, out, &[view, extra].concat());
|
||||||
|
let (all, no_grid, no_axes, bare) = (
|
||||||
|
with(&[], "all.png"),
|
||||||
|
with(&["--no-grid"], "no-grid.png"),
|
||||||
|
with(&["--no-axes"], "no-axes.png"),
|
||||||
|
with(&["--no-grid", "--no-axes"], "bare.png"),
|
||||||
|
);
|
||||||
|
let different = [&all, &no_grid, &no_axes, &bare];
|
||||||
|
for (i, a) in different.iter().enumerate() {
|
||||||
|
for b in &different[i + 1..] {
|
||||||
|
assert_differs(a, b, &format!("{view:?}: two of the pictures"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// The same as the MCP's `grid` and `axes`.
|
||||||
|
let mcp = |extra: Value, out: &str| {
|
||||||
|
let mut a = match view[0] {
|
||||||
|
"--view" => json!({"view": "front"}),
|
||||||
|
_ => json!({"camera": camera()}),
|
||||||
|
};
|
||||||
|
a.as_object_mut().unwrap().extend(extra.as_object().unwrap().clone());
|
||||||
|
dir.mcp(&script, out, a)
|
||||||
|
};
|
||||||
|
assert_same(&no_grid, &mcp(json!({"grid": false}), "mcp-no-grid.png"), "the MCP's grid: false");
|
||||||
|
assert_same(&no_axes, &mcp(json!({"axes": false}), "mcp-no-axes.png"), "the MCP's axes: false");
|
||||||
|
assert_same(&bare, &mcp(json!({"grid": false, "axes": false}), "mcp-bare.png"), "the MCP's bare picture");
|
||||||
|
}
|
||||||
|
let empty = dir.0.join("empty.json");
|
||||||
|
std::fs::write(&empty, json!({"commands": []}).to_string()).unwrap();
|
||||||
|
let blank = |view: &str, out: &str| dir.snapshot(&empty, out, &["--view", view, "--no-grid", "--no-axes"]);
|
||||||
|
assert_same(&blank("top", "blank-top.png"), &blank("front", "blank-front.png"), "blank from every side");
|
||||||
|
assert_differs(&blank("top", "blank-top.png"), &dir.snapshot(&empty, "top.png", &["--view", "top"]), "blank and the grid");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A snapshot of a box shows its silhouette where the camera puts it: the pixels that differ
|
||||||
|
/// from an empty design's picture (same camera, no grid or axes) span the box's corners projected
|
||||||
|
/// to pixels, within the edge and silhouette lines' width.
|
||||||
|
#[test]
|
||||||
|
fn a_snapshot_shows_the_part_where_the_camera_puts_it() {
|
||||||
|
if !gpu() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let part = dir.0.join("box.json");
|
||||||
|
let empty = dir.0.join("empty.json");
|
||||||
|
let corner = [10.0, -20.0, -15.0];
|
||||||
|
let size = [60.0, 40.0, 30.0];
|
||||||
|
std::fs::write(
|
||||||
|
&part,
|
||||||
|
json!({"commands": [{"command": "solid.box", "params": {"length": size[0], "width": size[1], "height": size[2], "corner": corner}}]})
|
||||||
|
.to_string(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
std::fs::write(&empty, json!({"commands": []}).to_string()).unwrap();
|
||||||
|
for cam in [
|
||||||
|
camera(),
|
||||||
|
json!({"target": [40, 0, 0], "yaw": 0.0, "pitch": 0.0, "distance": 160}),
|
||||||
|
json!({"target": [40, 0, 0], "yaw": -0.4, "pitch": 0.5, "distance": 150, "fov": 0.6}),
|
||||||
|
] {
|
||||||
|
let args = ["--camera", &cam.to_string(), "--no-grid", "--no-axes"];
|
||||||
|
let (_, _, with) = decode(&dir.snapshot(&part, "part.png", &args));
|
||||||
|
let (_, _, without) = decode(&dir.snapshot(&empty, "empty.png", &args));
|
||||||
|
// The part's pixels: where the picture differs from the empty one.
|
||||||
|
let (mut lo, mut hi) = ([u32::MAX; 2], [0u32; 2]);
|
||||||
|
for (i, (p, q)) in with.as_chunks::<4>().0.iter().zip(without.as_chunks::<4>().0).enumerate() {
|
||||||
|
if p.iter().zip(q.iter()).any(|(x, y)| x.abs_diff(*y) > 24) {
|
||||||
|
let (x, y) = (i as u32 % SIZE.0, i as u32 / SIZE.0);
|
||||||
|
lo = [lo[0].min(x), lo[1].min(y)];
|
||||||
|
hi = [hi[0].max(x), hi[1].max(y)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert!(lo[0] <= hi[0], "{cam}: the part is not in the picture");
|
||||||
|
// Where the camera puts the corners.
|
||||||
|
let mut s = solidcraft_engine::Session::default();
|
||||||
|
s.execute("view.apply", &json!({"camera": cam})).unwrap();
|
||||||
|
let c = s.camera.unwrap();
|
||||||
|
let vp = c.view_proj(f64::from(SIZE.0) / f64::from(SIZE.1), 1000.0);
|
||||||
|
let (mut elo, mut ehi) = ([f64::MAX; 2], [f64::MIN; 2]);
|
||||||
|
for k in 0..8 {
|
||||||
|
let p = solidcraft_engine::geom::Vec3::new(
|
||||||
|
corner[0] + size[0] * f64::from(k & 1),
|
||||||
|
corner[1] + size[1] * f64::from((k >> 1) & 1),
|
||||||
|
corner[2] + size[2] * f64::from((k >> 2) & 1),
|
||||||
|
);
|
||||||
|
let q = vp.apply(p);
|
||||||
|
let (x, y) = ((q[0] / q[3] + 1.0) * 0.5 * f64::from(SIZE.0), (1.0 - q[1] / q[3]) * 0.5 * f64::from(SIZE.1));
|
||||||
|
elo = [elo[0].min(x), elo[1].min(y)];
|
||||||
|
ehi = [ehi[0].max(x), ehi[1].max(y)];
|
||||||
|
}
|
||||||
|
let near = |got: u32, want: f64| (f64::from(got) - want).abs() <= 2.5;
|
||||||
|
assert!(
|
||||||
|
near(lo[0], elo[0]) && near(lo[1], elo[1]) && near(hi[0] + 1, ehi[0]) && near(hi[1] + 1, ehi[1]),
|
||||||
|
"{cam}: the part spans pixels {lo:?}..={hi:?}, its corners project to {elo:?}..{ehi:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `snapshot` under a `SOLIDCRAFT_GPU` policy: its reply and stderr.
|
||||||
|
fn snapshot_under(dir: &Scratch, script: &Path, out: &str, policy: &str) -> Output {
|
||||||
|
Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
|
||||||
|
.env("SOLIDCRAFT_GPU", policy)
|
||||||
|
.arg("snapshot")
|
||||||
|
.arg(script)
|
||||||
|
.arg("--out")
|
||||||
|
.arg(dir.0.join(out))
|
||||||
|
.args(["--width", &SIZE.0.to_string(), "--height", &SIZE.1.to_string(), "--view", "top"])
|
||||||
|
.output()
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The last tier: `SOLIDCRAFT_GPU=cpu` draws with the CPU rasterizer whatever adapters there are,
|
||||||
|
/// says so (`renderer: cpu` and a warning that overlays are not drawn), and the picture is the
|
||||||
|
/// rasterizer's own.
|
||||||
|
#[test]
|
||||||
|
fn a_forced_cpu_snapshot_is_the_cpu_rasterizers_and_says_so() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script("part.json", &[]);
|
||||||
|
let output = snapshot_under(&dir, &script, "cpu.png", "cpu");
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert!(output.status.success(), "{stderr}");
|
||||||
|
let reply: Value = serde_json::from_slice(&output.stdout).unwrap();
|
||||||
|
assert_eq!(reply["renderer"], "cpu", "{reply}");
|
||||||
|
assert!(reply["warning"].as_str().is_some_and(|w| w.contains("not drawn")), "{reply}");
|
||||||
|
assert!(stderr.contains("CPU rasterizer"), "{stderr}");
|
||||||
|
let mut s = Session::default();
|
||||||
|
s.run_script(&serde_json::from_slice(&std::fs::read(&script).unwrap()).unwrap()).unwrap();
|
||||||
|
let mut cam = solidcraft_engine::view::home_camera(&s);
|
||||||
|
cam.set_view(solidcraft_engine::render::StandardView::Top);
|
||||||
|
let scene = solidcraft_engine::view::scene(&s, &cam);
|
||||||
|
let cpu = solidcraft_engine::render::render_png(&scene, &cam, SIZE.0 as usize, SIZE.1 as usize).unwrap();
|
||||||
|
assert_eq!(std::fs::read(dir.0.join("cpu.png")).unwrap(), cpu);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `hardware` (and `software`) never fall to the CPU rasterizer: without such an adapter the
|
||||||
|
/// snapshot fails, naming the policy, and writes nothing; with one it says it was drawn on the GPU.
|
||||||
|
/// `auto` lands where `solidcraft-cli gpu` says it does.
|
||||||
|
#[test]
|
||||||
|
fn a_strict_policy_never_falls_to_the_cpu() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script("part.json", &[]);
|
||||||
|
let survey = |policy: &str| {
|
||||||
|
let o = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(["gpu", "--policy", policy]).output().unwrap();
|
||||||
|
(o.status.success(), serde_json::from_slice::<Value>(&o.stdout).unwrap_or(Value::Null))
|
||||||
|
};
|
||||||
|
for policy in ["hardware", "software"] {
|
||||||
|
let (found, report) = survey(policy);
|
||||||
|
let output = snapshot_under(&dir, &script, &format!("{policy}.png"), policy);
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
if found {
|
||||||
|
assert!(output.status.success(), "{policy}: {stderr}");
|
||||||
|
let reply: Value = serde_json::from_slice(&output.stdout).unwrap();
|
||||||
|
assert_eq!(reply["renderer"], report["renderer"], "{policy}: {reply}");
|
||||||
|
assert_ne!(reply["renderer"], "cpu");
|
||||||
|
} else {
|
||||||
|
assert_eq!(report["lands_on"], Value::Null, "{policy}: {report}");
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{policy}: {stderr}");
|
||||||
|
assert!(stderr.contains(&format!("`{policy}` policy")) && stderr.contains("solidcraft-cli gpu"), "{policy}: {stderr}");
|
||||||
|
assert!(!dir.0.join(format!("{policy}.png")).exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let (found, report) = survey("auto");
|
||||||
|
assert!(found, "auto always lands somewhere: {report}");
|
||||||
|
let output = snapshot_under(&dir, &script, "auto.png", "auto");
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
let reply: Value = serde_json::from_slice(&output.stdout).unwrap();
|
||||||
|
assert_eq!(reply["renderer"], report["renderer"], "{reply} vs {report}");
|
||||||
|
let (_, cpu) = survey("cpu");
|
||||||
|
assert_eq!((cpu["lands_on"].clone(), cpu["renderer"].clone()), (json!("cpu"), json!("cpu")), "{cpu}");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_view_or_a_camera_that_cannot_be_used_is_an_error_and_writes_nothing() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script("part.json", &[]);
|
||||||
|
let cases: [(&[&str], &str); 7] = [
|
||||||
|
(&["--view", "Nowhere"], "Nowhere"),
|
||||||
|
(&["--view", "iso", "--camera", "{}"], "not both"),
|
||||||
|
(&["--camera", "not json"], "--camera"),
|
||||||
|
(&["--camera", "{\"target\": [0, 0, 0]}"], "yaw"),
|
||||||
|
(&["--camera", "{\"target\": [0, 0, 0], \"yaw\": 0, \"pitch\": 0, \"distance\": 0}"], "distance"),
|
||||||
|
(&["--camera", "{\"target\": [0, 0, 0], \"yaw\": 0, \"pitch\": 0, \"distance\": 50, \"fov\": -1}"], "camera"),
|
||||||
|
(&["--camera", "[1, 2, 3]"], "camera"),
|
||||||
|
];
|
||||||
|
for (extra, expect) in cases {
|
||||||
|
let output = dir.run(&script, "never.png", extra);
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{extra:?}: {stderr}");
|
||||||
|
assert!(stderr.contains(expect), "{extra:?}: {stderr}");
|
||||||
|
assert!(output.stdout.is_empty() && !dir.0.join("never.png").exists(), "{extra:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The usage text says what the new options do.
|
||||||
|
#[test]
|
||||||
|
fn the_usage_names_the_camera_and_the_guides() {
|
||||||
|
let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).arg("snapshot").output().unwrap();
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
for word in ["--camera", "--view", "view.save", "--no-grid", "--no-axes"] {
|
||||||
|
assert!(stderr.contains(word), "usage lacks {word}: {stderr}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
//! Straight edges stay one edge after many cuts (#1049). The owner's design
|
||||||
|
//! (`tests/action_matrix/designs/crazy-geom-cuts.solidcraft`, saved by 0.10.0): five extrudes,
|
||||||
|
//! joins and cuts, over four sketches, three of them on faces of the body with the faces'
|
||||||
|
//! edges projected. Cuts used to leave the straight edges of the walls they sliced split at
|
||||||
|
//! vertices nothing else used, so an edge that is one straight line was drawn (and lit on hover)
|
||||||
|
//! as many pieces, and a sketch on such a face projected every piece.
|
||||||
|
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use serde_json::json;
|
||||||
|
use solidcraft_engine::Session;
|
||||||
|
use solidcraft_engine::doc::kernel::{FaceSurface, face_surface};
|
||||||
|
use solidcraft_engine::geom::Vec3;
|
||||||
|
|
||||||
|
fn design() -> PathBuf {
|
||||||
|
Path::new(env!("CARGO_MANIFEST_DIR")).join("../../tests/action_matrix/designs/crazy-geom-cuts.solidcraft")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn open(path: &Path) -> Session {
|
||||||
|
let mut s = Session::default();
|
||||||
|
s.execute("doc.open", &json!({"path": path.to_string_lossy()})).unwrap_or_else(|e| panic!("{}: {e}", path.display()));
|
||||||
|
s
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The design built from scratch: saved without cached geometry and opened again.
|
||||||
|
fn rebuilt() -> Session {
|
||||||
|
let s = open(&design());
|
||||||
|
let dir = std::env::temp_dir().join(format!("solidcraft-straight-edges-{}", std::process::id()));
|
||||||
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
|
let path = dir.join("crazy-geom-cuts.json");
|
||||||
|
let mut t = s.scratch();
|
||||||
|
t.execute("file.save", &json!({"path": path.to_string_lossy(), "format": "json"})).unwrap();
|
||||||
|
let out = open(&path);
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
fn errors(s: &Session) -> Vec<(u64, String)> {
|
||||||
|
s.model.results.iter().filter_map(|r| r.error.clone().map(|e| (r.id, e))).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn key(v: Vec3) -> [i64; 3] {
|
||||||
|
[v.x, v.y, v.z].map(|c| (c * 1e5).round() as i64)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn straight_edges_are_one_edge_after_many_cuts() {
|
||||||
|
for (what, s) in [("as saved", open(&design())), ("built from scratch", rebuilt())] {
|
||||||
|
assert_eq!(errors(&s), vec![], "{what}: every feature evaluates");
|
||||||
|
let st = s.world_state();
|
||||||
|
let bodies: Vec<_> = st.bodies.iter().filter(|b| !b.body.is_mesh()).collect();
|
||||||
|
assert_eq!(bodies.len(), 1, "{what}: one body");
|
||||||
|
let body = &bodies[0].body;
|
||||||
|
let mesh = body.tessellate(0.01).unwrap();
|
||||||
|
// Every edge is drawn as one polyline; a straight one as one segment.
|
||||||
|
let mut at: HashMap<[i64; 3], Vec<usize>> = HashMap::new();
|
||||||
|
for (i, e) in mesh.edges.iter().enumerate() {
|
||||||
|
let (Some(a), Some(z)) = (e.first(), e.last()) else { panic!("{what}: edge {i} is empty") };
|
||||||
|
at.entry(key(*a)).or_default().push(i);
|
||||||
|
at.entry(key(*z)).or_default().push(i);
|
||||||
|
}
|
||||||
|
let straight = |i: usize| mesh.edges.get(i).filter(|e| e.len() == 2).and_then(|e| (e[1] - e[0]).normalized());
|
||||||
|
let split: Vec<_> = at
|
||||||
|
.iter()
|
||||||
|
.filter(|(_, es)| match es.as_slice() {
|
||||||
|
[a, b] => straight(*a).zip(straight(*b)).is_some_and(|(u, w)| u.dot(w).abs() > 1. - 1e-9),
|
||||||
|
_ => false,
|
||||||
|
})
|
||||||
|
.map(|(k, _)| k.map(|c| c as f64 / 1e5))
|
||||||
|
.collect();
|
||||||
|
assert_eq!(split, Vec::<[f64; 3]>::new(), "{what}: straight edges split where nothing else meets them");
|
||||||
|
// No two faces side by side in one plane.
|
||||||
|
let plane = |f: usize| match face_surface(body, f) {
|
||||||
|
Some(FaceSurface::Plane { normal, point }) => Some((normal, normal.dot(point))),
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
for (i, faces) in mesh.edge_faces.iter().enumerate() {
|
||||||
|
if let [a, b] = faces.as_slice()
|
||||||
|
&& a != b
|
||||||
|
&& let (Some((na, da)), Some((nb, db))) = (plane(*a as usize), plane(*b as usize))
|
||||||
|
{
|
||||||
|
assert!(na.dot(nb) < 1. - 1e-9 || (da - db).abs() > 1e-6, "{what}: faces {a} and {b} meet at edge {i} in one plane");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert_eq!((body.face_count(), body.edge_count(), body.vertex_count()), (35, 107, 71), "{what}: faces, edges and vertices");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "solvecraft-web"
|
name = "solidcraft-web"
|
||||||
description = "SolidCraft in the browser (eframe web runner, WebGPU with WebGL2 fallback)"
|
description = "SolidCraft in the browser (eframe web runner, WebGPU with WebGL2 fallback)"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
@@ -10,12 +10,12 @@ publish = false
|
|||||||
workspace = true
|
workspace = true
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "solvecraft-web"
|
name = "solidcraft-web"
|
||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
solvecraft-engine = { workspace = true }
|
solidcraft-engine = { workspace = true }
|
||||||
solvecraft-ui-egui = { workspace = true }
|
solidcraft-ui-egui = { workspace = true }
|
||||||
egui = { workspace = true }
|
egui = { workspace = true }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
|
|
||||||
@@ -29,5 +29,5 @@ web-sys = { version = "0.3", features = [
|
|||||||
"Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "Location", "Navigator", "StorageManager",
|
"Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "Location", "Navigator", "StorageManager",
|
||||||
"FileSystemHandle", "FileSystemDirectoryHandle", "FileSystemFileHandle", "FileSystemGetFileOptions", "FileSystemWritableFileStream",
|
"FileSystemHandle", "FileSystemDirectoryHandle", "FileSystemFileHandle", "FileSystemGetFileOptions", "FileSystemWritableFileStream",
|
||||||
"WritableStream", "File", "FileList", "Blob", "BlobPropertyBag", "Url", "HtmlAnchorElement", "HtmlInputElement", "Storage",
|
"WritableStream", "File", "FileList", "Blob", "BlobPropertyBag", "Url", "HtmlAnchorElement", "HtmlInputElement", "Storage",
|
||||||
"BeforeUnloadEvent", "Event", "EventTarget", "Response",
|
"BeforeUnloadEvent", "Event", "EventTarget", "Response", "MediaQueryList", "Gamepad", "Performance",
|
||||||
] }
|
] }
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# Build with: trunk build --release (from apps/solidcraft-web)
|
||||||
|
[build]
|
||||||
|
target = "index.html"
|
||||||
|
dist = "../../dist/web"
|
||||||
|
public_url = "./"
|
||||||
|
filehash = true
|
||||||
|
|
||||||
|
[serve]
|
||||||
|
addresses = ["127.0.0.1"]
|
||||||
|
port = 8781
|
||||||
|
|
||||||
|
# Offline use and updates: release builds get sw.js listing this build's files (xtask/src/web_offline.rs).
|
||||||
|
[[hooks]]
|
||||||
|
stage = "post_build"
|
||||||
|
command = "cargo"
|
||||||
|
command_arguments = ["xtask", "web-offline"]
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
|
||||||
|
<title>SolidCraft</title>
|
||||||
|
<meta name="description" content="Open-source parametric CAD built in Rust. Desktop, browser, and MCP for AI agents.">
|
||||||
|
<meta property="og:type" content="website">
|
||||||
|
<meta property="og:site_name" content="SolidCraft">
|
||||||
|
<meta property="og:title" content="SolidCraft: try it in your browser">
|
||||||
|
<meta property="og:description" content="Open-source parametric CAD built in Rust. Desktop, browser, and MCP for AI agents.">
|
||||||
|
<meta property="og:url" content="https://solidcraft.ai/">
|
||||||
|
<meta property="og:image" content="https://docs.solidcraft.io/og.png">
|
||||||
|
<meta property="og:image:width" content="1280">
|
||||||
|
<meta property="og:image:height" content="640">
|
||||||
|
<meta property="og:image:alt" content="SolidCraft: open-source parametric CAD built in Rust">
|
||||||
|
<meta name="twitter:card" content="summary_large_image">
|
||||||
|
<meta name="twitter:title" content="SolidCraft: try it in your browser">
|
||||||
|
<meta name="twitter:description" content="Open-source parametric CAD built in Rust. Desktop, browser, and MCP for AI agents.">
|
||||||
|
<meta name="twitter:image" content="https://docs.solidcraft.io/og.png">
|
||||||
|
<meta name="twitter:image:alt" content="SolidCraft: open-source parametric CAD built in Rust">
|
||||||
|
<link data-trunk rel="rust" data-bin="solidcraft-web" data-wasm-opt="z" data-weak-refs />
|
||||||
|
<link data-trunk rel="copy-file" href="../../assets/fonts/biz-udp-gothic/BIZUDPGothic-Regular.ttf" data-target-path="fonts" />
|
||||||
|
<link data-trunk rel="copy-file" href="../../assets/fonts/biz-udp-gothic/OFL.txt" data-target-path="fonts" />
|
||||||
|
<link data-trunk rel="css" href="../../assets/styles/web/loading.css" />
|
||||||
|
<link data-trunk rel="copy-file" href="../../assets/styles/web/loading-logo.svg" />
|
||||||
|
<!-- Installable as an app (manifest.webmanifest); the icons are the Linux exports of the app mark. -->
|
||||||
|
<meta name="theme-color" content="#343840">
|
||||||
|
<link rel="manifest" href="manifest.webmanifest">
|
||||||
|
<link rel="icon" type="image/png" sizes="32x32" href="icons/32x32/ai.storyteller.solidcraft.png">
|
||||||
|
<link rel="apple-touch-icon" href="icons/256x256/ai.storyteller.solidcraft.png">
|
||||||
|
<link data-trunk rel="copy-file" href="manifest.webmanifest" />
|
||||||
|
<link data-trunk rel="copy-file" href="../../assets/icons/app/linux/exports/hicolor/32x32/apps/ai.storyteller.solidcraft.png" data-target-path="icons/32x32" />
|
||||||
|
<link data-trunk rel="copy-file" href="../../assets/icons/app/linux/exports/hicolor/256x256/apps/ai.storyteller.solidcraft.png" data-target-path="icons/256x256" />
|
||||||
|
<link data-trunk rel="copy-file" href="../../assets/icons/app/linux/exports/hicolor/512x512/apps/ai.storyteller.solidcraft.png" data-target-path="icons/512x512" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<canvas id="solidcraft_canvas"></canvas>
|
||||||
|
<div id="solidcraft_loading" role="status"><img src="loading-logo.svg" alt=""><span class="sr-only">Loading SolidCraft…</span></div>
|
||||||
|
<script>
|
||||||
|
// Offline use and updates (sw.js; written into release builds by `cargo xtask web-offline`).
|
||||||
|
if ("serviceWorker" in navigator) {
|
||||||
|
addEventListener("load", () => navigator.serviceWorker.register("sw.js").catch(() => {}));
|
||||||
|
}
|
||||||
|
// Install as an app: the browser's offer can come before the app runs, so it is kept here for
|
||||||
|
// the app's File ▸ Install app… item (src/install.rs). Installed, the browser makes no more offers.
|
||||||
|
addEventListener("beforeinstallprompt", (e) => { e.preventDefault(); window.solidcraftInstall = e; });
|
||||||
|
addEventListener("appinstalled", () => { window.solidcraftInstall = null; });
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"name": "SolidCraft",
|
||||||
|
"short_name": "SolidCraft",
|
||||||
|
"description": "Open-source parametric CAD built in Rust.",
|
||||||
|
"start_url": "./",
|
||||||
|
"scope": "./",
|
||||||
|
"display": "standalone",
|
||||||
|
"background_color": "#e8ebf0",
|
||||||
|
"theme_color": "#343840",
|
||||||
|
"categories": ["productivity", "utilities"],
|
||||||
|
"icons": [
|
||||||
|
{ "src": "icons/32x32/ai.storyteller.solidcraft.png", "sizes": "32x32", "type": "image/png" },
|
||||||
|
{ "src": "icons/256x256/ai.storyteller.solidcraft.png", "sizes": "256x256", "type": "image/png" },
|
||||||
|
{ "src": "icons/512x512/ai.storyteller.solidcraft.png", "sizes": "512x512", "type": "image/png" }
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,131 @@
|
|||||||
|
//! Promise-based access to the running app's existing control channel.
|
||||||
|
|
||||||
|
use std::cell::RefCell;
|
||||||
|
use std::rc::Rc;
|
||||||
|
use std::sync::mpsc::{Receiver, Sender, TryRecvError};
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use solidcraft_ui_egui::ControlRequest;
|
||||||
|
use wasm_bindgen::{JsValue, closure::Closure};
|
||||||
|
|
||||||
|
const MAX_PENDING: usize = 256;
|
||||||
|
const MAX_JSON_BYTES: usize = 16 * 1024 * 1024;
|
||||||
|
|
||||||
|
struct Pending {
|
||||||
|
reply: Receiver<Value>,
|
||||||
|
resolve: js_sys::Function,
|
||||||
|
reject: js_sys::Function,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Api {
|
||||||
|
sender: Sender<ControlRequest>,
|
||||||
|
pending: Rc<RefCell<Vec<Pending>>>,
|
||||||
|
ctx: egui::Context,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn params(value: &JsValue) -> Result<Value, String> {
|
||||||
|
if value.is_undefined() || value.is_null() {
|
||||||
|
return Ok(json!({}));
|
||||||
|
}
|
||||||
|
let text = js_sys::JSON::stringify(value).ok().and_then(|v| v.as_string()).ok_or("params must be JSON serializable")?;
|
||||||
|
if text.len() > MAX_JSON_BYTES {
|
||||||
|
return Err("params exceed 16 MiB".into());
|
||||||
|
}
|
||||||
|
serde_json::from_str(&text).map_err(|e| format!("invalid params: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn error(message: &str) -> JsValue {
|
||||||
|
js_sys::Error::new(message).into()
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Api {
|
||||||
|
pub fn install(sender: Sender<ControlRequest>, ctx: egui::Context) -> Result<Self, JsValue> {
|
||||||
|
let api = Self { sender, pending: Rc::default(), ctx };
|
||||||
|
let object = js_sys::Object::new();
|
||||||
|
let request = api.clone();
|
||||||
|
let execute = api.clone();
|
||||||
|
let commands = api.clone();
|
||||||
|
let inspect = api.clone();
|
||||||
|
for (name, function) in [
|
||||||
|
(
|
||||||
|
"request",
|
||||||
|
Closure::<dyn Fn(String, JsValue) -> js_sys::Promise>::new(move |method: String, value: JsValue| {
|
||||||
|
request.request(&method, params(&value))
|
||||||
|
})
|
||||||
|
.into_js_value(),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"execute",
|
||||||
|
Closure::<dyn Fn(String, JsValue) -> js_sys::Promise>::new(move |command: String, value: JsValue| {
|
||||||
|
execute.request("engine.execute", params(&value).map(|p| json!({"command": command, "params": p})))
|
||||||
|
})
|
||||||
|
.into_js_value(),
|
||||||
|
),
|
||||||
|
("commands", Closure::<dyn Fn() -> js_sys::Promise>::new(move || commands.request("engine.commands", Ok(json!({})))).into_js_value()),
|
||||||
|
(
|
||||||
|
"inspect",
|
||||||
|
Closure::<dyn Fn(JsValue) -> js_sys::Promise>::new(move |value: JsValue| inspect.request("document.inspect", params(&value)))
|
||||||
|
.into_js_value(),
|
||||||
|
),
|
||||||
|
] {
|
||||||
|
js_sys::Reflect::set(&object, &name.into(), &function)?;
|
||||||
|
}
|
||||||
|
let window = web_sys::window().ok_or_else(|| error("no window"))?;
|
||||||
|
js_sys::Reflect::set(&window, &"solidcraft".into(), &object)?;
|
||||||
|
Ok(api)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn request(&self, method: &str, params: Result<Value, String>) -> js_sys::Promise {
|
||||||
|
let params = match params {
|
||||||
|
Ok(params) => params,
|
||||||
|
Err(message) => return js_sys::Promise::reject(&error(&message)),
|
||||||
|
};
|
||||||
|
if self.pending.borrow().len() >= MAX_PENDING {
|
||||||
|
return js_sys::Promise::reject(&error("too many pending SolidCraft requests (maximum 256)"));
|
||||||
|
}
|
||||||
|
js_sys::Promise::new(&mut |resolve, reject| {
|
||||||
|
let (request, reply) = ControlRequest::new(method, params.clone());
|
||||||
|
if self.sender.send(request).is_err() {
|
||||||
|
let _ = reject.call1(&JsValue::UNDEFINED, &error("SolidCraft is not running"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
self.pending.borrow_mut().push(Pending { reply, resolve, reject });
|
||||||
|
self.ctx.request_repaint();
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn poll(&self) {
|
||||||
|
let mut completed = Vec::new();
|
||||||
|
self.pending.borrow_mut().retain_mut(|pending| {
|
||||||
|
let result = match pending.reply.try_recv() {
|
||||||
|
Ok(reply) => {
|
||||||
|
if reply.get("ok").and_then(Value::as_bool) == Some(true) {
|
||||||
|
js_sys::JSON::parse(&reply.get("result").unwrap_or(&Value::Null).to_string())
|
||||||
|
} else {
|
||||||
|
Err(error(reply.get("error").and_then(Value::as_str).unwrap_or("SolidCraft request failed")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(TryRecvError::Empty) => return true,
|
||||||
|
Err(TryRecvError::Disconnected) => Err(error("SolidCraft request dropped")),
|
||||||
|
};
|
||||||
|
completed.push((pending.resolve.clone(), pending.reject.clone(), result));
|
||||||
|
false
|
||||||
|
});
|
||||||
|
// Release the queue before calling JavaScript, which can submit another request.
|
||||||
|
for (resolve, reject, result) in completed {
|
||||||
|
match result {
|
||||||
|
Ok(value) => {
|
||||||
|
let _ = resolve.call1(&JsValue::UNDEFINED, &value);
|
||||||
|
}
|
||||||
|
Err(error) => {
|
||||||
|
let _ = reject.call1(&JsValue::UNDEFINED, &error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !self.pending.borrow().is_empty() {
|
||||||
|
self.ctx.request_repaint_after(Duration::from_millis(16));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
//! Files in the browser. Designs are kept in the origin private file system (OPFS): read into
|
//! Files in the browser. Designs are kept in the origin private file system (OPFS): read into
|
||||||
//! the engine's in-memory files (`solvecraft_engine::io::vfs`) at start, written back whenever a
|
//! the engine's in-memory files (`solidcraft_engine::io::vfs`) at start, written back whenever a
|
||||||
//! command writes one. Files come in from the computer through a file picker (the File System
|
//! command writes one. Files come in from the computer through a file picker (the File System
|
||||||
//! Access API where the browser has it, an `<input type=file>` otherwise) or a drop on the page,
|
//! Access API where the browser has it, an `<input type=file>` otherwise) or a drop on the page,
|
||||||
//! and go out as downloads (exports, and "Download design"). An autosave of unsaved work is kept
|
//! and go out as downloads (exports, and "Download design"). An autosave of unsaved work is kept
|
||||||
@@ -9,7 +9,7 @@ use std::cell::{Cell, RefCell};
|
|||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
use js_sys::{Array, Function, Object, Reflect, Uint8Array};
|
use js_sys::{Array, Function, Object, Reflect, Uint8Array};
|
||||||
use solvecraft_engine::io::vfs;
|
use solidcraft_engine::io::vfs;
|
||||||
use wasm_bindgen::{JsCast as _, JsValue, closure::Closure};
|
use wasm_bindgen::{JsCast as _, JsValue, closure::Closure};
|
||||||
use wasm_bindgen_futures::{JsFuture, spawn_local};
|
use wasm_bindgen_futures::{JsFuture, spawn_local};
|
||||||
use web_sys::{FileSystemDirectoryHandle, FileSystemFileHandle, FileSystemGetFileOptions, FileSystemWritableFileStream};
|
use web_sys::{FileSystemDirectoryHandle, FileSystemFileHandle, FileSystemGetFileOptions, FileSystemWritableFileStream};
|
||||||
@@ -20,8 +20,11 @@ pub const OPFS: &str = "/opfs/";
|
|||||||
pub const DOWNLOADS: &str = "/downloads/";
|
pub const DOWNLOADS: &str = "/downloads/";
|
||||||
/// Files brought in from the computer.
|
/// Files brought in from the computer.
|
||||||
pub const UPLOAD: &str = "/upload/";
|
pub const UPLOAD: &str = "/upload/";
|
||||||
/// The autosave of unsaved work (in OPFS: `recovery.solvecraft` and `recovery.json`).
|
/// The autosave of unsaved work (in OPFS: `recovery.solidcraft` and `recovery.json`).
|
||||||
const RECOVERY: &str = "recovery.solvecraft";
|
const RECOVERY: &str = "recovery.solidcraft";
|
||||||
|
/// The autosave earlier releases kept (compatibility shim, docs/compatibility.md): recovered
|
||||||
|
/// when there is no current one.
|
||||||
|
const LEGACY_RECOVERY: &str = "recovery.solvecraft";
|
||||||
const RECOVERY_META: &str = "recovery.json";
|
const RECOVERY_META: &str = "recovery.json";
|
||||||
|
|
||||||
/// What to do with a file brought in from the computer.
|
/// What to do with a file brought in from the computer.
|
||||||
@@ -87,7 +90,10 @@ thread_local! {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Local storage keys of stored files.
|
/// Local storage keys of stored files.
|
||||||
const LOCAL_PREFIX: &str = "solvecraft.file.";
|
const LOCAL_PREFIX: &str = "solidcraft.file.";
|
||||||
|
/// Local-storage files kept by earlier releases (compatibility shim, docs/compatibility.md):
|
||||||
|
/// still listed and opened; removing one removes either key.
|
||||||
|
const LEGACY_LOCAL_PREFIX: &str = "solvecraft.file.";
|
||||||
|
|
||||||
fn local() -> Result<web_sys::Storage, String> {
|
fn local() -> Result<web_sys::Storage, String> {
|
||||||
web_sys::window().and_then(|w| w.local_storage().ok().flatten()).ok_or_else(|| "this browser keeps no local storage".to_string())
|
web_sys::window().and_then(|w| w.local_storage().ok().flatten()).ok_or_else(|| "this browser keeps no local storage".to_string())
|
||||||
@@ -177,7 +183,9 @@ async fn write_file(name: &str, bytes: &[u8]) -> Result<(), String> {
|
|||||||
|
|
||||||
async fn remove_file(name: &str) -> Result<(), String> {
|
async fn remove_file(name: &str) -> Result<(), String> {
|
||||||
if local_only() {
|
if local_only() {
|
||||||
return local()?.remove_item(&format!("{LOCAL_PREFIX}{name}")).map_err(err);
|
let st = local()?;
|
||||||
|
st.remove_item(&format!("{LEGACY_LOCAL_PREFIX}{name}")).map_err(err)?;
|
||||||
|
return st.remove_item(&format!("{LOCAL_PREFIX}{name}")).map_err(err);
|
||||||
}
|
}
|
||||||
let dir = root().await?;
|
let dir = root().await?;
|
||||||
JsFuture::from(dir.remove_entry(name)).await.map_err(err)?;
|
JsFuture::from(dir.remove_entry(name)).await.map_err(err)?;
|
||||||
@@ -190,7 +198,7 @@ fn read_local() -> Result<Vec<(String, Vec<u8>, f64)>, String> {
|
|||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
for i in 0..st.length().unwrap_or(0).min(10_000) {
|
for i in 0..st.length().unwrap_or(0).min(10_000) {
|
||||||
let Some(k) = st.key(i).ok().flatten() else { continue };
|
let Some(k) = st.key(i).ok().flatten() else { continue };
|
||||||
let Some(name) = k.strip_prefix(LOCAL_PREFIX) else { continue };
|
let Some(name) = k.strip_prefix(LOCAL_PREFIX).or_else(|| k.strip_prefix(LEGACY_LOCAL_PREFIX)) else { continue };
|
||||||
if let Some(v) = st.get_item(&k).ok().flatten() {
|
if let Some(v) = st.get_item(&k).ok().flatten() {
|
||||||
out.push((name.to_string(), decode(&v), 0.0));
|
out.push((name.to_string(), decode(&v), 0.0));
|
||||||
}
|
}
|
||||||
@@ -251,7 +259,14 @@ pub fn start(files: &Rc<Files>) {
|
|||||||
files.say("This page can't use the browser's file storage (it needs https or localhost): designs are kept in local storage, a few MB at most.", false);
|
files.say("This page can't use the browser's file storage (it needs https or localhost): designs are kept in local storage, a few MB at most.", false);
|
||||||
}
|
}
|
||||||
let mut entries = Vec::new();
|
let mut entries = Vec::new();
|
||||||
|
let has_recovery = all.iter().any(|(n, _, _)| n == RECOVERY);
|
||||||
for (name, bytes, modified) in all {
|
for (name, bytes, modified) in all {
|
||||||
|
if name == LEGACY_RECOVERY {
|
||||||
|
if !has_recovery {
|
||||||
|
vfs::insert(&format!("{OPFS}{RECOVERY}"), bytes);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if name == RECOVERY_META {
|
if name == RECOVERY_META {
|
||||||
let meta: serde_json::Value = serde_json::from_slice(&bytes).unwrap_or_default();
|
let meta: serde_json::Value = serde_json::from_slice(&bytes).unwrap_or_default();
|
||||||
let n = meta["name"].as_str().unwrap_or("Untitled").to_string();
|
let n = meta["name"].as_str().unwrap_or("Untitled").to_string();
|
||||||
@@ -349,7 +364,7 @@ pub fn rename(files: &Rc<Files>, from: &str, to: &str) -> Result<(), String> {
|
|||||||
if files.entries.borrow().iter().any(|e| e.name == to) {
|
if files.entries.borrow().iter().any(|e| e.name == to) {
|
||||||
return Err(format!("there is already a file named {to}"));
|
return Err(format!("there is already a file named {to}"));
|
||||||
}
|
}
|
||||||
let bytes = vfs::read(&format!("{OPFS}{from}"), solvecraft_engine::io::MAX_DESIGN_BYTES).map_err(|e| e.to_string())?;
|
let bytes = vfs::read(&format!("{OPFS}{from}"), solidcraft_engine::io::MAX_DESIGN_BYTES).map_err(|e| e.to_string())?;
|
||||||
vfs::write(&format!("{OPFS}{to}"), &bytes).map_err(|e| e.to_string())?;
|
vfs::write(&format!("{OPFS}{to}"), &bytes).map_err(|e| e.to_string())?;
|
||||||
delete(files, from);
|
delete(files, from);
|
||||||
flush(files);
|
flush(files);
|
||||||
@@ -357,11 +372,17 @@ pub fn rename(files: &Rc<Files>, from: &str, to: &str) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Keep (or drop) the autosave of the open design.
|
/// Keep (or drop) the autosave of the open design.
|
||||||
pub fn autosave(files: &Rc<Files>, doc: Option<(&solvecraft_engine::doc::Document, Option<&str>)>) {
|
pub fn autosave(files: &Rc<Files>, doc: Option<(&solidcraft_engine::doc::Document, Option<&str>)>) {
|
||||||
let files = files.clone();
|
let files = files.clone();
|
||||||
match doc {
|
match doc {
|
||||||
Some((d, path)) => {
|
Some((d, path)) => {
|
||||||
let bytes = solvecraft_engine::io::write_design(d);
|
let bytes = match solidcraft_engine::io::write_design_container(d) {
|
||||||
|
Ok(bytes) => bytes,
|
||||||
|
Err(e) => {
|
||||||
|
files.say(format!("autosave: {e}"), true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
let meta = serde_json::json!({"name": d.name, "path": path, "saved_at": js_sys::Date::now()}).to_string();
|
let meta = serde_json::json!({"name": d.name, "path": path, "saved_at": js_sys::Date::now()}).to_string();
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let r = async {
|
let r = async {
|
||||||
@@ -375,6 +396,7 @@ pub fn autosave(files: &Rc<Files>, doc: Option<(&solvecraft_engine::doc::Documen
|
|||||||
}
|
}
|
||||||
None => spawn_local(async move {
|
None => spawn_local(async move {
|
||||||
let _ = remove_file(RECOVERY).await;
|
let _ = remove_file(RECOVERY).await;
|
||||||
|
let _ = remove_file(LEGACY_RECOVERY).await;
|
||||||
let _ = remove_file(RECOVERY_META).await;
|
let _ = remove_file(RECOVERY_META).await;
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
@@ -436,7 +458,7 @@ fn input_picker(files: &Rc<Files>, intent: Intent) {
|
|||||||
let Some(doc) = web_sys::window().and_then(|w| w.document()) else { return };
|
let Some(doc) = web_sys::window().and_then(|w| w.document()) else { return };
|
||||||
let Ok(input) = doc.create_element("input").map(|e| e.unchecked_into::<web_sys::HtmlInputElement>()) else { return };
|
let Ok(input) = doc.create_element("input").map(|e| e.unchecked_into::<web_sys::HtmlInputElement>()) else { return };
|
||||||
input.set_type("file");
|
input.set_type("file");
|
||||||
input.set_accept(".solvecraft,.step,.stp,.3mf,.stl");
|
input.set_accept(".solidcraft,.solvecraft,.json,.step,.stp,.3mf,.stl,.obj,.glb,.gltf");
|
||||||
// Attached (hidden) while it is open: some browsers ignore a click on a detached input.
|
// Attached (hidden) while it is open: some browsers ignore a click on a detached input.
|
||||||
let _ = input.set_attribute("style", "display:none");
|
let _ = input.set_attribute("style", "display:none");
|
||||||
if let Some(body) = doc.body() {
|
if let Some(body) = doc.body() {
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
//! Install as an app (`solidcraft_ui_egui::install`). The browser offers it with a
|
||||||
|
//! `beforeinstallprompt` event, which can come before this code runs: index.html keeps the event
|
||||||
|
//! as `window.solidcraftInstall` (and drops it once the app is installed). The offer is good for
|
||||||
|
//! one prompt; a browser that is still willing makes a new one later. Safari makes no offer: it
|
||||||
|
//! gets its steps, unless the app is already running installed.
|
||||||
|
|
||||||
|
use solidcraft_ui_egui::install::{InstallApp, Offer, safari_steps};
|
||||||
|
use wasm_bindgen::{JsCast as _, JsValue};
|
||||||
|
|
||||||
|
/// Where index.html keeps the browser's offer.
|
||||||
|
const OFFER: &str = "solidcraftInstall";
|
||||||
|
|
||||||
|
/// The browser's offer, kept by index.html (None: none, or it was used).
|
||||||
|
fn offer() -> Option<js_sys::Object> {
|
||||||
|
let window = web_sys::window()?;
|
||||||
|
js_sys::Reflect::get(&window, &OFFER.into()).ok()?.dyn_into().ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Show the browser's install prompt (from the File menu click, so the page may).
|
||||||
|
fn prompt() {
|
||||||
|
let Some(offer) = offer() else { return };
|
||||||
|
if let Some(window) = web_sys::window() {
|
||||||
|
let _ = js_sys::Reflect::set(&window, &OFFER.into(), &JsValue::NULL);
|
||||||
|
}
|
||||||
|
let shown = js_sys::Reflect::get(&offer, &"prompt".into())
|
||||||
|
.and_then(|f| f.dyn_into::<js_sys::Function>().map_err(JsValue::from))
|
||||||
|
.and_then(|f| f.call0(&offer))
|
||||||
|
.and_then(|p| p.dyn_into::<js_sys::Promise>().map_err(JsValue::from));
|
||||||
|
match shown {
|
||||||
|
// Accepted or dismissed, the browser handles it; a refusal is only logged.
|
||||||
|
Ok(p) => wasm_bindgen_futures::spawn_local(async move {
|
||||||
|
if let Err(e) = wasm_bindgen_futures::JsFuture::from(p).await {
|
||||||
|
log::warn!("install prompt: {e:?}");
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
Err(e) => log::warn!("install prompt: {e:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The page runs as the installed app (its own window, or from the Home Screen on iOS).
|
||||||
|
fn running_installed(window: &web_sys::Window) -> bool {
|
||||||
|
let standalone = window.match_media("(display-mode: standalone)").ok().flatten().is_some_and(|m| m.matches());
|
||||||
|
let home_screen = js_sys::Reflect::get(&window.navigator(), &"standalone".into()).ok().and_then(|v| v.as_bool()).unwrap_or(false);
|
||||||
|
standalone || home_screen
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The host service for File ▸ Install app…; the UI is drawn again whenever the browser
|
||||||
|
/// makes or withdraws its offer (even with nothing else happening).
|
||||||
|
pub fn service(ctx: &egui::Context) -> InstallApp {
|
||||||
|
// Safari's steps, decided once: the browser and the way the page runs don't change.
|
||||||
|
let steps = web_sys::window().filter(|w| !running_installed(w)).and_then(|w| {
|
||||||
|
let nav = w.navigator();
|
||||||
|
let vendor = js_sys::Reflect::get(&nav, &"vendor".into()).ok().and_then(|v| v.as_string()).unwrap_or_default();
|
||||||
|
safari_steps(&nav.user_agent().unwrap_or_default(), &vendor, nav.max_touch_points())
|
||||||
|
});
|
||||||
|
if let Some(window) = web_sys::window() {
|
||||||
|
for event in ["beforeinstallprompt", "appinstalled"] {
|
||||||
|
let ctx = ctx.clone();
|
||||||
|
let redraw = wasm_bindgen::closure::Closure::<dyn FnMut()>::new(move || ctx.request_repaint());
|
||||||
|
let _ = window.add_event_listener_with_callback(event, redraw.as_ref().unchecked_ref());
|
||||||
|
// The listener lives as long as the page.
|
||||||
|
redraw.forget();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let offered = move || if offer().is_some() { Some(Offer::Prompt) } else { steps.map(Offer::Steps) };
|
||||||
|
InstallApp { offer: Box::new(offered), prompt: Box::new(prompt) }
|
||||||
|
}
|
||||||
@@ -1,28 +1,63 @@
|
|||||||
//! SolveCraft in the browser.
|
//! SolidCraft in the browser.
|
||||||
//!
|
//!
|
||||||
//! Runs the same [`solvecraft_ui_egui::SolveApp`] as the desktop app through eframe's web runner
|
//! Runs the same [`solidcraft_ui_egui::SolveApp`] as the desktop app through eframe's web runner
|
||||||
//! (wgpu: WebGPU where available, WebGL2 otherwise). Build with `trunk build --release` from this
|
//! (wgpu: WebGPU where available, WebGL2 otherwise). Build with `trunk build --release` from this
|
||||||
//! directory (output in `dist/web`). URL flags: `?webgl` forces WebGL2, `?sample` opens the
|
//! directory (output in `dist/web`). URL flags: `?webgl` forces WebGL2 (remembered until
|
||||||
//! sample part.
|
//! `?webgpu`), `?sample` opens the sample part.
|
||||||
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
|
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
mod api;
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
mod files;
|
mod files;
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
mod install;
|
||||||
|
#[cfg(any(target_arch = "wasm32", test))]
|
||||||
|
mod space_mouse;
|
||||||
|
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
mod web {
|
mod web {
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
use solvecraft_engine::Session;
|
use solidcraft_engine::Session;
|
||||||
use solvecraft_engine::io::vfs;
|
use solidcraft_engine::io::vfs;
|
||||||
use solvecraft_ui_egui::{Services, SolveApp};
|
use solidcraft_ui_egui::{Services, SolveApp};
|
||||||
use wasm_bindgen::JsCast as _;
|
use wasm_bindgen::JsCast as _;
|
||||||
|
|
||||||
|
use crate::api::Api;
|
||||||
use crate::files::{self, Files, Intent};
|
use crate::files::{self, Files, Intent};
|
||||||
|
use crate::space_mouse::SpaceMouse;
|
||||||
|
|
||||||
const CANVAS_ID: &str = "solvecraft_canvas";
|
const CANVAS_ID: &str = "solidcraft_canvas";
|
||||||
const LOADING_ID: &str = "solvecraft_loading";
|
const LOADING_ID: &str = "solidcraft_loading";
|
||||||
const DEPTH_BITS: u8 = 24;
|
/// A 32-bit float depth buffer (no stencil): WebGPU and WebGL2 both have it, and the viewport
|
||||||
|
/// draws it with reversed depth, whose precision follows the distance from the eye (#1434).
|
||||||
|
const DEPTH_BITS: u8 = 32;
|
||||||
|
|
||||||
|
/// The loading animation (assets/styles/web/loading-logo.svg) settles into the finished mark
|
||||||
|
/// about 3.2 s after the page starts; this adds a short hold. The app doesn't land before it.
|
||||||
|
const LOADING_MIN_MS: f64 = 3600.0;
|
||||||
|
/// The fade from the loading screen into the app.
|
||||||
|
const LOADING_FADE_MS: i32 = 300;
|
||||||
|
|
||||||
|
/// Take the loading screen away once the animation has played to the finished mark: wait out
|
||||||
|
/// what is left of `LOADING_MIN_MS`, fade it, then remove it.
|
||||||
|
fn dismiss_loading(el: web_sys::Element) {
|
||||||
|
let Some(window) = web_sys::window() else {
|
||||||
|
el.remove();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
let now = window.performance().map_or(LOADING_MIN_MS, |p| p.now());
|
||||||
|
let wait = (LOADING_MIN_MS - now).max(0.0) as i32;
|
||||||
|
let fade = wasm_bindgen::closure::Closure::once_into_js(move || {
|
||||||
|
let _ = el.set_attribute("class", "done");
|
||||||
|
let gone = wasm_bindgen::closure::Closure::once_into_js(move || el.remove());
|
||||||
|
if let Some(window) = web_sys::window() {
|
||||||
|
let _ = window.set_timeout_with_callback_and_timeout_and_arguments_0(gone.unchecked_ref(), LOADING_FADE_MS);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let _ = window.set_timeout_with_callback_and_timeout_and_arguments_0(fade.unchecked_ref(), wait);
|
||||||
|
}
|
||||||
|
|
||||||
/// Seconds between autosaves of unsaved work.
|
/// Seconds between autosaves of unsaved work.
|
||||||
const AUTOSAVE_S: f64 = 30.0;
|
const AUTOSAVE_S: f64 = 30.0;
|
||||||
@@ -52,6 +87,7 @@ mod web {
|
|||||||
|
|
||||||
struct Shell {
|
struct Shell {
|
||||||
app: SolveApp,
|
app: SolveApp,
|
||||||
|
api: Api,
|
||||||
files: Rc<Files>,
|
files: Rc<Files>,
|
||||||
/// When the last autosave was (seconds), and the revision it holds (none stored: `None`).
|
/// When the last autosave was (seconds), and the revision it holds (none stored: `None`).
|
||||||
autosaved_at: f64,
|
autosaved_at: f64,
|
||||||
@@ -63,8 +99,9 @@ mod web {
|
|||||||
/// The start page's recent designs were filled from the stored ones.
|
/// The start page's recent designs were filled from the stored ones.
|
||||||
recents_synced: bool,
|
recents_synced: bool,
|
||||||
/// On-demand CJK font: fetched only when a CJK language is selected.
|
/// On-demand CJK font: fetched only when a CJK language is selected.
|
||||||
font: solvecraft_ui_egui::fonts::CjkFontLoader,
|
font: solidcraft_ui_egui::fonts::CjkFontLoader,
|
||||||
font_result: FontLoadResult,
|
font_result: FontLoadResult,
|
||||||
|
space_mouse: SpaceMouse,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Shell {
|
impl Shell {
|
||||||
@@ -73,13 +110,28 @@ mod web {
|
|||||||
if self.files.ctx.borrow().is_none() {
|
if self.files.ctx.borrow().is_none() {
|
||||||
*self.files.ctx.borrow_mut() = Some(ctx.clone());
|
*self.files.ctx.borrow_mut() = Some(ctx.clone());
|
||||||
}
|
}
|
||||||
|
// A ready picker answer is consumed in app.logic later in this frame. Keep
|
||||||
|
// incoming files queued until then so they cannot replace its target design.
|
||||||
|
if self.app.file_picker_busy() {
|
||||||
|
ctx.request_repaint();
|
||||||
|
return;
|
||||||
|
}
|
||||||
files::flush(&self.files);
|
files::flush(&self.files);
|
||||||
for (text, error) in self.files.messages.borrow_mut().drain(..) {
|
for (text, error) in self.files.messages.borrow_mut().drain(..) {
|
||||||
self.app.set_status(text, error);
|
self.app.set_status(text, error);
|
||||||
}
|
}
|
||||||
let incoming: Vec<_> = self.files.incoming.borrow_mut().drain(..).collect();
|
let mut incoming: Vec<_> = self.files.incoming.borrow_mut().drain(..).collect();
|
||||||
|
// A glTF file's buffers picked with it are kept next to it, not opened.
|
||||||
|
incoming.retain_mut(|(name, bytes, _)| {
|
||||||
|
let companion =
|
||||||
|
std::path::Path::new(name.as_str()).extension().and_then(|e| e.to_str()).is_some_and(|e| e.eq_ignore_ascii_case("bin"));
|
||||||
|
if companion {
|
||||||
|
vfs::insert(&format!("{}{name}", files::UPLOAD), std::mem::take(bytes));
|
||||||
|
}
|
||||||
|
!companion
|
||||||
|
});
|
||||||
for (name, bytes, intent) in incoming {
|
for (name, bytes, intent) in incoming {
|
||||||
let design = name.ends_with(&format!(".{}", solvecraft_engine::io::DESIGN_EXT));
|
let design = solidcraft_engine::io::is_design_path(&name);
|
||||||
let path = if design && intent == Intent::Open {
|
let path = if design && intent == Intent::Open {
|
||||||
// A design from the computer is kept in the browser (a copy), so Save works.
|
// A design from the computer is kept in the browser (a copy), so Save works.
|
||||||
let path = files::free_name(&name);
|
let path = files::free_name(&name);
|
||||||
@@ -110,7 +162,7 @@ mod web {
|
|||||||
let changed = s.is_dirty() && self.autosaved != Some(s.revision);
|
let changed = s.is_dirty() && self.autosaved != Some(s.revision);
|
||||||
let wait = AUTOSAVE_S - (now - self.autosaved_at);
|
let wait = AUTOSAVE_S - (now - self.autosaved_at);
|
||||||
if changed && wait <= 0.0 {
|
if changed && wait <= 0.0 {
|
||||||
files::autosave(&self.files, Some((&s.doc, s.path.as_deref())));
|
files::autosave(&self.files, Some((&s.design(), s.path.as_deref())));
|
||||||
self.autosaved = Some(s.revision);
|
self.autosaved = Some(s.revision);
|
||||||
self.autosaved_at = now;
|
self.autosaved_at = now;
|
||||||
} else if changed {
|
} else if changed {
|
||||||
@@ -133,13 +185,13 @@ mod web {
|
|||||||
entries.sort_by(|a, b| b.modified.total_cmp(&a.modified));
|
entries.sort_by(|a, b| b.modified.total_cmp(&a.modified));
|
||||||
let recent = &mut self.app.home.recent;
|
let recent = &mut self.app.home.recent;
|
||||||
recent.retain(|p| vfs::exists(p));
|
recent.retain(|p| vfs::exists(p));
|
||||||
for e in entries.iter().filter(|e| e.name.ends_with(&format!(".{}", solvecraft_engine::io::DESIGN_EXT))) {
|
for e in entries.iter().filter(|e| solidcraft_engine::io::is_design_path(&e.name)) {
|
||||||
let p = format!("{}{}", files::OPFS, e.name);
|
let p = format!("{}{}", files::OPFS, e.name);
|
||||||
if !recent.contains(&p) {
|
if !recent.contains(&p) {
|
||||||
recent.push(p);
|
recent.push(p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
recent.truncate(solvecraft_ui_egui::home::MAX_RECENT);
|
recent.truncate(solidcraft_ui_egui::home::MAX_RECENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The stored designs: open, insert, rename, delete, download; open from the computer.
|
/// The stored designs: open, insert, rename, delete, download; open from the computer.
|
||||||
@@ -206,7 +258,7 @@ mod web {
|
|||||||
if ui.small_button("Open").clicked() {
|
if ui.small_button("Open").clicked() {
|
||||||
act = Some(("open", e.name.clone()));
|
act = Some(("open", e.name.clone()));
|
||||||
}
|
}
|
||||||
let design = e.name.ends_with(&format!(".{}", solvecraft_engine::io::DESIGN_EXT));
|
let design = solidcraft_engine::io::is_design_path(&e.name);
|
||||||
if !design && ui.small_button("Insert").on_hover_text("Into the open design (STEP, 3MF, STL)").clicked() {
|
if !design && ui.small_button("Insert").on_hover_text("Into the open design (STEP, 3MF, STL)").clicked() {
|
||||||
act = Some(("insert", e.name.clone()));
|
act = Some(("insert", e.name.clone()));
|
||||||
}
|
}
|
||||||
@@ -241,7 +293,7 @@ mod web {
|
|||||||
self.app.insert_path(&path);
|
self.app.insert_path(&path);
|
||||||
self.files.panel.set(false);
|
self.files.panel.set(false);
|
||||||
}
|
}
|
||||||
"download" => match vfs::read(&path, solvecraft_engine::io::MAX_DESIGN_BYTES) {
|
"download" => match vfs::read(&path, solidcraft_engine::io::MAX_DESIGN_BYTES) {
|
||||||
Ok(b) => {
|
Ok(b) => {
|
||||||
if let Err(e) = files::download(&name, &b) {
|
if let Err(e) = files::download(&name, &b) {
|
||||||
self.app.set_status(e, true);
|
self.app.set_status(e, true);
|
||||||
@@ -251,8 +303,13 @@ mod web {
|
|||||||
},
|
},
|
||||||
"download_open" => {
|
"download_open" => {
|
||||||
let d = &self.app.session.doc;
|
let d = &self.app.session.doc;
|
||||||
let bytes = solvecraft_engine::io::write_design(d);
|
let result = self
|
||||||
if let Err(e) = files::download(&format!("{}.{}", d.name, solvecraft_engine::io::DESIGN_EXT), &bytes) {
|
.app
|
||||||
|
.session
|
||||||
|
.design_container(solidcraft_engine::io::DesignCompression::Fast, false, false)
|
||||||
|
.map_err(|e| e.to_string())
|
||||||
|
.and_then(|bytes| files::download(&format!("{}.{}", d.name, solidcraft_engine::io::DESIGN_EXT), &bytes));
|
||||||
|
if let Err(e) = result {
|
||||||
self.app.set_status(e, true);
|
self.app.set_status(e, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -318,7 +375,7 @@ mod web {
|
|||||||
let done = self.font_result.borrow_mut().take();
|
let done = self.font_result.borrow_mut().take();
|
||||||
if let Some(res) = done {
|
if let Some(res) = done {
|
||||||
let installed = match res {
|
let installed = match res {
|
||||||
Ok(bytes) => solvecraft_ui_egui::fonts::install_cjk_font(ctx, bytes),
|
Ok(bytes) => solidcraft_ui_egui::fonts::install_cjk_font(ctx, bytes),
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
log::warn!("failed to fetch CJK font from {JAPANESE_FONT_PATH}: {err}");
|
log::warn!("failed to fetch CJK font from {JAPANESE_FONT_PATH}: {err}");
|
||||||
false
|
false
|
||||||
@@ -326,33 +383,49 @@ mod web {
|
|||||||
};
|
};
|
||||||
if installed {
|
if installed {
|
||||||
log::info!("loaded web CJK font from {JAPANESE_FONT_PATH}");
|
log::info!("loaded web CJK font from {JAPANESE_FONT_PATH}");
|
||||||
} else {
|
} else if solidcraft_ui_egui::fonts::needs_cjk_font(&self.app.preferences.language) {
|
||||||
log::warn!("CJK font unavailable; showing English for this session");
|
log::warn!("CJK font unavailable; showing English for this session");
|
||||||
}
|
}
|
||||||
self.font.finished(installed, &mut self.app.preferences.language);
|
self.font.finished(installed, &mut self.app.preferences.language);
|
||||||
ctx.request_repaint();
|
ctx.request_repaint();
|
||||||
}
|
}
|
||||||
if self.font.tick(&mut self.app.preferences.language) {
|
if self.font.tick(&mut self.app.preferences.language) {
|
||||||
let slot = self.font_result.clone();
|
self.fetch_font(ctx);
|
||||||
let ctx = ctx.clone();
|
|
||||||
wasm_bindgen_futures::spawn_local(async move {
|
|
||||||
let res = fetch_font_bytes(JAPANESE_FONT_PATH).await;
|
|
||||||
*slot.borrow_mut() = Some(res);
|
|
||||||
ctx.request_repaint();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// CJK text on screen with no CJK font yet (an English UI showing a Japanese name):
|
||||||
|
/// fetch the font, so the text does not stay tofu (#720).
|
||||||
|
fn watch_text_for_font(&mut self, ctx: &egui::Context) {
|
||||||
|
if self.font.watching_text() && solidcraft_ui_egui::fonts::painted_cjk(ctx) && self.font.text_needs_font() {
|
||||||
|
self.fetch_font(ctx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fetch_font(&self, ctx: &egui::Context) {
|
||||||
|
let slot = self.font_result.clone();
|
||||||
|
let ctx = ctx.clone();
|
||||||
|
wasm_bindgen_futures::spawn_local(async move {
|
||||||
|
let res = fetch_font_bytes(JAPANESE_FONT_PATH).await;
|
||||||
|
*slot.borrow_mut() = Some(res);
|
||||||
|
ctx.request_repaint();
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl eframe::App for Shell {
|
impl eframe::App for Shell {
|
||||||
fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
||||||
self.tick_font(ctx);
|
self.tick_font(ctx);
|
||||||
self.app.logic(ctx);
|
self.app.logic(ctx);
|
||||||
|
self.api.poll();
|
||||||
|
self.space_mouse.logic(&mut self.app, ctx);
|
||||||
self.files_tick(ctx);
|
self.files_tick(ctx);
|
||||||
UNSAVED.with(|u| u.set(solvecraft_ui_egui::documents::any_dirty(&self.app)));
|
UNSAVED.with(|u| u.set(solidcraft_ui_egui::documents::any_dirty(&self.app)));
|
||||||
}
|
}
|
||||||
fn raw_input_hook(&mut self, _ctx: &egui::Context, raw: &mut egui::RawInput) {
|
fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
|
||||||
files::take_drops(&self.files, raw);
|
files::take_drops(&self.files, raw);
|
||||||
|
// Before the app's own hook, which adds the control channel's events.
|
||||||
|
self.space_mouse.raw_input_hook(ctx, self.app.preferences.space_mouse_enabled, raw);
|
||||||
self.app.raw_input_hook(raw);
|
self.app.raw_input_hook(raw);
|
||||||
}
|
}
|
||||||
fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
|
fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
|
||||||
@@ -360,23 +433,44 @@ mod web {
|
|||||||
let ctx = ui.ctx().clone();
|
let ctx = ui.ctx().clone();
|
||||||
self.file_panel(&ctx);
|
self.file_panel(&ctx);
|
||||||
self.recovery_prompt(&ctx);
|
self.recovery_prompt(&ctx);
|
||||||
|
self.watch_text_for_font(&ctx);
|
||||||
}
|
}
|
||||||
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
||||||
// Persist the user's own language, not a session-only English fallback.
|
// Persist the user's own language, not a session-only English fallback.
|
||||||
let saved = self.font.persisted_language(&self.app.preferences.language).to_owned();
|
let saved = self.font.persisted_language(&self.app.preferences.language).to_owned();
|
||||||
let live = std::mem::replace(&mut self.app.preferences.language, saved);
|
let live = std::mem::replace(&mut self.app.preferences.language, saved);
|
||||||
storage.set_string(PREFS_KEY, self.app.prefs());
|
storage.set_string(solidcraft_ui_egui::prefs::STORAGE_KEY, self.app.prefs());
|
||||||
self.app.preferences.language = live;
|
self.app.preferences.language = live;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Where the preferences (theme) are kept (the browser's local storage).
|
|
||||||
const PREFS_KEY: &str = "solvecraft.prefs";
|
|
||||||
|
|
||||||
fn query() -> String {
|
fn query() -> String {
|
||||||
web_sys::window().and_then(|w| w.location().search().ok()).unwrap_or_default()
|
web_sys::window().and_then(|w| w.location().search().ok()).unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Where `?webgl` is remembered. The installed app starts from its manifest's start URL, which
|
||||||
|
/// has no query, so the choice has to outlive the page it was made on.
|
||||||
|
const WEBGL_KEY: &str = "solidcraft.webgl";
|
||||||
|
|
||||||
|
/// Render with WebGL2: asked for now (`?webgl`, remembered) or before (until `?webgpu`).
|
||||||
|
fn webgl() -> bool {
|
||||||
|
let storage = web_sys::window().and_then(|w| w.local_storage().ok().flatten());
|
||||||
|
let q = query();
|
||||||
|
if q.contains("webgl") {
|
||||||
|
if let Some(s) = &storage {
|
||||||
|
let _ = s.set_item(WEBGL_KEY, "1");
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if q.contains("webgpu") {
|
||||||
|
if let Some(s) = &storage {
|
||||||
|
let _ = s.remove_item(WEBGL_KEY);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
storage.and_then(|s| s.get_item(WEBGL_KEY).ok().flatten()).is_some()
|
||||||
|
}
|
||||||
|
|
||||||
/// Fetch font bytes asynchronously through the browser.
|
/// Fetch font bytes asynchronously through the browser.
|
||||||
async fn fetch_font_bytes(url: &str) -> Result<Vec<u8>, String> {
|
async fn fetch_font_bytes(url: &str) -> Result<Vec<u8>, String> {
|
||||||
let window = web_sys::window().ok_or("no window")?;
|
let window = web_sys::window().ok_or("no window")?;
|
||||||
@@ -401,7 +495,7 @@ mod web {
|
|||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
let mut options = eframe::WebOptions { depth_buffer: DEPTH_BITS, ..Default::default() };
|
let mut options = eframe::WebOptions { depth_buffer: DEPTH_BITS, ..Default::default() };
|
||||||
if query().contains("webgl")
|
if webgl()
|
||||||
&& let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup
|
&& let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup
|
||||||
{
|
{
|
||||||
create.instance_descriptor.backends = eframe::wgpu::Backends::GL;
|
create.instance_descriptor.backends = eframe::wgpu::Backends::GL;
|
||||||
@@ -411,25 +505,29 @@ mod web {
|
|||||||
canvas,
|
canvas,
|
||||||
options,
|
options,
|
||||||
Box::new(move |cc| {
|
Box::new(move |cc| {
|
||||||
solvecraft_ui_egui::fonts::setup_fonts(&cc.egui_ctx);
|
solidcraft_ui_egui::fonts::setup_fonts(&cc.egui_ctx);
|
||||||
let files = Rc::new(Files::default());
|
let files = Rc::new(Files::default());
|
||||||
files::start(&files);
|
files::start(&files);
|
||||||
let panel = files.clone();
|
let panel = files.clone();
|
||||||
let services = Services {
|
let services = Services {
|
||||||
// Open shows the browser's files (and the computer's, from there).
|
// Open shows the browser's files (and the computer's, from there).
|
||||||
pick_open: Some(Box::new(move || {
|
pick_open: Some(Box::new(move |_: &[&str]| {
|
||||||
panel.panel.set(true);
|
panel.panel.set(true);
|
||||||
None
|
Box::pin(std::future::ready(None))
|
||||||
})),
|
})),
|
||||||
// Designs are kept in the browser; everything else is downloaded.
|
// Designs are kept in the browser; everything else is downloaded.
|
||||||
pick_save: Some(Box::new(|name: &str, exts: &[&str]| {
|
pick_save: Some(Box::new(|name: &str, exts: &[&str]| {
|
||||||
let design = exts.contains(&solvecraft_engine::io::DESIGN_EXT);
|
let design = exts.contains(&solidcraft_engine::io::DESIGN_EXT);
|
||||||
Some(format!("{}{name}", if design { files::OPFS } else { files::DOWNLOADS }))
|
Box::pin(std::future::ready(Some(format!("{}{name}", if design { files::OPFS } else { files::DOWNLOADS }))))
|
||||||
})),
|
})),
|
||||||
|
install_app: Some(crate::install::service(&cc.egui_ctx)),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
let mut app = SolveApp::new(Session::default(), services);
|
// Thumbnails of saves and start-page cards.
|
||||||
if let Some(p) = cc.storage.and_then(|s| s.get_string(PREFS_KEY)) {
|
solidcraft_ui_egui::gpu::install_cpu_picture_renderer();
|
||||||
|
let (sender, receiver) = std::sync::mpsc::channel();
|
||||||
|
let mut app = SolveApp::new(Session::default(), services).with_control(receiver);
|
||||||
|
if let Some(p) = cc.storage.and_then(|s| solidcraft_ui_egui::prefs::stored(|k| s.get_string(k))) {
|
||||||
app.load_prefs(&p);
|
app.load_prefs(&p);
|
||||||
}
|
}
|
||||||
if let Some(rs) = &cc.wgpu_render_state {
|
if let Some(rs) = &cc.wgpu_render_state {
|
||||||
@@ -437,18 +535,23 @@ mod web {
|
|||||||
app.set_wgpu(rs, DEPTH_BITS, 0, 1);
|
app.set_wgpu(rs, DEPTH_BITS, 0, 1);
|
||||||
}
|
}
|
||||||
if query().contains("sample") {
|
if query().contains("sample") {
|
||||||
if let Err(e) = app.session.run_script(&solvecraft_engine::sample::script()) {
|
if let Err(e) = app.session.run_script(&solidcraft_engine::sample::script()) {
|
||||||
app.set_status(format!("sample: {e}"), true);
|
app.set_status(format!("sample: {e}"), true);
|
||||||
}
|
}
|
||||||
app.session.doc_mut().name = "Sample Plate".into();
|
app.session.doc_mut().name = "Sample Plate".into();
|
||||||
app.session.mark_saved();
|
app.session.mark_saved();
|
||||||
}
|
}
|
||||||
if !query().contains("sample") {
|
if !query().contains("sample") {
|
||||||
|
// The empty design takes Units of new designs (#1205). The sample
|
||||||
|
// part is built in millimetres and is left that way.
|
||||||
|
solidcraft_ui_egui::prefs::apply_new_design(&mut app);
|
||||||
let rev = app.session.revision;
|
let rev = app.session.revision;
|
||||||
app.home.show(rev);
|
app.home.show(rev);
|
||||||
}
|
}
|
||||||
|
let api = Api::install(sender, cc.egui_ctx.clone()).map_err(|e| format!("SolidCraft browser API: {e:?}"))?;
|
||||||
Ok(Box::new(Shell {
|
Ok(Box::new(Shell {
|
||||||
app,
|
app,
|
||||||
|
api,
|
||||||
files,
|
files,
|
||||||
autosaved_at: f64::NEG_INFINITY,
|
autosaved_at: f64::NEG_INFINITY,
|
||||||
autosaved: None,
|
autosaved: None,
|
||||||
@@ -457,13 +560,14 @@ mod web {
|
|||||||
recents_synced: false,
|
recents_synced: false,
|
||||||
font: Default::default(),
|
font: Default::default(),
|
||||||
font_result: Rc::new(std::cell::RefCell::new(None)),
|
font_result: Rc::new(std::cell::RefCell::new(None)),
|
||||||
|
space_mouse: SpaceMouse::default(),
|
||||||
}))
|
}))
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
if let Some(el) = document.get_element_by_id(LOADING_ID) {
|
if let Some(el) = document.get_element_by_id(LOADING_ID) {
|
||||||
match result {
|
match result {
|
||||||
Ok(()) => el.remove(),
|
Ok(()) => dismiss_loading(el),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
el.set_inner_html(&format!("<p>SolidCraft failed to start: {e:?}</p><p>A browser with WebGPU or WebGL2 is required.</p>"))
|
el.set_inner_html(&format!("<p>SolidCraft failed to start: {e:?}</p><p>A browser with WebGPU or WebGL2 is required.</p>"))
|
||||||
}
|
}
|
||||||
@@ -480,5 +584,5 @@ fn main() {
|
|||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
fn main() {
|
fn main() {
|
||||||
eprintln!("solvecraft-web only runs in the browser: build it with `trunk build --release` in apps/solvecraft-web");
|
eprintln!("solidcraft-web only runs in the browser: build it with `trunk build --release` in apps/solidcraft-web");
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,285 @@
|
|||||||
|
//! The 3D mouse in the browser (#1336), through the Gamepad API.
|
||||||
|
//!
|
||||||
|
//! Chromium browsers list a 3Dconnexion device itself, with its six axes scaled to -1..1 from the
|
||||||
|
//! device's ±350. Firefox lists only joysticks and gamepads (a 3D mouse is a HID multi-axis
|
||||||
|
//! controller), but 3DxWare's virtual joystick carries the same six axes once 3DxWare's profile
|
||||||
|
//! for Firefox sends them there. Both come in the device's own order and signs, so the shared
|
||||||
|
//! navigation takes them with 3DxWare's object-mode mapping, as the Linux app does without a
|
||||||
|
//! profile.
|
||||||
|
|
||||||
|
use solidcraft_ui_egui::space_mouse::{Axes, FULL_SCALE};
|
||||||
|
|
||||||
|
/// Logitech's vendor id, which older 3Dconnexion devices carry, and those devices' product ids
|
||||||
|
/// (usb.ids). Logitech's own gamepads and wheels carry the same vendor id.
|
||||||
|
const LOGITECH: u16 = 0x046d;
|
||||||
|
const LOGITECH_3D_MICE: [u16; 11] = [0xc603, 0xc605, 0xc606, 0xc621, 0xc623, 0xc625, 0xc626, 0xc627, 0xc628, 0xc629, 0xc62b];
|
||||||
|
/// 3Dconnexion's own vendor id. The browser lists only its 3D mice as gamepads: its mice, and the
|
||||||
|
/// mouse side of its receivers, are not gamepads.
|
||||||
|
const THREEDCONNEXION: u16 = 0x256f;
|
||||||
|
/// 3DxWare's virtual joystick.
|
||||||
|
const VIRTUAL_JOYSTICK: (u16, u16) = (0xbeef, 0x046d);
|
||||||
|
|
||||||
|
/// What a gamepad the browser lists is, when it is a 3D mouse. A device is read before the
|
||||||
|
/// joystick: in a Chromium browser both are listed, and the joystick stays at rest.
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
|
pub enum Source {
|
||||||
|
Device,
|
||||||
|
VirtualJoystick,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The vendor and product ids in a gamepad's id: `Name (Vendor: 046d Product: c62b)` in Chromium
|
||||||
|
/// browsers, `046d-c62b-Name` in Firefox.
|
||||||
|
fn vendor_product(id: &str) -> Option<(u16, u16)> {
|
||||||
|
fn hex(digits: &str) -> Option<u16> {
|
||||||
|
if (1..=4).contains(&digits.len()) && digits.bytes().all(|b| b.is_ascii_hexdigit()) { u16::from_str_radix(digits, 16).ok() } else { None }
|
||||||
|
}
|
||||||
|
if let Some((_, ids)) = id.rsplit_once("Vendor: ") {
|
||||||
|
let (vendor, rest) = ids.split_once(" Product: ")?;
|
||||||
|
let product = rest.split(|c: char| !c.is_ascii_hexdigit()).next()?;
|
||||||
|
return Some((hex(vendor)?, hex(product)?));
|
||||||
|
}
|
||||||
|
let mut parts = id.splitn(3, '-');
|
||||||
|
let (vendor, product, _name) = (parts.next()?, parts.next()?, parts.next()?);
|
||||||
|
Some((hex(vendor)?, hex(product)?))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether a gamepad is a 3D mouse, from the id the browser gives it.
|
||||||
|
pub fn source(id: &str) -> Option<Source> {
|
||||||
|
match vendor_product(id)? {
|
||||||
|
VIRTUAL_JOYSTICK => Some(Source::VirtualJoystick),
|
||||||
|
(THREEDCONNEXION, _) => Some(Source::Device),
|
||||||
|
(LOGITECH, product) if LOGITECH_3D_MICE.contains(&product) => Some(Source::Device),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The six axes in the device's raw units, from a gamepad's axes (-1..1). Fewer than six: not a
|
||||||
|
/// 3D mouse. A value that isn't a number reads as rest.
|
||||||
|
pub fn axes(values: &[f64]) -> Option<Axes> {
|
||||||
|
let raw = |i: usize| values.get(i).map(|&v| if v.is_finite() { (v.clamp(-1.0, 1.0) * f64::from(FULL_SCALE)).round() as i16 } else { 0 });
|
||||||
|
Some(Axes { translation: [raw(0)?, raw(1)?, raw(2)?], rotation: [raw(3)?, raw(4)?, raw(5)?] })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The 3D mouse to read among the ones listed: the first device, else the first joystick.
|
||||||
|
pub fn choose(found: impl IntoIterator<Item = (Source, Axes)>) -> Option<Axes> {
|
||||||
|
found.into_iter().min_by_key(|(source, _)| *source).map(|(_, axes)| axes)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
pub use browser::SpaceMouse;
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
mod browser {
|
||||||
|
use std::cell::Cell;
|
||||||
|
use std::rc::Rc;
|
||||||
|
|
||||||
|
use solidcraft_ui_egui::SolveApp;
|
||||||
|
use solidcraft_ui_egui::space_mouse::{Axes, DriverMapping, navigate_frame};
|
||||||
|
use wasm_bindgen::JsCast as _;
|
||||||
|
use wasm_bindgen::closure::Closure;
|
||||||
|
|
||||||
|
use solidcraft_ui_egui::space_mouse::WheelGuard;
|
||||||
|
|
||||||
|
use super::{axes, choose, source};
|
||||||
|
|
||||||
|
/// How often the page looks for the cap starting to move while nothing else redraws.
|
||||||
|
const WAKE_MS: i32 = 50;
|
||||||
|
|
||||||
|
/// The 3D mouse the browser lists, if any.
|
||||||
|
fn read() -> Option<Axes> {
|
||||||
|
let pads = web_sys::window()?.navigator().get_gamepads().ok()?;
|
||||||
|
choose(pads.iter().filter_map(|pad| {
|
||||||
|
let pad = pad.dyn_into::<web_sys::Gamepad>().ok().filter(web_sys::Gamepad::connected)?;
|
||||||
|
let source = source(&pad.id())?;
|
||||||
|
let values: Vec<f64> = pad.axes().iter().map(|v| v.as_f64().unwrap_or(f64::NAN)).collect();
|
||||||
|
Some((source, axes(&values)?))
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Reads the 3D mouse once per frame and moves the view with it.
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct SpaceMouse {
|
||||||
|
axes: Axes,
|
||||||
|
/// The previous frame's time and the step since it (seconds).
|
||||||
|
last: Option<f64>,
|
||||||
|
seconds: f64,
|
||||||
|
wheel: WheelGuard,
|
||||||
|
/// Listening for gamepads (from the first frame with navigation on).
|
||||||
|
listening: bool,
|
||||||
|
/// The timer that wakes the app when the cap starts moving runs (from when a 3D mouse
|
||||||
|
/// is first listed).
|
||||||
|
waking: bool,
|
||||||
|
/// Navigation is on (the waker reads it).
|
||||||
|
enabled: Rc<Cell<bool>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SpaceMouse {
|
||||||
|
/// At the start of a frame: reads the cap and drops 3DxWare's emulated wheel from the
|
||||||
|
/// frame's input, before the app sees it.
|
||||||
|
pub fn raw_input_hook(&mut self, ctx: &egui::Context, enabled: bool, raw: &mut egui::RawInput) {
|
||||||
|
let now = raw.time.unwrap_or_else(|| js_sys::Date::now() / 1000.0);
|
||||||
|
self.seconds = self.last.map_or(0.0, |last| now - last);
|
||||||
|
self.last = Some(now);
|
||||||
|
self.enabled.set(enabled);
|
||||||
|
self.axes = Axes::default();
|
||||||
|
if !enabled {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if !self.listening {
|
||||||
|
self.listening = true;
|
||||||
|
listen(ctx);
|
||||||
|
}
|
||||||
|
let reading = read();
|
||||||
|
if reading.is_some() && !self.waking {
|
||||||
|
self.waking = wake(ctx, &self.enabled);
|
||||||
|
}
|
||||||
|
// Inside the dead zone is rest: a cap resting just off zero doesn't keep redrawing.
|
||||||
|
self.axes = reading.filter(|axes| axes.moving()).unwrap_or_default();
|
||||||
|
self.wheel.filter(self.axes.moving(), now, &mut raw.events);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn logic(&self, app: &mut SolveApp, ctx: &egui::Context) {
|
||||||
|
navigate_frame(app, ctx, DriverMapping::object_mode(), self.axes, self.seconds);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A 3D mouse is listed only once it has been moved on the page: redraw then, so the frame
|
||||||
|
/// finds it without waiting for the pointer.
|
||||||
|
fn listen(ctx: &egui::Context) {
|
||||||
|
let Some(window) = web_sys::window() else { return };
|
||||||
|
let ctx = ctx.clone();
|
||||||
|
let on_connect = Closure::<dyn FnMut()>::new(move || ctx.request_repaint());
|
||||||
|
let _ = window.add_event_listener_with_callback("gamepadconnected", on_connect.as_ref().unchecked_ref());
|
||||||
|
// The listener lives as long as the page.
|
||||||
|
on_connect.forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The browser sends no event when a gamepad moves, so a timer looks while the app is idle and
|
||||||
|
/// redraws when the cap starts moving; the frames that follow keep going on their own.
|
||||||
|
fn wake(ctx: &egui::Context, enabled: &Rc<Cell<bool>>) -> bool {
|
||||||
|
let Some(window) = web_sys::window() else { return false };
|
||||||
|
let (ctx, enabled) = (ctx.clone(), Rc::clone(enabled));
|
||||||
|
let tick = Closure::<dyn FnMut()>::new(move || {
|
||||||
|
if enabled.get() && read().is_some_and(Axes::moving) {
|
||||||
|
ctx.request_repaint();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let started = window.set_interval_with_callback_and_timeout_and_arguments_0(tick.as_ref().unchecked_ref(), WAKE_MS).is_ok();
|
||||||
|
// The timer lives as long as the page.
|
||||||
|
tick.forget();
|
||||||
|
started
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn recognises_3d_mice_in_each_browsers_ids() {
|
||||||
|
// As Edge and Firefox list them (Windows 11, SpaceMouse Pro, 3DxWare 10).
|
||||||
|
assert_eq!(source("SpaceMouse Pro (Vendor: 046d Product: c62b)"), Some(Source::Device));
|
||||||
|
assert_eq!(source("Unknown Gamepad (Vendor: beef Product: 046d)"), Some(Source::VirtualJoystick));
|
||||||
|
assert_eq!(source("beef-046d-Unknown Gamepad"), Some(Source::VirtualJoystick));
|
||||||
|
// 3Dconnexion's own vendor id, any product; the older devices under Logitech's.
|
||||||
|
assert_eq!(source("SpaceMouse Compact (Vendor: 256f Product: c635)"), Some(Source::Device));
|
||||||
|
assert_eq!(source("256f-c652-3Dconnexion Universal Receiver"), Some(Source::Device));
|
||||||
|
assert_eq!(source("46d-c626-SpaceNavigator"), Some(Source::Device));
|
||||||
|
assert_eq!(source("SpaceNavigator (STANDARD GAMEPAD Vendor: 046d Product: c626)"), Some(Source::Device));
|
||||||
|
for product in LOGITECH_3D_MICE {
|
||||||
|
assert_eq!(source(&format!("x (Vendor: 046d Product: {product:04x})")), Some(Source::Device));
|
||||||
|
assert_eq!(source(&format!("046d-{product:04X}-x")), Some(Source::Device));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gamepads_and_other_logitech_devices_are_not_3d_mice() {
|
||||||
|
for id in [
|
||||||
|
"Logitech Dual Action (STANDARD GAMEPAD Vendor: 046d Product: c216)",
|
||||||
|
"046d-c21d-Logitech Gamepad F310",
|
||||||
|
"G29 Driving Force Racing Wheel (Vendor: 046d Product: c24f)",
|
||||||
|
"046d-c215-Logitech Extreme 3D",
|
||||||
|
"NuLOOQ navigator (Vendor: 046d Product: c640)",
|
||||||
|
"Xbox 360 Controller (XInput STANDARD GAMEPAD)",
|
||||||
|
"45e-28e-Xbox 360 Wired Controller",
|
||||||
|
"beef-046e-Unknown Gamepad",
|
||||||
|
"beee-046d-Unknown Gamepad",
|
||||||
|
"",
|
||||||
|
"-",
|
||||||
|
"--",
|
||||||
|
"256f-",
|
||||||
|
"256f-c635",
|
||||||
|
"Vendor: 256f",
|
||||||
|
"Vendor: 256f Product: ",
|
||||||
|
"x (Vendor: 256fff Product: c635)",
|
||||||
|
"x (Vendor: zz6f Product: c635)",
|
||||||
|
"12345-c635-x",
|
||||||
|
"256f--x",
|
||||||
|
"SpaceMouse Pro",
|
||||||
|
] {
|
||||||
|
assert_eq!(source(id), None, "{id:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn ids_never_panic() {
|
||||||
|
// Hostile and odd ids: multi-byte text around the markers, markers repeated or cut short.
|
||||||
|
for id in [
|
||||||
|
"Vendor: é Product: ü",
|
||||||
|
"Vendor: Vendor: 256f Product: c635)",
|
||||||
|
"é-ü-ö",
|
||||||
|
"Ⅰ (Vendor: 256f Product: c6Ⅰ)",
|
||||||
|
"\u{0}-\u{0}-\u{0}",
|
||||||
|
"Vendor: 256f Product: c635 Vendor: ",
|
||||||
|
] {
|
||||||
|
let _ = source(id);
|
||||||
|
}
|
||||||
|
let mut seed = 0x2545_f491_4f6c_dd1d_u64;
|
||||||
|
let alphabet: Vec<char> = "0123456789abcdefABCDEF- ():VendorProductéⅠ\u{0}".chars().collect();
|
||||||
|
for _ in 0..20_000 {
|
||||||
|
let len = (seed % 40) as usize;
|
||||||
|
let id: String = (0..len)
|
||||||
|
.map(|_| {
|
||||||
|
seed ^= seed << 13;
|
||||||
|
seed ^= seed >> 7;
|
||||||
|
seed ^= seed << 17;
|
||||||
|
alphabet[(seed % alphabet.len() as u64) as usize]
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
if let Some(Source::Device) = source(&id) {
|
||||||
|
let (vendor, product) = vendor_product(&id).expect("recognised ids have both");
|
||||||
|
assert!(vendor == THREEDCONNEXION || (vendor == LOGITECH && LOGITECH_3D_MICE.contains(&product)), "{id:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gamepad_axes_are_the_devices_raw_units() {
|
||||||
|
// Full deflection is the desktop's 350, and the browser's scale keeps the device's steps.
|
||||||
|
let axes = axes(&[1.0, -1.0, 0.5, -0.5, 2.0 / 700.0, 0.0]).expect("six axes");
|
||||||
|
assert_eq!(axes, Axes { translation: [350, -350, 175], rotation: [-175, 1, 0] });
|
||||||
|
for raw in -350_i16..=350 {
|
||||||
|
let value = f64::from(raw) / 350.0;
|
||||||
|
assert_eq!(super::axes(&[value; 6]).map(|a| a.translation[0]), Some(raw));
|
||||||
|
}
|
||||||
|
// Past full deflection is full deflection; anything that isn't a number is rest.
|
||||||
|
let hostile = super::axes(&[f64::NAN, f64::INFINITY, f64::NEG_INFINITY, 1e300, -1e300, f64::MIN_POSITIVE]).expect("six axes");
|
||||||
|
assert_eq!(hostile, Axes { translation: [0, 0, 0], rotation: [350, -350, 0] });
|
||||||
|
// A gamepad with fewer than six axes is not a 3D mouse; extra axes are ignored.
|
||||||
|
assert_eq!(super::axes(&[1.0; 5]), None);
|
||||||
|
assert_eq!(super::axes(&[]), None);
|
||||||
|
assert_eq!(super::axes(&[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0]), Some(Axes::default()));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_device_is_read_before_the_virtual_joystick() {
|
||||||
|
let moving = Axes { translation: [100, 0, 0], rotation: [0; 3] };
|
||||||
|
let other = Axes { translation: [0, 200, 0], rotation: [0; 3] };
|
||||||
|
assert_eq!(choose([(Source::VirtualJoystick, other), (Source::Device, moving)]), Some(moving));
|
||||||
|
assert_eq!(choose([(Source::Device, moving), (Source::VirtualJoystick, other)]), Some(moving));
|
||||||
|
assert_eq!(choose([(Source::VirtualJoystick, other)]), Some(other));
|
||||||
|
// Two devices: the first listed.
|
||||||
|
assert_eq!(choose([(Source::Device, moving), (Source::Device, other)]), Some(moving));
|
||||||
|
assert_eq!(choose([]), None);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,235 @@
|
|||||||
|
// SolidCraft's service worker: the web app keeps working offline and updates itself.
|
||||||
|
//
|
||||||
|
// `cargo xtask web-offline` (Trunk's post_build hook) writes the build into the line below: the
|
||||||
|
// version (workspace version + a hash of every built file) and the files to keep, each with its
|
||||||
|
// SHA-256, and the same as `build.json` next to it. Files the app only fetches when it needs
|
||||||
|
// them (the CJK font) aren't kept: they come from the network. Every download is checked
|
||||||
|
// against its SHA-256: a deployment that lands mid-download (another build's `index.html`) fails
|
||||||
|
// the download instead of mixing into the kept build. A new build changes this file, so the
|
||||||
|
// browser installs the new worker, which keeps the whole new build before taking over.
|
||||||
|
//
|
||||||
|
// A launch only ever starts a build whose every file is kept, so a half-downloaded update can't
|
||||||
|
// break it. It asks for `build.json` (waiting at most NAVIGATE_TIMEOUT_MS): offline, slow or
|
||||||
|
// unchanged, the kept build starts; when a new build is deployed, it is downloaded first
|
||||||
|
// (waiting at most UPDATE_TIMEOUT_MS; the download goes on in the background after that) and
|
||||||
|
// started. When the site has no `build.json` (the app was removed), launches go to the network,
|
||||||
|
// the kept build answering when that fails. So they do when `build.json` is redirected or
|
||||||
|
// refused (a sign-in in front of the app): the browser then shows the sign-in. Each page then
|
||||||
|
// gets its files from the build it started (remembered in PAGES), never from another build
|
||||||
|
// with a file of the same name.
|
||||||
|
//
|
||||||
|
// A cache is only deleted when nothing uses it: a download holds its lock (Web Locks, shared,
|
||||||
|
// in any tab or worker; the browser releases it when the download ends or its worker stops), and
|
||||||
|
// an open page uses the build it started. Then unfinished downloads are dropped, and so are
|
||||||
|
// builds replaced by a newer worker (RETIRED). The origin is shared with other apps (github.io)
|
||||||
|
// and other copies of this one (the release zip works from any path): only caches named after
|
||||||
|
// this worker's path (CACHE_PREFIX…, PAGES) are ever touched.
|
||||||
|
//
|
||||||
|
// Unbuilt (VERSION "dev", as debug builds get it), the worker retires: it drops what a release
|
||||||
|
// build kept and unregisters, so `trunk serve` after `trunk serve --release --no-autoreload`
|
||||||
|
// shows the development build. Deploying this file unbuilt switches the worker off for everyone.
|
||||||
|
/* @build */ const VERSION = "dev", FILES = [];
|
||||||
|
const RETIRE = VERSION === "dev";
|
||||||
|
|
||||||
|
const PATH = new URL(self.registration.scope).pathname;
|
||||||
|
const CACHE_PREFIX = `solidcraft-app ${PATH} `;
|
||||||
|
const CACHE = CACHE_PREFIX + VERSION;
|
||||||
|
/** Which build each open page started: page id → cache name (or NETWORK). */
|
||||||
|
const PAGES = `solidcraft-app-pages ${PATH}`;
|
||||||
|
/** A page that came from the network gets its files from there too. */
|
||||||
|
const NETWORK = "network";
|
||||||
|
const NAVIGATE_TIMEOUT_MS = 4000;
|
||||||
|
const UPDATE_TIMEOUT_MS = 20000;
|
||||||
|
/** The entry that marks a cache as holding its whole build. */
|
||||||
|
const COMPLETE = "build-complete";
|
||||||
|
/** The entry that marks a build replaced by a newer worker. */
|
||||||
|
const RETIRED = "build-retired";
|
||||||
|
/** A page remembered this recently may still be loading (not yet listed among the clients). */
|
||||||
|
const PAGE_LOADING_MS = 30 * 1000;
|
||||||
|
|
||||||
|
const url = (file) => new URL(file, self.registration.scope).href;
|
||||||
|
const has = (name, entry) => caches.match(url(entry), { cacheName: name }).then(Boolean);
|
||||||
|
|
||||||
|
/** Run `fn` while using the cache `name`: it isn't deleted meanwhile. */
|
||||||
|
const using = (name, fn) => navigator.locks.request(name, { mode: "shared" }, fn);
|
||||||
|
|
||||||
|
/** Delete the cache `name` if nothing is using it and `unwanted()` (asked once no one can start to) agrees. */
|
||||||
|
const drop = (name, unwanted) =>
|
||||||
|
navigator.locks.request(name, { ifAvailable: true }, async (free) => free && (await unwanted()) && caches.delete(name));
|
||||||
|
|
||||||
|
const hex = (buffer) => Array.from(new Uint8Array(buffer), (b) => b.toString(16).padStart(2, "0")).join("");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keep every file of a build (an earlier partial download is resumed); resolves to its cache's
|
||||||
|
* name. The first file that fails cancels the others.
|
||||||
|
*/
|
||||||
|
function keep(version, files) {
|
||||||
|
const name = CACHE_PREFIX + version;
|
||||||
|
return using(name, async () => {
|
||||||
|
const cache = await caches.open(name);
|
||||||
|
await cache.delete(url(RETIRED)); // Back in use (a rollback).
|
||||||
|
if (await has(name, COMPLETE)) return name;
|
||||||
|
const cancel = new AbortController();
|
||||||
|
const results = await Promise.allSettled(
|
||||||
|
files.map(async ({ file, sha256 }) => {
|
||||||
|
try {
|
||||||
|
if (await cache.match(url(file))) return;
|
||||||
|
// `no-cache`: revalidate with the server, so a stale HTTP-cached page never mixes builds.
|
||||||
|
const response = await fetch(new Request(url(file), { cache: "no-cache" }), { signal: cancel.signal });
|
||||||
|
if (!response.ok) throw new Error(`${file}: HTTP ${response.status}`);
|
||||||
|
const body = await response.arrayBuffer();
|
||||||
|
if (hex(await crypto.subtle.digest("SHA-256", body)) !== sha256) throw new Error(`${file}: not this build's`);
|
||||||
|
await cache.put(url(file), new Response(body, { headers: response.headers }));
|
||||||
|
} catch (error) {
|
||||||
|
cancel.abort();
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const failed = results.find((r) => r.status === "rejected");
|
||||||
|
if (failed) throw failed.reason;
|
||||||
|
await cache.put(url(COMPLETE), new Response(version));
|
||||||
|
return name;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const pageEntry = (id) => url(`~page/${encodeURIComponent(id)}`);
|
||||||
|
|
||||||
|
/** Remember which build a page started. */
|
||||||
|
async function started(id, build) {
|
||||||
|
if (!id) return;
|
||||||
|
const record = JSON.stringify({ build, at: Date.now() });
|
||||||
|
await (await caches.open(PAGES)).put(pageEntry(id), new Response(record));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The build a page started; a page started before it was remembered gets this worker's. */
|
||||||
|
async function startedBy(id) {
|
||||||
|
const response = id ? await caches.match(pageEntry(id), { cacheName: PAGES }) : null;
|
||||||
|
return response ? (await response.json()).build : CACHE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The builds open pages use (pages closed since are forgotten). */
|
||||||
|
async function inUse() {
|
||||||
|
const open = new Set((await self.clients.matchAll({ includeUncontrolled: true })).map((c) => c.id));
|
||||||
|
const pages = await caches.open(PAGES);
|
||||||
|
const builds = new Set();
|
||||||
|
for (const request of await pages.keys()) {
|
||||||
|
const id = decodeURIComponent(request.url.split("~page/")[1] ?? "");
|
||||||
|
const record = await pages.match(request).then((r) => r?.json()).catch(() => null);
|
||||||
|
if (record && (open.has(id) || Date.now() - record.at < PAGE_LOADING_MS)) builds.add(record.build);
|
||||||
|
else await pages.delete(request);
|
||||||
|
}
|
||||||
|
return builds;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Drop unfinished downloads nothing is using, and replaced builds no open page uses. */
|
||||||
|
async function sweep() {
|
||||||
|
for (const name of await caches.keys()) {
|
||||||
|
if (!name.startsWith(CACHE_PREFIX) || name === CACHE) continue;
|
||||||
|
await drop(name, async () => !(await has(name, COMPLETE)) || ((await has(name, RETIRED)) && !(await inUse()).has(name)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
self.addEventListener("install", (event) => {
|
||||||
|
// Clean up first: a page open for days sees updates (and failed ones) without any launch.
|
||||||
|
const install = () => sweep().catch(() => {}).then(() => keep(VERSION, FILES));
|
||||||
|
event.waitUntil(RETIRE ? self.skipWaiting() : install().then(() => self.skipWaiting()));
|
||||||
|
});
|
||||||
|
|
||||||
|
self.addEventListener("activate", (event) => {
|
||||||
|
event.waitUntil(
|
||||||
|
(async () => {
|
||||||
|
if (RETIRE) {
|
||||||
|
for (const name of await caches.keys()) if (name.startsWith(CACHE_PREFIX) || name === PAGES) await caches.delete(name);
|
||||||
|
return self.registration.unregister();
|
||||||
|
}
|
||||||
|
for (const name of await caches.keys()) {
|
||||||
|
if (name.startsWith(CACHE_PREFIX) && name !== CACHE) await (await caches.open(name)).put(url(RETIRED), new Response(""));
|
||||||
|
}
|
||||||
|
await sweep();
|
||||||
|
await self.clients.claim();
|
||||||
|
})(),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
/** The promise's value, or null when it fails or takes longer than `ms`. */
|
||||||
|
function within(ms, promise) {
|
||||||
|
return Promise.race([promise.catch(() => null), new Promise((resolve) => setTimeout(resolve, ms, null))]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** No app is deployed here any more (the server says `build.json` doesn't exist). */
|
||||||
|
const GONE = "gone";
|
||||||
|
|
||||||
|
/** The site wants a sign-in first (`build.json` is redirected, often to another origin, or refused). */
|
||||||
|
const SIGN_IN = "sign-in";
|
||||||
|
|
||||||
|
/** The deployed build's version and files, GONE, SIGN_IN, or null (unknown: offline, failing, invalid). */
|
||||||
|
async function deployed() {
|
||||||
|
// `manual`: a redirect to another origin would only fail (CORS), looking like being offline.
|
||||||
|
const response = await fetch(url("build.json"), { cache: "no-cache", redirect: "manual" });
|
||||||
|
if (response.type === "opaqueredirect" || response.status === 401 || response.status === 403) return SIGN_IN;
|
||||||
|
if (response.status === 404 || response.status === 410) return GONE;
|
||||||
|
const build = response.ok ? await response.json() : null;
|
||||||
|
const valid = build && typeof build.version === "string" && Array.isArray(build.files);
|
||||||
|
return valid && build.files.every((f) => typeof f.file === "string" && typeof f.sha256 === "string") ? build : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Keep the worker alive for `promise` (allowed while the launch is being answered). */
|
||||||
|
function extend(event, promise) {
|
||||||
|
try {
|
||||||
|
event.waitUntil(promise.catch(() => {}));
|
||||||
|
} catch {
|
||||||
|
// The event has ended; the work goes on while the worker runs.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A launch: the start page of a complete build (whatever query the URL has: `?sample`), and that build. */
|
||||||
|
async function launch(event) {
|
||||||
|
const kept = await caches.match(url("index.html"), { cacheName: CACHE });
|
||||||
|
if (!kept) return [await fetch(event.request), NETWORK]; // Nothing kept yet (the first visit).
|
||||||
|
extend(event, sweep());
|
||||||
|
const build = await within(NAVIGATE_TIMEOUT_MS, deployed());
|
||||||
|
if (build === SIGN_IN) return [await fetch(event.request), NETWORK];
|
||||||
|
if (build === GONE) {
|
||||||
|
const page = await fetch(event.request).catch(() => null);
|
||||||
|
return page && page.ok ? [page, NETWORK] : [kept, CACHE];
|
||||||
|
}
|
||||||
|
if (!build || build.version === VERSION) return [kept, CACHE];
|
||||||
|
const download = keep(build.version, build.files);
|
||||||
|
extend(event, download);
|
||||||
|
const name = await within(UPDATE_TIMEOUT_MS, download);
|
||||||
|
const page = name && (await caches.match(url("index.html"), { cacheName: name }));
|
||||||
|
return page ? [page, name] : [kept, CACHE];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A launch that fails unexpectedly still starts the kept build (or asks the network). A newer
|
||||||
|
* worker only takes over once the launch has ended, by when its page is remembered (in use).
|
||||||
|
*/
|
||||||
|
async function launchOrKept(event) {
|
||||||
|
let page, build;
|
||||||
|
try {
|
||||||
|
[page, build] = await launch(event);
|
||||||
|
} catch {
|
||||||
|
page = await caches.match(url("index.html"), { cacheName: CACHE }).catch(() => null);
|
||||||
|
build = page ? CACHE : NETWORK;
|
||||||
|
page = page || (await fetch(event.request));
|
||||||
|
}
|
||||||
|
await started(event.resultingClientId, build).catch(() => {});
|
||||||
|
return page;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A page's files come from the build it started, else the network. */
|
||||||
|
async function asset(event) {
|
||||||
|
const build = await startedBy(event.clientId).catch(() => CACHE);
|
||||||
|
const kept = build === NETWORK ? null : await caches.match(event.request, { cacheName: build, ignoreSearch: true });
|
||||||
|
return kept || fetch(event.request);
|
||||||
|
}
|
||||||
|
|
||||||
|
self.addEventListener("fetch", (event) => {
|
||||||
|
const request = event.request;
|
||||||
|
if (RETIRE || request.method !== "GET" || new URL(request.url).origin !== self.location.origin) return;
|
||||||
|
const path = request.url.split(/[?#]/)[0];
|
||||||
|
const start = request.mode === "navigate" && (path === url("") || path === url("index.html"));
|
||||||
|
event.respondWith(start ? launchOrKept(event) : asset(event));
|
||||||
|
});
|
||||||
Loaded 100 of 1622 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user