Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b5728f284b | ||
|
|
dc32cff620 | ||
|
|
531fc04db8 | ||
|
|
4907429439 | ||
|
|
192ef78ff3 | ||
|
|
44a0be8d94 | ||
|
|
9cba66c14d | ||
|
|
4afd93331f | ||
|
|
698621dfdf | ||
|
|
5fc23436ca | ||
|
|
76879f8b39 | ||
|
|
514b0c84f9 | ||
|
|
ddca1054ab | ||
|
|
783ee91404 | ||
|
|
38dedcca3b | ||
|
|
99cca6a11a | ||
|
|
af07f4e0e5 | ||
|
|
0c16cfefbb | ||
|
|
b2189e3f4d | ||
|
|
6e12f5954f | ||
|
|
3ad5a360f2 | ||
|
|
6848c78424 | ||
|
|
b47f82d406 | ||
|
|
614e006eac | ||
|
|
4e07b6c4b7 | ||
|
|
efa2cae0b4 | ||
|
|
78d80e0144 | ||
|
|
13f650b695 | ||
|
|
a7c1909766 | ||
|
|
702f35ae6e | ||
|
|
2d629069c6 | ||
|
|
4b327bab1f | ||
|
|
237341423c | ||
|
|
b99761a3f7 | ||
|
|
3726959d82 | ||
|
|
af1d15b5ea | ||
|
|
84a3a0c478 | ||
|
|
1551c0acef | ||
|
|
f1cc49bcdb | ||
|
|
622a392a83 | ||
|
|
5622963b91 | ||
|
|
3bea744823 | ||
|
|
e8eb7ee11a | ||
|
|
ebb6cc53ab | ||
|
|
924724dc89 | ||
|
|
56bcd872cb | ||
|
|
6c0fca30a7 | ||
|
|
ef1d02f274 | ||
|
|
367aa249bc | ||
|
|
afd6a5c584 | ||
|
|
5965439a15 | ||
|
|
0b2d3ecd44 | ||
|
|
65366ba131 | ||
|
|
96e43bb4ef | ||
|
|
f077f48318 | ||
|
|
955f5aea43 | ||
|
|
bd44f6f496 | ||
|
|
739e442824 | ||
|
|
3918f23c3d | ||
|
|
30f951ecf9 | ||
|
|
02458892d9 | ||
|
|
1d02a5f2d4 | ||
|
|
c391ef17cb | ||
|
|
e413327821 | ||
|
|
a1eb63c169 | ||
|
|
610f2e479c | ||
|
|
f49cd33db1 | ||
|
|
4c7087ec16 | ||
|
|
f87b657c82 | ||
|
|
64ba396c05 | ||
|
|
1720c56840 | ||
|
|
b28decfaf6 | ||
|
|
9e4dc48165 | ||
|
|
3de2f96b7f | ||
|
|
436ee95095 | ||
|
|
1ee2532678 | ||
|
|
3152e02fe5 | ||
|
|
fbcd4852c1 | ||
|
|
97cce94a1c | ||
|
|
5b41d61f1e | ||
|
|
2863b80574 | ||
|
|
03a701d678 | ||
|
|
a2ccbd0684 | ||
|
|
2e566e2c58 | ||
|
|
47285ccb88 | ||
|
|
da16362626 | ||
|
|
13cd45d1f1 | ||
|
|
c5e63b7871 | ||
|
|
2755c9ccfb | ||
|
|
4ab6d92952 | ||
|
|
e063a7778e | ||
|
|
8630a3f0e5 | ||
|
|
0e0c23b080 | ||
|
|
e29075376c | ||
|
|
44b0056d48 | ||
|
|
3bcf77ee32 | ||
|
|
91638cb1f3 | ||
|
|
66b872a749 | ||
|
|
2016ba71f4 | ||
|
|
7556e23fe7 | ||
|
|
4d06daf87b | ||
|
|
c7e53899af | ||
|
|
18ca30a311 | ||
|
|
b55f30959d | ||
|
|
8b98f6c7e3 | ||
|
|
3a504f5347 | ||
|
|
7f2acbc004 | ||
|
|
d3720041b6 | ||
|
|
a3c7a6ff93 | ||
|
|
e6fb3793dc | ||
|
|
c6d361347f | ||
|
|
a078d4e7e9 | ||
|
|
c71234edfb | ||
|
|
00ff63f75e | ||
|
|
82cd5cc52e | ||
|
|
7d7016b356 | ||
|
|
cd66495e14 | ||
|
|
484f0cf8ae | ||
|
|
daecea6edf | ||
|
|
bd38bc40be | ||
|
|
19c8eb846e | ||
|
|
6f5f64f2d9 | ||
|
|
b2525ed34e | ||
|
|
72a76edcf7 | ||
|
|
710b7a664e | ||
|
|
0d32821e9e | ||
|
|
d9c5e4c325 | ||
|
|
12fe17d1b7 | ||
|
|
cf7fbeaba1 | ||
|
|
e2c9f908f8 | ||
|
|
fa961eaa31 | ||
|
|
aa88360357 | ||
|
|
e1ff3fa9c0 | ||
|
|
3afcd69a5c | ||
|
|
a3483ed451 | ||
|
|
d7252f2240 | ||
|
|
30e9b87b48 | ||
|
|
b20f522f5d | ||
|
|
d895fef354 | ||
|
|
070b1414ee | ||
|
|
111c662fe4 | ||
|
|
ab709e6c46 | ||
|
|
03bf992bc1 | ||
|
|
586a358ed4 | ||
|
|
4d61100534 | ||
|
|
25ad6c7266 | ||
|
|
cfb3f52aec | ||
|
|
7c31631ea6 | ||
|
|
c13e516cd5 | ||
|
|
c264c7a42a | ||
|
|
56f09f3993 | ||
|
|
6e63f8bd97 | ||
|
|
b01f361edf | ||
|
|
c482dab4a1 | ||
|
|
189b47c750 | ||
|
|
1530a8e247 | ||
|
|
1d2674ebc4 | ||
|
|
10b5cc5914 | ||
|
|
41a938e731 | ||
|
|
9d0b509961 | ||
|
|
7ae17e6dd5 | ||
|
|
1cd14e2412 | ||
|
|
7014b62388 | ||
|
|
adc568a715 | ||
|
|
12b0d9dbff | ||
|
|
613903229e | ||
|
|
0c4eb458df | ||
|
|
b00c432ac9 | ||
|
|
8a28d13161 | ||
|
|
74321f8bbd | ||
|
|
a67b3bfdf3 | ||
|
|
abdf9d79cf | ||
|
|
b1bbca97ef | ||
|
|
2ec11cfc3a | ||
|
|
2205955329 | ||
|
|
bd9d0778f6 | ||
|
|
a0f7529fd6 | ||
|
|
4a0d519727 | ||
|
|
ffbcdc614c | ||
|
|
06af6e1107 | ||
|
|
84b1aeecae | ||
|
|
a6354dfec5 | ||
|
|
8108646e2c | ||
|
|
b3cbbe7bd5 | ||
|
|
ae2d2145b2 | ||
|
|
a800a40099 | ||
|
|
dc3061a039 | ||
|
|
102314dbb2 | ||
|
|
4ced1d7bcf | ||
|
|
a82f839255 | ||
|
|
08484af293 | ||
|
|
d29e70bad9 | ||
|
|
1d482aff74 | ||
|
|
2445c0f13d | ||
|
|
3d0e2a8b3c | ||
|
|
2a01cca00e | ||
|
|
d7cc5621fa | ||
|
|
be6c7fc17c | ||
|
|
f006eefd6e | ||
|
|
15269f85a1 | ||
|
|
e53390ea1b | ||
|
|
c8314687fc | ||
|
|
878339cac8 | ||
|
|
348bbc1dfa | ||
|
|
262f5c61c0 | ||
|
|
ece2a8693a | ||
|
|
0f77199449 | ||
|
|
e02ef3246f | ||
|
|
ffbeb42b5c | ||
|
|
816bcf10de | ||
|
|
28689e784e | ||
|
|
d396be78a2 | ||
|
|
cbac207852 | ||
|
|
ff2ca2d462 | ||
|
|
7770f8982d | ||
|
|
8e61eb7d6f | ||
|
|
ab80a410a1 | ||
|
|
b94692497e | ||
|
|
7bcc1ee0eb | ||
|
|
36a60a70d9 | ||
|
|
5d17fa970b | ||
|
|
b5bab3f663 | ||
|
|
ccea34e73c | ||
|
|
c7f86c7309 | ||
|
|
4355d117ef | ||
|
|
39951a22ff | ||
|
|
a3890b3bd5 | ||
|
|
59cad5f0bb | ||
|
|
5fbe058051 | ||
|
|
0752d8d79c | ||
|
|
0344a41dc4 | ||
|
|
dba8108369 | ||
|
|
57d787f5ba | ||
|
|
2eaa15ea04 | ||
|
|
f512d4a004 | ||
|
|
62d55c3b29 | ||
|
|
826244bb28 | ||
|
|
111dbc6855 | ||
|
|
ab7602fd0e | ||
|
|
b1d4293cf0 | ||
|
|
99d5b43024 | ||
|
|
f937905cf3 | ||
|
|
46f7d4d8dc | ||
|
|
8071096a99 | ||
|
|
d17b70241f | ||
|
|
fbe778a1e8 | ||
|
|
0252f0bf30 | ||
|
|
633ce20563 | ||
|
|
0c0c4db612 | ||
|
|
16bb97f065 | ||
|
|
3e6c039985 | ||
|
|
7734ba2300 | ||
|
|
0e916ee598 | ||
|
|
87c9a37663 | ||
|
|
10124c8ccf | ||
|
|
0870d6474a | ||
|
|
e9b9c8f697 | ||
|
|
cbcf1fe716 | ||
|
|
e21760e46d | ||
|
|
df01e59716 | ||
|
|
3045d0787e | ||
|
|
d876f475a6 | ||
|
|
ef1a400bb3 | ||
|
|
53c84eb3a7 | ||
|
|
9a7a75788e | ||
|
|
92dc6bc987 | ||
|
|
b5af4a80fa | ||
|
|
309eda87a2 | ||
|
|
c3fd7aa048 | ||
|
|
2e6e05bc9a | ||
|
|
7cea146438 | ||
|
|
492bba9242 | ||
|
|
9be14db8c0 | ||
|
|
b8c496f37a | ||
|
|
aeb406188f | ||
|
|
ceed604498 | ||
|
|
44bd29acc3 | ||
|
|
aa8e8cf69c | ||
|
|
669e14b3bf | ||
|
|
1ee65cf70a | ||
|
|
129364be5e | ||
|
|
3be4727ca6 | ||
|
|
a53eb927d1 | ||
|
|
c3dd40405d | ||
|
|
5012f33c85 | ||
|
|
eb37a82bc0 | ||
|
|
b1da434458 | ||
|
|
e1d99ef0ce | ||
|
|
4f2c133d01 | ||
|
|
0f90fb7e8d | ||
|
|
52e5bc114e | ||
|
|
4cd9a4f4d4 | ||
|
|
72ad6383ef | ||
|
|
2cf05388f1 | ||
|
|
4577dffb36 | ||
|
|
093571cfe4 | ||
|
|
a1b9ca13e3 | ||
|
|
699f526429 | ||
|
|
16a5254e97 | ||
|
|
e5613ebfdf | ||
|
|
dfde1e032d | ||
|
|
10da6b9efc | ||
|
|
5a5a98ee80 | ||
|
|
4e2270517a | ||
|
|
0312808b92 | ||
|
|
9d45fa6b34 | ||
|
|
e4f11c8df6 | ||
|
|
bbc3aa4301 | ||
|
|
611d4eb6b8 | ||
|
|
c50f5364c6 | ||
|
|
beb38b44aa | ||
|
|
a49698ee3d | ||
|
|
919f54a23e | ||
|
|
1d0e371e64 | ||
|
|
43565cd33b | ||
|
|
ab9d9ac50f | ||
|
|
157c0d68d0 | ||
|
|
38d7ea4198 | ||
|
|
7c2b2f1559 | ||
|
|
cc1e654690 | ||
|
|
7af97e3729 | ||
|
|
138bb0261c | ||
|
|
dbe7dfa4bc | ||
|
|
1ceab2ed4c | ||
|
|
743accca7a | ||
|
|
128692da0c | ||
|
|
13b4f6e98c | ||
|
|
ac53fc1e6f | ||
|
|
8d63a9f4cb | ||
|
|
a150822d9b | ||
|
|
a9fd4b1b05 | ||
|
|
face5e2d31 | ||
|
|
efd0e70f7d | ||
|
|
3f4c6e4571 | ||
|
|
abc39685b1 | ||
|
|
f93913b3d3 | ||
|
|
765c5fd143 | ||
|
|
6494f8fe18 | ||
|
|
1623034973 | ||
|
|
74004841b4 | ||
|
|
be08517de2 | ||
|
|
24ed21998b | ||
|
|
3592031d5e | ||
|
|
b8d9db7440 | ||
|
|
2b620338df | ||
|
|
a5b6408587 | ||
|
|
78de687902 | ||
|
|
2741cd9a8b | ||
|
|
86f5500914 | ||
|
|
7804f9938a | ||
|
|
ab03aa5bc5 | ||
|
|
2e3f27f06e | ||
|
|
bda32419bd | ||
|
|
c242c484a8 | ||
|
|
5d37cb01d5 | ||
|
|
7313fd8684 | ||
|
|
6f340ade69 | ||
|
|
e260437846 | ||
|
|
f54ad0f12f | ||
|
|
43f21e8fec | ||
|
|
3e1f1a89f8 | ||
|
|
82253c6f35 | ||
|
|
f4d937d8a2 | ||
|
|
75fb613e25 | ||
|
|
ce614044a7 | ||
|
|
91549d29fb | ||
|
|
b6a5a9166a | ||
|
|
0063954286 | ||
|
|
6f6b64d484 | ||
|
|
52e496d017 | ||
|
|
d557c09c3b | ||
|
|
7046f7f0e7 | ||
|
|
16286249ed | ||
|
|
19e2800472 | ||
|
|
a5f7f5a921 | ||
|
|
a402c5e502 | ||
|
|
cdde7d62b2 | ||
|
|
3f6b9fe89f | ||
|
|
b4acd83c78 | ||
|
|
f7233c4418 | ||
|
|
5573ae06fc | ||
|
|
89a4a96630 | ||
|
|
34d1ac0376 | ||
|
|
0e9e175e79 | ||
|
|
f11ad0ce28 | ||
|
|
9ad96fb81b | ||
|
|
b671265faa | ||
|
|
832ff941d1 | ||
|
|
9869997733 | ||
|
|
745a24bbc8 | ||
|
|
26340882c0 | ||
|
|
8e2b8f2ace | ||
|
|
34e75979b2 | ||
|
|
d5eca6cc78 | ||
|
|
77c77829e3 | ||
|
|
f01ef3c6aa | ||
|
|
f5a6c8fa51 | ||
|
|
865575e410 | ||
|
|
992c93fe5b | ||
|
|
0343960bd6 | ||
|
|
1d48707d0c | ||
|
|
443baa41f0 | ||
|
|
d366b8922a | ||
|
|
692265980b | ||
|
|
28fe5fdb43 | ||
|
|
26c9d1c445 | ||
|
|
f157f5489f | ||
|
|
d1ec8dfd5a | ||
|
|
08d094db39 | ||
|
|
5fa6361ff2 | ||
|
|
1f93b6d39c | ||
|
|
0477e0ba4e | ||
|
|
ae7176cc86 | ||
|
|
eef9a68809 | ||
|
|
f06875128b | ||
|
|
9d226b3535 | ||
|
|
7a1f903216 | ||
|
|
b88673f366 | ||
|
|
67adf5abb5 | ||
|
|
adbd2adf89 | ||
|
|
96303873fe | ||
|
|
b925a1af3d | ||
|
|
05d43d3542 | ||
|
|
c0640cb95e | ||
|
|
2ff17c0fcb | ||
|
|
ecf57d131a | ||
|
|
32ad6e0832 | ||
|
|
13c4a62a71 | ||
|
|
bba1953623 | ||
|
|
0537623a75 | ||
|
|
2a0096fe4a | ||
|
|
4b119dd471 | ||
|
|
6224cbf526 | ||
|
|
e89a8f56c1 | ||
|
|
4cd1a51f48 | ||
|
|
88f079bd8c | ||
|
|
dbdeeec2e9 | ||
|
|
1dbb13cad2 | ||
|
|
0b91ff8a34 | ||
|
|
1e81e65e7e | ||
|
|
9227685483 | ||
|
|
582e6097be | ||
|
|
22190e703c | ||
|
|
f7b08ab8c4 | ||
|
|
ae0b1edeac | ||
|
|
cf1b0d67cc | ||
|
|
b702ce8c7d | ||
|
|
60105172b2 | ||
|
|
e2b8bf5a05 | ||
|
|
9e065aa0d5 | ||
|
|
2fd7b6f08d | ||
|
|
59795872f6 | ||
|
|
37b7b0bd3e | ||
|
|
7e24f0e35a | ||
|
|
152efb5774 | ||
|
|
e726f780d1 | ||
|
|
b201c283c7 | ||
|
|
a2ae3ffbe0 | ||
|
|
96661111f9 | ||
|
|
cc9d76cd86 | ||
|
|
c61ffb54a8 | ||
|
|
ab889a8fff | ||
|
|
fcc3753a4c | ||
|
|
2c9d0a2847 | ||
|
|
99fd05afeb | ||
|
|
a8051760f7 | ||
|
|
c795a3f581 | ||
|
|
2cab9dc142 | ||
|
|
6d8d53aac8 | ||
|
|
4e6939b5cf | ||
|
|
f6ff2ff139 | ||
|
|
048c1ae8a8 | ||
|
|
b00a1e87f4 | ||
|
|
8cbde001ef | ||
|
|
ad8b2f91bb | ||
|
|
9919825ea3 | ||
|
|
97e0ff9050 | ||
|
|
c48c1a09d3 | ||
|
|
ee3d41210d | ||
|
|
be685d064f | ||
|
|
32e613aa8c | ||
|
|
58a9d33f02 | ||
|
|
a8e6154c0d | ||
|
|
d61dff69a6 | ||
|
|
8c853fff3e | ||
|
|
daec1091f4 | ||
|
|
0520910bfd | ||
|
|
46f24f2394 | ||
|
|
1236863b17 | ||
|
|
4f4b1fc2d2 | ||
|
|
d5a79a77e6 | ||
|
|
5d47946e4d | ||
|
|
69cfd89ae8 | ||
|
|
9e6e0b8df1 | ||
|
+33 |
b7b25f9e2b | ||
|
|
65d288227e | ||
|
|
fedb3bcdb1 | ||
|
|
097b8b7550 | ||
|
|
af7ca3a8a2 | ||
|
|
27ddb725c7 | ||
|
|
a06bdf5cfc | ||
|
|
33fdcdb3a0 | ||
|
|
c07ab5f8f9 | ||
|
|
fea32f8aac | ||
|
|
4927214976 | ||
|
|
b621819c0c | ||
|
|
ec552a5300 | ||
|
|
e0cc740cc3 | ||
|
|
5de48e916d | ||
|
|
80af7bbe3e | ||
|
|
191e983423 | ||
|
|
2b9445b049 | ||
|
|
7ddf48ca16 | ||
|
|
d2f6848377 | ||
|
|
0b6d6fecd8 | ||
|
|
fa691707c2 | ||
|
|
b9a55c74e2 | ||
|
|
2bb9c81069 | ||
|
|
cedb51b8ea | ||
|
|
66d13059dd | ||
|
|
800ea40c0d | ||
|
|
20442eecd3 | ||
|
|
22d1cd7032 | ||
|
|
6a0dc18655 | ||
|
|
e006dbf1af | ||
|
|
8241a750fa | ||
|
|
41779cf7bb | ||
|
|
b01b9689c8 | ||
|
|
4426da6f5d | ||
|
|
5ead82e627 | ||
|
|
c29b0d2f13 | ||
|
|
480fd8d517 | ||
|
|
4c09fa5355 |
No files matched your search
@@ -1,5 +1,6 @@
|
|||||||
# cargo-nextest settings for CI (`cargo xtask test` does not use nextest).
|
# cargo-nextest settings for CI (`cargo xtask test` does not use nextest).
|
||||||
# CI builds the tests once and runs them in one job on a 32 vCPU runner (.github/workflows/ci.yml).
|
# CI builds the tests once and runs them in one job on a 32 vCPU runner (.github/workflows/ci.yml),
|
||||||
|
# except the GPU path tracer's tests (the gpu-path group below), which run in four shards of their own.
|
||||||
|
|
||||||
[profile.ci]
|
[profile.ci]
|
||||||
# Heavy tests (one to twelve minutes each on a CI runner) that pull requests skip. They run on
|
# Heavy tests (one to twelve minutes each on a CI runner) that pull requests skip. They run on
|
||||||
@@ -42,7 +43,6 @@ filter = "binary(action_matrix) & test(=action_matrix_sample)"
|
|||||||
threads-required = 12
|
threads-required = 12
|
||||||
priority = 100
|
priority = 100
|
||||||
|
|
||||||
|
|
||||||
# The slowest tests start first, so a shard does not end with one of them running alone on a
|
# The slowest tests start first, so a shard does not end with one of them running alone on a
|
||||||
# core while the others sit idle (seed_81 alone takes about 20 minutes under CI load). Medians
|
# core while the others sit idle (seed_81 alone takes about 20 minutes under CI load). Medians
|
||||||
# from the CI test timings (the junit artifacts), slowest first; a test over ~100 s belongs here.
|
# from the CI test timings (the junit artifacts), slowest first; a test over ~100 s belongs here.
|
||||||
@@ -70,6 +70,17 @@ filter = """
|
|||||||
"""
|
"""
|
||||||
priority = 100
|
priority = 100
|
||||||
|
|
||||||
|
# Each nextest test has its own process/device. Concurrent cold lavapipe path
|
||||||
|
# compiles contend for CPU and can exhaust the 600 s pipeline setup budget.
|
||||||
|
# Serialize this module per CI shard; other tests retain their normal parallelism.
|
||||||
|
# CI runs these in their own job (GPU path tests in ci.yml), split into count partitions.
|
||||||
|
[test-groups.gpu-path]
|
||||||
|
max-threads = 1
|
||||||
|
|
||||||
|
[[profile.ci.overrides]]
|
||||||
|
filter = "package(=solidcraft-gpu) & test(/^path::/)"
|
||||||
|
test-group = "gpu-path"
|
||||||
|
|
||||||
# Full local validation opts into its own scheduling policy. Keep GitHub CI's
|
# Full local validation opts into its own scheduling policy. Keep GitHub CI's
|
||||||
# worker reservation and slow-test priorities above independent of this runner.
|
# worker reservation and slow-test priorities above independent of this runner.
|
||||||
[profile.local-ci]
|
[profile.local-ci]
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# Preserve canonical source receipts and the runtime icon-discovery snapshot.
|
||||||
|
.gitattributes text eol=lf
|
||||||
|
/assets/icons/ui/design/requested_icons.txt text eol=lf
|
||||||
@@ -6,6 +6,7 @@ body:
|
|||||||
attributes:
|
attributes:
|
||||||
value: |
|
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.
|
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.
|
||||||
|
Before reporting a boolean or modelling failure, please try to reproduce it on the latest nightly or a build from current `main`, and say which build you used.
|
||||||
- type: textarea
|
- type: textarea
|
||||||
id: what
|
id: what
|
||||||
attributes:
|
attributes:
|
||||||
@@ -19,6 +20,7 @@ body:
|
|||||||
label: Steps to reproduce
|
label: Steps to reproduce
|
||||||
description: |
|
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.
|
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.
|
||||||
|
Using an AI agent with SolidCraft's MCP server? The `solidcraft-reporting` skill in [`skills/`](https://github.com/tangency-labs/solidcraft/tree/main/skills) has it reproduce the problem in a fresh design and write these steps for you.
|
||||||
placeholder: |
|
placeholder: |
|
||||||
1. Sketch a circle on the XY plane
|
1. Sketch a circle on the XY plane
|
||||||
2. Extrude it 10 mm
|
2. Extrude it 10 mm
|
||||||
|
|||||||
@@ -2,6 +2,12 @@
|
|||||||
|
|
||||||
Describe the problem and resulting behavior. Link the issue when applicable.
|
Describe the problem and resulting behavior. Link the issue when applicable.
|
||||||
|
|
||||||
|
Changes a default: no
|
||||||
|
|
||||||
|
<!-- Required line, replace "no" if this changes what a user gets out of the box (a default value, key binding, setting, tool behaviour):
|
||||||
|
Changes a default: yes — <what>, old behaviour kept behind preference <name>
|
||||||
|
Docs-only and bot PRs are exempt. -->
|
||||||
|
|
||||||
## Validation
|
## Validation
|
||||||
|
|
||||||
What did you run, and what were the results? Include expected and measured values for geometry changes.
|
What did you run, and what were the results? Include expected and measured values for geometry changes.
|
||||||
|
|||||||
@@ -9,12 +9,14 @@
|
|||||||
# Documentation, packaging, the other workflows and the GitHub bots' scripts select nothing:
|
# Documentation, packaging, the other workflows and the GitHub bots' scripts select nothing:
|
||||||
# no native job runs for them, on pull requests or on main.
|
# no native job runs for them, on pull requests or on main.
|
||||||
# Tests are built and run in one job on a big runner, slowest first, starting beside the repository
|
# Tests are built and run in one job on a big runner, slowest first, starting beside the repository
|
||||||
# checks (no archive to upload and download). A few heavy tests (see .config/nextest.toml) are
|
# checks (no archive to upload and download). The GPU path tracer's tests run one at a time
|
||||||
# skipped on pull requests and run on pushes to main and nightly. The Windows jobs (D3D12 shaders
|
# (.config/nextest.toml), so they have a job of their own in four shards (GPU path tests). A few
|
||||||
# and app startup), the reference tests and the doc tests run on main and nightly only, not on
|
# heavy tests (see .config/nextest.toml) are skipped on pull requests and run on pushes to main and
|
||||||
# pull requests (the fast lane, in Select checks); a break there is fixed forward on main. Only
|
# nightly. The reference tests and the doc tests run in the merge queue, on main and nightly, not
|
||||||
# main saves the build caches; pull requests restore them. sccache is on a Blacksmith sticky disk that
|
# on pull requests (the fast lane, in Select checks); a break there is fixed forward on main. The
|
||||||
# only main commits.
|
# Windows jobs (D3D12 shaders and app startup) run nightly, and in the merge queue only for a group
|
||||||
|
# that changes what they exercise. Only main saves the build caches; pull requests restore them.
|
||||||
|
# sccache is on a Blacksmith sticky disk that only main commits.
|
||||||
# A push to main runs only the repository checks when a passing merge-queue run tested that very
|
# A push to main runs only the repository checks when a passing merge-queue run tested that very
|
||||||
# commit, or when nothing a build reads changed since the last push to main whose run passed.
|
# commit, or when nothing a build reads changed since the last push to main whose run passed.
|
||||||
# Otherwise it runs everything.
|
# Otherwise it runs everything.
|
||||||
@@ -30,7 +32,7 @@
|
|||||||
# reads `ci` from the newest run of a commit, so a run without it would block a PR that passed.
|
# reads `ci` from the newest run of a commit, so a run without it would block a PR that passed.
|
||||||
# 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.
|
||||||
# Every Linux job runs on Blacksmith's Ubuntu 24.04 runners (blacksmith-<N>vcpu-ubuntu-2404), sized
|
# Every Linux job runs on Blacksmith's Ubuntu 24.04 runners (blacksmith-<N>vcpu-ubuntu-2404), sized
|
||||||
# per job: 32 vCPU for the tests, 16 for Clippy, the archive build (nightly) and the merge queue's, 8 for compiles, doc and reference tests, 4 for the light checks, 2 for Select checks and ci.
|
# per job: 32 vCPU for the tests, 16 for Clippy, the GPU path tests, the archive build (nightly) and the merge queue's, 8 for compiles, doc and reference tests, 4 for the light checks, 2 for Select checks and ci.
|
||||||
# The Windows shader job runs on Blacksmith's Windows Server 2025 runners (blacksmith-8vcpu-windows-2025);
|
# The Windows shader job runs on Blacksmith's Windows Server 2025 runners (blacksmith-8vcpu-windows-2025);
|
||||||
# the Windows app startup smoke stays on windows-latest, which has a desktop session that presents frames.
|
# the Windows app startup smoke stays on windows-latest, which has a desktop session that presents frames.
|
||||||
# Pull requests, forks included, the merge queue, pushes to main and the nightly run all use them:
|
# Pull requests, forks included, the merge queue, pushes to main and the nightly run all use them:
|
||||||
@@ -103,6 +105,9 @@ jobs:
|
|||||||
kernel: ${{ steps.paths.outputs.kernel }}
|
kernel: ${{ steps.paths.outputs.kernel }}
|
||||||
goldens: ${{ steps.paths.outputs.goldens }}
|
goldens: ${{ steps.paths.outputs.goldens }}
|
||||||
windows: ${{ steps.paths.outputs.windows }}
|
windows: ${{ steps.paths.outputs.windows }}
|
||||||
|
# The GPU path tests run: native, and the whole workspace or solidcraft-gpu selected. The
|
||||||
|
# job's `if` and the `ci` job's check both read this, so they cannot disagree.
|
||||||
|
gpu: ${{ steps.paths.outputs.gpu }}
|
||||||
full: ${{ steps.paths.outputs.full }}
|
full: ${{ steps.paths.outputs.full }}
|
||||||
# Code changed on a pull request that has no approved-for-ci label yet: only Quick compile.
|
# Code changed on a pull request that has no approved-for-ci label yet: only Quick compile.
|
||||||
quick: ${{ steps.paths.outputs.quick }}
|
quick: ${{ steps.paths.outputs.quick }}
|
||||||
@@ -122,6 +127,8 @@ jobs:
|
|||||||
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 }}
|
PUSH_SHA: ${{ github.sha }}
|
||||||
|
GROUP_BASE_SHA: ${{ github.event.merge_group.base_sha }}
|
||||||
|
GROUP_HEAD_SHA: ${{ github.event.merge_group.head_sha }}
|
||||||
PR_NUMBER: ${{ github.event.pull_request.number }}
|
PR_NUMBER: ${{ github.event.pull_request.number }}
|
||||||
HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
|
HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
|
||||||
HEAD_REF: ${{ github.event.pull_request.head.ref }}
|
HEAD_REF: ${{ github.event.pull_request.head.ref }}
|
||||||
@@ -144,6 +151,23 @@ jobs:
|
|||||||
full=$(sed -n 's/^full=//p' "$RUNNER_TEMP/ci-affected")
|
full=$(sed -n 's/^full=//p' "$RUNNER_TEMP/ci-affected")
|
||||||
packages=$(sed -n 's/^packages=//p' "$RUNNER_TEMP/ci-affected")
|
packages=$(sed -n 's/^packages=//p' "$RUNNER_TEMP/ci-affected")
|
||||||
}
|
}
|
||||||
|
# Whether the NUL-separated paths in $1 (the diff $2) reach 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, or a lockfile change that moves the
|
||||||
|
# graphics stack (wgpu, naga, egui, winit, windows). Pull requests and merge groups share it.
|
||||||
|
windows_paths() {
|
||||||
|
while IFS= read -r -d '' path; do
|
||||||
|
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
|
||||||
|
done < "$1"
|
||||||
|
if [ "$windows" = false ] && grep -qxz 'Cargo.lock' "$1" \
|
||||||
|
&& git diff "$2" -- Cargo.lock \
|
||||||
|
| grep -Eq '^[ +-]name = "(wgpu[a-z_-]*|naga|egui[a-z_-]*|eframe|winit|windows[a-z_-]*|d3d12)"'; then
|
||||||
|
windows=true
|
||||||
|
fi
|
||||||
|
}
|
||||||
if [ "$EVENT_NAME" = push ]; then
|
if [ "$EVENT_NAME" = push ]; then
|
||||||
# The queue lands the very commit its merge_group run tested. If that run passed,
|
# 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
|
# testing the push again proves nothing new; otherwise (a merge that skipped the
|
||||||
@@ -164,13 +188,25 @@ jobs:
|
|||||||
# push before may never have run: a newer push cancels a waiting one).
|
# push before may never have run: a newer push cancels a waiting one).
|
||||||
echo "$tested..$PUSH_SHA changes no code: repository checks only."
|
echo "$tested..$PUSH_SHA changes no code: repository checks only."
|
||||||
else
|
else
|
||||||
# Code changed (or the push can't be compared): main runs everything.
|
# Code changed (or the push can't be compared): main runs everything but Windows.
|
||||||
|
# The merge queue ran Windows for the changes that reach it, and the nightly runs it
|
||||||
|
# for everything else (it passed 129 of 129 non-PR runs before this).
|
||||||
full=true
|
full=true
|
||||||
packages=
|
packages=
|
||||||
native=true
|
native=true
|
||||||
|
fi
|
||||||
|
elif [ "$EVENT_NAME" = merge_group ]; then
|
||||||
|
native=true
|
||||||
|
# Windows (about 16 runner-minutes) only for a group that changes what it exercises;
|
||||||
|
# the nightly runs it whatever changed. A group that can't be compared runs it.
|
||||||
|
if git diff --no-renames --name-only -z "$GROUP_BASE_SHA...$GROUP_HEAD_SHA" > "$RUNNER_TEMP/ci-paths"; then
|
||||||
|
windows_paths "$RUNNER_TEMP/ci-paths" "$GROUP_BASE_SHA...$GROUP_HEAD_SHA"
|
||||||
|
else
|
||||||
windows=true
|
windows=true
|
||||||
fi
|
fi
|
||||||
|
echo "windows=$windows for $GROUP_BASE_SHA...$GROUP_HEAD_SHA"
|
||||||
elif [ "$EVENT_NAME" != pull_request ]; then
|
elif [ "$EVENT_NAME" != pull_request ]; then
|
||||||
|
# The nightly run and Run workflow: everything, Windows included.
|
||||||
native=true
|
native=true
|
||||||
windows=true
|
windows=true
|
||||||
else
|
else
|
||||||
@@ -185,19 +221,9 @@ jobs:
|
|||||||
case "$path" in
|
case "$path" in
|
||||||
crates/kernel/*|vendor/truck-*|tests/robustness/*) goldens=true ;;
|
crates/kernel/*|vendor/truck-*|tests/robustness/*) goldens=true ;;
|
||||||
esac
|
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
|
|
||||||
done < "$RUNNER_TEMP/ci-paths"
|
done < "$RUNNER_TEMP/ci-paths"
|
||||||
# A lockfile change that moves the graphics stack (wgpu, naga, egui, winit, windows).
|
# Computed as for a merge group, then turned off below (the fast lane).
|
||||||
if [ "$windows" = false ] && grep -qxz 'Cargo.lock' "$RUNNER_TEMP/ci-paths" \
|
windows_paths "$RUNNER_TEMP/ci-paths" "$BASE_SHA...$HEAD_SHA"
|
||||||
&& 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; nothing
|
# Pull requests build and test the touched packages and their dependents; nothing
|
||||||
# selected means no code changed.
|
# selected means no code changed.
|
||||||
select_packages "$RUNNER_TEMP/ci-paths"
|
select_packages "$RUNNER_TEMP/ci-paths"
|
||||||
@@ -242,8 +268,16 @@ jobs:
|
|||||||
goldens=false
|
goldens=false
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
# The GPU path tests (their own job) run with the other tests, when solidcraft-gpu is
|
||||||
|
# among the packages they test.
|
||||||
|
gpu=false
|
||||||
|
if [ "$native" = true ]; then
|
||||||
|
case " $packages " in *" solidcraft-gpu "*) gpu=true ;; esac
|
||||||
|
if [ "$full" = true ]; then gpu=true; fi
|
||||||
|
fi
|
||||||
{
|
{
|
||||||
echo "native=$native"
|
echo "native=$native"
|
||||||
|
echo "gpu=$gpu"
|
||||||
echo "kernel=$kernel"
|
echo "kernel=$kernel"
|
||||||
echo "goldens=$goldens"
|
echo "goldens=$goldens"
|
||||||
echo "windows=$windows"
|
echo "windows=$windows"
|
||||||
@@ -286,6 +320,10 @@ jobs:
|
|||||||
cargo test -p xtask ui_containers --locked
|
cargo test -p xtask ui_containers --locked
|
||||||
- name: Sorted lists
|
- name: Sorted lists
|
||||||
run: cargo xtask lists
|
run: cargo xtask lists
|
||||||
|
- name: Agent router and skills cite real files
|
||||||
|
run: |
|
||||||
|
cargo xtask skills
|
||||||
|
cargo test -p xtask skills --locked
|
||||||
- name: Design format pending changes
|
- name: Design format pending changes
|
||||||
run: bash scripts/test-format-pending.sh
|
run: bash scripts/test-format-pending.sh
|
||||||
- name: Web app offline use and updates (headless Chrome)
|
- name: Web app offline use and updates (headless Chrome)
|
||||||
@@ -295,7 +333,7 @@ jobs:
|
|||||||
- name: Merge-of-main detection self-test
|
- name: Merge-of-main detection self-test
|
||||||
run: python3 -I scripts/ci/test_main_merge.py
|
run: python3 -I scripts/ci/test_main_merge.py
|
||||||
- name: Claim, triage and kernel-paused bot tests
|
- name: Claim, triage and kernel-paused bot tests
|
||||||
run: node --test scripts/claim/*.test.js scripts/triage/*.test.js scripts/kernel-paused/*.test.js
|
run: node --test scripts/claim/*.test.js scripts/triage/*.test.js scripts/kernel-paused/*.test.js scripts/pr-checks/*.test.js
|
||||||
|
|
||||||
# Fast feedback for a pull request that has not been approved for the full CI yet.
|
# Fast feedback for a pull request that has not been approved for the full CI yet.
|
||||||
quick-compile:
|
quick-compile:
|
||||||
@@ -487,8 +525,10 @@ jobs:
|
|||||||
scope=(--workspace)
|
scope=(--workspace)
|
||||||
if [ "$FULL" != true ]; then scope=(); for p in $PACKAGES; do scope+=(-p "$p"); done; fi
|
if [ "$FULL" != true ]; then scope=(); for p in $PACKAGES; do scope+=(-p "$p"); done; fi
|
||||||
status=0
|
status=0
|
||||||
|
# The GPU path tracer's tests run in their own job (GPU path tests): one at a time, they
|
||||||
|
# took about 36 of this job's 45 minutes.
|
||||||
cargo nextest run "${scope[@]}" --cargo-profile ci --locked --profile ci --no-tests=pass \
|
cargo nextest run "${scope[@]}" --cargo-profile ci --locked --profile ci --no-tests=pass \
|
||||||
--ignore-default-filter -E "$base" || status=1
|
--ignore-default-filter -E "($base) & not (package(=solidcraft-gpu) & test(/^path::/))" || status=1
|
||||||
if [ "$status" != 0 ]; then
|
if [ "$status" != 0 ]; then
|
||||||
# A failed golden gets the hint to re-record it (junit.xml lists the failures).
|
# A failed golden gets the hint to re-record it (junit.xml lists the failures).
|
||||||
if [ -f "$junit" ] && tr '\n' ' ' < "$junit" | grep -q '<testcase name="tests::robustness_goldens::[^"]*"[^>]*>[[:space:]]*<failure'; then
|
if [ -f "$junit" ] && tr '\n' ' ' < "$junit" | grep -q '<testcase name="tests::robustness_goldens::[^"]*"[^>]*>[[:space:]]*<failure'; then
|
||||||
@@ -508,6 +548,96 @@ jobs:
|
|||||||
path: ${{ env.CARGO_TARGET_DIR || 'target' }}/nextest/ci/junit.xml
|
path: ${{ env.CARGO_TARGET_DIR || 'target' }}/nextest/ci/junit.xml
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
|
gpu-path-tests:
|
||||||
|
name: GPU path tests (${{ matrix.shard }}/4)
|
||||||
|
# The GPU path tracer's tests (about 108) compile their pipelines on lavapipe, one test at a
|
||||||
|
# time (the gpu-path test group in .config/nextest.toml keeps them within the 600 s pipeline
|
||||||
|
# setup budget). Serial, they took about 36 minutes, the longest chain in Native Linux tests;
|
||||||
|
# here four shards run beside it. Their filter is the one Native Linux tests leaves out, so
|
||||||
|
# every test runs exactly once.
|
||||||
|
# 16 vCPU, not 8: lavapipe compiles on every core, and on 8 vCPU one test went past the 600 s
|
||||||
|
# budget (665 s, against 204 s for the same test in another run) and a shard took 35 minutes.
|
||||||
|
needs: changes
|
||||||
|
if: ${{ !cancelled() && needs.changes.result == 'success' && needs.changes.outputs.gpu == 'true' }}
|
||||||
|
runs-on: blacksmith-16vcpu-ubuntu-2404
|
||||||
|
timeout-minutes: 45
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
shard: [1, 2, 3, 4]
|
||||||
|
env:
|
||||||
|
# As in Native Linux tests: lavapipe draws, and a test without an adapter fails.
|
||||||
|
SOLIDCRAFT_GPU: software
|
||||||
|
SOLIDCRAFT_REQUIRE_GPU: "1"
|
||||||
|
# lavapipe's own shader cache (below).
|
||||||
|
MESA_SHADER_CACHE_DIR: /home/runner/.cache/mesa-gpu
|
||||||
|
CARGO_INCREMENTAL: "0"
|
||||||
|
RUSTC_WRAPPER: sccache
|
||||||
|
SCCACHE_DIR: /home/runner/.cache/sccache
|
||||||
|
SCCACHE_CACHE_SIZE: 20G
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- name: Install a software Vulkan driver (lavapipe)
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends mesa-vulkan-drivers libvulkan1
|
||||||
|
- name: Size parallel compiles to the job's memory
|
||||||
|
run: scripts/ci/build-jobs.sh
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
# sccache lives on a Blacksmith sticky disk (an ext4 volume cloned from the last snapshot,
|
||||||
|
# no 10 GB limit and no download). Only main commits it; pull requests, the merge queue and
|
||||||
|
# forks mount a clone and never write back, so nothing they build can reach main's cache.
|
||||||
|
# The shards build the same thing, so only the first one commits it (and saves the cache).
|
||||||
|
- name: Mount the compiler cache
|
||||||
|
uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
|
||||||
|
continue-on-error: true
|
||||||
|
with:
|
||||||
|
key: ${{ github.repository }}-sccache-gpu
|
||||||
|
path: /home/runner/.cache/sccache
|
||||||
|
commit: ${{ github.ref == 'refs/heads/main' && matrix.shard == 1 && 'on-change' || 'false' }}
|
||||||
|
# The first test in a shard to build the path pipeline compiles it cold on lavapipe (335 to
|
||||||
|
# 665 s, against the 600 s setup budget); every later one reads Mesa's disk cache (about
|
||||||
|
# 30 s). Keeping that cache from main's last run lets the first test read it too, until the
|
||||||
|
# shaders change. Same sticky disk rules as the compiler cache.
|
||||||
|
- name: Mount lavapipe's shader cache
|
||||||
|
uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
|
||||||
|
continue-on-error: true
|
||||||
|
with:
|
||||||
|
key: ${{ github.repository }}-mesa-gpu
|
||||||
|
path: /home/runner/.cache/mesa-gpu
|
||||||
|
commit: ${{ github.ref == 'refs/heads/main' && matrix.shard == 1 && 'on-change' || 'false' }}
|
||||||
|
# Main saves the cache; every other run restores it, read-only.
|
||||||
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
|
with:
|
||||||
|
key: native-gpu
|
||||||
|
save-if: ${{ github.ref == 'refs/heads/main' && matrix.shard == 1 }}
|
||||||
|
- name: Set up compiler cache
|
||||||
|
uses: mozilla-actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11
|
||||||
|
with:
|
||||||
|
version: v0.16.0
|
||||||
|
- uses: taiki-e/install-action@1168f6810a3cb30a3514bf5756a3b7f0422c6df8 # v2.87.28
|
||||||
|
with:
|
||||||
|
tool: cargo-nextest
|
||||||
|
- name: Run one shard of the GPU path tests
|
||||||
|
env:
|
||||||
|
SHARD: ${{ matrix.shard }}
|
||||||
|
run: |
|
||||||
|
# None of these is in the default filter (the heavy tests), so pull requests, the merge
|
||||||
|
# queue, main and nightly all run every one of them, as before. `count` deals the tests
|
||||||
|
# out in turn (27 each); `hash` split them 41/40/27 across three shards.
|
||||||
|
cargo nextest run -p solidcraft-gpu --cargo-profile ci --locked --profile ci --no-tests=pass \
|
||||||
|
--ignore-default-filter -E 'test(/^path::/)' --partition "count:$SHARD/4"
|
||||||
|
- name: Compiler cache statistics
|
||||||
|
if: always()
|
||||||
|
run: sccache --show-stats
|
||||||
|
- name: Upload test timings
|
||||||
|
if: always()
|
||||||
|
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: junit-gpu-${{ matrix.shard }}
|
||||||
|
path: ${{ env.CARGO_TARGET_DIR || 'target' }}/nextest/ci/junit.xml
|
||||||
|
retention-days: 7
|
||||||
|
|
||||||
action-matrix:
|
action-matrix:
|
||||||
# Every ordinary action on every face, edge, vertex and body of the design corpus, against
|
# 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;
|
# tests/action_matrix/baseline.json (docs/action-matrix.md). Every test run checks a sample;
|
||||||
@@ -769,7 +899,7 @@ jobs:
|
|||||||
# commit's real run instead: the merge queue reads `ci` from the newest run of a commit, so a
|
# commit's real run instead: the merge queue reads `ci` from the newest run of a commit, so a
|
||||||
# run without a passing `ci` would block a pull request that passed (#1850, #3182, #3252).
|
# run without a passing `ci` would block a pull request that passed (#1850, #3182, #3252).
|
||||||
name: ci
|
name: ci
|
||||||
needs: [changes, checks, quick-compile, clippy, build-tests, tests, doc-tests, oracle, windows-fxc, windows-startup]
|
needs: [changes, checks, quick-compile, clippy, build-tests, tests, gpu-path-tests, doc-tests, oracle, windows-fxc, windows-startup]
|
||||||
if: always() && (github.event_name != 'pull_request' || !github.event.pull_request.draft)
|
if: always() && (github.event_name != 'pull_request' || !github.event.pull_request.draft)
|
||||||
runs-on: blacksmith-2vcpu-ubuntu-2404
|
runs-on: blacksmith-2vcpu-ubuntu-2404
|
||||||
permissions:
|
permissions:
|
||||||
@@ -817,6 +947,8 @@ jobs:
|
|||||||
BUILD: ${{ needs.build-tests.result }}
|
BUILD: ${{ needs.build-tests.result }}
|
||||||
EVENT_NAME: ${{ github.event_name }}
|
EVENT_NAME: ${{ github.event_name }}
|
||||||
TESTS: ${{ needs.tests.result }}
|
TESTS: ${{ needs.tests.result }}
|
||||||
|
GPU_RUN: ${{ needs.changes.outputs.gpu }}
|
||||||
|
GPU: ${{ needs.gpu-path-tests.result }}
|
||||||
DOCS: ${{ needs.doc-tests.result }}
|
DOCS: ${{ needs.doc-tests.result }}
|
||||||
ORACLE: ${{ needs.oracle.result }}
|
ORACLE: ${{ needs.oracle.result }}
|
||||||
WINDOWS_FXC: ${{ needs.windows-fxc.result }}
|
WINDOWS_FXC: ${{ needs.windows-fxc.result }}
|
||||||
@@ -836,6 +968,10 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
test "$TESTS" = success
|
test "$TESTS" = success
|
||||||
fi
|
fi
|
||||||
|
# The same output decides whether the GPU path tests run (their job's `if`).
|
||||||
|
if [ "$GPU_RUN" = true ]; then
|
||||||
|
test "$GPU" = success
|
||||||
|
fi
|
||||||
if [ "$DOCTESTS" = true ]; then
|
if [ "$DOCTESTS" = true ]; then
|
||||||
test "$DOCS" = success
|
test "$DOCS" = success
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
# Nightly import checks on real-world STEP files (#1397): the external corpus in
|
||||||
|
# tests/external-corpus.toml is downloaded (hash-verified), imported headless, and checked
|
||||||
|
# against tolerance-based expectations — body counts, total volume and area, time and memory
|
||||||
|
# budgets. It is not part of `cargo xtask ci`: it downloads from the internet.
|
||||||
|
#
|
||||||
|
# Import results should improve over time (healing, edge merging, meshing). When a check fails
|
||||||
|
# because the numbers moved for the better (or the source changed upstream), re-record with
|
||||||
|
# `cargo xtask external-corpus --bless "why"` in a pull request, never by editing numbers.
|
||||||
|
name: External corpus
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: '40 3 * * *'
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
only:
|
||||||
|
description: "Run only this corpus entry name (empty = every entry)"
|
||||||
|
type: string
|
||||||
|
default: ""
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
corpus:
|
||||||
|
name: Import the external STEP corpus
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 120
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
|
- name: Build the CLI
|
||||||
|
run: cargo build --profile ci -p solidcraft-cli
|
||||||
|
- name: Import and check every entry
|
||||||
|
env:
|
||||||
|
ONLY: ${{ inputs.only }}
|
||||||
|
run: |
|
||||||
|
if [ -z "$ONLY" ]; then
|
||||||
|
cargo run -q -p xtask -- external-corpus --cli target/ci/solidcraft-cli
|
||||||
|
else
|
||||||
|
cargo run -q -p xtask -- external-corpus --cli target/ci/solidcraft-cli --only "$ONLY"
|
||||||
|
fi
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
# Files generated from the code are rewritten here, on main, after each merge, so pull requests
|
# 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):
|
# 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`).
|
# THIRD-PARTY-LICENSES.txt (`cargo xtask licences`) and docs/features.md (`cargo xtask features`).
|
||||||
|
# Pending files (assets/locales/pending, attribution/pending) are folded into the catalogs and
|
||||||
|
# ATTRIBUTION.md by `cargo xtask fold-pending`.
|
||||||
name: Generated files
|
name: Generated files
|
||||||
|
|
||||||
on:
|
on:
|
||||||
@@ -17,6 +19,8 @@ on:
|
|||||||
- "crates/engine/**"
|
- "crates/engine/**"
|
||||||
- "apps/solidcraft-cli/**"
|
- "apps/solidcraft-cli/**"
|
||||||
- "xtask/**"
|
- "xtask/**"
|
||||||
|
- "assets/locales/pending/*.json"
|
||||||
|
- "attribution/pending/*.md"
|
||||||
- ".github/workflows/generated.yml"
|
- ".github/workflows/generated.yml"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
@@ -48,13 +52,15 @@ jobs:
|
|||||||
run: cargo xtask licences
|
run: cargo xtask licences
|
||||||
- name: docs/features.md
|
- name: docs/features.md
|
||||||
run: cargo xtask features
|
run: cargo xtask features
|
||||||
|
- name: Pending locale strings and attribution rows
|
||||||
|
run: cargo xtask fold-pending
|
||||||
- name: Commit if changed
|
- name: Commit if changed
|
||||||
run: |
|
run: |
|
||||||
if git diff --quiet -- THIRD-PARTY-LICENSES.txt docs/features.md; then echo "unchanged"; exit 0; fi
|
if [ -z "$(git status --porcelain)" ]; then echo "unchanged"; exit 0; fi
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
git add THIRD-PARTY-LICENSES.txt docs/features.md
|
git add -A THIRD-PARTY-LICENSES.txt docs/features.md assets/locales ATTRIBUTION.md attribution
|
||||||
git commit -m "Regenerate THIRD-PARTY-LICENSES.txt and docs/features.md [skip ci]"
|
git commit -m "Regenerate generated files and fold pending files [skip ci]"
|
||||||
for _ in 1 2 3; do
|
for _ in 1 2 3; do
|
||||||
git pull --rebase origin main && git push origin HEAD:main && exit 0
|
git pull --rebase origin main && git push origin HEAD:main && exit 0
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ on:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: read # to check out scripts/kernel-paused
|
contents: read # to check out scripts/kernel-paused
|
||||||
issues: write
|
issues: write
|
||||||
pull-requests: read # to list a PR's changed paths
|
pull-requests: write # to list a PR's changed paths and add its label
|
||||||
discussions: write
|
discussions: write
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ jobs:
|
|||||||
run: python3 packaging/tests/nightly_test.py
|
run: python3 packaging/tests/nightly_test.py
|
||||||
- name: Windows executable icon validation regression
|
- name: Windows executable icon validation regression
|
||||||
run: python3 packaging/tests/windows_icon_test.py
|
run: python3 packaging/tests/windows_icon_test.py
|
||||||
|
- name: AppImage CLI wrapper regression
|
||||||
|
run: python3 packaging/tests/apprun_test.py
|
||||||
- name: Flatpak desktop smoke validation regression
|
- name: Flatpak desktop smoke validation regression
|
||||||
run: python3 packaging/tests/flatpak_test.py
|
run: python3 packaging/tests/flatpak_test.py
|
||||||
- name: PowerShell
|
- name: PowerShell
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir -p site
|
mkdir -p site
|
||||||
cp -r target/book/. site/
|
cp -r target/book/. site/
|
||||||
|
bash docs/book/seo.sh site # canonical links, robots.txt, sitemap.xml
|
||||||
cp -r dist/web site/app
|
cp -r dist/web site/app
|
||||||
- uses: actions/configure-pages@v5
|
- uses: actions/configure-pages@v5
|
||||||
id: pages
|
id: pages
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
# Two quick checks on every pull request (CONTRIBUTING.md, "Sending a change"): no second open PR
|
||||||
|
# for an issue a lower-numbered one already closes, and the "Changes a default:" line is filled in.
|
||||||
|
# Neither is a required status check. The logic is in scripts/pr-checks/pr-checks.js (tested in ci.yml).
|
||||||
|
name: PR checks
|
||||||
|
|
||||||
|
on:
|
||||||
|
# pull_request, never pull_request_target: nothing here checks out or runs the PR's code, and the
|
||||||
|
# token is read-only for fork PRs. Only scripts/pr-checks from the PR's own merge commit is run.
|
||||||
|
pull_request:
|
||||||
|
types: [opened, edited, synchronize, reopened, ready_for_review, labeled, unlabeled]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
pull-requests: read
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: pr-checks-${{ github.event.pull_request.number }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
duplicate:
|
||||||
|
name: Duplicate PR check
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 5
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
with:
|
||||||
|
sparse-checkout: scripts/pr-checks
|
||||||
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const checks = require('./scripts/pr-checks/pr-checks.js');
|
||||||
|
const r = await checks.checkDuplicate({ github, context, core });
|
||||||
|
core.info(JSON.stringify(r));
|
||||||
|
|
||||||
|
defaults:
|
||||||
|
name: Defaults line check
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 5
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
with:
|
||||||
|
sparse-checkout: scripts/pr-checks
|
||||||
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const checks = require('./scripts/pr-checks/pr-checks.js');
|
||||||
|
const r = await checks.checkDefaults({ github, context, core });
|
||||||
|
core.info(JSON.stringify(r));
|
||||||
|
|
||||||
|
# Labelling needs write access, which a fork PR's token never has, so it is its own job and best
|
||||||
|
# effort: a fork PR just doesn't get the `changes-default` label from here.
|
||||||
|
label:
|
||||||
|
name: Label changes-default
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 5
|
||||||
|
continue-on-error: true
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
pull-requests: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
with:
|
||||||
|
sparse-checkout: scripts/pr-checks
|
||||||
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const checks = require('./scripts/pr-checks/pr-checks.js');
|
||||||
|
await checks.syncDefaultLabel({ github, context, core });
|
||||||
@@ -4,11 +4,14 @@
|
|||||||
# comes from [workspace.package] in Cargo.toml. An agent verifies the artifacts and publishes
|
# comes from [workspace.package] in Cargo.toml. An agent verifies the artifacts and publishes
|
||||||
# the draft separately; see docs/releasing.md. Tags and pushes to main do not trigger releases.
|
# the draft separately; see docs/releasing.md. Tags and pushes to main do not trigger releases.
|
||||||
# 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.
|
||||||
|
# The macOS app is signed and notarized when the APPLE_* secrets exist. The Windows binaries and
|
||||||
|
# MSI are Authenticode-signed through SignPath Foundation when the SIGNPATH_API_TOKEN secret exists
|
||||||
|
# (see the windows job). Nothing else is signed yet.
|
||||||
#
|
#
|
||||||
# Linux x86_64, aarch64 AppImage (+ .zsync), .deb, .rpm, .flatpak, .snap, .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 (both archs built in parallel) 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
|
||||||
#
|
#
|
||||||
@@ -17,6 +20,8 @@
|
|||||||
# releases/latest/download/<name> links in the README keep working across releases.
|
# 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.
|
||||||
|
# A dry run from any branch also test-signs the Windows files when SIGNPATH_API_TOKEN exists:
|
||||||
|
# gh workflow run release.yml --ref <branch> -f draft=false [-f signpath_signing_policy=test-signing]
|
||||||
name: Release
|
name: Release
|
||||||
|
|
||||||
on:
|
on:
|
||||||
@@ -31,6 +36,10 @@ on:
|
|||||||
description: "Create/update a draft (release branch only; off: build artifacts only)"
|
description: "Create/update a draft (release branch only; off: build artifacts only)"
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
signpath_signing_policy:
|
||||||
|
description: "SignPath signing policy for the Windows files (empty: the repository variable, else test-signing)"
|
||||||
|
type: string
|
||||||
|
default: ""
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@@ -295,11 +304,19 @@ jobs:
|
|||||||
path: dist/release/*
|
path: dist/release/*
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
macos:
|
# The two halves of the universal binary build in parallel on their own runners (each alone
|
||||||
name: macOS universal
|
# took about half of the old single job's 45 minutes); `macos` below joins and packages them.
|
||||||
|
macos-build:
|
||||||
|
name: macOS build ${{ matrix.arch }}
|
||||||
needs: version
|
needs: version
|
||||||
if: needs.version.outputs.build == 'true'
|
if: needs.version.outputs.build == 'true'
|
||||||
runs-on: macos-14
|
runs-on: macos-14
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- { arch: aarch64, target: aarch64-apple-darwin }
|
||||||
|
- { arch: x86_64, target: x86_64-apple-darwin }
|
||||||
env:
|
env:
|
||||||
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
SOLIDCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
SOLIDCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
|
||||||
@@ -307,12 +324,58 @@ jobs:
|
|||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
with:
|
with:
|
||||||
targets: aarch64-apple-darwin, x86_64-apple-darwin
|
targets: ${{ matrix.target }}
|
||||||
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
with:
|
with:
|
||||||
key: release-macos-universal
|
key: release-macos-${{ matrix.arch }}
|
||||||
- name: Build and package (dmg, CLI zip; the dmg is mounted and checked)
|
- name: Build
|
||||||
run: packaging/macos/package.sh --arch universal
|
run: packaging/macos/package.sh --build-only ${{ matrix.target }}
|
||||||
|
# Not named release-*: the release job collects every release-* artifact as an asset.
|
||||||
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: macos-bin-${{ matrix.arch }}
|
||||||
|
path: |
|
||||||
|
target/${{ matrix.target }}/release/solidcraft
|
||||||
|
target/${{ matrix.target }}/release/solidcraft-cli
|
||||||
|
target/${{ matrix.target }}/release/solvecraft-cli
|
||||||
|
if-no-files-found: error
|
||||||
|
|
||||||
|
macos:
|
||||||
|
name: macOS universal
|
||||||
|
needs: [version, macos-build]
|
||||||
|
if: needs.version.outputs.build == 'true'
|
||||||
|
runs-on: macos-14
|
||||||
|
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: macos-bin-aarch64
|
||||||
|
path: target/aarch64-apple-darwin/release
|
||||||
|
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||||
|
with:
|
||||||
|
name: macos-bin-x86_64
|
||||||
|
path: target/x86_64-apple-darwin/release
|
||||||
|
- name: Set up Developer ID signing and notarization
|
||||||
|
# Optional until the APPLE_* secrets exist (docs/releasing.md, "macOS signing"). Without
|
||||||
|
# them (forks, dry runs) the app keeps its ad-hoc signature and is not notarized.
|
||||||
|
env:
|
||||||
|
APPLE_CERTIFICATE_P12: ${{ secrets.APPLE_CERTIFICATE_P12 }}
|
||||||
|
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
|
||||||
|
APPLE_API_KEY_P8: ${{ secrets.APPLE_API_KEY_P8 }}
|
||||||
|
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
|
||||||
|
APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
|
||||||
|
run: packaging/macos/signing.sh --setup
|
||||||
|
- name: Join, sign, package and check (dmg, CLI zip; the dmg is mounted and checked)
|
||||||
|
run: |
|
||||||
|
# Artifacts don't keep the executable bit.
|
||||||
|
chmod +x target/*-apple-darwin/release/solidcraft target/*-apple-darwin/release/solidcraft-cli target/*-apple-darwin/release/solvecraft-cli
|
||||||
|
packaging/macos/package.sh --arch universal --skip-build ${MACOS_SIGN_IDENTITY:+--sign}
|
||||||
|
- name: Remove the signing keychain and API key
|
||||||
|
if: always()
|
||||||
|
run: packaging/macos/signing.sh --cleanup
|
||||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
with:
|
with:
|
||||||
name: release-macos
|
name: release-macos
|
||||||
@@ -323,7 +386,14 @@ jobs:
|
|||||||
name: Windows ${{ matrix.arch }}
|
name: Windows ${{ matrix.arch }}
|
||||||
needs: [version, icons]
|
needs: [version, icons]
|
||||||
if: needs.version.outputs.build == 'true'
|
if: needs.version.outputs.build == 'true'
|
||||||
|
# Must stay a GitHub-hosted runner, like every job before it: SignPath's open-source policy
|
||||||
|
# only signs builds whose jobs all ran on GitHub-hosted runners.
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
# actions: read lets the SignPath action read this job's details and fetch the uploaded
|
||||||
|
# artifact with GITHUB_TOKEN (the workflow default above grants contents: read only).
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: read
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -334,6 +404,16 @@ jobs:
|
|||||||
- { arch: arm64, target: aarch64-pc-windows-msvc }
|
- { arch: arm64, target: aarch64-pc-windows-msvc }
|
||||||
env:
|
env:
|
||||||
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
|
||||||
|
# Authenticode signing through SignPath Foundation (docs/releasing.md, "Windows signing").
|
||||||
|
# Only when the API token secret exists: forks and repositories without it build unsigned,
|
||||||
|
# exactly as before. `if:` can't read secrets, so the check goes through this variable.
|
||||||
|
SIGN_WINDOWS: ${{ secrets.SIGNPATH_API_TOKEN != '' }}
|
||||||
|
# The one switch between the self-signed test certificate (test-signing) and the real one
|
||||||
|
# (release-signing): a dispatch input, else the SIGNPATH_SIGNING_POLICY repository variable,
|
||||||
|
# else test-signing.
|
||||||
|
SIGNPATH_SIGNING_POLICY: ${{ inputs.signpath_signing_policy || vars.SIGNPATH_SIGNING_POLICY || 'test-signing' }}
|
||||||
|
SIGNPATH_ORGANIZATION_ID: fa603ff4-c702-404b-8588-a524371c7a4e
|
||||||
|
SIGNPATH_PROJECT_SLUG: solidcraft
|
||||||
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
|
||||||
@@ -352,10 +432,109 @@ jobs:
|
|||||||
dotnet tool install --global wix --version 5.0.2
|
dotnet tool install --global wix --version 5.0.2
|
||||||
wix extension add -g WixToolset.UI.wixext/5.0.2 WixToolset.Util.wixext/5.0.2
|
wix extension add -g WixToolset.UI.wixext/5.0.2 WixToolset.Util.wixext/5.0.2
|
||||||
- name: Build and package (msi, portable zip)
|
- name: Build and package (msi, portable zip)
|
||||||
|
if: env.SIGN_WINDOWS != 'true'
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
env:
|
env:
|
||||||
SOLIDCRAFT_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 }}
|
||||||
|
|
||||||
|
# ---- signed path ---------------------------------------------------------------------------
|
||||||
|
# SignPath's GitHub integration (docs.signpath.io/trusted-build-systems/github): the files go
|
||||||
|
# up as a workflow artifact, SignPath fetches that artifact itself (so it can verify it came
|
||||||
|
# from this workflow run), signs it, and the action downloads the signed copy. GitHub stores
|
||||||
|
# artifacts as zips, so packaging/windows/signpath-artifact-configuration.xml (pasted into the
|
||||||
|
# SignPath project) describes a zip holding the files at its top level.
|
||||||
|
# Two rounds: the .exe files first, so the MSI, the portable zip and the plain .exe all carry
|
||||||
|
# signed binaries; then the MSI built from them.
|
||||||
|
- name: Build and stage the binaries for signing
|
||||||
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
SOLIDCRAFT_ICONS: ${{ github.workspace }}/icons
|
||||||
|
run: ./packaging/windows/package.ps1 -Arch ${{ matrix.arch }} -Phase stage
|
||||||
|
- name: Upload the unsigned binaries
|
||||||
|
id: unsigned-exes
|
||||||
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
|
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: signpath-unsigned-exes-windows-${{ matrix.arch }}
|
||||||
|
path: target/windows-package/${{ matrix.arch }}/*.exe
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 3
|
||||||
|
- name: Sign the binaries (SignPath, ${{ env.SIGNPATH_SIGNING_POLICY }})
|
||||||
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
|
uses: signpath/github-action-submit-signing-request@f6d04783b4569d051e0c80105fe66e82819d0092 # v3.0
|
||||||
|
with:
|
||||||
|
api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
|
||||||
|
organization-id: ${{ env.SIGNPATH_ORGANIZATION_ID }}
|
||||||
|
project-slug: ${{ env.SIGNPATH_PROJECT_SLUG }}
|
||||||
|
signing-policy-slug: ${{ env.SIGNPATH_SIGNING_POLICY }}
|
||||||
|
github-artifact-id: ${{ steps.unsigned-exes.outputs.artifact-id }}
|
||||||
|
wait-for-completion: true
|
||||||
|
# release-signing requests wait for a person to approve them in SignPath; give that an
|
||||||
|
# hour instead of the default 10 minutes. test-signing requests finish in seconds.
|
||||||
|
wait-for-completion-timeout-in-seconds: 3600
|
||||||
|
output-artifact-directory: target/windows-package/signed-exes-${{ matrix.arch }}
|
||||||
|
- name: Put the signed binaries in place
|
||||||
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$stage = "target/windows-package/${{ matrix.arch }}"
|
||||||
|
foreach ($exe in 'solidcraft.exe', 'solidcraft-cli.exe', 'solvecraft-cli.exe') {
|
||||||
|
$signed = "target/windows-package/signed-exes-${{ matrix.arch }}/$exe"
|
||||||
|
# The artifact configuration matches each file optionally, so check that every file
|
||||||
|
# actually came back signed rather than trusting the request's success.
|
||||||
|
$sig = Get-AuthenticodeSignature $signed
|
||||||
|
if (-not $sig.SignerCertificate) { throw "$exe came back from SignPath without a signature ($($sig.Status))" }
|
||||||
|
# The test certificate is self-signed, so Status is not Valid until release-signing.
|
||||||
|
Write-Output "$exe signed by $($sig.SignerCertificate.Subject) (status: $($sig.Status))"
|
||||||
|
Copy-Item -Force $signed "$stage/$exe"
|
||||||
|
}
|
||||||
|
- name: Package the signed binaries (msi, portable zip)
|
||||||
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
SOLIDCRAFT_ICONS: ${{ github.workspace }}/icons
|
||||||
|
run: ./packaging/windows/package.ps1 -Arch ${{ matrix.arch }} -Phase package
|
||||||
|
- name: Upload the unsigned MSI
|
||||||
|
id: unsigned-msi
|
||||||
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
|
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
|
with:
|
||||||
|
name: signpath-unsigned-msi-windows-${{ matrix.arch }}
|
||||||
|
path: dist/release/*.msi
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 3
|
||||||
|
- name: Sign the MSI (SignPath, ${{ env.SIGNPATH_SIGNING_POLICY }})
|
||||||
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
|
uses: signpath/github-action-submit-signing-request@f6d04783b4569d051e0c80105fe66e82819d0092 # v3.0
|
||||||
|
with:
|
||||||
|
api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
|
||||||
|
organization-id: ${{ env.SIGNPATH_ORGANIZATION_ID }}
|
||||||
|
project-slug: ${{ env.SIGNPATH_PROJECT_SLUG }}
|
||||||
|
signing-policy-slug: ${{ env.SIGNPATH_SIGNING_POLICY }}
|
||||||
|
github-artifact-id: ${{ steps.unsigned-msi.outputs.artifact-id }}
|
||||||
|
wait-for-completion: true
|
||||||
|
wait-for-completion-timeout-in-seconds: 3600
|
||||||
|
output-artifact-directory: target/windows-package/signed-msi-${{ matrix.arch }}
|
||||||
|
- name: Put the signed MSI in place
|
||||||
|
if: env.SIGN_WINDOWS == 'true'
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$msi = Get-Item "dist/release/*.msi"
|
||||||
|
$signed = "target/windows-package/signed-msi-${{ matrix.arch }}/$($msi.Name)"
|
||||||
|
$sig = Get-AuthenticodeSignature $signed
|
||||||
|
if (-not $sig.SignerCertificate) { throw "$($msi.Name) came back from SignPath without a signature ($($sig.Status))" }
|
||||||
|
Write-Output "$($msi.Name) signed by $($sig.SignerCertificate.Subject) (status: $($sig.Status))"
|
||||||
|
Copy-Item -Force $signed $msi.FullName
|
||||||
|
"Windows ${{ matrix.arch }}: Authenticode-signed through SignPath (policy $env:SIGNPATH_SIGNING_POLICY, $($sig.SignerCertificate.Subject))." >> $env:GITHUB_STEP_SUMMARY
|
||||||
|
- name: Note the unsigned build
|
||||||
|
if: env.SIGN_WINDOWS != 'true'
|
||||||
|
shell: pwsh
|
||||||
|
run: '"Windows ${{ matrix.arch }}: unsigned (no SIGNPATH_API_TOKEN secret)." >> $env:GITHUB_STEP_SUMMARY'
|
||||||
|
|
||||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||||
with:
|
with:
|
||||||
name: release-windows-${{ matrix.arch }}
|
name: release-windows-${{ matrix.arch }}
|
||||||
|
|||||||
@@ -11,3 +11,7 @@ __pycache__/
|
|||||||
|
|
||||||
# cargo-mutants output (docs/mutation-testing.md)
|
# cargo-mutants output (docs/mutation-testing.md)
|
||||||
mutants.out*/
|
mutants.out*/
|
||||||
|
|
||||||
|
# external corpus downloads (cargo xtask external-corpus, #1397): fetched at test time,
|
||||||
|
# hash-pinned in tests/external-corpus.toml; never commit case data
|
||||||
|
/corpus/
|
||||||
@@ -1,216 +1,48 @@
|
|||||||
# SolidCraft — instructions for agents
|
# SolidCraft: instructions for agents
|
||||||
|
|
||||||
SolidCraft is a clean-room, open-source, pure-Rust parametric 3D CAD application:
|
SolidCraft is a clean-room, pure-Rust parametric 3D CAD app (sketch solver, feature timeline, B-rep kernel, an egui UI that agents drive). This file is a router: the hard rules, then the skill to read for your task. Humans: CONTRIBUTING.md.
|
||||||
sketches with a constraint solver, a parametric timeline of features, a B-rep
|
|
||||||
kernel, and a desktop UI that agents can drive. Projects published by
|
|
||||||
[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.
|
|
||||||
|
|
||||||
## Product name
|
## Start here
|
||||||
SolidCraft everywhere: crates `solidcraft-*`, binaries `solidcraft` and `solidcraft-cli`,
|
Work: ROADMAP.md, "Where help is wanted most" in CONTRIBUTING.md, issues labelled `help wanted`, `good first issue`, `needs-triage`; architecture in `docs/architecture.md`. Act when the code, docs and rules settle a question; ask only when it changes what users see. Local `plan/` notes are optional.
|
||||||
`.solidcraft` designs, the `solidcraft/N` format tag, `SOLIDCRAFT_*` environment variables,
|
|
||||||
settings and recovery folders, the MCP server name, docs, CI and packaging. The old name
|
|
||||||
survives only in the explicit compatibility shims listed in `docs/compatibility.md`; don't add
|
|
||||||
new uses of it anywhere else. Public docs/web/Flatpak deployments use project Pages
|
|
||||||
`/solidcraft/`; do not add permanent old-name Pages aliases.
|
|
||||||
|
|
||||||
## Start every session here
|
## Hard rules (what enforces each)
|
||||||
1. Read `plan/STATUS.md` (current milestone, next task), then the task in `plan/execution-plan.md`
|
- Independent: never copy another product's code, icons, text or templates; never drive or take data from commercial CAD. `skills/solidcraft-ground-rules/SKILL.md`.
|
||||||
and the relevant `plan/architecture.md` section.
|
- No GPL/LGPL/AGPL code, not even reading it (OpenCASCADE, FreeCAD, SolveSpace, CadQuery, LibreCAD, QCAD): `cargo xtask licences --check`.
|
||||||
2. Kernel and library decisions: `plan/adr/0001-geometry-kernel.md` (what we may depend on, what
|
- Every asset is original or openly licensed with a row in ATTRIBUTION.md; read `assets/AGENTS.md` before icon work: `cargo xtask assets`, `cargo xtask icons`.
|
||||||
is rejected for licence reasons).
|
- Never crash: no unwrap/expect/panic/unsafe in non-test code (unsafe allowlist in crash-safety), errors are `Result`, input is hostile: clippy `-D warnings`, `hostile_params_never_panic`.
|
||||||
3. Follow the autonomous operation protocol (`plan/execution-plan.md` §6). Don't stop to ask
|
- Everything is a command and programmatic calls never open dialogs: `skills/solidcraft-commands/SKILL.md`.
|
||||||
unless it lists the decision as the owner's.
|
- Layering (geom, sketch/kernel/render, doc, io, engine, ui-egui, apps); only `crates/kernel` uses truck: `cargo xtask layers`.
|
||||||
|
- One outer UI container, one camera path (`navigation::handle`), colours from theme tokens: `cargo xtask ui-containers`.
|
||||||
|
- Application code is Rust only and builds for wasm: `cargo xtask wasm`, `cargo xtask web-offline-test`.
|
||||||
|
- The product name is SolidCraft; the old name lives only in `docs/compatibility.md`.
|
||||||
|
- Sorted lists (message catalogs, `mod` lines, languages) stay sorted: `cargo xtask lists`. Never edit generated files (`docs/features.md`, `THIRD-PARTY-LICENSES.txt`) in a PR.
|
||||||
|
- A design-format change is ONE new file in `crates/doc/src/format/pending/`: `scripts/test-format-pending.sh`.
|
||||||
|
- A command has input and output schemas (will become required; `schema/unconverted.txt` only shrinks): `skills/solidcraft-commands/SKILL.md`.
|
||||||
|
- New UI strings go in `assets/locales/pending/<slug>.json`, ATTRIBUTION rows in `attribution/pending/<slug>.md`: `cargo xtask lists`.
|
||||||
|
- A changed default keeps the old behaviour behind a preference and fills the PR's `Changes a default:` line, and no second PR for an issue a lower-numbered one closes: `pr-checks.yml`.
|
||||||
|
- A regression test goes in the area's existing test file, never a per-bug file (#3226).
|
||||||
|
- Look at open PRs first, claim with a draft PR (lowest number wins), one topic per PR, never force-push `main`, no pushes just to catch up with `main`: `skills/solidcraft-contributing/SKILL.md`.
|
||||||
|
- Show observable changes with real screenshots or a recording, captured yourself.
|
||||||
|
- Run `cargo xtask ci` before every commit, without switching branches while it runs. `cargo xtask skills` keeps this file and `skills/` honest.
|
||||||
|
|
||||||
`plan/` is gitignored (local only).
|
## Working on X: read the skill first
|
||||||
|
| Working on | Read |
|
||||||
## Never crash
|
|---|---|
|
||||||
People trust SolidCraft with their designs; a crash loses their work. **This outranks feature work.**
|
| A PR, a claim, review, CI or evidence | `skills/solidcraft-contributing/SKILL.md` |
|
||||||
- **No panics in non-test code:** no `unwrap()`, `expect()`, `panic!`, `unreachable!`, `todo!`,
|
| Licences, assets, clean-room, the name | `skills/solidcraft-ground-rules/SKILL.md` |
|
||||||
`unimplemented!`; no `unsafe` (`unsafe_code = "forbid"`). The exceptions, in the app crate and in
|
| Non-test Rust, hostile input, a crash report | `skills/solidcraft-crash-safety/SKILL.md` |
|
||||||
`crates/threedx-client` (which deny it instead), have no safe API: the macOS-only
|
| A command, a crate boundary | `skills/solidcraft-commands/SKILL.md` |
|
||||||
`crates/threedx-client/src/macos.rs` (loads the 3Dconnexion driver's client framework at run time
|
| A dialog, panel, camera, icon, colour | `skills/solidcraft-ui/SKILL.md` |
|
||||||
and calls through its function pointers), two functions in
|
| Labels, messages, translations | `skills/solidcraft-ui-text/SKILL.md` |
|
||||||
`apps/solidcraft/src/open_documents.rs` (macOS hands Finder files only to an Objective-C
|
| Saving something new in a design, import, export | `skills/solidcraft-file-formats/SKILL.md` |
|
||||||
method), the Windows-only `apps/solidcraft/src/native_crash.rs` (the exception filter that
|
| Preferences, a changed default | `skills/solidcraft-preferences/SKILL.md` |
|
||||||
records crashes inside native code such as graphics drivers), the Windows-only
|
| Writing or running tests | `skills/solidcraft-tests/SKILL.md` |
|
||||||
`apps/solidcraft/src/native_frame.rs` (the window procedure that answers the resize-border hit
|
| Slow work, the window thread, wasm | `skills/solidcraft-performance/SKILL.md` |
|
||||||
test of the window without OS decorations) and the Windows-only
|
| Releases, installers, packages | `skills/solidcraft-packaging/SKILL.md` |
|
||||||
`apps/solidcraft/src/space_mouse/windows_hid.rs` (asks Plug and Play which HID interfaces are 3D
|
| Running the app, control channel, MCP tools | `skills/solidcraft-agent-tools/SKILL.md` |
|
||||||
mice, so no other device is sent anything).
|
| Building a part over MCP | `skills/solidcraft-modeling/SKILL.md` |
|
||||||
- **Errors are `Result<T, E>`** through the crate's error type and `?`. An unfinished feature
|
| Changing an existing design | `skills/solidcraft-editing/SKILL.md` |
|
||||||
returns an error ("not supported yet: …"); it never panics.
|
| A bug report, a crash, a wrong result | `skills/solidcraft-reporting/SKILL.md` |
|
||||||
- **Input-derived numbers are hostile** (command parameters, design files, control-channel
|
| Checking, porting, designs in git | `skills/solidcraft-checking/SKILL.md` |
|
||||||
input): `get()` not `[i]`, finite checks, caps on sizes and loop counts.
|
| Assemblies, joints, motion | `skills/solidcraft-mechanisms/SKILL.md` |
|
||||||
- **Third-party kernel calls are guarded:** everything that calls `truck` goes through
|
>>>>>>> 4a3e0772a (Agents: AGENTS.md becomes a router to focused skills, with a staleness check (Refs #6439))
|
||||||
`solidcraft_kernel::guard`, which turns a panic into `KernelError::Internal`.
|
|
||||||
- **Last-resort guard:** `Session::execute` runs every command under `catch_unwind`; an escaped
|
|
||||||
panic restores the design and reports `EngineError::Internal`.
|
|
||||||
- **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.
|
|
||||||
- **Where tests go:** a regression test goes into the existing test file for its area (booleans, blends,
|
|
||||||
shell, sweep, STEP, naming…), never a new file named after the bug (#3226).
|
|
||||||
- Every production crate root carries
|
|
||||||
`#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]`.
|
|
||||||
|
|
||||||
## Non-negotiables
|
|
||||||
- **Independent.** SolidCraft is independent. Behaviour is designed from public documentation,
|
|
||||||
general CAD conventions and user feedback. Reference tests use analytic values and open-source
|
|
||||||
tools. Never copy another product's code, icons, artwork, help text, tooltips, templates or
|
|
||||||
materials. File formats come from public specifications.
|
|
||||||
- **No commercial CAD products.** Agents must not drive, script, automate or extract data from
|
|
||||||
commercial CAD products (Fusion, SolidWorks, Onshape, …) for this project: no test data,
|
|
||||||
measurements, command lists, ids or files produced with them.
|
|
||||||
- **Never read, copy or link GPL/LGPL/AGPL code**: OpenCASCADE, FreeCAD (incl. planegcs),
|
|
||||||
SolveSpace, CadQuery/OCP, LibreCAD, QCAD — don't even read their sources. (`tools/freecad-oracle/`
|
|
||||||
runs FreeCAD as a separate program through its public scripting API to compute reference values;
|
|
||||||
nothing from FreeCAD is linked, vendored or shipped.) The sketch solver and the blend
|
|
||||||
operations are our own.
|
|
||||||
- **Assets — absolutely essential.** SolidCraft contains **no iconography, images, fonts or
|
|
||||||
artwork from commercial CAD products — ever.** Command icons are the original SVG masters in
|
|
||||||
`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.
|
|
||||||
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/*`
|
|
||||||
(`CommandSpec`: id = our own dotted, lower-case id `<area>.<thing>[.<variant>]` such as
|
|
||||||
`solid.extrude` or `sketch.rectangle.two_point`, never another product's command id; label;
|
|
||||||
toolbar tab and panel; icon; shortcut; params doc; `enabled`; JSON `run`) + tests. The toolbar,
|
|
||||||
dialogs, sketch tools, palette, scripts, CLI and control channel all reach the same commands.
|
|
||||||
- **Programmatic calls never open dialogs.** `engine.execute` runs the JSON form; only toolbar
|
|
||||||
clicks (`ui.start`) start interactive tools and dialogs, which then run commands.
|
|
||||||
- **Layering** is enforced by `cargo xtask layers`: L0 `geom` → L1 `sketch`, `kernel`, `render`
|
|
||||||
→ L2 `doc` → L3 `io` → L4 `engine` → L5 `ui-egui` → apps. Nothing below L5 depends on
|
|
||||||
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)` /
|
|
||||||
`app.start(id)`. Colours come from `theme::Tokens`.
|
|
||||||
- **One outer UI container**: all panels, floating sheets, menus, overlays and platform UI
|
|
||||||
windows use `ui_kit::Container` (directly or through `Panel`, `Window`, `Confirm`, `Menu`).
|
|
||||||
Declare the semantic `Surface`; workspace panels use its shared layout policy and chrome.
|
|
||||||
System/report windows use `ui_kit::Window`; its low-level host builder is kit-private.
|
|
||||||
Do not construct raw egui hosts, outer popup/window frames or shadows in feature modules.
|
|
||||||
`cargo xtask ui-containers` recursively checks source/examples in all current and future crates
|
|
||||||
and apps. It runs in the fast repository CI job and `cargo xtask ci`, with no caller allowances.
|
|
||||||
See `docs/ui-container-audit.md` for the inventory and legitimate content/native exceptions.
|
|
||||||
- **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,
|
|
||||||
assets, layers). Commit after every feature arc that builds.
|
|
||||||
- **Publishing**: the repository is github.com/tangency-labs/solidcraft. Changes land through
|
|
||||||
**pull requests** and the **merge queue**: push a branch and open a PR. The heavy CI jobs start
|
|
||||||
when a maintainer adds `approved-for-ci` after reviewing the code. Approved PRs go into the queue
|
|
||||||
with `gh pr merge N -R tangency-labs/solidcraft --squash --auto`; the queue runs the full suite
|
|
||||||
on each group before it lands on `main`. Keep each PR to one topic and one issue, and never
|
|
||||||
force-push `main`. Never commit `plan/`, build dirs (`target*/`) or generated reference data;
|
|
||||||
check `git ls-files` before pushing.
|
|
||||||
- **Never break wasm**: everything below the apps must build for `wasm32-unknown-unknown`
|
|
||||||
(`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 the relevant PR's merge status. Don't push to
|
|
||||||
an open PR only to catch up with `main` (no merge of `main`, no Update branch, no rebase for
|
|
||||||
that alone): every push restarts the whole CI run, and `main`'s own run catches what lands in
|
|
||||||
between, to be fixed forward. When you push a change anyway, or GitHub reports a conflict,
|
|
||||||
rebase onto the latest `main` (push your own branch with `--force-with-lease`); never merge
|
|
||||||
`main` into a PR. Resolve conflicts without discarding others' work; never force-push `main`.
|
|
||||||
Don't re-run CI on an unchanged commit: a real failure fails again. Re-run only a job that
|
|
||||||
runner trouble cancelled, with "Re-run failed jobs". Report the PR state you checked and any
|
|
||||||
conflicts resolved. 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.
|
|
||||||
|
|
||||||
## Before you start: look at what is already open
|
|
||||||
- Work with an authenticated GitHub CLI (`gh auth status`) and `git`; the checks below need both.
|
|
||||||
- Pull the whole list, not one search: `gh pr list -R tangency-labs/solidcraft --state open --limit 500`
|
|
||||||
(drafts included) and `gh issue list -R tangency-labs/solidcraft --state open --limit 500`. Look for
|
|
||||||
work on the same issue, the same feature under another number, and PRs that change the files
|
|
||||||
you are about to change (`gh pr list ... --json number,title,files`).
|
|
||||||
- If someone already has it, comment on their PR or issue instead of opening a second one. Two
|
|
||||||
PRs for one change can't both land, and one of them is wasted work and CI.
|
|
||||||
|
|
||||||
## Claim = a draft PR
|
|
||||||
- Before working on issue #N, check nobody has it: `gh pr list -R tangency-labs/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). Reference `#N` in the PR title
|
|
||||||
so the bot can find it. Don't claim by editing files; comment `/claim` on the issue only to stake
|
|
||||||
a claim before you have a branch.
|
|
||||||
- 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
|
|
||||||
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
|
|
||||||
Cargo.lock, pass the quality gates, advance `release` without force-pushing, and verify the
|
|
||||||
resulting draft and its artifacts. When shipping is authorized, publish that verified draft
|
|
||||||
and confirm its tag and downstream deployment. Do not auto-release every push to `main`, infer
|
|
||||||
version bumps solely from commit prefixes, overwrite published versions, or push release tags
|
|
||||||
before the draft is verified.
|
|
||||||
|
|
||||||
## Running and looking at the app
|
|
||||||
- `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`.
|
|
||||||
- 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":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.
|
|
||||||
- **For UI work, look at the result** (screenshot, read the PNG). Without a window use
|
|
||||||
`ui.render` or `solidcraft-cli snapshot`.
|
|
||||||
- Headless: `solidcraft-cli run script.json --out part.step`, `solidcraft-cli eval design.solidcraft`,
|
|
||||||
`solidcraft-cli snapshot script.json --out shot.png`, `solidcraft-cli commands`.
|
|
||||||
- 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
|
|
||||||
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 solidcraft`.
|
|
||||||
|
|
||||||
## Roadmap
|
|
||||||
`ROADMAP.md` (committed) tracks status, milestones and estimates. Update it whenever a
|
|
||||||
milestone task lands. `docs/features.md` (SolidCraft's commands by area, from the registry) and
|
|
||||||
`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.
|
|
||||||
@@ -14,9 +14,33 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
|
|
||||||
| File | Author | Source | Licence |
|
| File | Author | Source | Licence |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
|
| assets/render/catalog/capabilities.json | SolidCraft contributors | Byte-identical runtime export of docs/render-materials/capabilities.json; generated and checked by tools/render-library/generate.py | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/catalog/environments.json | SolidCraft contributors | Byte-identical runtime export of docs/render-materials/environments.json; generated and checked by tools/render-library/generate.py | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/catalog/lighting.json | SolidCraft contributors | Byte-identical runtime export of docs/render-materials/lighting.json; generated and checked by tools/render-library/generate.py | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/catalog/materials.json | SolidCraft contributors | Byte-identical runtime export of docs/render-materials/materials.json; generated and checked by tools/render-library/generate.py | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/catalog/quality-presets.json | SolidCraft contributors | Byte-identical runtime export of docs/render-materials/quality-presets.json; generated and checked by tools/render-library/generate.py | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/catalog/scene-presets.json | SolidCraft contributors | Byte-identical runtime export of docs/render-materials/scene-presets.json; generated and checked by tools/render-library/generate.py | MIT OR Apache-2.0 |
|
||||||
| examples/chebyshev-motion-trace.json | SolidCraft contributors | Original parametric Chebyshev lambda mechanism and associative-trace demo, constructed from analytic circle intersections; classical link proportions documented at https://doi.org/10.1002/rcs.70095; no external CAD geometry or artwork | MIT OR Apache-2.0 |
|
| examples/chebyshev-motion-trace.json | SolidCraft contributors | Original parametric Chebyshev lambda mechanism and associative-trace demo, constructed from analytic circle intersections; classical link proportions documented at https://doi.org/10.1002/rcs.70095; no external CAD geometry or artwork | MIT OR Apache-2.0 |
|
||||||
|
| examples/material-card.json | SolidCraft contributors | original analytic box and explicitly synthetic engineering card; invented illustrative constants, no external material dataset | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/author_sweep.py | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/author_scene.py | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/materials.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-exploded-sweep.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-exploded-render.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-exploded.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/stage1-sweep.json | SolidCraft contributors | original tangent circular-arc CAD cyclorama; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/stage1.json | SolidCraft contributors | original editable CAD studio scene; no imported geometry or external image assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/stage1-render.json | SolidCraft contributors | original studio camera and lighting parameters | 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 |
|
| examples/render-studio.json | SolidCraft contributors | original procedural box/cylinder enclosure script for the integrated Render workspace | 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 |
|
| 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 |
|
||||||
|
| crates/gpu/src/path/denoise.wgsl | SolidCraft contributors | original bounded edge-aware a-trous spatial filter; GPU2 donor d710e31, no external shader source | MIT OR Apache-2.0 |
|
||||||
|
| crates/gpu/src/path/denoise_guides.wgsl | SolidCraft contributors | original deterministic centre-ray material and geometry guide pass; GPU2 donor d710e31, no external shader source | MIT OR Apache-2.0 |
|
||||||
|
| crates/gpu/src/path/shadows.wgsl | SolidCraft contributors | original bounded area, sun and environment visibility transport; GPU2 donor d710e31, no external shader source | MIT OR Apache-2.0 |
|
||||||
|
| crates/gpu/src/path/textures.wgsl | SolidCraft contributors | original planar colour and normal map sampling; GPU2 donor d710e31, no external shader source | MIT OR Apache-2.0 |
|
||||||
|
| assets/appearances/starter_pack.rs | SolidCraft contributors | original illustrative optical recipes, authored scalar values and future procedural resource descriptors; no measured or external material dataset | MIT OR Apache-2.0 |
|
||||||
|
| examples/material-finishes.json | SolidCraft contributors | original procedural sphere study of six illustrative opaque finishes with generic material densities; no external assets or measured optical data | MIT OR Apache-2.0 |
|
||||||
|
| examples/render-path-studio.json | SolidCraft contributors | original procedural opaque enclosure, teal insert and metal fasteners for progressive rendering; no imported models | MIT OR Apache-2.0 |
|
||||||
|
| crates/gpu/src/path/path.wgsl | SolidCraft contributors | original software BVH traversal and path integration using the existing SolidCraft surface/studio equations; no external shader source | 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 |
|
| 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 |
|
||||||
| 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 |
|
| 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 |
|
||||||
| 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 |
|
| 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 |
|
||||||
@@ -27,10 +51,10 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| 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 |
|
| 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 |
|
||||||
| assets/models/test_boat.bin | 3DBenchy.com | 3DBenchy.com | Public Domain |
|
| assets/models/test_boat.bin | 3DBenchy.com | 3DBenchy.com | Public Domain |
|
||||||
| assets/models/make_test_boat.py | SolidCraft contributors | original script that packs a model into the compact file above | MIT OR Apache-2.0 |
|
| assets/models/make_test_boat.py | SolidCraft contributors | original script that packs a model into the compact file above | 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-blend.png | SolidCraft contributors | screenshot of SolidCraft itself: a 24 mm and a 10 mm box bridged by a `surface.blend` sheet (G1 at both edges), rendered by the app's `ui.render` in the dark theme with examples/demo/class_a_shots.py | 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-crown.png | SolidCraft contributors | screenshot of SolidCraft itself: a patch crowned with `surface.patch crown=0.3` over a skew four-line rim, rendered by the app's `ui.render` in the dark theme with examples/demo/class_a_shots.py | 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/class-a-boundary.png | SolidCraft contributors | screenshot of SolidCraft itself: a surface through two 3D sketch splines built by `surface.boundary`, rendered by the app's `ui.render` in the dark theme with examples/demo/class_a_shots.py | 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/sample-plate.png | SolidCraft contributors | screenshot of SolidCraft 0.22.1 itself (`solidcraft --sample`, default dark theme, 1600x1000) | MIT OR Apache-2.0 |
|
||||||
| assets/samples/exports/0.png | SolidCraft contributors | original Sample Plate from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
| assets/samples/exports/0.png | SolidCraft contributors | original Sample Plate from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||||
| assets/samples/exports/1.png | SolidCraft contributors | original Sheet Metal Bracket from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
| assets/samples/exports/1.png | SolidCraft contributors | original Sheet Metal Bracket from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||||
| assets/samples/exports/2.png | SolidCraft contributors | original Hinge Assembly from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
| assets/samples/exports/2.png | SolidCraft contributors | original Hinge Assembly from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||||
@@ -38,10 +62,10 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| assets/samples/exports/4.png | SolidCraft contributors | original Bolted Flange from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
| assets/samples/exports/4.png | SolidCraft contributors | original Bolted Flange from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||||
| assets/samples/exports/5.png | SolidCraft contributors | original Vent Plate from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
| assets/samples/exports/5.png | SolidCraft contributors | original Vent Plate from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||||
| assets/samples/exports/scripts.json | SolidCraft contributors | SHA-256 fingerprints of the original sample scripts, generated with the shipped thumbnails | MIT OR Apache-2.0 |
|
| assets/samples/exports/scripts.json | SolidCraft contributors | SHA-256 fingerprints of the original sample scripts, generated with the shipped thumbnails | 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.gif | SolidCraft contributors | original screen recording of the actual SolidCraft 0.22.1 English desktop UI (default dark theme, software renderer) 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 (6× playback, idle pauses cut) | 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/demo.mp4 | SolidCraft contributors | original screen recording of the actual SolidCraft 0.22.1 English desktop UI (default dark theme, software renderer) 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 (6× playback, idle pauses cut) | 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.gif | 0xlillith (model); SolidCraft contributors (recording) | screen recording of the actual SolidCraft 0.22.1 desktop UI (default dark theme, software renderer) 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 (15× playback, idle pauses cut, constant-rate camera orbit) | 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/screenshots/rover-build.mp4 | 0xlillith (model); SolidCraft contributors (recording) | screen recording of the actual SolidCraft 0.22.1 desktop UI (default dark theme, software renderer) 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-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/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/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 |
|
||||||
@@ -77,6 +101,7 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| tests/step-conformance/tiny_pin.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
|
| tests/step-conformance/tiny_pin.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
|
||||||
| tests/step-conformance/torus_ring_nurbs.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
|
| tests/step-conformance/torus_ring_nurbs.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
|
||||||
| tests/step-conformance/washer.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
|
| tests/step-conformance/washer.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
|
||||||
|
| tests/step-regressions/rod_doubled_edge.step | SolidCraft contributors | written by SolidCraft from the commands of #4598 (a bored rod moved 100 mm and exported); import regression fixture | 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/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 |
|
||||||
@@ -98,6 +123,7 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| 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/appearances/library.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
|
| assets/appearances/opaque_finishes.rs | SolidCraft contributors | original illustrative opaque finish values; no external dataset, textures or measured engineering data | 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/biz-udp-gothic/OFL.txt | The BIZ UDGothic Project Authors | Unmodified accompanying font licence | SIL OFL 1.1 |
|
||||||
| assets/fonts/ibm-plex-mono/OFL.txt | IBM Corp. | Unmodified accompanying font licence | SIL OFL 1.1 |
|
| assets/fonts/ibm-plex-mono/OFL.txt | IBM Corp. | Unmodified accompanying font licence | SIL OFL 1.1 |
|
||||||
| assets/fonts/ibm-plex-sans/OFL.txt | IBM Corp. | Unmodified accompanying font licence | SIL OFL 1.1 |
|
| assets/fonts/ibm-plex-sans/OFL.txt | IBM Corp. | Unmodified accompanying font licence | SIL OFL 1.1 |
|
||||||
@@ -132,6 +158,7 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| assets/locales/ja.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | 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/ko.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||||
| assets/locales/ms.json | A.Hakim (a-hakim) | Malay translation of the English message catalog | MIT OR Apache-2.0 |
|
| assets/locales/ms.json | A.Hakim (a-hakim) | Malay translation of the English message catalog | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/nb.json | SolidCraft contributors | Original Norwegian Bokmål translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
|
||||||
| assets/locales/nl.json | SolidCraft contributors | Original Dutch translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
|
| assets/locales/nl.json | SolidCraft contributors | Original Dutch translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
|
||||||
| assets/locales/pl.json | cyryllo | Polish translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
| assets/locales/pl.json | cyryllo | Polish translation of the English catalog, contributed upstream | 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/ru.json | Alex Pro (del000) | Russian translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||||
@@ -147,6 +174,10 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| 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.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.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/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/dmg/background.tiff | SolidCraft contributors | original disk image window background (blueprint sheet: grid, double border, circles, centre lines, leader arrow, title block) drawn by assets/platforms/macos/dmg/make_background.py in IBM Plex Sans/Mono; 1x and 2x representations | MIT OR Apache-2.0 |
|
||||||
|
| assets/platforms/macos/dmg/make_background.py | SolidCraft contributors | authoring script that draws the disk image background (Pillow); not part of any build | MIT OR Apache-2.0 |
|
||||||
|
| assets/platforms/macos/dmg/layout.json | SolidCraft contributors | disk image window size, icon size and icon positions shared by the background script and settings.py | MIT OR Apache-2.0 |
|
||||||
|
| assets/platforms/macos/dmg/settings.py | SolidCraft contributors | dmgbuild settings (MIT, https://github.com/dmgbuild/dmgbuild) for the SolidCraft disk image; original settings, no dmgbuild code copied | MIT OR 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/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/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.en-us.wxl | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
|
||||||
@@ -173,6 +204,8 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| assets/styles/ui/themes/graphite.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
|
| assets/styles/ui/themes/graphite.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
|
||||||
| assets/styles/ui/themes/nosferatu.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Dracula by Zeno Rocha and the Dracula Theme contributors, https://github.com/dracula/dracula-theme, MIT) | MIT OR Apache-2.0 |
|
| assets/styles/ui/themes/nosferatu.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Dracula by Zeno Rocha and the Dracula Theme contributors, https://github.com/dracula/dracula-theme, MIT) | MIT OR Apache-2.0 |
|
||||||
| assets/styles/ui/themes/catppuccin-mocha.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Catppuccin by the Catppuccin organisation, https://github.com/catppuccin/catppuccin, MIT) | MIT OR Apache-2.0 |
|
| assets/styles/ui/themes/catppuccin-mocha.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Catppuccin by the Catppuccin organisation, https://github.com/catppuccin/catppuccin, MIT) | MIT OR Apache-2.0 |
|
||||||
|
| assets/styles/ui/themes/okibi.json | SolidCraft contributors (Kai Evans) | original SolidCraft theme file mapping SolidCraft's UI colours to the Okibi palette (dark) of the Okibi design system by Kai Evans (https://kaievns.github.io/okibi-akiri-design-system-spec/) | MIT OR Apache-2.0 |
|
||||||
|
| assets/styles/ui/themes/akari.json | SolidCraft contributors (Kai Evans) | original SolidCraft theme file mapping SolidCraft's UI colours to the Akari palette (light) of the Okibi design system by Kai Evans (https://kaievns.github.io/okibi-akiri-design-system-spec/) | 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-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 |
|
| 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.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 |
|
||||||
@@ -255,8 +288,57 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| 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_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/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/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/colored_components.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/colored_components_off.svg | SolidCraft contributors | original icon master (64 grid) | 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/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/component.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
### Render workspace icon drafts
|
||||||
|
|
||||||
|
Original SolidCraft drawings, Open for owner review; no runtime assignments.
|
||||||
|
|
||||||
|
| File | Author | Source | Licence |
|
||||||
|
|---|---|---|---|
|
||||||
|
| assets/icons/ui/design/svg/model/render_all_shots.svg | SolidCraft contributors | original Camera icon master (64 grid): stacked camera bodies with a lower-right play badge | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_appearance.svg | SolidCraft contributors | original Looks icon master (64 grid): shaded look sphere on the top corner of an accent-shaded cube | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_aspect_frame.svg | SolidCraft contributors | original Camera icon master (64 grid): wide rounded frame with two opposite corner brackets | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_backdrop.svg | SolidCraft contributors | original Studio icon master (64 grid): grey cube in front of a tall upright accent panel | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_cancel.svg | SolidCraft contributors | original Output icon master (64 grid): picture with a lower-right round stop badge | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_check.svg | SolidCraft contributors | original Output icon master (64 grid): picture with a lower-right round check badge | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_compare.svg | SolidCraft contributors | original Output icon master (64 grid): two grey pictures split by a vertical slider with opposed arrows | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_copy_look.svg | SolidCraft contributors | original Looks icon master (64 grid): look sphere in a square frame offset from a second frame outline | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_execute.svg | SolidCraft contributors | original Output icon master (64 grid): picture with a lower-right round play badge | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_export_image.svg | SolidCraft contributors | original Output icon master (64 grid): picture with a large outward diagonal arrow at the upper right | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_exposure.svg | SolidCraft contributors | original Camera icon master (64 grid): split light and accent disc with plus and minus marks | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_fit_product.svg | SolidCraft contributors | original Camera icon master (64 grid): grey cube inside four corner brackets | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_frame_guides.svg | SolidCraft contributors | original Camera icon master (64 grid): rounded frame with a rule-of-thirds grid and four accent nodes | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_from_material.svg | SolidCraft contributors | original Looks icon master (64 grid): look sphere struck through above a plain grey slab | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_ground.svg | SolidCraft contributors | original Studio icon master (64 grid): grey cube on a slab with an accent contact patch | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_lens.svg | SolidCraft contributors | original Camera icon master (64 grid): concentric lens rings around an accent centre | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_library.svg | SolidCraft contributors | original Studio icon master (64 grid): row of three look spheres, middle one accent, on a shelf bar | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_light_area.svg | SolidCraft contributors | original Lights icon master (64 grid): slanted flat panel above a dotted accent stem | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_light_by_highlight.svg | SolidCraft contributors | original Lights icon master (64 grid): shaded sphere with a ringed highlight target and dotted stem arriving from above | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_light_point.svg | SolidCraft contributors | original Lights icon master (64 grid): round source disc with centre dot above a dotted accent stem | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_light_spot.svg | SolidCraft contributors | original Lights icon master (64 grid): cone source with curved rim above a dotted accent stem | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_lighting_presets.svg | SolidCraft contributors | original Studio icon master (64 grid): two stacked cards, the front one holding a light bulb | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_output_size.svg | SolidCraft contributors | original Output icon master (64 grid): picture frame with a diagonal double-headed dimension arrow | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_paint.svg | SolidCraft contributors | original Looks icon master (64 grid): flat brush with an accent tip, light ferrule and slate handle | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_pick_up.svg | SolidCraft contributors | original Looks icon master (64 grid): eyedropper with a grey bulb, slate crossbar and accent sampling tip | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_quality.svg | SolidCraft contributors | original Output icon master (64 grid): three rising bars, the tallest in accent | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_replace_all.svg | SolidCraft contributors | original Looks icon master (64 grid): grey sample sphere with an arrow to an accent sphere beside a second one | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_results.svg | SolidCraft contributors | original Output icon master (64 grid): stack of two pictures, the front one showing a landscape | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_same_look.svg | SolidCraft contributors | original Looks icon master (64 grid): look sphere and three cubes, the two matching cubes ringed | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_shot.svg | SolidCraft contributors | original Camera icon master (64 grid): camera body with a lower-right plus badge | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_shots_strip.svg | SolidCraft contributors | original Camera icon master (64 grid): strip of three small frames, the middle one in accent | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_solo_light.svg | SolidCraft contributors | original Lights icon master (64 grid): point source and dotted stem inside four corner focus brackets | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_sun.svg | SolidCraft contributors | original Lights icon master (64 grid): source disc with eight short radial rays | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_transparent_background.svg | SolidCraft contributors | original Output icon master (64 grid): grey cube on a checker tile | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_update_shot.svg | SolidCraft contributors | original Camera icon master (64 grid): camera body with a lower-right refresh badge | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
### UI icon masters (continued)
|
||||||
|
|
||||||
|
| File | Author | Source | Licence |
|
||||||
|
|---|---|---|---|
|
||||||
| 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/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/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/conic.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
@@ -346,6 +428,7 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
| assets/icons/ui/design/svg/flat/shield.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
| assets/icons/ui/design/svg/flat/shield.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
| assets/icons/ui/design/svg/model/status_recovery.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
| assets/icons/ui/design/svg/model/status_recovery.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
| assets/icons/ui/design/svg/model/frame_member.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
| assets/icons/ui/design/svg/model/frame_member.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/render_environment.svg | SolidCraft contributors | original Studio icon master (64 grid): dome with a grey cube inside | 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/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.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/plane_angle.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||||
@@ -487,6 +570,14 @@ Editable drawing code, native projects and shipped exports are collected under `
|
|||||||
|
|
||||||
| 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 |
|
| 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 |
|
||||||
| docs/sponsors/blacksmith-ci-powered.png | Blacksmith (blacksmith.sh) | "CI powered by Blacksmith" sponsor banner supplied by Blacksmith for the sponsorship credit; used only to credit the sponsor, not part of the application | © Blacksmith, used with permission |
|
| docs/sponsors/blacksmith-ci-powered.png | Blacksmith (blacksmith.sh) | "CI powered by Blacksmith" sponsor banner supplied by Blacksmith for the sponsorship credit; used only to credit the sponsor, not part of the application | © Blacksmith, used with permission |
|
||||||
|
| assets/icons/ui/design/svg/model/path_flange.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| docs/book/src/generated/hem.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/hem.json`; gitignored), original sheet metal demonstration | MIT OR Apache-2.0 |
|
||||||
|
| docs/book/scripts/hem.json | SolidCraft contributors | original parametric recipe for an 80 × 50 mm sheet with an 8 mm returned edge, authored for the command guide | MIT OR Apache-2.0 |
|
||||||
|
| assets/styles/ui/themes/clay.json | SolidCraft contributors | original SolidCraft theme file (Clay, light): warm paper palette chosen for SolidCraft | MIT OR Apache-2.0 |
|
||||||
|
| assets/styles/ui/themes/clay-dark.json | SolidCraft contributors | original SolidCraft theme file (Clay Dark): warm charcoal palette chosen for SolidCraft | MIT OR Apache-2.0 |
|
||||||
|
| assets/icons/ui/design/svg/model/cone.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/ar.json | Abdullah (A-AL-ANAZI) | Original Arabic translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
|
||||||
|
| assets/locales/he.json | SolidCraft contributors | Original Hebrew translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
## Code adapted from sibling projects
|
## Code adapted from sibling projects
|
||||||
|
|
||||||
@@ -564,3 +655,453 @@ A frame whose meshes the GPU refuses to stage (device lost or out of memory) is
|
|||||||
skipped with a warning instead of panicking (#1469).
|
skipped with a warning instead of panicking (#1469).
|
||||||
Paint callbacks are prepared only after a drawable is acquired, so a skipped
|
Paint callbacks are prepared only after a drawable is acquired, so a skipped
|
||||||
surface frame cannot strand cached meshes without their GPU initialization.
|
surface frame cannot strand cached meshes without their GPU initialization.
|
||||||
|
|
||||||
|
## Runtime studio lighting mathematics
|
||||||
|
|
||||||
|
`crates/gpu/src/path/path.wgsl` implements the power-heuristic estimator from the
|
||||||
|
mathematical description in [PBRT fourth edition, section 13.4](https://pbr-book.org/4ed/Light_Transport_I_Surface_Reflection/A_Better_Path_Tracer).
|
||||||
|
No PBRT code or assets were copied. `crates/render/src/job/lighting.rs` evaluates
|
||||||
|
[Krzysztof Narkowicz's published 2016 ACES rational fit](https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/)
|
||||||
|
using its published coefficients (author licenses the fit under CC0/MIT).
|
||||||
|
These original implementations are under SolidCraft's MIT OR Apache-2.0 licence.
|
||||||
|
|
||||||
|
## Original coffee framing variant
|
||||||
|
|
||||||
|
| File | Author | Provenance | Licence |
|
||||||
|
|---|---|---|---|
|
||||||
|
| examples/studio/author_coffee_framing.py | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-framing.json | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-framing-sweep.json | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-framing-render.json | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-framing.md | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
## Original cylindrical coffee housing variant
|
||||||
|
|
||||||
|
| File | Author | Provenance | Licence |
|
||||||
|
|---|---|---|---|
|
||||||
|
| examples/studio/author_coffee_cylinder.py | SolidCraft contributors | original parametric cylindrical CAD construction and editable command recipes; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-cylinder.json | SolidCraft contributors | original cylindrical housing on the original exploded coffee composition; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-cylinder-sweep.json | SolidCraft contributors | original cylindrical housing and continuous CAD cyclorama; no external assets | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-cylinder-render.json | SolidCraft contributors | original camera, studio lighting and optical settings retained from the framing variant | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/coffee-cylinder.md | SolidCraft contributors | original dimensional recipe, provenance and validation limitations | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
## Runtime environment sampling
|
||||||
|
|
||||||
|
`crates/render/src/lighting/environment.rs` and the environment/sun portions of
|
||||||
|
`crates/gpu/src/path/path.wgsl` are original SolidCraft implementations of
|
||||||
|
solid-angle importance sampling and MIS, informed by the mathematical description
|
||||||
|
in [PBRT fourth edition, sections 12.5](https://pbr-book.org/4ed/Light_Sources/Infinite_Area_Lights)
|
||||||
|
and [13.4](https://pbr-book.org/4ed/Light_Transport_I_Surface_Reflection/A_Better_Path_Tracer).
|
||||||
|
The procedural gradient and inline RGBE test fixtures are original mathematical
|
||||||
|
colours, not downloaded imagery. No third-party environment images or shader code
|
||||||
|
are included. Licence: MIT OR Apache-2.0.
|
||||||
|
|
||||||
|
## Original tumbler showcase assets
|
||||||
|
|
||||||
|
The CAD room, tumblers, window opening, wood/weave patterns and RGBE sky below
|
||||||
|
are original SolidCraft contributor work. No third-party scene, photograph, HDRI,
|
||||||
|
texture, or AI-generated artwork was used. Python authoring sources are included.
|
||||||
|
All listed files use the repository MIT OR Apache-2.0 licence.
|
||||||
|
|
||||||
|
| File | Source / author | Use | License |
|
||||||
|
| --- | --- | --- | --- |
|
||||||
|
| examples/studio/author_showcase.py | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/author_tumblers.py | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/textures/ATTRIBUTION.md | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/textures/author_textures.py | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/textures/environment-manifest.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/textures/manifest.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-hdr-textures-blocked-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-hdr-textures-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-materials.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-sun-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-sun-textures-blocked-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-sun-textures-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-sun.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-textures-blocked-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers-textures-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
| examples/studio/tumblers.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
The original studio generators produce local ignored PNG maps and an RGBE gradient.
|
||||||
|
Generated image bytes are not source assets; their authorship, licences and expected
|
||||||
|
hashes are documented under `examples/studio/textures`. Rendered evidence belongs
|
||||||
|
on the results branch. No photographs, scans or external image assets are included.
|
||||||
|
|
||||||
|
## Additional render and showcase resources
|
||||||
|
|
||||||
|
| File | Author | Source | Licence |
|
||||||
|
|---|---|---|---|
|
||||||
|
| assets/render/starter/tools/check_all.py | SolidCraft contributors | original read-only authored/native resource validation orchestration and evidence receipts | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/test_check_all.py | SolidCraft contributors | original validation-runner regression fixtures and subprocess tests | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/requirements.txt | SolidCraft contributors | pinned offline authoring tool requirements; no application dependency changes | MIT OR Apache-2.0 |
|
||||||
|
| crates/render/examples/validate_starter.rs | SolidCraft contributors | original native resource conformance checker using public SolidCraft decoding, normalization, sampling and mip APIs | MIT OR Apache-2.0 |
|
||||||
|
| .gitattributes | SolidCraft contributors | original canonical line-ending policy for the existing runtime icon-discovery manifest; no artwork or icon-assignment changes | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/.gitattributes | SolidCraft contributors | original canonical line-ending policy for SHA-256-pinned renderer authoring resources | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/.gitattributes | SolidCraft contributors | original canonical line-ending policy for SHA-256-pinned renderer authoring resources | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/assembly-bench-soft.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/automotive-turntable.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/black-metal-strips.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/cnc-overhead.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/esd-bench-neutral.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/fdm-neutral-inspection.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/garage-door.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/hangar-skylight.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/home-workbench.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/makerspace-worklights.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/mechanical-bay.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/neutral-comparison.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/neutral-side-softbox.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/paint-inspection-bands.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/printed-part-photo.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/rework-offset-strips.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/robot-led-editorial.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/showroom-ribbons.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/spacecraft-clean-bay.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/sun-free-overcast.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/vacuum-black.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/warm-table-window.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/white-enveloping-studio.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/exports/woodshop-window.hdr | SolidCraft contributors | original analytic relative-radiance HDR export; recipe, linear-sRGB primaries and SHA-256 in assets/render/starter/environments/manifest.json; not measured photometry | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/manifest.json | SolidCraft contributors | original clean-room renderer resource recipe or manifest; authored/unbound scope and source receipts in assets/render/starter/README.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/environments/source/recipes.json | SolidCraft contributors | original clean-room renderer resource recipe or manifest; authored/unbound scope and source receipts in assets/render/starter/README.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/lighting/exports/rigs.json | SolidCraft contributors | original clean-room renderer resource recipe or manifest; authored/unbound scope and source receipts in assets/render/starter/README.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/lighting/recipe.json | SolidCraft contributors | original clean-room renderer resource recipe or manifest; authored/unbound scope and source receipts in assets/render/starter/README.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-001/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-001/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-001/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-001/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-001/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-002/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-002/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-002/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-002/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-002/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-003/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-003/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-003/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-003/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-003/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-004/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-004/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-004/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-004/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-004/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-005/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-005/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-005/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-005/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-005/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-006/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-006/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-006/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-006/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-006/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-007/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-007/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-007/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-007/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-007/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-008/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-008/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-008/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-008/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-008/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-009/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-009/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-009/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-009/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-009/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-010/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-010/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-010/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-010/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-010/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-011/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-011/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-011/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-011/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-011/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-012/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-012/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-012/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-012/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-012/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-013/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-013/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-013/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-013/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-013/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-014/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-014/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-014/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-014/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-014/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-015/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-015/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-015/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-015/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-015/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-016/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-016/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-016/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-016/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-016/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-017/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-017/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-017/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-017/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-017/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-018/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-018/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-018/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-018/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-018/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-019/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-019/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-019/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-019/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-019/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-020/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-020/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-020/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-020/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-020/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-021/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-021/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-021/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-021/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-021/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-022/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-022/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-022/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-022/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-022/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-023/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-023/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-023/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-023/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-023/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-024/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-024/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-024/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-024/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-024/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-025/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-025/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-025/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-025/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-025/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-026/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-026/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-026/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-026/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-026/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-027/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-027/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-027/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-027/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-027/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-028/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-028/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-028/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-028/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-028/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-029/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-029/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-029/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-029/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-029/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-030/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-030/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-030/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-030/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-030/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-031/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-031/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-031/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-031/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-031/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-032/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-032/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-032/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-032/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-032/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-033/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-033/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-033/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-033/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-033/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-034/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-034/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-034/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-034/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-034/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-035/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-035/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-035/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-035/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-035/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-036/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-036/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-036/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-036/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-036/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-037/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-037/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-037/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-037/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-037/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-038/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-038/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-038/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-038/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-038/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-039/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-039/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-039/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-039/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-039/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-040/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-040/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-040/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-040/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-040/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-041/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-041/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-041/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-041/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-041/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-042/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-042/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-042/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-042/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-042/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-043/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-043/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-043/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-043/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-043/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-044/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-044/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-044/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-044/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-044/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-045/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-045/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-045/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-045/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-045/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-046/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-046/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-046/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-046/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-046/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-047/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-047/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-047/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-047/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-047/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-048/base_color.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-048/height.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-048/metallic.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-048/normal_open_gl.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/exports/SURF-048/roughness.png | SolidCraft contributors | original deterministic periodic PBR map export; recipe, role, scale and SHA-256 in assets/render/starter/materials/manifest.json; not measured material data | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/manifest.json | SolidCraft contributors | original clean-room renderer resource recipe or manifest; authored/unbound scope and source receipts in assets/render/starter/README.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/materials/source/recipes.json | SolidCraft contributors | original clean-room renderer resource recipe or manifest; authored/unbound scope and source receipts in assets/render/starter/README.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/pack.json | SolidCraft contributors | original clean-room renderer resource recipe or manifest; authored/unbound scope and source receipts in assets/render/starter/README.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/environments.py | SolidCraft contributors | original clean-room offline resource authoring, numerical verification or validation tool; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/lighting.py | SolidCraft contributors | original clean-room offline resource authoring, numerical verification or validation tool; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/materials.py | SolidCraft contributors | original clean-room offline resource authoring, numerical verification or validation tool; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/test_environments.py | SolidCraft contributors | original clean-room offline resource authoring, numerical verification or validation tool; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/test_lighting.py | SolidCraft contributors | original clean-room offline resource authoring, numerical verification or validation tool; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/test_materials.py | SolidCraft contributors | original clean-room offline resource authoring, numerical verification or validation tool; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/starter/tools/validate_pack.py | SolidCraft contributors | original clean-room offline resource authoring, numerical verification or validation tool; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/licenses/UFL.txt | Canonical Ltd. | exact Ubuntu Font Licence 1.0 notice retained from https://github.com/0xlillith/solidcraft-rover/blob/b32437915372d32b71419dc8f5143fe22ff1e869/UFL.txt for the modelled Ubuntu Light lettering | Ubuntu Font Licence 1.0 |
|
||||||
|
| assets/render/selene/materials/appearance-pack.json | SolidCraft contributors | original clean-room English appearance authoring data: 48 illustrative opaque PBR projections with separate advanced target specifications; no measured dataset or external assets | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/materials/appearance-swatches.json | SolidCraft contributors | original analytic command script for 48 opaque box swatches and a support base, derived only from the adjacent original appearance pack; no external artwork or engineering properties | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/models/SELENE-functional.solidcraft | SolidCraft contributors (native enhancements); 0xlillith (original rover); SychPL / Mateusz Sych (supplied showcase assembly); Canonical Ltd. (lettering outlines) | native-command derivative of the unchanged author-supplied source, with original bearing, suspension, gripper, electronics and presentation work; source and final hashes in assets/render/selene/SOURCE.md and VALIDATION.md | Model and showcase contributions: MIT OR Apache-2.0 (explicit SychPL grant https://github.com/tangency-labs/solidcraft/pull/5494#issuecomment-6375788360); lettering: Ubuntu Font Licence 1.0, notice retained in assets/render/selene/licenses/UFL.txt |
|
||||||
|
| assets/render/selene/motion/interference-pairs.json | SolidCraft contributors | original authored exact-body pair selection for bounded native clearance checks on the functional SELENE derivative; not a generated collision result | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/motion/mechanism-acceptance.json | SolidCraft contributors | original kinematic acceptance criteria, inspected source-container bindings and analytic planning checks from cited public SolidCraft documentation and the admitted native source; derivative runtime acceptance is recorded separately | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/motion/preflight-commands.json | SolidCraft contributors | original read-only inventory script using existing project commands; no source-model selectors or state mutations | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/motion/sample-sequence.json | SolidCraft contributors | original future lunar sampling and sealed-vial dynamics state specification; no simulation or physical calibration result | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/scenes/roles.json | SolidCraft contributors | original semantic role and candidate-material authoring specification for the prepared SELENE demo; no native geometry or external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/scenes/shots.json | SolidCraft contributors | original shot, framing and staged-sequence authoring specification for the prepared SELENE demo; no render or simulation result claimed | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/scenes/stages.json | SolidCraft contributors | original stage composition and light-ownership authoring specification derived from the project render catalog; scientific context linked in scenes/README.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/source-lock.json | SolidCraft contributors | original source-admission metadata and public-reference inventory pinning the supplied improved SELENE native file; original-model and font notices preserved in SOURCE.md | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/source/SELENE-showcase.solidcraft | 0xlillith (original rover); SychPL / Mateusz Sych (showcase assembly and helpers); SolidCraft contributors (emblem); Canonical Ltd. (lettering outlines) | unchanged author-published native file from https://github.com/SychPL/solidcraft/blob/32ec1720447e3fcc6bb6cc53a63fb5b39cfa21b9/SELENE-showcase.solidcraft; source hash and license evidence in assets/render/selene/SOURCE.md | Model and showcase contributions: MIT OR Apache-2.0 (explicit SychPL grant https://github.com/tangency-labs/solidcraft/pull/5494#issuecomment-6375788360); lettering: Ubuntu Font Licence 1.0, notice retained in assets/render/selene/licenses/UFL.txt |
|
||||||
|
| assets/render/selene/tools/bearings.py | SolidCraft contributors | original native-command authoring of grooved bearings, rolling-element kinematics, clamp hubs and arm/head clearances; analytic geometry, no copied CAD source | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/build.py | SolidCraft contributors | original Python development tool for pinned-source native command replay, staged checkpoints, command-trace and geometry health checks; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/electronics.py | SolidCraft contributors | original native-command Raspberry Pi 5 visual reconstruction using public manufacturer mechanical dimensions; original package envelopes and connector internals, no manufacturer CAD or artwork copied | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/export_views.py | SolidCraft contributors | original native MCP preview export tool for three reusable showcase views; changes only transient visibility and cameras and verifies the source master hash | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/finishes.py | SolidCraft contributors | original native physical-material proxy and opaque PBR assignment generator preserving the supplied rover palette | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/mechanisms.py | SolidCraft contributors | original native-command gripper sleeves, pads, wheel ownership, joint limits and inspection studies with independent analytic suspension relation | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/prepare.py | SolidCraft contributors | original Python development tool for bounded native-container inspection and reviewed opaque body-assignment preparation; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/presentation.py | SolidCraft contributors | original native-command browser organization, camera/render setups and closed sample-vial glass preparation | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/suspension.py | SolidCraft contributors | original native-command trailing-arm suspension, telescoping coilover loops, plain bushings, carrier gussets and local motion clearances derived from the admitted rover geometry; independent analytic pin-distance relation, no copied external CAD | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/validate_native.py | SolidCraft contributors | original bounded native MCP verification tool for sampled SELENE kinematics, independent analytic follower and world-coordinate checks, optional exact-name interference pairs and unchanged input hashes; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/validate_prepared.py | SolidCraft contributors | original Python development validator for prepared SELENE resources, source status, references, hashes and command projections; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/tools/yaw_supports.py | SolidCraft contributors | original native-command plain yaw journals, flanged brass thrust bushings, recessed axial retaining pins and mounting-head clearances derived from the admitted rover geometry; no copied external CAD | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/selene/ui/demo-flow.json | SolidCraft contributors | original progressive-disclosure UI integration specification for the existing Render workspace; no copied UI artwork or runtime registration | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/baseline-setup-commands.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/capabilities.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/environment-presets.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/environments.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/lighting.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/lunar-physics-fixtures.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/materials.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/provenance.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/quality-presets.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/roadmap.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/scene-presets.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/selene-bindings.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/simulation-requirements.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/studio-presets.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/ui-integration.json | SolidCraft contributors | original English UI integration specification and exact source-revision mappings from SolidCraft's own implemented shell, UI kit and accepted icons; no copied artwork or runtime registration | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/ux.json | SolidCraft contributors | original clean-room English catalog, preset or analytic planning data; external references documented in docs/render-materials/SOURCES.md; no external assets bundled | MIT OR Apache-2.0 |
|
||||||
|
| docs/render-materials/validate_catalog.py | SolidCraft contributors | original Python development validator for catalog references, preset composition and analytic specification fixtures; no application runtime dependency | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
### Built-in render resource adapters (personal integration batch, 2026-10-22)
|
||||||
|
|
||||||
|
The original adapters in `crates/engine/src/cmd/render/library.rs`, the generated lookup `library_data.rs` and its generator `tools/render-library/generate.py` project the already attributed starter and SELENE resources without replacing their bytes or authoring manifests. The added scalar texture channels, explicit color/V conventions and immutable-source/GPU-payload sharing are original contributor work under MIT OR Apache-2.0. No external code, commercial CAD data or new third-party imagery was imported. Source metadata and the original authoring attribution remain authoritative; pending runtime acceptance is not a photometric or engineering qualification.
|
||||||
|
|
||||||
|
## Physical reference resource additions
|
||||||
|
|
||||||
|
| File | Author | Source | Licence |
|
||||||
|
|---|---|---|---|
|
||||||
|
| assets/render/physical/bindings.json | SolidCraft contributors | original physical-reference curation, associations or derived schema-1 export; per-fact public sources retained without relicensing their publications | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/exports/coverage.json | SolidCraft contributors | original physical-reference curation, associations or derived schema-1 export; per-fact public sources retained without relicensing their publications | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/exports/native-cards.json | SolidCraft contributors | original physical-reference curation, associations or derived schema-1 export; per-fact public sources retained without relicensing their publications | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/profiles.json | SolidCraft contributors | original physical-reference curation, associations or derived schema-1 export; per-fact public sources retained without relicensing their publications | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/quantities.json | SolidCraft contributors | original physical-reference curation, associations or derived schema-1 export; per-fact public sources retained without relicensing their publications | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/sources.json | SolidCraft contributors | original physical-reference curation, associations or derived schema-1 export; per-fact public sources retained without relicensing their publications | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/tools/check_physical.py | SolidCraft contributors | original offline physical-reference validation and projection tool | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/tools/physical.py | SolidCraft contributors | original offline physical-reference validation and projection tool | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/tools/test_physical.py | SolidCraft contributors | original offline physical-reference validation and projection tool | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/tools/export_library.py | SolidCraft contributors | original explicit reference-library planner and native no-loss export verifier; no external code | MIT OR Apache-2.0 |
|
||||||
|
| assets/render/physical/tools/test_export_library.py | SolidCraft contributors | original regressions for native capability refusal, source identity and physical-card preservation | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
| tools/render-library/selene_studio.py | SolidCraft contributors | original bounded native MCP studio orchestration with pinned editable master, explicit GPU policy and request/export receipts; no generated model or image substitutes | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
| tools/render-library/selene_recipe.py | SolidCraft contributors | original full-detail SELENE material/light composition and analytic camera fit; unchanged pinned native master, no external imagery or measured optical dataset | MIT OR Apache-2.0 |
|
||||||
|
| tools/render-library/test_selene_recipe.py | SolidCraft contributors | original independent projection, scaling, nonmutation and input-refusal fixtures for the SELENE studio recipe | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
| assets/render/selene/scenes/studio-hero.json | SolidCraft contributors | original executable render intent and verified provenance for the selected native SELENE studio showcase; authored RGB appearance and relative light units, not measured optics or simulation results | MIT OR Apache-2.0 |
|
||||||
|
| tools/render-library/publish_selene.py | SolidCraft contributors | original bounded native-frame publication checks for explicit visual review, source identity, resource hashes, PNG CRCs and scanline limits; copies completed native bytes without image synthesis or resampling | MIT OR Apache-2.0 |
|
||||||
|
| tools/render-library/test_publish_selene.py | SolidCraft contributors | original tiny analytic PNG fixtures for source-size, CRC, expansion, dimensions and explicit-publication-consent regressions | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
| tools/render-library/package_selene.py | SolidCraft contributors | original byte-preserving packaging of the reviewed native SELENE PNG, public provenance and checksums; bounded resource/PNG verification, no fonts, executables or new render execution | MIT OR Apache-2.0 |
|
||||||
|
| .github/workflows/selene-showcase.yml | SolidCraft contributors | original read-only artifact-delivery workflow for the reviewed native SELENE export; existing pinned repository actions, no compilation, package installation, secret use or renderer claims | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
| tools/render-library/verify_linear_master.py | SolidCraft contributors | original independent validation driver for native linear EXR output using the official OpenEXR Python reader as an external test oracle; no codec implementation copied or production dependency added | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
## Aging, effects and backgrounds showcase, 2026-10-23
|
||||||
|
|
||||||
|
| File | Author | Source | Licence |
|
||||||
|
|---|---|---|---|
|
||||||
|
| tools/render-showcase/instrument.py | SolidCraft contributors | original native-scene authoring, checksum-verified editorial assembly or bounded delivery tool; no third-party source or font binary copied | MIT OR Apache-2.0 |
|
||||||
|
| tools/render-showcase/compose.py | SolidCraft contributors | original native-scene authoring, checksum-verified editorial assembly or bounded delivery tool; no third-party source or font binary copied | MIT OR Apache-2.0 |
|
||||||
|
| tools/render-showcase/package.py | SolidCraft contributors | original native-scene authoring, checksum-verified editorial assembly or bounded delivery tool; no third-party source or font binary copied | MIT OR Apache-2.0 |
|
||||||
|
|
||||||
|
| distribution/SolidCraft-Render-Showcase.zip | SolidCraft contributors and the explicitly credited original model/UI/resource authors | byte-verified selected collaborator package of reviewed native media, editable sample, recipes and public provenance; contained attribution and existing SELENE lettering notices retained; no fonts or executable binaries | MIT OR Apache-2.0 for new contributions; referenced original notices retained |
|
||||||
|
| distribution/SolidCraft-Render-Showcase.json | SolidCraft contributors | original verified delivery archive manifest with exact SHA-256, member count and bounded scope | MIT OR Apache-2.0 |
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
# Contributing to SolidCraft
|
# Contributing to SolidCraft
|
||||||
|
|
||||||
|
Agents: start from the router in [AGENTS.md](AGENTS.md), which points to a short skill in [`skills/`](skills/README.md) for each kind of work. This page stays the full human guide.
|
||||||
|
|
||||||
SolidCraft is an open-source parametric 3D CAD app written in pure Rust.
|
SolidCraft is an open-source parametric 3D CAD app written in pure Rust.
|
||||||
You sketch on a plane, constrain the sketch, turn profiles into solids, and
|
You sketch on a plane, constrain the sketch, turn profiles into solids, and
|
||||||
change a parameter to watch the timeline rebuild. It runs as a desktop app (Windows, Linux), in
|
change a parameter to watch the timeline rebuild. It runs as a desktop app (Windows, macOS, Linux), in
|
||||||
the browser (wasm + WebGPU/WebGL2), headless from a CLI, and as an MCP server that AI agents can
|
the browser (wasm + WebGPU/WebGL2), headless from a CLI, and as an MCP server that AI agents can
|
||||||
model with.
|
model with.
|
||||||
|
|
||||||
@@ -11,7 +13,7 @@ build it, how the code is laid out, the few rules that aren't negotiable, and wh
|
|||||||
needed most.
|
needed most.
|
||||||
|
|
||||||
Before choosing a task, check the [command inventory](docs/features.md) and
|
Before choosing a task, check the [command inventory](docs/features.md) and
|
||||||
[roadmap](ROADMAP.md) for implemented capabilities and current priorities.
|
[roadmap](docs/roadmap-detail.md) for implemented capabilities and current priorities.
|
||||||
|
|
||||||
Questions, ideas or want to say what you're working on? Join the [Discord](https://discord.gg/FtU4NQNVDH).
|
Questions, ideas or want to say what you're working on? Join the [Discord](https://discord.gg/FtU4NQNVDH).
|
||||||
|
|
||||||
@@ -130,7 +132,9 @@ The [architecture page](docs/architecture.md) has the layer table. The short ver
|
|||||||
- Every call into truck goes through `solidcraft_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/` with input and output schemas (see
|
||||||
|
[Adding a command](docs/book/src/dev/commands.md#adding-a-command); a test warns about a
|
||||||
|
command without them, and will fail it once required), 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
|
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
|
viewport, the Render preview, and any new page such as a flat pattern or drawing) calls
|
||||||
@@ -186,8 +190,16 @@ no LTO, and debug assertions off (truck has debug-only assertions that reject va
|
|||||||
builds several times faster than `--release`. If a test fails only in a plain debug build, say so
|
builds several times faster than `--release`. If a test fails only in a plain debug build, say so
|
||||||
in the PR. `cargo xtask test` builds the tests with it and then runs every test binary at once
|
in the PR. `cargo xtask test` builds the tests with it and then runs every test binary at once
|
||||||
(`cargo test` runs them one after another); arguments after `--` go to each binary, e.g.
|
(`cargo test` runs them one after another); arguments after `--` go to each binary, e.g.
|
||||||
`cargo xtask test -- shell`. Tests run beside each other on a busy machine, so a test must not
|
`cargo xtask test -- shell`. Set `SOLIDCRAFT_TEST_JOBS` to a positive integer to opt into a
|
||||||
depend on wall-clock timing.
|
shared bound on top-level test/side commands for `cargo xtask test` and `cargo xtask ci`.
|
||||||
|
For example, `SOLIDCRAFT_TEST_JOBS=2` allows two commands at once; the sequential wasm/doc
|
||||||
|
worker consumes one of those slots. Every binary and side check still runs after failures.
|
||||||
|
Without the variable the existing concurrency is unchanged. With it set, each test binary
|
||||||
|
inherits `RUST_TEST_THREADS` and `ACTION_MATRIX_JOBS` of `max(1, cpus / jobs)` — the machine's
|
||||||
|
parallelism shared between the binaries in flight — unless you set either one explicitly;
|
||||||
|
explicit caller overrides always win. Cargo's build-job setting remains an independent caller
|
||||||
|
override; this limit does not change test filters, timeouts or baselines.
|
||||||
|
Tests run beside each other on a busy machine, so a test must not depend on wall-clock timing.
|
||||||
|
|
||||||
**Ready pull requests test what they touch.** CI maps changed files to workspace packages and
|
**Ready pull requests test what they touch.** CI maps changed files to workspace packages and
|
||||||
runs Clippy, the test build and tests for those and their dependents. The
|
runs Clippy, the test build and tests for those and their dependents. The
|
||||||
@@ -268,12 +280,18 @@ and a fresh CI run:
|
|||||||
and the Lists workflow) fails on an unsorted catalog or an id that appears twice.
|
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
|
- **`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.
|
sorted). Add a new module into the existing group, not as a new group at the end.
|
||||||
|
- **Commands without schemas** (`crates/engine/src/schema/unconverted.txt`): sorted, one id per
|
||||||
|
line, and it only shrinks. Converting a command removes its line; a new command is never added
|
||||||
|
to it.
|
||||||
- **Languages** (`crates/ui-egui/src/i18n.rs`): one per line, English first, then by id (a test
|
- **Languages** (`crates/ui-egui/src/i18n.rs`): one per line, English first, then by id (a test
|
||||||
checks it).
|
checks it).
|
||||||
- **Generated files**: `THIRD-PARTY-LICENSES.txt` and `docs/features.md` are rewritten on `main`
|
- **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
|
after each merge by the Generated files workflow (`cargo xtask licences`, `cargo xtask
|
||||||
features`). Don't regenerate or edit them in a pull request.
|
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).
|
- **Design format**: one file per change, never an edit to a shared number (above).
|
||||||
|
- **New UI strings and attribution rows**: one new file per change, `assets/locales/pending/<slug>.json`
|
||||||
|
and `attribution/pending/<slug>.md`, instead of editing the catalogs or the ATTRIBUTION.md table;
|
||||||
|
`cargo xtask fold-pending` folds them on `main` (see the README in each folder).
|
||||||
|
|
||||||
## Sending a change
|
## Sending a change
|
||||||
|
|
||||||
@@ -325,6 +343,16 @@ Changes with no useful observable behavior do not need screenshot or video evide
|
|||||||
small example without private designs or sensitive details; attach the media or link to an
|
small example without private designs or sensitive details; attach the media or link to an
|
||||||
accessible recording rather than committing generated review artifacts.
|
accessible recording rather than committing generated review artifacts.
|
||||||
|
|
||||||
|
To show a picture without committing it, attach the media to the PR (it goes to the PR's own
|
||||||
|
attachment storage and renders inline in the comment). A gist is the better home for a log or
|
||||||
|
another text file, and you link it; a gist does not render a picture inline. The review artifacts
|
||||||
|
stay out of the diff that way, and nothing has to be pushed to a branch of its own.
|
||||||
|
|
||||||
|
Attaching works in the browser for anyone who can comment: drag the file into a comment on the
|
||||||
|
pull request. A command-line agent without a browser session usually cannot attach a file (the
|
||||||
|
upload needs write access to this repository). Say so in the pull request, and the person running
|
||||||
|
the agent or a maintainer can attach it.
|
||||||
|
|
||||||
Keep an eye on your PR's status, but don't push to it only to catch up with `main` (no merge of
|
Keep an eye on your PR's status, but don't push to it only to catch up with `main` (no merge of
|
||||||
`main`, no Update branch button, no rebase for that alone): every push restarts the whole CI
|
`main`, no Update branch button, no rebase for that alone): every push restarts the whole CI
|
||||||
run for everyone waiting behind it, and `main`'s own run catches what lands in between. When you
|
run for everyone waiting behind it, and `main`'s own run catches what lands in between. When you
|
||||||
@@ -340,6 +368,10 @@ 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.
|
||||||
|
|
||||||
|
Two quick checks run on every pull request (`.github/workflows/pr-checks.yml`, not required): it
|
||||||
|
fails when a lower-numbered open PR by someone else already closes the same issue (the label
|
||||||
|
`not-a-duplicate` skips it), or when the description lacks the `Changes a default: no` / `Changes a default: yes — <what>, old behaviour kept behind preference <name>` line (docs-only and bot PRs are exempt).
|
||||||
|
|
||||||
## Labels and triage
|
## Labels and triage
|
||||||
|
|
||||||
The triage bot labels every new issue and PR (`.github/workflows/triage.yml`). It only adds labels;
|
The triage bot labels every new issue and PR (`.github/workflows/triage.yml`). It only adds labels;
|
||||||
@@ -376,7 +408,7 @@ In order of how much they'd help users:
|
|||||||
2. **Boolean robustness.** A random-design fuzzer currently gets about half of its designs
|
2. **Boolean robustness.** A random-design fuzzer currently gets about half of its designs
|
||||||
through without a kernel error. Each failing seed is a reproducible bug.
|
through without a kernel error. Each failing seed is a reproducible bug.
|
||||||
3. **Drawings, CAM and mesh tools.** These are out of scope for now (see
|
3. **Drawings, CAM and mesh tools.** These are out of scope for now (see
|
||||||
[ROADMAP.md](ROADMAP.md)), but anyone who wants to own one is welcome.
|
[ROADMAP.md](docs/roadmap-detail.md)), but anyone who wants to own one is welcome.
|
||||||
|
|
||||||
## Updating the generated feature list
|
## Updating the generated feature list
|
||||||
|
|
||||||
|
|||||||
@@ -4208,7 +4208,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft"
|
name = "solidcraft"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"block2 0.6.2",
|
"block2 0.6.2",
|
||||||
"eframe",
|
"eframe",
|
||||||
@@ -4217,6 +4217,7 @@ dependencies = [
|
|||||||
"getrandom 0.3.4",
|
"getrandom 0.3.4",
|
||||||
"hidapi",
|
"hidapi",
|
||||||
"keyring",
|
"keyring",
|
||||||
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"muda",
|
"muda",
|
||||||
"objc2 0.6.5",
|
"objc2 0.6.5",
|
||||||
@@ -4228,6 +4229,7 @@ dependencies = [
|
|||||||
"rfd",
|
"rfd",
|
||||||
"ron",
|
"ron",
|
||||||
"rustls",
|
"rustls",
|
||||||
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"solidcraft-3dx-client",
|
"solidcraft-3dx-client",
|
||||||
"solidcraft-engine",
|
"solidcraft-engine",
|
||||||
@@ -4240,11 +4242,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-3dx-client"
|
name = "solidcraft-3dx-client"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-cli"
|
name = "solidcraft-cli"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"image",
|
"image",
|
||||||
"log",
|
"log",
|
||||||
@@ -4256,7 +4258,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-derive"
|
name = "solidcraft-derive"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -4265,7 +4267,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-doc"
|
name = "solidcraft-doc"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -4282,8 +4284,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-engine"
|
name = "solidcraft-engine"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"image",
|
||||||
"log",
|
"log",
|
||||||
"schemars",
|
"schemars",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -4296,12 +4299,13 @@ dependencies = [
|
|||||||
"solidcraft-render",
|
"solidcraft-render",
|
||||||
"solidcraft-sketch",
|
"solidcraft-sketch",
|
||||||
"thiserror 2.0.21",
|
"thiserror 2.0.21",
|
||||||
|
"toml_edit",
|
||||||
"web-time",
|
"web-time",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-geom"
|
name = "solidcraft-geom"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -4310,15 +4314,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-gpu"
|
name = "solidcraft-gpu"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"image",
|
||||||
"log",
|
"log",
|
||||||
"naga",
|
"naga",
|
||||||
"pollster 0.4.0",
|
"pollster 0.4.0",
|
||||||
|
"robust",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"solidcraft-engine",
|
"solidcraft-engine",
|
||||||
"solidcraft-geom",
|
"solidcraft-geom",
|
||||||
|
"solidcraft-io",
|
||||||
"solidcraft-kernel",
|
"solidcraft-kernel",
|
||||||
"solidcraft-render",
|
"solidcraft-render",
|
||||||
"thiserror 2.0.21",
|
"thiserror 2.0.21",
|
||||||
@@ -4327,13 +4334,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-io"
|
name = "solidcraft-io"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cadmpeg-core",
|
"cadmpeg-core",
|
||||||
"cadmpeg-ir",
|
"cadmpeg-ir",
|
||||||
"cadmpeg-registry",
|
"cadmpeg-registry",
|
||||||
"chardetng",
|
"chardetng",
|
||||||
"encoding_rs",
|
"encoding_rs",
|
||||||
|
"gethostname",
|
||||||
"gltf",
|
"gltf",
|
||||||
"log",
|
"log",
|
||||||
"quick-xml",
|
"quick-xml",
|
||||||
@@ -4350,7 +4358,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-kernel"
|
name = "solidcraft-kernel"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"proptest",
|
"proptest",
|
||||||
@@ -4370,7 +4378,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-mcp"
|
name = "solidcraft-mcp"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"solidcraft-engine",
|
"solidcraft-engine",
|
||||||
@@ -4379,7 +4387,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-render"
|
name = "solidcraft-render"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"image",
|
"image",
|
||||||
"moxcms",
|
"moxcms",
|
||||||
@@ -4393,7 +4401,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-sketch"
|
name = "solidcraft-sketch"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -4404,14 +4412,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-space-mouse"
|
name = "solidcraft-space-mouse"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-ui-egui"
|
name = "solidcraft-ui-egui"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arboard",
|
"arboard",
|
||||||
"egui",
|
"egui",
|
||||||
@@ -4433,6 +4441,7 @@ dependencies = [
|
|||||||
"tiny-skia",
|
"tiny-skia",
|
||||||
"toml",
|
"toml",
|
||||||
"ttf-parser",
|
"ttf-parser",
|
||||||
|
"unicode-bidi",
|
||||||
"web-time",
|
"web-time",
|
||||||
"winreg",
|
"winreg",
|
||||||
"zip",
|
"zip",
|
||||||
@@ -4440,15 +4449,17 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solidcraft-web"
|
name = "solidcraft-web"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"eframe",
|
"eframe",
|
||||||
"egui",
|
"egui",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"log",
|
"log",
|
||||||
|
"percent-encoding",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"solidcraft-engine",
|
"solidcraft-engine",
|
||||||
"solidcraft-ui-egui",
|
"solidcraft-ui-egui",
|
||||||
|
"url",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"wasm-bindgen-futures",
|
"wasm-bindgen-futures",
|
||||||
"web-sys",
|
"web-sys",
|
||||||
@@ -4695,6 +4706,7 @@ dependencies = [
|
|||||||
"indexmap",
|
"indexmap",
|
||||||
"toml_datetime",
|
"toml_datetime",
|
||||||
"toml_parser",
|
"toml_parser",
|
||||||
|
"toml_writer",
|
||||||
"winnow",
|
"winnow",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -4939,6 +4951,12 @@ version = "0.1.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
|
checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-bidi"
|
||||||
|
version = "0.3.18"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-general-category"
|
name = "unicode-general-category"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@@ -5976,12 +5994,15 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "xtask"
|
name = "xtask"
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"sha2 0.10.9",
|
"sha2 0.10.9",
|
||||||
"syn 2.0.119",
|
"syn 2.0.119",
|
||||||
|
"toml",
|
||||||
|
"zip",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ members = ["crates/*", "apps/*", "xtask"]
|
|||||||
exclude = ["vendor"]
|
exclude = ["vendor"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.21.0"
|
version = "0.24.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
rust-version = "1.95"
|
rust-version = "1.95"
|
||||||
@@ -13,6 +13,7 @@ authors = ["SolidCraft contributors"]
|
|||||||
repository = "https://github.com/bherbruck/solidcraft"
|
repository = "https://github.com/bherbruck/solidcraft"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
|
robust = "1.2"
|
||||||
# internal
|
# internal
|
||||||
solidcraft-geom = { path = "crates/geom" }
|
solidcraft-geom = { path = "crates/geom" }
|
||||||
solidcraft-sketch = { path = "crates/sketch" }
|
solidcraft-sketch = { path = "crates/sketch" }
|
||||||
@@ -66,6 +67,9 @@ encoding_rs = "0.8"
|
|||||||
# glTF 2.0 import (MIT OR Apache-2.0): the document model and GLB container only; buffers are
|
# 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.
|
# read by crates/io itself, so no image decoding or file access comes with it.
|
||||||
gltf = { version = "1.4", default-features = false, features = ["names"] }
|
gltf = { version = "1.4", default-features = false, features = ["names"] }
|
||||||
|
# The computer's name in a design's "open elsewhere" lock file (MIT OR Apache-2.0; already in the
|
||||||
|
# tree through x11rb).
|
||||||
|
gethostname = "1"
|
||||||
|
|
||||||
# FreeCAD and Rhino import (Apache-2.0, pure Rust; native and browser builds).
|
# FreeCAD and Rhino import (Apache-2.0, pure Rust; native and browser builds).
|
||||||
# Pinned: its IR and codec APIs change between minor versions. Open formats only: no default
|
# Pinned: its IR and codec APIs change between minor versions. Open formats only: no default
|
||||||
|
|||||||
@@ -46,13 +46,13 @@
|
|||||||
<a href="https://trendshift.io/repositories/296178?utm_source=trendshift-badge&utm_medium=badge&utm_campaign=badge-trendshift-296178" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/trendshift/repositories/296178/daily?language=Rust" alt="tangency-labs%2Fsolidcraft | Trendshift (Rust)" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/296178?utm_source=trendshift-badge&utm_medium=badge&utm_campaign=badge-trendshift-296178" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/trendshift/repositories/296178/daily?language=Rust" alt="tangency-labs%2Fsolidcraft | Trendshift (Rust)" width="250" height="55"/></a>
|
||||||
</p>
|
</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).*
|
*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. 6× playback with the idle pauses cut. [Full video](https://github.com/tangency-labs/solidcraft/raw/refs/heads/main/docs/screenshots/demo.mp4), recorded with the [demo script](examples/demo/record_ui.sh).*
|
||||||
|
|
||||||
## Download
|
## Download
|
||||||
|
|
||||||
- **Windows:** the [installer][windows-msi], or `winget install bherbruck.SolidCraft`.
|
- **Windows:** the [installer][windows-msi].
|
||||||
- **macOS:** the [disk image][macos-dmg] (Apple silicon and Intel).
|
- **macOS:** the [disk image][macos-dmg] (Apple silicon and Intel).
|
||||||
- **Linux:** the [AppImage][linux-appimage], or `sudo snap install solidcraft` ([Snap Store][snap-store]).
|
- **Linux:** the [AppImage][linux-appimage], or `sudo snap install solidcraft` ([Snap Store][snap-store]).
|
||||||
- **Web:** [try it in your browser][web-app], no install.
|
- **Web:** [try it in your browser][web-app], no install.
|
||||||
@@ -96,8 +96,10 @@ More commands, the Windows cross-build and the browser build are in [docs/buildi
|
|||||||
|
|
||||||
`solidcraft-cli mcp` is a [Model Context Protocol](https://modelcontextprotocol.io) server. Headless it
|
`solidcraft-cli mcp` is a [Model Context Protocol](https://modelcontextprotocol.io) server. Headless it
|
||||||
runs its own design session, or with `--connect` it drives the running app so you can watch.
|
runs its own design session, or with `--connect` it drives the running app so you can watch.
|
||||||
Claude Code: `claude mcp add solidcraft -- solidcraft-cli mcp`. Tools, access rules and an
|
Claude Code: `claude mcp add solidcraft -- solidcraft-cli mcp`. If a terminal doesn't find
|
||||||
example session: [docs/mcp.md](docs/mcp.md).
|
`solidcraft-cli` (older Windows installers don't put it on `PATH`), give its full path (by default
|
||||||
|
`"C:\Program Files\SolidCraft\solidcraft-cli.exe"`). Tools, access rules and an example session:
|
||||||
|
[docs/mcp.md](docs/mcp.md).
|
||||||
|
|
||||||
## Scripts
|
## Scripts
|
||||||
|
|
||||||
|
|||||||
@@ -1,680 +1,82 @@
|
|||||||
# SolidCraft roadmap
|
# SolidCraft roadmap
|
||||||
|
|
||||||
Status as of **2026-10-14**. SolidCraft supports parametric modelling (sketch →
|
The short version, for people who use SolidCraft. The detailed developer status (milestone
|
||||||
features → parametric timeline) as an open, pure-Rust, agent-drivable application.
|
tables, limitations, measurements) is in [docs/roadmap-detail.md](docs/roadmap-detail.md).
|
||||||
|
|
||||||
## At a glance
|
## What SolidCraft is
|
||||||
|
|
||||||
| Question | Answer |
|
SolidCraft is open-source parametric 3D CAD written in Rust. You sketch, constrain, extrude, and
|
||||||
|---|---|
|
change a parameter to watch the timeline rebuild. It runs as a desktop app and in the browser
|
||||||
| 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. |
|
([try it](https://solidcraft.io/app)), and it has a command-line tool and an MCP server so that
|
||||||
| Features | Every registered command by area — [docs/features.md](docs/features.md) (`cargo xtask features`); registry breadth does not establish workflow or geometric depth |
|
scripts and AI agents can drive the same commands you use.
|
||||||
| Reference tests | [Current case count and results](docs/oracle.md): public cases in `tests/oracle/` with analytic or FreeCAD-computed expected values, checked by the reference-test job in [CI](.github/workflows/ci.yml). |
|
|
||||||
| 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 |
|
|
||||||
| Time to a useful alpha (M0–M6) | ≈ **82 agent hours** remain (sum of the M1–M6 estimates below) |
|
|
||||||
|
|
||||||
Optional GPU viewport ambient occlusion is available in View settings and Graphics preferences,
|
## Works today
|
||||||
with persistent settings, Performance/Quality graphics presets (Quality combines AO, Fine tessellation and adaptive 2× supersampling; manual combinations show Custom), and the
|
|
||||||
`view.ambient_occlusion` and `view.graphics_preset` commands. See [display settings](docs/ambient-occlusion.md).
|
|
||||||
|
|
||||||
## Scope (owner decision, 2026-10-07)
|
- Sketching with a constraint solver, and the usual create and modify tools.
|
||||||
|
- Extrude, revolve, loft, sweep, coil, fillet, chamfer, shell, draft, holes, threads,
|
||||||
|
patterns, mirror and split.
|
||||||
|
- Parameters with units and expressions, and configurations.
|
||||||
|
- Faces and edges keep their names through edits, so references survive changes.
|
||||||
|
- Components, assemblies, joints, motion studies and exploded views.
|
||||||
|
- Sheet metal with flat patterns and DXF export, and a plastic-enclosure subset.
|
||||||
|
- A Render workspace with GPU rendering, studio lighting, materials and image export
|
||||||
|
(first release in 0.22.0).
|
||||||
|
- Import and export of STEP, IGES, 3MF, STL, OBJ and DXF, and FreeCAD and Rhino files.
|
||||||
|
- Autosave and crash recovery, and the browser build of the same app.
|
||||||
|
|
||||||
The issue batch adds preservation of blind pockets in through cuts, associative projected
|
The full list of commands is in [docs/features.md](docs/features.md). Release notes for each
|
||||||
offsets and plastic face placements, XZ (+Y normal) with a v6 migration preserving older
|
version are on the [releases page](https://github.com/tangency-labs/solidcraft/releases).
|
||||||
designs, interactive angle placement, file-picker sketch imports, Home/recent controls,
|
|
||||||
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).
|
|
||||||
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 progress now
|
||||||
1. SOLID and SKETCH (now).
|
|
||||||
2. Parameters / functional constraints (done: see `parameters.*`, `expr.evaluate`; unit-aware,
|
|
||||||
cycles reported with their path, rename follows references, deletes list their users):
|
|
||||||
user parameters with units and expressions (+-*/, ^,
|
|
||||||
parentheses, sin/cos/sqrt/min/max/floor/ceil/round, unit conversion), model parameters
|
|
||||||
d1, d2… for every dimension and feature input, references between parameters with a
|
|
||||||
dependency graph and cycle detection, re-evaluation on change, comments, favourites,
|
|
||||||
CSV/JSON import and export.
|
|
||||||
3. Components and assemblies with joints (M9).
|
|
||||||
4. SHEET METAL: flange, contour flange, bend, unfold/refold, flat pattern with DXF export, sheet
|
|
||||||
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.
|
|
||||||
|
|
||||||
Deferred until further notice: MESH, FORM (T-splines), SURFACE beyond what solids need (scope proposed in #772), PCB / 3D
|
Each feature below is a [milestone](https://github.com/tangency-labs/solidcraft/milestones) holding
|
||||||
PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
the issues for it, so the count shows how far along it is. Counts are as of 2026-10-25, one per
|
||||||
|
feature or request. Work merged on a feature branch (`drawings`, `render`) counts as built but
|
||||||
|
reaches the app only when that branch merges. They are rough, not a promise.
|
||||||
|
|
||||||
## Milestones
|
- **[Rendering & materials](https://github.com/tangency-labs/solidcraft/milestone/17)**: in progress, 9 of 34 pieces done, 3 of them built only on the `render` branch and in the app when it merges. The basic Render workspace is already in releases (0.22.0); the interface rework (#6281) and the material and light libraries are what is left.
|
||||||
|
- **[Drawings](https://github.com/tangency-labs/solidcraft/milestone/8)**: in progress, 3 of 21 pieces built (2 in releases, 1 on the `drawings` branch), and 3 more partly built there (sheets and borders, bill-of-materials types, the paper scene). Not in the app yet: it lands when the `drawings` branch merges. Today you can export the current view as a DXF.
|
||||||
|
- **[Sheet metal](https://github.com/tangency-labs/solidcraft/milestone/15)**: in progress, 1 of 30 requests done. Flanges, hems, unfold and flat patterns already work; the 30 are extensions, mostly the per-edge flange options (segments, miters, partial flanges, reliefs) and bend allowance.
|
||||||
|
- **[Sketching](https://github.com/tangency-labs/solidcraft/milestone/14)**: in progress, 12 of 50 pieces done. Dimension types, selection and snapping options.
|
||||||
|
- **[Solid modeling](https://github.com/tangency-labs/solidcraft/milestone/2)**: in progress, 9 of 50 pieces done. Blends, holes, threads and patterns.
|
||||||
|
- **[Assemblies & joints](https://github.com/tangency-labs/solidcraft/milestone/3)**: in progress, 4 of 19 pieces done. Joints, motion studies and exploded views already work; placement rules, linked sub-assemblies, fastener stacks and weldment corners are the pieces left.
|
||||||
|
- **[Import & export](https://github.com/tangency-labs/solidcraft/milestone/5)**: in progress, 7 of 39 pieces done. FreeCAD, SolidWorks and point-cloud import, and mesh export options.
|
||||||
|
- **[AI agents & MCP](https://github.com/tangency-labs/solidcraft/milestone/18)**: in progress, 2 of 8 pieces done. Agent chat and the MCP server.
|
||||||
|
- **[Interface, web app & plugins](https://github.com/tangency-labs/solidcraft/milestone/4)**: in progress, 31 of 96 pieces done. Ribbon redesign, navigation, themes, the web app and plugins.
|
||||||
|
- **[SMLib kernel migration](https://github.com/tangency-labs/solidcraft/milestone/1)**: in progress, 1 tracking issue open. The kernel is moving from truck to NVIDIA's SMLib (usd-brep, Apache-2.0) on the `kernel-smlib` branch; it is not in releases yet. Tracked in [#4012](https://github.com/tangency-labs/solidcraft/issues/4012).
|
||||||
|
|
||||||
| # | Milestone | Status | Hours left |
|
## Next
|
||||||
|---|---|---|---|
|
|
||||||
| 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, Shift-picked line midpoints in Horizontal/Vertical using persisted points and ordinary constraints (#2087), 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, at distances from reference edges, 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; tiny rim edges remain selected instead of nearby wall seams when filleting (#2498) | in progress | 30 |
|
|
||||||
| M4 | Files: STEP import (done — [docs/step-import.md](docs/step-import.md)), FreeCAD/Rhino solids through cadmpeg (done, desktop, browser 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 |
|
|
||||||
| 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; responsive feature history with width-driven icons/names/title, snapping width resize, bottom/left/browser-stack docking, shared-column collapse, rollback bar, multi-selection and persistent folders), 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, extrude taper), 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 | 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 (#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, a face or sketch curves swept onto the surface, keeping a side or the picked regions; mutual trim of two surfaces, extended to meet and stitched, #767), 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: edge chains along one or several faces, closed rims paired seam to seam or from picked seams, a dialog), **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, and guide rails on solid and surface lofts (one or two, scaling or stretching the sections between; #201). 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), 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, 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 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 | — |
|
|
||||||
| 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 |
|
|
||||||
| 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 |
|
|
||||||
| M15 | Frames and weldments (#4003): structural members along 2D and 3D sketch lines, butt and mitre corners, trim to faces and bodies, end caps, gussets, cosmetic welds and a cut list. Done: the profile library (`frame.profile.list`, `frame.profile.properties`, `frame.profile.insert`): bar, round bar, rectangular and round tube, angle, channel and I-beam, each SolidCraft's own parametric definition with exact fillet arcs and exact section properties (area, centroid, second moments), tested against hand-computed values; members (`frame.member`): one body per straight line of a 2D or 3D frame sketch, following parameter edits, with a built-in profile (its dimensions parameter expressions) or a profile sketch (its drawn material by alternating nested loops), anchor, angle and mirror; each member's name kept with its line. Left: corners, trims, end caps, gussets, welds, cut list, FRAME tab and dialogs | in progress | 60 |
|
|
||||||
|
|
||||||
M6 navigation preferences include **Touchpad**: Shift + pointer movement pans, Alt/Option +
|
- **[Surfacing](https://github.com/tangency-labs/solidcraft/milestone/16)**: next, 6 of 14 pieces done. Patch, trim, blend and match exist; the rest of the surface toolset is planned.
|
||||||
pointer movement orbits without a mouse button, and vertical scrolling zooms. Other presets
|
- **[Manufacturing / CAM](https://github.com/tangency-labs/solidcraft/milestone/9)**: next, 1 pieces tracked, none done. There is no CAM in SolidCraft yet. Send to Slicer and a first toolpath slice are in review; proposals are [#1153](https://github.com/tangency-labs/solidcraft/issues/1153) and [#1621](https://github.com/tangency-labs/solidcraft/issues/1621).
|
||||||
retain their saved two-finger scroll preference; camera motion is available through
|
|
||||||
`view.navigate` and modifier-aware `ui.move` automation.
|
|
||||||
With the **Fusion** preset and two-finger pan enabled, two fingers pan and Shift + two fingers
|
|
||||||
orbit freely, with pinch zoom and mouse bindings unchanged. The shared navigation handler
|
|
||||||
applies the same gestures to model and Render views and blocks orbit on flat pages.
|
|
||||||
|
|
||||||
UI redesign (#2016): the File/start view (#2027) uses shared light/dark navigation,
|
Features are not tied to a release or a date. Work lands in the daily releases as it is finished.
|
||||||
action tiles, recent rows and sample cards, with recovery review and Save As/Export
|
Anything without a milestone, such as bug fixes, is not a feature and is not listed here.
|
||||||
entry points. Document loading, sample caches and recovery safety retain their
|
|
||||||
existing command paths.
|
|
||||||
|
|
||||||
M11 precursor: File → Export Current View as DXF exports shown placed bodies and sketches from the current
|
## How releases work
|
||||||
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)
|
- Releases ship daily, as numbered versions (v0.22.0, v0.22.1) with nightly pre-releases in
|
||||||
and the [foundation ledger](docs/drawing-foundations.md) track the bounded implementation
|
between. They are delivered through the in-app updater.
|
||||||
packages. The first geometry increment defines validated section records in a plane-local
|
- SolidCraft tells you when a newer stable release exists and never updates without asking.
|
||||||
frame; the ledger separates that contract from section producers and the Drawing workspace.
|
Where it can replace itself safely (AppImage, Windows installer and portable builds) there is
|
||||||
|
an **Update now** button; downloads are checked against the release's SHA-256 list. See
|
||||||
|
[updates and privacy](docs/book/src/guide/updates.md).
|
||||||
|
- Design files carry a format number. A new version opens designs from older versions, but an
|
||||||
|
older version refuses a design saved by a newer one (0.22.0 writes format 35, and 0.21.0 and
|
||||||
|
earlier will not open it). Each release's notes say when the format changed. Keep a copy of
|
||||||
|
an important design before you move to a new version.
|
||||||
|
|
||||||
Desktop view DXF export runs in the file-operation worker with five-stage progress and
|
## Licence
|
||||||
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
|
SolidCraft is licensed MIT OR Apache-2.0, at your option; see [LICENSE-MIT](LICENSE-MIT) and
|
||||||
|
[LICENSE-APACHE](LICENSE-APACHE). Versions already released stay available under those licences
|
||||||
|
permanently.
|
||||||
|
|
||||||
- Modelled threads preview their cut before OK using the background worker on desktop.
|
## How to follow along
|
||||||
Browser users apply the cut with OK to avoid blocking on every edit.
|
|
||||||
|
|
||||||
- Thread resolves a suggested metric size when a cylindrical face is picked. Diameter and
|
- Feature milestones: <https://github.com/tangency-labs/solidcraft/milestones>
|
||||||
pitch selectors expose the existing metric designation parameter; custom designations stay
|
- Issues: <https://github.com/tangency-labs/solidcraft/issues> (area labels such as
|
||||||
editable, and Automatic size returns to the face's suggestion. Cosmetic/modelled and
|
`area:kernel`, `area:sketch` and `area:ui` group them)
|
||||||
full/partial-length options remain available. This does not add tolerance classes or
|
- Discord: <https://discord.gg/FtU4NQNVDH>
|
||||||
left-hand threads.
|
- Releases: <https://github.com/tangency-labs/solidcraft/releases>
|
||||||
- New Body extrusion and face-offset previews show completed intermediate geometry while a
|
- Contributing: [CONTRIBUTING.md](CONTRIBUTING.md)
|
||||||
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.
|
|
||||||
- Large fine modelled threads use pitch-based helix resolution and tighter faceted
|
|
||||||
reconstruction fallbacks, preserving thin crests and closed shells on large shafts.
|
|
||||||
|
|
||||||
## 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
|
|
||||||
|
|
||||||
- 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
|
|
||||||
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
|
|
||||||
stored references keep their saved meaning. Section Analysis uses the same check.
|
|
||||||
- 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;
|
|
||||||
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
|
|
||||||
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
|
|
||||||
waits for a distinct point without a degenerate-shape error or history entry. Typed input
|
|
||||||
and programmatic commands retain their validation.
|
|
||||||
- Circular-pattern and angled-plane axes reject explicitly supplied malformed or expression
|
|
||||||
origins instead of silently rotating about zero. Numeric origins remain in millimetres;
|
|
||||||
associative axis expressions and construction-axis references remain unsupported.
|
|
||||||
- Single-line and rectangle-side dimensioning supports selecting a line or its two endpoints.
|
|
||||||
Type a value and press Enter to commit one undo step; rejected values remain editable and
|
|
||||||
cancellation leaves the sketch unchanged. Fit keeps geometry clear of the Sketch Palette
|
|
||||||
and navigation controls, including enlarged displays and nested pending placements.
|
|
||||||
- Sketch Dimension takes a line and a circle or arc (#1803): it measures from the line to the
|
|
||||||
circle's edge (the gap, 0 when tangent, or how far the edge reaches past a line that cuts
|
|
||||||
it), drives it like any other dimension and keeps the circle on its side of the line.
|
|
||||||
- Sketch annotations, live drawing lengths and Measure use document units. Inches show
|
|
||||||
three decimals and retain a meaningful fourth digit. Bare length dimension entry captures
|
|
||||||
the current design unit; changing units leaves existing geometry and expressions intact.
|
|
||||||
Component/canvas distance controls, sketch cursor coordinates, flat-pattern dimensions
|
|
||||||
and pocket depths, interference volumes and parts-library lengths also use design units.
|
|
||||||
- Curvature and Polygon constraints accept complete preselected operands. Fix/Unfix
|
|
||||||
consumes complete point/curve selections consistently; mixed or ambiguous selections
|
|
||||||
retain the picking workflow. Rejected constraints preserve selection and undo history.
|
|
||||||
- Contextual error reporting: a **Create Issue** action beside feature errors opens a
|
|
||||||
reviewable GitHub issue draft with the error, operation settings, build diagnostics and
|
|
||||||
useful reproduction context. The draft is editable, with optional capture of the actual
|
|
||||||
viewport and copy/save controls. Opening GitHub does not submit the issue. Help also exposes
|
|
||||||
reporting for unexpected results that did not produce an error.
|
|
||||||
- The header exposes **Report a bug**, including an accessible compact control on
|
|
||||||
narrow windows. It opens the same editable report and screenshot review without
|
|
||||||
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
|
|
||||||
|
|
||||||
- Includes the new axis navigation, adaptive sketch drawing/picking, origin-corner repairs,
|
|
||||||
durable supported profile/face references, endpoint dimensioning and contextual reporting.
|
|
||||||
- Smooth ruled-wall display joins are hidden only within the supported geometric certificate;
|
|
||||||
authored splits and actual creases remain protected. Wireframe retains physical edges.
|
|
||||||
- Paste New uses a bounded current-geometry comparison for supported convex line/circle
|
|
||||||
prisms with separated circular holes; unsupported shapes retain the existing strict check.
|
|
||||||
- Common-bore Union retries check additional boundary curves before recutting the bore,
|
|
||||||
preventing the reproduced thin-web loss. Unknown additional trims refuse; inherited
|
|
||||||
common-cylinder trims retain their existing policy, so this is not a general Boolean proof.
|
|
||||||
- Exact full-path assembly joint editing remains separate work and is not part of this batch.
|
|
||||||
- Stable 0.2.0 is published: all release payload checksums, native cold reopening, deployed
|
|
||||||
web app and both Flatpak architectures were verified. The replacement README demo uses
|
|
||||||
the original electronics enclosure story and animated pointer in the actual English
|
|
||||||
0.2.0 UI, at 4× playback. Publication follows [the release workflow](docs/releasing.md).
|
|
||||||
|
|
||||||
## 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
|
|
||||||
the command palette open, at normal and enlarged display scales. Fit still accounts for
|
|
||||||
dialog coverage; covered controls do not receive clicks through dialogs.
|
|
||||||
- Eligible planar faces survive fillet, chamfer and shell operations with exact source
|
|
||||||
certificates. Sketches placed directly on the enclosure wall and inner floor follow
|
|
||||||
width and wall changes, including after the USB cut and cold reopening.
|
|
||||||
- Remove artificial straight-wall and rounded-corner subdivisions left by shell and
|
|
||||||
extrusion cuts. Identical generated wall segments span adjacent slabs as one physical
|
|
||||||
face, with exact full-height supports and boundary stitching. Preserve authored face
|
|
||||||
splits and face appearances. Permanent regressions cover material, STEP, reopening and
|
|
||||||
unaffected bodies across the extrusion end plane.
|
|
||||||
- Feature dialogs use the available screen height for their fields, with OK and Cancel
|
|
||||||
outside the scrolling region, including enlarged display scales.
|
|
||||||
- Design format 13 records shell-face attachments. Older designs remain readable;
|
|
||||||
newly saved designs require 0.2.1 or later. Ambiguous or unsupported faces still refuse
|
|
||||||
attachment rather than guessing a plane.
|
|
||||||
- Saved projections from a removed strip retain their geometry and report the lost
|
|
||||||
reference. Explicitly reselect the wall to repair that projection.
|
|
||||||
|
|
||||||
## Workspace layouts (#2029)
|
|
||||||
|
|
||||||
- General preferences save Floating or Compact using the universal UI containers.
|
|
||||||
Compact joins the workspace selector and ribbon, docks the content-hugging Browser
|
|
||||||
flush beneath them with a square join, and opens tool sheets below the compass.
|
|
||||||
Sheets remain draggable, rounding all corners away from their right dock; footer
|
|
||||||
backgrounds follow the same corners. A separate preference hides ribbon icon labels
|
|
||||||
for a shorter ribbon in either layout.
|
|
||||||
Assistant keeps the outermost edge and History keeps its chosen dock. Switching
|
|
||||||
retains the active tool, camera, selection and design; system windows and menus
|
|
||||||
keep their existing behavior.
|
|
||||||
|
|
||||||
## View navigation
|
|
||||||
|
|
||||||
- Navigation has an opt-in Free orbit preference for mouse and 3D-mouse rotation through
|
|
||||||
both poles with roll. It defaults off, preserving existing preset snapping and pole limits.
|
|
||||||
The SolidWorks face menu offers Normal to Selection (`view.normal_to`), shared with Look At
|
|
||||||
and Ctrl+8, including repeat-to-flip, preserving scale and projection.
|
|
||||||
|
|
||||||
- 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
|
|
||||||
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
|
|
||||||
top/bottom heading are preserved. Diagonals include 45-degree edge and isometric corner views.
|
|
||||||
|
|
||||||
## 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
|
|
||||||
attachments and ambiguous coincident sources remain unsupported.
|
|
||||||
- G2 fillets: exact quintic blends of straight edges between planar faces, with one planar
|
|
||||||
end face at each end, including sloped ends (#2708). The UI and `solid.fillet` expose
|
|
||||||
`curvature` (alias `g2`); the size is an equivalent circular setback. Curved faces/edges,
|
|
||||||
multi-face ends and corner junctions remain unsupported.
|
|
||||||
- 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
|
|
||||||
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);
|
|
||||||
mitres between separate rounds of the same radius keep their endpoint tangent, so a later
|
|
||||||
fillet can select an upright and its adjoining bottom mitre as one chain (#2422);
|
|
||||||
straight edges (convex or concave) between planar faces with perpendicular
|
|
||||||
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
|
|
||||||
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;
|
|
||||||
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
|
|
||||||
chain), including circles and walls at any angle (boss bases and tops, bores, pocket floors,
|
|
||||||
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;
|
|
||||||
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
|
|
||||||
convex planar body or of an extruded part; fillets inside patterns; closed chains of curved
|
|
||||||
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
|
|
||||||
edges, where straight or curved cap edges are trimmed to the contacts (the straight edge
|
|
||||||
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
|
|
||||||
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;
|
|
||||||
curved wall qualification rejects false transverse axes instead of filling holes.
|
|
||||||
Bodies touching along one whole face
|
|
||||||
(a part and its mirror image) are stitched; coincident planar faces are pushed apart when
|
|
||||||
their neighbours are planes or cylinders. Other coincident curved configurations can still
|
|
||||||
fail. Bounded containment classification preserves fully internal cavities and nested
|
|
||||||
material islands independently of shell order, with STEP round-trip and material-membership
|
|
||||||
regressions. Near-contact curved shells use the general boolean path rather than a
|
|
||||||
containment shortcut. Spheres are built from six pole-free patches.
|
|
||||||
- Mass properties come from fine tessellation (curved faces within ~1e-4 relative); triangles
|
|
||||||
that cut through curved faces (trimmed faces after booleans) are split onto the surface first.
|
|
||||||
- STEP import (our own reader, crates/kernel/src/step_in) reads solids (B-rep with analytic and B-spline geometry), units,
|
|
||||||
product names, colours and assemblies; analytic offsets on planes, cylinders, cones, spheres
|
|
||||||
and regular tori are read exactly (signed/nested distances, units and face sense). Freeform
|
|
||||||
offset surfaces and pcurve-only edges are not read yet,
|
|
||||||
and assembly components are flattened into bodies. Closed periodic faces (torus, B-spline
|
|
||||||
bands) are split in two for meshing; measure() uses a finer tolerance for small radii.
|
|
||||||
- Persistent naming follows the kernel's exact face history (docs/book/src/dev/naming.md):
|
|
||||||
references resolve by name first, follow splits and merges, and warn when the entity split,
|
|
||||||
merged or vanished, or was found by geometry only (operations that report no history yet).
|
|
||||||
New planar sketch attachments use exact box, extrusion cap/side and immutable imported-face
|
|
||||||
source certificates with checked target and author occurrence paths. A missing or changed
|
|
||||||
source fails explicitly; Redefine Sketch Plane previews reattachment or a fixed plane while
|
|
||||||
retaining current geometry and dimension identities. Unsupported modified faces need an
|
|
||||||
explicit fixed plane. Legacy attachments retain their original resolver behavior.
|
|
||||||
- Modelled threads are cut as a faceted body (curved faces within 1/200 of the pitch); Extrude
|
|
||||||
and Revolve To Object on a curved face cut the tool back to the target's surface.
|
|
||||||
- Explicit sketch breaks preserve exact ellipses, fit/control splines (including high degrees)
|
|
||||||
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.
|
|
||||||
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
|
|
||||||
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.
|
|
||||||
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
|
|
||||||
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.
|
|
||||||
Newly captured adaptive profile references with complete source coverage retain their outer
|
|
||||||
and hole identities through span-count changes, including parameter edits after extrusion.
|
|
||||||
Partial, intersected or ambiguous boundaries do not qualify for these whole-source references.
|
|
||||||
Legacy curve-span multisets remain exact and unchanged; already-lost selections may need
|
|
||||||
reselection. Format 12 stores the new bounded whole-boundary references.
|
|
||||||
Projected analytic boundaries follow nested loop identities through resizing, including
|
|
||||||
stationary holes and rounded corners. Supported convex, tangent line-and-arc boundaries
|
|
||||||
can lose or regain corner arcs during an inset while preserving reserved curve identities
|
|
||||||
and linked profile selections. Format 12 saves those associations; compatible older closed
|
|
||||||
offsets upgrade structurally without changing their curve IDs. Breaking an association
|
|
||||||
freezes its current boundary and materializes downstream profile references. Child offsets
|
|
||||||
of a boundary with retired arcs still require breaking its association first; mixed or
|
|
||||||
nonconvex junctions and retained references to disappearing individual arcs remain limited.
|
|
||||||
- Extrude and Revolve editors retain original direction, extent expressions, explicit targets,
|
|
||||||
axes, From/To inputs and All-profile intent. No-op edits preserve downstream dimension names
|
|
||||||
and selected occurrence frames; cancel and successful edits preserve one-step undo history.
|
|
||||||
Placed feature edits preview through the edited timeline entry, and cylindrical Emboss guides
|
|
||||||
use the sketch's actual target, author or uniquely placed third-component frame.
|
|
||||||
Revolve rotators follow the actual signed axis and support symmetric and two-sided extents;
|
|
||||||
dragging a To Object extent converts its derived value to an explicit angle. Legacy reversed-axis
|
|
||||||
symmetric geometry is preserved through format 11's explicit legacy convention. New revolves
|
|
||||||
use the sketch-normal direction for each selected profile, including To Object and curved
|
|
||||||
target trimming, independently of the selected axis sign.
|
|
||||||
- Cylindrical emboss/deboss wraps bounded orthogonal line profiles, including holes, concave
|
|
||||||
outlines and nested islands, onto complete exterior cylinders or coaxial sleeves with exact
|
|
||||||
radial walls. New features infer a unique eligible cylinder when the face field is empty;
|
|
||||||
ambiguous targets require an explicit face. Saved target
|
|
||||||
and author occurrence paths retain the chosen placements; missing/split faces refuse rather
|
|
||||||
than retarget. General free-form profiles, seams, stepped cylinders and other curved surfaces
|
|
||||||
remain unsupported. STEP round-trip and independent radial/volume checks cover this subset.
|
|
||||||
- Shell and offset faces work on bodies of planes, cylinders, cones, spheres and tori (convex or not:
|
|
||||||
filleted boxes, bosses, domes, countersinks; corners where four or more planes meet, such as a
|
|
||||||
floor falling to a drain, as long as the corner's edges are all convex or all concave); draft on convex planar bodies and on walls (planes, cylinders → cones) between caps; lofts through three or more sections are smooth (B-spline sides through every section), two
|
|
||||||
sections ruled. Circular-meridian barrels retain curved inner walls through either axial
|
|
||||||
opening (#2421). Solid lofts preserve holes through sections with matching hole counts
|
|
||||||
(#2435), including inner walls and caps with openings; a hole cannot appear or disappear
|
|
||||||
between sections, and sections with holes cannot collapse to a point.
|
|
||||||
|
|
||||||
- Sketch corner tools: fillet and all three chamfer modes pick a connected corner even when
|
|
||||||
its endpoint overlaps the fixed origin or a loose point. Ordinary drawing still snaps to
|
|
||||||
the origin; clicked UI regressions verify geometry, closed profiles and undo.
|
|
||||||
- Sketch display: drawing, picking, highlighting, tool previews and profile shading share
|
|
||||||
adaptive projected curve boundaries. Fit, zoom, display scale and placed sketch frames
|
|
||||||
invalidate the display cache without changing CAD geometry or timeline history. Work
|
|
||||||
budgets and clipped paths prevent unbounded sampling or invented edges across the eye plane.
|
|
||||||
The Sketch Palette scrolls its options on short windows and enlarged displays while
|
|
||||||
keeping constraint status and Finish Sketch visible.
|
|
||||||
- Face projection: closed boundaries have a deterministic outer-first order. Refresh matches
|
|
||||||
existing geometry before assigning positions, retaining saved curve IDs and constraints
|
|
||||||
across enumeration changes and resize, including concentric circles. Ambiguous identities
|
|
||||||
retain the last geometry and report a lost reference; permutation matching is bounded.
|
|
||||||
- Project accepts complete supported preselection in one undo step. Visible external sketch
|
|
||||||
curves and points retain their source sketch identity; model geometry, axes and planes use
|
|
||||||
the existing linked projection commands. Rejection preserves the document and selection;
|
|
||||||
mixed selections retain ordinary tool-first picking.
|
|
||||||
- Inline sketch dimensions: Tab and Shift+Tab cycle within the active shape's value boxes,
|
|
||||||
selecting visited values for replacement. Expression completion retains forward-Tab
|
|
||||||
priority; real keyboard regressions cover rectangles, lines and single-value circles.
|
|
||||||
Typed lengths, radii, line angles, signed arc sweeps and slot lengths persist as constraints
|
|
||||||
and expressions through save/reopen. Shape creation and its dimensions form one undo step;
|
|
||||||
rejected values keep the editable field focused.
|
|
||||||
- Repeated components: Browser selection, visibility, properties, copy and Move/Copy use
|
|
||||||
checked occurrence paths. Active nested occurrences author planar sketches and solids in
|
|
||||||
their selected frame. Pending moves compose through parents; dialog cancellation restores
|
|
||||||
its selected move. Source materials and body/face appearances follow transformed instances.
|
|
||||||
Shared nested definitions remain shared. Deep Paste New copies reachable definition graphs,
|
|
||||||
independent feature/input histories, styles and internal motion records, with bounded geometry
|
|
||||||
checks and explicit external-link notices. Paste New selects the copy while preserving the active
|
|
||||||
authoring context. Imported periodic STEP seams survive placement and reexport with shared
|
|
||||||
topology and appearances intact. Recorded body transfers preserve historical Join/Cut membership,
|
|
||||||
material, placements and machining data through edits, copying, undo and reopen. New 3D wires
|
|
||||||
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.
|
|
||||||
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 opens the user/model variable editor; Configurations opens the configuration table.
|
|
||||||
Configure remains available in the panel dropdown.
|
|
||||||
- Parameter creation supports Enter with validation and continued keyboard entry. Shared
|
|
||||||
expression autocomplete supports Up/Down selection, Enter/Tab acceptance and Escape dismissal;
|
|
||||||
accepting a suggestion does not submit a parameter or trigger viewport shortcuts.
|
|
||||||
- Movable window title bars follow the app's dark/light header palette. Radial right-click
|
|
||||||
menus are opt-in in Preferences > Navigation; ordinary context menus remain the default.
|
|
||||||
- Desktop distribution: running Windows windows and executable resources use the app icon;
|
|
||||||
packaging validates icon resources. Nix installs launchers, MIME data and generated icons,
|
|
||||||
with explicit launch apps and Vulkan-loader/driver discovery. Flatpak feed instructions
|
|
||||||
register the required runtime source; release checks exercise desktop modelling on X11/Wayland.
|
|
||||||
- OpenGL rendering clamps effective anti-aliasing to 1x across UI pipelines, textures and CAD
|
|
||||||
callbacks to prevent black frames. Other backends retain the requested sample count, and
|
|
||||||
stored preferences remain unchanged.
|
|
||||||
- Configuration rules: ordered typed conditions can drive parameters and suppressions or
|
|
||||||
restrict values. Preview explains effective values without modifying the document; applying
|
|
||||||
rules validates rows atomically. Length expressions retain their authoring units across
|
|
||||||
document-unit changes. The UI supports structured All/Any/Not conditions and rule ordering.
|
|
||||||
Component styles and certified semantic face styles are available; unsupported lineage refuses
|
|
||||||
atomically, and stale certified face paint cannot jump to another surface. See [configurations](docs/configurations.md).
|
|
||||||
- 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
|
|
||||||
pieces survive unfold/refold as one logical sheet group, including split flanged sheets.
|
|
||||||
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
|
|
||||||
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
|
|
||||||
records complementary depth layers as pockets while retaining the stock gauge. Unsupported
|
|
||||||
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
|
|
||||||
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
|
|
||||||
check. Under-resolved fits return an error.
|
|
||||||
- Contact driving checks the trajectory between clear endpoints, including linked joints,
|
|
||||||
playback and sparse motion exports. Checks use bounded tessellation samples, not exact
|
|
||||||
continuous collision detection; local thin walls and small details remain limitations.
|
|
||||||
See [contact-set limits and recovery](docs/contact-sets.md).
|
|
||||||
|
|
||||||
## Assembly dragging
|
|
||||||
|
|
||||||
The design's first part is grounded when it is made, and a left-button drag repositions a free part (`occurrence.drag`: one undo step, exact occurrence paths including repeated jointed definitions, any floating-chain member carries the chain, grounded parts and joints hold where present, Escape cancels).
|
|
||||||
|
|
||||||
## 3D sketch bridges
|
|
||||||
|
|
||||||
3D sketch drawing snaps to points on other visible sketch planes without flattening them onto
|
|
||||||
the active plane. Bridge endpoints capture their source positions; associative endpoint links,
|
|
||||||
construction-plane selection of 3D wires and loft guide rails remain separate work.
|
|
||||||
Feature dialog header chevrons collapse and restore the form without discarding selections
|
|
||||||
or edited values, including the Appearance panel.
|
|
||||||
## Construction on 3D paths
|
|
||||||
|
|
||||||
Plane Along Path has a viewport path selector, fractional position, live preview and timeline
|
|
||||||
editing. Construction planes and points resolve drawn 3D wires without applying their sketch
|
|
||||||
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.
|
|
||||||
|
|
||||||
## 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
|
|
||||||
|
|
||||||
- Desktop STEP import prepares consecutive independent solids in bounded batches with up
|
|
||||||
to eight workers, retaining serial traversal, result order and persistent source identities.
|
|
||||||
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
|
|
||||||
[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
|
|
||||||
thumbnails. Straight-line closest-point projection and exact curved-surface evaluation
|
|
||||||
reuse reduce repeated work without relaxing geometry checks. Three alternating optimized
|
|
||||||
benchmark runs reduce median rebuild time by 26% on the public sensor enclosure and 22%
|
|
||||||
on a local case assembly; shape measurements and topology match the original build.
|
|
||||||
See [performance measurements](docs/perf.md). Further cold Boolean and import costs remain.
|
|
||||||
- Prepared assembly geometry survives selection and view changes while real geometry and
|
|
||||||
placement changes invalidate it. A Pi assembly edge-selection probe drops from 9.24 s to
|
|
||||||
0.57 s; initial opening is unchanged. Actual Windows desktop profiling measures 15.87 s
|
|
||||||
median opening, with 82% spent rebuilding geometry; halving full opening remains open.
|
|
||||||
|
|
||||||
## Kernel
|
|
||||||
|
|
||||||
- Successful Boolean retries report their strategy and numerical adjustments as
|
|
||||||
feature warnings and structured inspection data. Diagnostics survive cached
|
|
||||||
evaluation, undo/redo and cold reopening; the robustness runner counts retry
|
|
||||||
events by strategy and reports any bounded-log truncation. Existing geometry
|
|
||||||
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
|
|
||||||
polylines without panicking. Direct constructor regressions retain valid open endpoints
|
|
||||||
and closed spherical intersections; the original interactive trigger remains unidentified.
|
|
||||||
- Shell of a stepped, joined planar body no longer creates horizontal subdivisions across
|
|
||||||
continuous walls. Fresh axis-aligned Cut walls are stitched using their exact construction
|
|
||||||
support and shared topology, preserving real steps and intentional boundaries. The local
|
|
||||||
reported case returns from 86 to 49 faces with unchanged material and bounds; regressions
|
|
||||||
cover stepped stock, STEP round trips and saved projections from removed pieces.
|
|
||||||
|
|
||||||
truck (Apache-2.0) behind our own `kernel` crate, with our own blend operation and boolean
|
|
||||||
retry/validation; see `plan/adr/0001-geometry-kernel.md` (local) — summary in README.
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
Third-party software in SolidCraft
|
Third-party software in SolidCraft
|
||||||
|
|
||||||
SolidCraft (the desktop app, solidcraft-cli and the web app) is built from the 559 crates below.
|
SolidCraft (the desktop app, solidcraft-cli and the web app) is built from the 560 crates below.
|
||||||
Generated by `cargo xtask licences` from Cargo.lock and the crates' own licence files.
|
Generated by `cargo xtask licences` from Cargo.lock and the crates' own licence files.
|
||||||
SolidCraft's own licence is in LICENSE-MIT and LICENSE-APACHE, and NOTICE.
|
SolidCraft's own licence is in LICENSE-MIT and LICENSE-APACHE, and NOTICE.
|
||||||
|
|
||||||
@@ -439,6 +439,7 @@ typed-path 0.12.3 (MIT OR Apache-2.0)
|
|||||||
typeid 1.0.3 (MIT OR Apache-2.0)
|
typeid 1.0.3 (MIT OR Apache-2.0)
|
||||||
typenum 1.20.1 (MIT OR Apache-2.0)
|
typenum 1.20.1 (MIT OR Apache-2.0)
|
||||||
uds_windows 1.2.1 (MIT)
|
uds_windows 1.2.1 (MIT)
|
||||||
|
unicode-bidi 0.3.18 (MIT OR Apache-2.0)
|
||||||
unicode-general-category 1.1.0 (Apache-2.0)
|
unicode-general-category 1.1.0 (Apache-2.0)
|
||||||
unicode-ident 1.0.26 ((MIT OR Apache-2.0) AND Unicode-3.0)
|
unicode-ident 1.0.26 ((MIT OR Apache-2.0) AND Unicode-3.0)
|
||||||
unicode-segmentation 1.13.3 (MIT OR Apache-2.0)
|
unicode-segmentation 1.13.3 (MIT OR Apache-2.0)
|
||||||
@@ -1123,9 +1124,9 @@ parking_lot_core 0.9.12, percent-encoding 2.3.2, piper 0.2.5, plain 0.2.3, png 0
|
|||||||
rustls-native-certs 0.8.5, scoped-tls 1.0.1, scopeguard 1.2.0, secret-service 4.0.0,
|
rustls-native-certs 0.8.5, scoped-tls 1.0.1, scopeguard 1.2.0, secret-service 4.0.0,
|
||||||
security-framework 2.11.1, security-framework 3.7.0, security-framework-sys 2.17.0,
|
security-framework 2.11.1, security-framework 3.7.0, security-framework-sys 2.17.0,
|
||||||
signal-hook-registry 1.4.8, simd_cesu8 1.2.0, smallvec 1.16.2, smol_str 0.2.2, stable_deref_trait
|
signal-hook-registry 1.4.8, simd_cesu8 1.2.0, smallvec 1.16.2, smol_str 0.2.2, stable_deref_trait
|
||||||
1.2.1, syn 1.0.109, tempfile 3.27.0, ttf-parser 0.25.1, unicode-segmentation 1.13.3, unicode-width
|
1.2.1, syn 1.0.109, tempfile 3.27.0, ttf-parser 0.25.1, unicode-bidi 0.3.18, unicode-segmentation
|
||||||
0.2.2, url 2.5.8, uuid 1.27.0, wasi 0.11.1+wasi-snapshot-preview1, wasip2 1.0.4+wasi-0.2.12,
|
1.13.3, unicode-width 0.2.2, url 2.5.8, uuid 1.27.0, wasi 0.11.1+wasi-snapshot-preview1, wasip2
|
||||||
wasm-bindgen 0.2.129, wasm-bindgen-futures 0.4.79, wasm-bindgen-macro 0.2.129,
|
1.0.4+wasi-0.2.12, wasm-bindgen 0.2.129, wasm-bindgen-futures 0.4.79, wasm-bindgen-macro 0.2.129,
|
||||||
wasm-bindgen-macro-support 0.2.129, wasm-bindgen-shared 0.2.129, web-sys 0.3.106, weezl 0.1.12,
|
wasm-bindgen-macro-support 0.2.129, wasm-bindgen-shared 0.2.129, web-sys 0.3.106, weezl 0.1.12,
|
||||||
wit-bindgen 0.57.1
|
wit-bindgen 0.57.1
|
||||||
================================================================================
|
================================================================================
|
||||||
@@ -14524,6 +14525,49 @@ MIT License
|
|||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
SOFTWARE
|
SOFTWARE
|
||||||
|
|
||||||
|
================================================================================
|
||||||
|
unicode-bidi 0.3.18
|
||||||
|
================================================================================
|
||||||
|
|
||||||
|
This project is copyright 2015, The Servo Project Developers (given in the
|
||||||
|
file AUTHORS).
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
|
||||||
|
http://opensource.org/licenses/MIT>, at your option. All files in the project
|
||||||
|
carrying such notice may not be copied, modified, or distributed except
|
||||||
|
according to those terms.
|
||||||
|
|
||||||
|
================================================================================
|
||||||
|
unicode-bidi 0.3.18, unicode-segmentation 1.13.3, unicode-width 0.2.2
|
||||||
|
================================================================================
|
||||||
|
|
||||||
|
Copyright (c) 2015 The Rust Project Developers
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any
|
||||||
|
person obtaining a copy of this software and associated
|
||||||
|
documentation files (the "Software"), to deal in the
|
||||||
|
Software without restriction, including without
|
||||||
|
limitation the rights to use, copy, modify, merge,
|
||||||
|
publish, distribute, sublicense, and/or sell copies of
|
||||||
|
the Software, and to permit persons to whom the Software
|
||||||
|
is furnished to do so, subject to the following
|
||||||
|
conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice
|
||||||
|
shall be included in all copies or substantial portions
|
||||||
|
of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
|
||||||
|
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
|
||||||
|
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
|
||||||
|
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||||
|
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
|
||||||
|
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
================================================================================
|
================================================================================
|
||||||
unicode-ident 1.0.26
|
unicode-ident 1.0.26
|
||||||
================================================================================
|
================================================================================
|
||||||
@@ -14572,36 +14616,6 @@ authorization of the copyright holder.
|
|||||||
unicode-segmentation 1.13.3, unicode-width 0.2.2
|
unicode-segmentation 1.13.3, unicode-width 0.2.2
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
Copyright (c) 2015 The Rust Project Developers
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any
|
|
||||||
person obtaining a copy of this software and associated
|
|
||||||
documentation files (the "Software"), to deal in the
|
|
||||||
Software without restriction, including without
|
|
||||||
limitation the rights to use, copy, modify, merge,
|
|
||||||
publish, distribute, sublicense, and/or sell copies of
|
|
||||||
the Software, and to permit persons to whom the Software
|
|
||||||
is furnished to do so, subject to the following
|
|
||||||
conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice
|
|
||||||
shall be included in all copies or substantial portions
|
|
||||||
of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
|
|
||||||
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
|
|
||||||
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
|
|
||||||
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
||||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
||||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
|
|
||||||
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
================================================================================
|
|
||||||
unicode-segmentation 1.13.3, unicode-width 0.2.2
|
|
||||||
================================================================================
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0
|
Licensed under the Apache License, Version 2.0
|
||||||
<LICENSE-APACHE or
|
<LICENSE-APACHE or
|
||||||
http://www.apache.org/licenses/LICENSE-2.0> or the MIT
|
http://www.apache.org/licenses/LICENSE-2.0> or the MIT
|
||||||
|
|||||||
@@ -19,6 +19,11 @@ path = "src/main.rs"
|
|||||||
name = "solvecraft-cli"
|
name = "solvecraft-cli"
|
||||||
path = "src/alias.rs"
|
path = "src/alias.rs"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = ["raytrace-cpu"]
|
||||||
|
bundled-render-library = ["solidcraft-engine/bundled-render-library"]
|
||||||
|
raytrace-cpu = ["solidcraft-engine/raytrace-cpu"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
solidcraft-engine = { workspace = true }
|
solidcraft-engine = { workspace = true }
|
||||||
solidcraft-gpu = { workspace = true }
|
solidcraft-gpu = { workspace = true }
|
||||||
|
|||||||
@@ -0,0 +1,151 @@
|
|||||||
|
//! Reproducible evidence through the production command/job interfaces.
|
||||||
|
//! Usage: studio_evidence RECIPE.json RENDER-PARAMS.json OUTPUT.png
|
||||||
|
//! Writes the editable design, command timings and actual adapter/job metadata beside PNG.
|
||||||
|
//! Accepts runtime requests as well as inline or named saved render jobs.
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use solidcraft_engine::{
|
||||||
|
Session,
|
||||||
|
doc::render_settings::{RenderJob, RenderSetup},
|
||||||
|
render::job::{CpuHost, ErrorCode, JobId, Phase},
|
||||||
|
};
|
||||||
|
use std::{
|
||||||
|
io::Read,
|
||||||
|
path::Path,
|
||||||
|
time::{Duration, Instant},
|
||||||
|
};
|
||||||
|
|
||||||
|
fn read_json(path: &str) -> Result<Value, String> {
|
||||||
|
let mut bytes = Vec::new();
|
||||||
|
std::fs::File::open(path).map_err(|e| format!("{path}: {e}"))?.take(16_777_217).read_to_end(&mut bytes).map_err(|e| e.to_string())?;
|
||||||
|
if bytes.len() > 16_777_216 {
|
||||||
|
return Err("evidence input exceeds 16 MiB".into());
|
||||||
|
}
|
||||||
|
serde_json::from_slice(&bytes).map_err(|e| format!("{path}: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only decide which optional host must be installed. The production command
|
||||||
|
// still validates and resolves the actual request without a second wire format.
|
||||||
|
fn needs_gpu(session: &Session, params: &Value) -> Result<bool, String> {
|
||||||
|
let inline = params.get("settings").filter(|value| !value.is_null());
|
||||||
|
let named = params.get("setup").filter(|value| !value.is_null());
|
||||||
|
if inline.is_some() && named.is_some() {
|
||||||
|
return Err("choose either setup or settings".into());
|
||||||
|
}
|
||||||
|
let inline_setup = inline
|
||||||
|
.filter(|value| value.get("job").is_some_and(|job| !job.is_null()))
|
||||||
|
.map(|value| serde_json::from_value::<RenderSetup>(value.clone()).map_err(|e| e.to_string()))
|
||||||
|
.transpose()?;
|
||||||
|
let setup = if let Some(name) = named.and_then(Value::as_str) {
|
||||||
|
Some(session.doc.render.setups.get(name).ok_or("no saved render setup with that name")?)
|
||||||
|
} else {
|
||||||
|
inline_setup.as_ref()
|
||||||
|
};
|
||||||
|
if let Some(setup) = setup
|
||||||
|
&& let Some(job) = &setup.job
|
||||||
|
{
|
||||||
|
if params.as_object().is_some_and(|object| object.keys().any(|key| !matches!(key.as_str(), "setup" | "settings" | "replace"))) {
|
||||||
|
return Err("saved render jobs cannot be mixed with runtime controls".into());
|
||||||
|
}
|
||||||
|
setup.validate().map_err(|e| e.to_string())?;
|
||||||
|
return Ok(matches!(job, RenderJob::GpuPath { .. }));
|
||||||
|
}
|
||||||
|
Ok(params.get("progressive").and_then(Value::as_bool) == Some(true))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run() -> Result<(), String> {
|
||||||
|
let args: Vec<String> = std::env::args().skip(1).collect();
|
||||||
|
let [recipe_path, params_path, output_path] = args.as_slice() else {
|
||||||
|
return Err("usage: studio_evidence RECIPE.json RENDER-PARAMS.json OUTPUT.png".into());
|
||||||
|
};
|
||||||
|
let output = Path::new(output_path);
|
||||||
|
if !output.extension().is_some_and(|e| e.eq_ignore_ascii_case("png")) {
|
||||||
|
return Err("output must have a .png extension".into());
|
||||||
|
}
|
||||||
|
let recipe = read_json(recipe_path)?;
|
||||||
|
let params = read_json(params_path)?;
|
||||||
|
let mut session = Session::default();
|
||||||
|
eprintln!("Generating original CAD scene from {recipe_path}");
|
||||||
|
let generation_start = Instant::now();
|
||||||
|
let (commands, command_timings) = session.run_script_timed(&recipe, false).map_err(|e| e.to_string())?;
|
||||||
|
let generation_seconds = generation_start.elapsed().as_secs_f64();
|
||||||
|
let design_path = output.with_extension("solidcraft");
|
||||||
|
session.execute("file.save_as", &json!({"path":design_path})).map_err(|e| e.to_string())?;
|
||||||
|
let scene = solidcraft_engine::product_scene::extract(&session).map_err(|e| e.to_string())?;
|
||||||
|
let bodies: Vec<Value> = scene
|
||||||
|
.meshes
|
||||||
|
.iter()
|
||||||
|
.map(|mesh| json!({"name":mesh.name,"vertices":mesh.mesh.positions.len(),"triangles":mesh.mesh.triangles.len()}))
|
||||||
|
.collect();
|
||||||
|
drop(scene);
|
||||||
|
|
||||||
|
let cpu_host_start = Instant::now();
|
||||||
|
session.set_render_job_host(Some(CpuHost::for_platform().map_err(|e| e.to_string())?)).map_err(|e| e.to_string())?;
|
||||||
|
let cpu_host_seconds = cpu_host_start.elapsed().as_secs_f64();
|
||||||
|
// Match runtime and saved-job dispatch. CPU evidence must not require a
|
||||||
|
// Vulkan device, parse GPU policy or initialize a GPU host.
|
||||||
|
let (adapter_report, gpu_host_seconds) = if needs_gpu(&session, ¶ms)? {
|
||||||
|
let gpu_host_start = Instant::now();
|
||||||
|
let policy = solidcraft_gpu::select::Policy::from_env().map_err(|e| e.to_string())?;
|
||||||
|
let (adapter, report) =
|
||||||
|
solidcraft_gpu::select::pick_vulkan(policy, |_| true).ok_or("no Vulkan adapter satisfies the requested GPU policy")?;
|
||||||
|
session.register_render_job_host(solidcraft_gpu::path::host_on_adapter(&adapter).map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
|
||||||
|
(Some(report), Some(gpu_host_start.elapsed().as_secs_f64()))
|
||||||
|
} else {
|
||||||
|
(None, None)
|
||||||
|
};
|
||||||
|
let preflight = session.execute("render.preflight", ¶ms).map_err(|e| e.to_string())?;
|
||||||
|
let start = Instant::now();
|
||||||
|
let started = session.execute("render.start", ¶ms).map_err(|e| e.to_string())?;
|
||||||
|
let executor = started
|
||||||
|
.get("resolved")
|
||||||
|
.and_then(|resolved| resolved.get("executor"))
|
||||||
|
.and_then(Value::as_str)
|
||||||
|
.ok_or("started job did not report the resolved image executor")?
|
||||||
|
.to_owned();
|
||||||
|
let id: JobId = serde_json::from_value(started.get("job").cloned().ok_or("missing job id")?).map_err(|e| e.to_string())?;
|
||||||
|
let handle = session.render_job_handle(id).map_err(|e| e.to_string())?;
|
||||||
|
eprintln!("Rendering through production {executor} executor");
|
||||||
|
if let Some(adapter) = &adapter_report {
|
||||||
|
eprintln!("GPU adapter: {adapter:?}");
|
||||||
|
}
|
||||||
|
let status = loop {
|
||||||
|
match handle.wait_timeout(Duration::from_secs(10)) {
|
||||||
|
Ok(status) => break status,
|
||||||
|
Err(error) if error.code == ErrorCode::TimedOut && start.elapsed() < Duration::from_secs(3600) => {
|
||||||
|
let status = handle.status().map_err(|e| e.to_string())?;
|
||||||
|
eprintln!(
|
||||||
|
"Render progress: {:?} {}/{} after {:.1}s",
|
||||||
|
status.progress.phase,
|
||||||
|
status.progress.done,
|
||||||
|
status.progress.total,
|
||||||
|
start.elapsed().as_secs_f64()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Err(error) => {
|
||||||
|
let _ = handle.cancel();
|
||||||
|
return Err(error.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let render_and_encode_seconds = start.elapsed().as_secs_f64();
|
||||||
|
if status.progress.phase != Phase::Completed {
|
||||||
|
return Err(status.error.map_or_else(|| "render did not complete".into(), |e| e.to_string()));
|
||||||
|
}
|
||||||
|
let exported = session.execute("render.export", &json!({"job":id,"path":output_path,"overwrite":true})).map_err(|e| e.to_string())?;
|
||||||
|
let report = json!({
|
||||||
|
"recipe":recipe_path,"render_params":params,"executor":executor,"adapter":adapter_report,
|
||||||
|
"environment":{"SOLIDCRAFT_GPU":std::env::var("SOLIDCRAFT_GPU").ok(),"WGPU_BACKEND":std::env::var("WGPU_BACKEND").ok()},
|
||||||
|
"cad_generation_seconds":generation_seconds,"cpu_host_setup_seconds":cpu_host_seconds,"gpu_host_setup_seconds":gpu_host_seconds,
|
||||||
|
"render_and_encode_seconds":render_and_encode_seconds,
|
||||||
|
"timing_scope":"wall time from render.start through completed PNG encoding; includes job preparation and readback, excludes CAD generation, preflight and initial CPU/GPU host setup; GPU setup timing includes adapter selection and pipelines when requested",
|
||||||
|
"bodies":bodies,"commands":commands,"command_timings":command_timings,
|
||||||
|
"preflight":preflight,"export":exported,"editable_design":design_path
|
||||||
|
});
|
||||||
|
std::fs::write(output.with_extension("json"), serde_json::to_vec_pretty(&report).map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
|
||||||
|
println!("{}", serde_json::to_string_pretty(&report).map_err(|e| e.to_string())?);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() -> Result<(), String> {
|
||||||
|
run()
|
||||||
|
}
|
||||||
@@ -69,6 +69,7 @@ impl Control {
|
|||||||
return Err("--connect requires a loopback address and a nonzero port (the app listens on 127.0.0.1)".into());
|
return Err("--connect requires a loopback address and a nonzero port (the app listens on 127.0.0.1)".into());
|
||||||
}
|
}
|
||||||
let token = solidcraft_engine::control_auth::client_token(addr.port(), token)
|
let token = solidcraft_engine::control_auth::client_token(addr.port(), token)
|
||||||
|
.map(|t| t.token)
|
||||||
.ok_or("no control token: pass --token, set SOLIDCRAFT_CONTROL_TOKEN, or run on the app's computer (its token file)")?;
|
.ok_or("no control token: pass --token, set SOLIDCRAFT_CONTROL_TOKEN, or run on the app's computer (its token file)")?;
|
||||||
if token.len() > 4096 {
|
if token.len() > 4096 {
|
||||||
return Err("the control token is longer than 4096 bytes".into());
|
return Err("the control token is longer than 4096 bytes".into());
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
//!
|
//!
|
||||||
//! ```text
|
//! ```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 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 eval <script.json|design.solidcraft|part.step> [--in 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 script <design.solidcraft> [--out script.json] the design's history as a command script
|
||||||
//! solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only] [--save OUT.solidcraft] [--display LEVEL [--edit NAME EXPR]] [--ops script.json] loading timings as JSON lines
|
//! solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only] [--save OUT.solidcraft] [--display LEVEL [--edit NAME EXPR]] [--ops script.json] 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 bench-agent [--scale F] [--save F] [--script-out F] a ~1,300-body design built command by command, timed
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
//! solidcraft-cli mcp [--headless] [--in design|script] [--connect HOST:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]
|
//! solidcraft-cli mcp [--headless] [--in design|script] [--connect HOST:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]
|
||||||
//! [--param-check off|warn|strict]
|
//! [--param-check off|warn|strict]
|
||||||
//! MCP server on stdio (docs/mcp.md)
|
//! MCP server on stdio (docs/mcp.md)
|
||||||
|
//! solidcraft-cli mcp setup [--dry-run] [--client NAME] [--live] (alias: mcp install) add it to OpenCode, Claude Desktop, Claude Code, Cursor
|
||||||
//! solidcraft-cli licences SolidCraft's licence and the third-party licences
|
//! 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)
|
//! solidcraft-cli icon --out F.png|F.ico [--size N] the app icon (packaging; drawn, not a file)
|
||||||
//!
|
//!
|
||||||
@@ -57,7 +58,7 @@ struct Command {
|
|||||||
/// `run`'s lines in the usage.
|
/// `run`'s lines in the usage.
|
||||||
const USAGE_RUN: &str = " 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]\n solidcraft-cli run --in <design.solidcraft|part.step> [--out FILE]...\n (a timeline feature that fails fails the run and nothing is written; --allow-errors writes anyway)\n (--timings prints {timings: [{index, command, ms}], total_ms} for a script, with --results its results too;\n --profile adds each command's profile: {boolean_ms, tessellate_ms, other_ms}, the kernel's share)\n";
|
const USAGE_RUN: &str = " 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]\n solidcraft-cli run --in <design.solidcraft|part.step> [--out FILE]...\n (a timeline feature that fails fails the run and nothing is written; --allow-errors writes anyway)\n (--timings prints {timings: [{index, command, ms}], total_ms} for a script, with --results its results too;\n --profile adds each command's profile: {boolean_ms, tessellate_ms, other_ms}, the kernel's share)\n";
|
||||||
/// `eval`'s lines in the usage.
|
/// `eval`'s lines in the usage.
|
||||||
const USAGE_EVAL: &str = " solidcraft-cli eval <script.json|design.solidcraft|part.step> [--json-out FILE] (alias: inspect; or --in FILE)\n (--json-out FILE writes the JSON that run (with --results, else the measurement) and eval print to FILE instead of stdout,\n as plain UTF-8: a shell's > can re-encode it, e.g. Windows PowerShell adds a byte-order mark)\n";
|
const USAGE_EVAL: &str = " solidcraft-cli eval <script.json|design.solidcraft|part.step> [--in design.solidcraft|part.step] [--json-out FILE] (alias: inspect)\n solidcraft-cli eval --in <script.json|design.solidcraft|part.step> [--json-out FILE]\n (with both inputs, runs the positional script on --in before measuring; does not automatically save the modified design)\n (--json-out FILE writes the JSON that run (with --results, else the measurement) and eval print to FILE instead of stdout,\n as plain UTF-8: a shell's > can re-encode it, e.g. Windows PowerShell adds a byte-order mark)\n";
|
||||||
/// `script`'s lines in the usage.
|
/// `script`'s lines in the usage.
|
||||||
const USAGE_SCRIPT: &str = " solidcraft-cli script <design.solidcraft|script.json> [--out script.json]\n (the design's history as a command script that eval and run replay)\n";
|
const USAGE_SCRIPT: &str = " solidcraft-cli script <design.solidcraft|script.json> [--out script.json]\n (the design's history as a command script that eval and run replay)\n";
|
||||||
/// `bench-open`'s lines in the usage.
|
/// `bench-open`'s lines in the usage.
|
||||||
@@ -69,7 +70,7 @@ const USAGE_BENCH_ASSISTANT: &str = " solidcraft-cli bench-assistant --connect
|
|||||||
/// `snapshot`'s lines in the usage.
|
/// `snapshot`'s lines in the usage.
|
||||||
const USAGE_SNAPSHOT: &str = " 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]\n [--body NAME:opacity=0.3,color=#rrggbb]... [--tool NAME]... [--section z=27]\n solidcraft-cli snapshot --in <design.solidcraft|part.step> --out shot.png ...\n (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;\n --view: iso, front, back, top, bottom, left, right, or the name of a view saved in the design with view.save;\n --camera: {target: [x,y,z], yaw, pitch, distance, fov?} in mm and radians, as the MCP screenshot takes it (docs/mcp.md);\n --no-grid and --no-axes leave the ground grid (on Z 0) and the origin's axes out of the picture;\n --body: how one body is drawn, as appearance.assign takes it: opacity 0-1 (below 1 is see-through, so what is inside\n it shows) and color #rrggbb, either or both, once per body;\n --tool: draw this body solid in the tool colour and every other body see-through, so a cut's or a join's tool body\n is visible inside the material it meets; a later --body overrides it;\n --section: cut the model as inspect.section does, so the inside shows: z=27 (the plane through that world\n coordinate, keeping the smaller side), add ,flip to keep the other side, or XY, XZ, YZ, or its own JSON)\n";
|
const USAGE_SNAPSHOT: &str = " 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]\n [--body NAME:opacity=0.3,color=#rrggbb]... [--tool NAME]... [--section z=27]\n solidcraft-cli snapshot --in <design.solidcraft|part.step> --out shot.png ...\n (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;\n --view: iso, front, back, top, bottom, left, right, or the name of a view saved in the design with view.save;\n --camera: {target: [x,y,z], yaw, pitch, distance, fov?} in mm and radians, as the MCP screenshot takes it (docs/mcp.md);\n --no-grid and --no-axes leave the ground grid (on Z 0) and the origin's axes out of the picture;\n --body: how one body is drawn, as appearance.assign takes it: opacity 0-1 (below 1 is see-through, so what is inside\n it shows) and color #rrggbb, either or both, once per body;\n --tool: draw this body solid in the tool colour and every other body see-through, so a cut's or a join's tool body\n is visible inside the material it meets; a later --body overrides it;\n --section: cut the model as inspect.section does, so the inside shows: z=27 (the plane through that world\n coordinate, keeping the smaller side), add ,flip to keep the other side, or XY, XZ, YZ, or its own JSON)\n";
|
||||||
/// `render`'s lines in the usage.
|
/// `render`'s lines in the usage.
|
||||||
const USAGE_RENDER: &str = " solidcraft-cli render <script|design> --out image.png [--setup NAME] [--width W] [--height H] [--transparent] [--overwrite] [--timeout SECONDS]\n";
|
const USAGE_RENDER: &str = " solidcraft-cli render <script|design> --out image.png [--setup NAME] [--width W] [--height H] [--transparent] [--overwrite] [--timeout SECONDS]\n [--progressive] [--samples N] [--max-depth N] [--seed N] [--exposure EV] [--lighting FILE.json] [--environment FILE.json] [--tone-map reinhard|aces_fitted]\n";
|
||||||
/// `exec`'s lines in the usage.
|
/// `exec`'s lines in the usage.
|
||||||
const USAGE_EXEC: &str = " solidcraft-cli exec <command> [json-params]\n";
|
const USAGE_EXEC: &str = " solidcraft-cli exec <command> [json-params]\n";
|
||||||
/// `commands`'s lines in the usage.
|
/// `commands`'s lines in the usage.
|
||||||
@@ -82,7 +83,7 @@ const USAGE_ORACLE: &str = " solidcraft-cli oracle <case-dir>... [--json]\n";
|
|||||||
const USAGE_FUZZ: &str =
|
const USAGE_FUZZ: &str =
|
||||||
" solidcraft-cli fuzz [--from N] [--count N] [--jobs J] [--timeout S] [--steps N] [--minimise] [--out DIR] [--report FILE]\n";
|
" solidcraft-cli fuzz [--from N] [--count N] [--jobs J] [--timeout S] [--steps N] [--minimise] [--out DIR] [--report FILE]\n";
|
||||||
/// `mcp`'s lines in the usage.
|
/// `mcp`'s lines in the usage.
|
||||||
const USAGE_MCP: &str = " solidcraft-cli mcp [--headless] [--in design.solidcraft|script.json] [--connect 127.0.0.1:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]\n [--param-check off|warn|strict]\n";
|
const USAGE_MCP: &str = " solidcraft-cli mcp [--headless] [--in design.solidcraft|script.json] [--connect 127.0.0.1:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]\n [--param-check off|warn|strict] [--render-gpu]\n solidcraft-cli mcp setup [--dry-run] [--client opencode|claude-desktop|claude-code|cursor] [--live]\n (adds a `solidcraft` server, with this program's path, to each installed AI client; --live adds `solidcraft-live` for the running app; alias: mcp install)\n";
|
||||||
/// `crashes`'s lines in the usage.
|
/// `crashes`'s lines in the usage.
|
||||||
const USAGE_CRASHES: &str = " solidcraft-cli crashes [list [--json] | show <id> | replay <id> | dir | clear [<id>]]\n";
|
const USAGE_CRASHES: &str = " solidcraft-cli crashes [list [--json] | show <id> | replay <id> | dir | clear [<id>]]\n";
|
||||||
/// `licences`'s lines in the usage.
|
/// `licences`'s lines in the usage.
|
||||||
@@ -261,8 +262,7 @@ fn load_checked(path: &str, check: solidcraft_engine::schema::ParamCheck) -> Res
|
|||||||
let bytes = solidcraft_engine::io::vfs::read(path, solidcraft_engine::io::MAX_DESIGN_BYTES).map_err(|e| format!("{path}: {e}"))?;
|
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) {
|
if solidcraft_engine::io::is_design_container(&bytes) {
|
||||||
let doc = solidcraft_engine::io::read_design(&bytes).map_err(|e| format!("{path}: {e}"))?;
|
let doc = solidcraft_engine::io::read_design(&bytes).map_err(|e| format!("{path}: {e}"))?;
|
||||||
let mut session = Session::new(doc);
|
let mut session = Session::opened_at(doc, None, Some(path));
|
||||||
session.path = Some(path.to_owned());
|
|
||||||
session.param_check = check;
|
session.param_check = check;
|
||||||
return Ok(session);
|
return Ok(session);
|
||||||
}
|
}
|
||||||
@@ -339,6 +339,7 @@ fn print_json(v: &Value, file: Option<&str>) -> Result<(), String> {
|
|||||||
fn cmd_run(args: &[String]) -> Result<(), String> {
|
fn cmd_run(args: &[String]) -> Result<(), String> {
|
||||||
install_renderer();
|
install_renderer();
|
||||||
let json_out = json_out(args)?;
|
let json_out = json_out(args)?;
|
||||||
|
known_args("run", args, &["--in", "--out", "--save", "--json-out"], &["--quiet", "--results", "--timings", "--profile", "--allow-errors"], true)?;
|
||||||
let base = flag(args, "--in");
|
let base = flag(args, "--in");
|
||||||
let path = positional(args);
|
let path = positional(args);
|
||||||
if path.is_none() && base.is_none() {
|
if path.is_none() && base.is_none() {
|
||||||
@@ -391,7 +392,7 @@ fn cmd_run(args: &[String]) -> Result<(), String> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The session `run` and `snapshot` start from: `--in` (a design or STEP file) with the
|
/// The session `run`, `eval` and `snapshot` start from: `--in` (a design or STEP file) with the
|
||||||
/// positional script run on top of it, or either one alone.
|
/// positional script run on top of it, or either one alone.
|
||||||
fn open(base: Option<&str>, path: Option<&String>) -> Result<Session, String> {
|
fn open(base: Option<&str>, path: Option<&String>) -> Result<Session, String> {
|
||||||
match (base, path) {
|
match (base, path) {
|
||||||
@@ -443,8 +444,8 @@ fn timeline_ok(s: &Session) -> Result<(), String> {
|
|||||||
|
|
||||||
fn cmd_eval(args: &[String]) -> Result<(), String> {
|
fn cmd_eval(args: &[String]) -> Result<(), String> {
|
||||||
let json_out = json_out(args)?;
|
let json_out = json_out(args)?;
|
||||||
let path = flag(args, "--in").or_else(|| positional(args).map(String::as_str)).ok_or_else(usage)?;
|
known_args("eval", args, &["--in", "--json-out"], &[], true)?;
|
||||||
let mut s = load(path)?;
|
let mut s = open(flag(args, "--in"), positional(args))?;
|
||||||
let m = s.execute("inspect.measure", &json!({})).map_err(|e| e.to_string())?;
|
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 d = s.execute("document.inspect", &json!({})).map_err(|e| e.to_string())?;
|
||||||
let out = json!({
|
let out = json!({
|
||||||
@@ -625,10 +626,27 @@ fn cmd_exec(args: &[String]) -> Result<(), String> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `mcp setup`: add the server to each installed AI client, with this program's own path.
|
||||||
|
fn cmd_mcp_setup(args: &[String]) -> Result<(), String> {
|
||||||
|
use solidcraft_engine::agent_setup as setup;
|
||||||
|
let (lines, ok) = setup::setup(args, &setup::Env::from_process(), &setup::current_exe()?)?;
|
||||||
|
for l in lines {
|
||||||
|
println!("{l}");
|
||||||
|
}
|
||||||
|
if ok { Ok(()) } else { Err("mcp setup: some clients could not be configured".into()) }
|
||||||
|
}
|
||||||
|
|
||||||
/// MCP server on stdio: headless (optionally starting from a design or script) or bridged to
|
/// 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
|
/// 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.
|
/// calls reach are confined to `solidcraft_mcp::agent_scope` unless `--allow-any-path` is given.
|
||||||
fn cmd_mcp(args: &[String]) -> Result<(), String> {
|
fn cmd_mcp(args: &[String]) -> Result<(), String> {
|
||||||
|
if matches!(args.first().map(String::as_str), Some("setup" | "install")) {
|
||||||
|
return cmd_mcp_setup(&args[1..]);
|
||||||
|
}
|
||||||
|
let render_gpu = args.iter().any(|arg| arg == "--render-gpu");
|
||||||
|
if render_gpu && flag(args, "--connect").is_some() {
|
||||||
|
return Err("mcp: --render-gpu installs a headless image host; a connected application owns its own device".into());
|
||||||
|
}
|
||||||
install_renderer();
|
install_renderer();
|
||||||
let scope = (!args.iter().any(|a| a == "--allow-any-path"))
|
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)));
|
.then(|| solidcraft_mcp::agent_scope(flags(args, "--allow-path").into_iter().map(std::path::PathBuf::from)));
|
||||||
@@ -672,19 +690,30 @@ fn cmd_mcp(args: &[String]) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
Box::new(remote)
|
Box::new(remote)
|
||||||
}
|
}
|
||||||
(None, Some(path)) => Box::new(solidcraft_mcp::Headless::new(load_checked(path, param_check)?)),
|
(None, Some(path)) => {
|
||||||
// No arguments: the running desktop app, found through the discovery file it wrote
|
let mut headless = solidcraft_mcp::Headless::new(load_checked(path, param_check)?);
|
||||||
// (docs/control-protocol.md); none running (or `--headless`): a session of its own.
|
if render_gpu {
|
||||||
|
headless.session.register_render_job_host(solidcraft_gpu::path::host().map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
Box::new(headless)
|
||||||
|
}
|
||||||
(None, None) => {
|
(None, None) => {
|
||||||
if !args.iter().any(|a| a == "--headless")
|
let auto = !args.iter().any(|a| a == "--headless");
|
||||||
&& let Some(port) = discover_app()
|
if auto && let Some(port) = discover_app() {
|
||||||
{
|
|
||||||
eprintln!("solidcraft mcp: bridged to the running app at 127.0.0.1:{port} (--headless starts a session of its own)");
|
eprintln!("solidcraft mcp: bridged to the running app at 127.0.0.1:{port} (--headless starts a session of its own)");
|
||||||
return serve_mcp(Box::new(solidcraft_mcp::Remote::new(&format!("127.0.0.1:{port}"), flag(args, "--token"))), scope);
|
return serve_mcp(Box::new(solidcraft_mcp::Remote::new(&format!("127.0.0.1:{port}"), flag(args, "--token"))), scope);
|
||||||
}
|
}
|
||||||
let mut headless = solidcraft_mcp::Headless::default();
|
let mut headless = solidcraft_mcp::Headless::default();
|
||||||
headless.session.param_check = param_check;
|
headless.session.param_check = param_check;
|
||||||
Box::new(headless)
|
if render_gpu {
|
||||||
|
headless.session.register_render_job_host(solidcraft_gpu::path::host().map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
if auto {
|
||||||
|
// The app may start after the agent: look for it again until there is work here.
|
||||||
|
Box::new(solidcraft_mcp::Auto::new(headless, Box::new(discover_app), flag(args, "--token")))
|
||||||
|
} else {
|
||||||
|
Box::new(headless)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
serve_mcp(backend, scope)
|
serve_mcp(backend, scope)
|
||||||
@@ -814,7 +843,7 @@ pub(crate) fn cmd_bench_open(args: &[String]) -> Result<(), String> {
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
let t = std::time::Instant::now();
|
let t = std::time::Instant::now();
|
||||||
let s = Session::opened(doc, saved.as_ref());
|
let s = Session::opened_at(doc, saved.as_ref(), (!step).then_some(path.as_str()));
|
||||||
drop(read);
|
drop(read);
|
||||||
// Taken from the file: nothing evaluated (SOLIDCRAFT_NO_MODEL_CACHE evaluates anyway), or
|
// Taken from the file: nothing evaluated (SOLIDCRAFT_NO_MODEL_CACHE evaluates anyway), or
|
||||||
// only the features whose state a thinned file left out.
|
// only the features whose state a thinned file left out.
|
||||||
|
|||||||
@@ -1,25 +1,89 @@
|
|||||||
//! Complete headless image-job workflow through the same engine commands as the UI/MCP.
|
//! Complete headless image-job workflow through the same engine commands as the UI/MCP.
|
||||||
use serde_json::json;
|
use serde_json::{Value, json};
|
||||||
use solidcraft_engine::{
|
use solidcraft_engine::{
|
||||||
doc::render_settings::RenderSetup,
|
Session,
|
||||||
render::job::{CpuHost, JobId, Phase},
|
doc::render_settings::{RenderJob, RenderSetup},
|
||||||
|
render::job::{CpuHost, JobId, Phase, ToneMap},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// Only explicit runtime CLI flags are stored here. A typed setup owns these
|
||||||
|
/// values even when a supplied flag happens to match the saved value.
|
||||||
|
#[derive(Default)]
|
||||||
|
struct RuntimeOptions {
|
||||||
|
progressive: bool,
|
||||||
|
transparent: bool,
|
||||||
|
samples: Option<u32>,
|
||||||
|
max_depth: Option<u32>,
|
||||||
|
seed: Option<u32>,
|
||||||
|
lighting: Option<String>,
|
||||||
|
tone_map: Option<ToneMap>,
|
||||||
|
environment: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RuntimeOptions {
|
||||||
|
fn explicit_flag(&self) -> Option<&'static str> {
|
||||||
|
[
|
||||||
|
(self.progressive, "--progressive"),
|
||||||
|
(self.transparent, "--transparent"),
|
||||||
|
(self.samples.is_some(), "--samples"),
|
||||||
|
(self.max_depth.is_some(), "--max-depth"),
|
||||||
|
(self.seed.is_some(), "--seed"),
|
||||||
|
(self.lighting.is_some(), "--lighting"),
|
||||||
|
(self.tone_map.is_some(), "--tone-map"),
|
||||||
|
(self.environment.is_some(), "--environment"),
|
||||||
|
]
|
||||||
|
.into_iter()
|
||||||
|
.find_map(|(present, flag)| present.then_some(flag))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn request(&self, session: &Session, settings: RenderSetup) -> Result<(Value, bool), String> {
|
||||||
|
if let Some(job) = &settings.job {
|
||||||
|
if let Some(flag) = self.explicit_flag() {
|
||||||
|
return Err(format!("{flag} cannot accompany a typed saved render setup; change the saved job options instead"));
|
||||||
|
}
|
||||||
|
settings.validate().map_err(|e| e.to_string())?;
|
||||||
|
session.doc.render.validate_resources(&settings).map_err(|e| e.to_string())?;
|
||||||
|
let needs_gpu = matches!(job, RenderJob::GpuPath { .. });
|
||||||
|
return Ok((json!({"settings":settings}), needs_gpu));
|
||||||
|
}
|
||||||
|
// Legacy setups and unnamed requests retain their runtime wire contract.
|
||||||
|
settings.validate().map_err(|e| e.to_string())?;
|
||||||
|
let mut params = json!({"settings":settings,"transparent_background":self.transparent,
|
||||||
|
"progressive":self.progressive,"samples":self.samples,"max_depth":self.max_depth,"seed":self.seed});
|
||||||
|
if let Some(path) = &self.lighting {
|
||||||
|
let text = solidcraft_engine::io::vfs::read_to_string(path, 65536).map_err(|e| format!("could not read lighting: {e}"))?;
|
||||||
|
let lighting: solidcraft_engine::render::job::StudioLighting = serde_json::from_str(&text).map_err(|e| e.to_string())?;
|
||||||
|
params["lighting"] = json!(lighting);
|
||||||
|
}
|
||||||
|
if let Some(tone_map) = self.tone_map {
|
||||||
|
params["tone_map"] = json!(tone_map);
|
||||||
|
}
|
||||||
|
if let Some(path) = &self.environment {
|
||||||
|
let text = solidcraft_engine::io::vfs::read_to_string(path, 65536).map_err(|e| format!("could not read environment: {e}"))?;
|
||||||
|
params["environment"] = serde_json::from_str(&text).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
Ok((params, self.progressive))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn run(args: &[String]) -> Result<(), String> {
|
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 input = args.first().filter(|p| !p.starts_with('-')).ok_or("render requires an input design or script")?;
|
||||||
let mut out = None;
|
let mut out = None;
|
||||||
let mut setup = None;
|
let mut setup = None;
|
||||||
let mut width = None;
|
let mut width = None;
|
||||||
let mut height = None;
|
let mut height = None;
|
||||||
let mut transparent = false;
|
let mut exposure = None;
|
||||||
|
let mut runtime = RuntimeOptions::default();
|
||||||
let mut overwrite = false;
|
let mut overwrite = false;
|
||||||
let mut timeout = 120u64;
|
let mut timeout = 120u64;
|
||||||
let mut i = 1;
|
let mut i = 1;
|
||||||
while let Some(arg) = args.get(i) {
|
while let Some(arg) = args.get(i) {
|
||||||
match arg.as_str() {
|
match arg.as_str() {
|
||||||
"--transparent" => transparent = true,
|
"--progressive" => runtime.progressive = true,
|
||||||
|
"--transparent" => runtime.transparent = true,
|
||||||
"--overwrite" => overwrite = true,
|
"--overwrite" => overwrite = true,
|
||||||
"--out" | "--setup" | "--width" | "--height" | "--timeout" => {
|
"--out" | "--setup" | "--width" | "--height" | "--timeout" | "--samples" | "--max-depth" | "--seed" | "--exposure" | "--lighting"
|
||||||
|
| "--tone-map" | "--environment" => {
|
||||||
i += 1;
|
i += 1;
|
||||||
let value = args.get(i).ok_or_else(|| format!("missing value for {arg}"))?;
|
let value = args.get(i).ok_or_else(|| format!("missing value for {arg}"))?;
|
||||||
match arg.as_str() {
|
match arg.as_str() {
|
||||||
@@ -27,6 +91,20 @@ pub fn run(args: &[String]) -> Result<(), String> {
|
|||||||
"--setup" => setup = Some(value.clone()),
|
"--setup" => setup = Some(value.clone()),
|
||||||
"--width" => width = Some(value.parse::<u32>().map_err(|_| "invalid width")?),
|
"--width" => width = Some(value.parse::<u32>().map_err(|_| "invalid width")?),
|
||||||
"--height" => height = Some(value.parse::<u32>().map_err(|_| "invalid height")?),
|
"--height" => height = Some(value.parse::<u32>().map_err(|_| "invalid height")?),
|
||||||
|
"--samples" => runtime.samples = Some(value.parse::<u32>().map_err(|_| "invalid samples")?),
|
||||||
|
"--max-depth" => runtime.max_depth = Some(value.parse::<u32>().map_err(|_| "invalid depth")?),
|
||||||
|
"--seed" => runtime.seed = Some(value.parse::<u32>().map_err(|_| "invalid seed")?),
|
||||||
|
"--exposure" => exposure = Some(value.parse::<f64>().map_err(|_| "invalid exposure")?),
|
||||||
|
// Defer file reads until a saved job has rejected conflicting controls.
|
||||||
|
"--environment" => runtime.environment = Some(value.clone()),
|
||||||
|
"--lighting" => runtime.lighting = Some(value.clone()),
|
||||||
|
"--tone-map" => {
|
||||||
|
runtime.tone_map = Some(match value.as_str() {
|
||||||
|
"reinhard" => ToneMap::Reinhard,
|
||||||
|
"aces_fitted" => ToneMap::AcesFitted,
|
||||||
|
_ => return Err("tone-map must be reinhard or aces_fitted".into()),
|
||||||
|
})
|
||||||
|
}
|
||||||
_ => timeout = value.parse::<u64>().map_err(|_| "invalid timeout")?,
|
_ => timeout = value.parse::<u64>().map_err(|_| "invalid timeout")?,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -39,18 +117,10 @@ pub fn run(args: &[String]) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
let out = out.ok_or("render requires --out FILE.png")?;
|
let out = out.ok_or("render requires --out FILE.png")?;
|
||||||
let mut session = crate::load(input)?;
|
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())?;
|
let mut settings = if let Some(name) = setup.as_deref() {
|
||||||
session.execute("render.scene", &json!({})).map_err(|e| e.to_string())?;
|
session.doc.render.setups.get(name).cloned().ok_or("no saved render setup with that name")?
|
||||||
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 {
|
} else {
|
||||||
let mut settings = RenderSetup::default();
|
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 {
|
if let Some(width) = width {
|
||||||
settings.width = width;
|
settings.width = width;
|
||||||
@@ -58,7 +128,27 @@ pub fn run(args: &[String]) -> Result<(), String> {
|
|||||||
if let Some(height) = height {
|
if let Some(height) = height {
|
||||||
settings.height = height;
|
settings.height = height;
|
||||||
}
|
}
|
||||||
let params = json!({"settings":settings,"transparent_background":transparent});
|
if let Some(exposure) = exposure {
|
||||||
|
settings.exposure_ev = exposure;
|
||||||
|
}
|
||||||
|
// Resolve saved intent before opening a GPU or explicitly settling geometry.
|
||||||
|
// Width/height/exposure only change this validated inline settings clone.
|
||||||
|
let (mut params, needs_gpu) = runtime.request(&session, settings)?;
|
||||||
|
session.set_render_job_host(Some(CpuHost::for_platform().map_err(|e| e.to_string())?)).map_err(|e| e.to_string())?;
|
||||||
|
if needs_gpu {
|
||||||
|
session.register_render_job_host(solidcraft_gpu::path::host().map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
session.execute("render.scene", &json!({})).map_err(|e| e.to_string())?;
|
||||||
|
if setup.is_none() {
|
||||||
|
let camera = if let Some(camera) = session.camera {
|
||||||
|
camera
|
||||||
|
} else {
|
||||||
|
let mut camera = RenderSetup::default().camera;
|
||||||
|
camera.fit(&solidcraft_engine::product_scene::extract(&session).map_err(|e| e.to_string())?.bounds);
|
||||||
|
camera
|
||||||
|
};
|
||||||
|
params["settings"]["camera"] = json!(camera);
|
||||||
|
}
|
||||||
let preflight = session.execute("render.preflight", ¶ms).map_err(|e| e.to_string())?;
|
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 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 id: JobId = serde_json::from_value(started["job"].clone()).map_err(|e| e.to_string())?;
|
||||||
|
|||||||
@@ -395,8 +395,10 @@ fn actions(s: &Session) -> Vec<Action> {
|
|||||||
let r = round3((shortest * 0.1).max(0.01));
|
let r = round3((shortest * 0.1).max(0.01));
|
||||||
let mut add = |action, act| out.push(Action { entity: entity.clone(), action, act });
|
let mut add = |action, act| out.push(Action { entity: entity.clone(), action, act });
|
||||||
if !smooth(e, mid) {
|
if !smooth(e, mid) {
|
||||||
add("edge.fillet", Act::Run("solid.fillet", json!({"edges": [pt(mid)], "radius": r})));
|
// The midpoint is interior to this edge, but other bodies (including component
|
||||||
add("edge.chamfer", Act::Run("solid.chamfer", json!({"edges": [pt(mid)], "distance": r})));
|
// copies in their local frames) can have coincident edges. Retain the picked body.
|
||||||
|
add("edge.fillet", Act::Run("solid.fillet", json!({"body": world, "edges": [pt(mid)], "radius": r})));
|
||||||
|
add("edge.chamfer", Act::Run("solid.chamfer", json!({"body": world, "edges": [pt(mid)], "distance": r})));
|
||||||
}
|
}
|
||||||
let dir = straight(pts);
|
let dir = straight(pts);
|
||||||
if dir.is_some() {
|
if dir.is_some() {
|
||||||
@@ -1278,6 +1280,41 @@ fn rectangle(plane: Value, p0: [f64; 2], p1: [f64; 2]) -> [Value; 3] {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn edge_round_actions_keep_the_picked_body() {
|
||||||
|
for (corner, length) in [([10, 0, 20], 4), ([0, 0, 0], 20)] {
|
||||||
|
let mut s = Session::default();
|
||||||
|
s.execute("solid.box", &json!({"length": 20, "width": 20, "height": 20, "body_name": "Plate"})).unwrap();
|
||||||
|
s.execute(
|
||||||
|
"solid.box",
|
||||||
|
&json!({"corner": corner, "length": length, "width": length, "height": length, "body_name": "Block", "operation": "new"}),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let mut tried = 0;
|
||||||
|
for a in actions(&s) {
|
||||||
|
if !a.entity.starts_with("Plate/") || !matches!(a.action, "edge.chamfer" | "edge.fillet") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let Act::Run(id, ref p) = a.act else { continue };
|
||||||
|
let q = &p["edges"][0];
|
||||||
|
let x = q[0].as_f64().unwrap();
|
||||||
|
if q[1] != 0.0 || q[2] != 20.0 || !(0.0..20.0).contains(&x) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// Block either meets this midpoint or coincides with the whole edge.
|
||||||
|
assert_eq!(p["body"], "Plate", "{}: {p}", a.action);
|
||||||
|
assert_eq!(q, &json!([10.0, 0.0, 20.0]));
|
||||||
|
let mut unscoped = p.clone();
|
||||||
|
unscoped.as_object_mut().unwrap().remove("body");
|
||||||
|
let err = s.scratch().execute(id, &unscoped).unwrap_err().to_string();
|
||||||
|
assert!(err.contains("edges meet"), "{err}");
|
||||||
|
perform(&mut s.scratch(), &a.act, &errors(&s)).unwrap();
|
||||||
|
tried += 1;
|
||||||
|
}
|
||||||
|
assert_eq!(tried, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_fillet_or_chamfer_on_one_edge_ending_at_a_cylinder() {
|
fn a_fillet_or_chamfer_on_one_edge_ending_at_a_cylinder() {
|
||||||
for (cmd, size) in [("solid.fillet", "radius"), ("solid.chamfer", "distance")] {
|
for (cmd, size) in [("solid.fillet", "radius"), ("solid.chamfer", "distance")] {
|
||||||
|
|||||||
@@ -144,3 +144,16 @@ fn fuzz_refuses_an_argument_it_does_not_take() {
|
|||||||
assert!(stderr.contains(arg), "`fuzz {arg}`: {stderr}");
|
assert!(stderr.contains(arg), "`fuzz {arg}`: {stderr}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn render_help_keeps_the_registered_gpu_request_controls() {
|
||||||
|
for args in [vec!["--help"], vec!["render", "--help"]] {
|
||||||
|
let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(&args).output().unwrap();
|
||||||
|
assert!(output.status.success(), "{args:?}: {}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
assert!(output.stderr.is_empty());
|
||||||
|
let stdout = String::from_utf8_lossy(&output.stdout);
|
||||||
|
for flag in ["--progressive", "--samples", "--max-depth", "--seed", "--exposure", "--lighting", "--environment", "--tone-map"] {
|
||||||
|
assert!(stdout.contains(flag), "{args:?} lost {flag}: {stdout}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -139,11 +139,13 @@ fn eval_json_out_holds_what_stdout_would() {
|
|||||||
fn json_out_needs_a_file_and_fails_when_it_cannot_write() {
|
fn json_out_needs_a_file_and_fails_when_it_cannot_write() {
|
||||||
let dir = Scratch::new();
|
let dir = Scratch::new();
|
||||||
let script = dir.script();
|
let script = dir.script();
|
||||||
for cmd in ["run", "eval"] {
|
for cmd in ["run", "eval", "inspect"] {
|
||||||
let output = cli().arg(cmd).arg(&script).arg("--json-out").output().unwrap();
|
for trailing in [&[][..], &["--in"][..]] {
|
||||||
assert_eq!(output.status.code(), Some(1), "{cmd}");
|
let output = cli().arg(cmd).arg(&script).arg("--json-out").args(trailing).output().unwrap();
|
||||||
assert!(String::from_utf8_lossy(&output.stderr).contains("--json-out needs a FILE"), "{cmd}");
|
assert_eq!(output.status.code(), Some(1), "{cmd}");
|
||||||
assert!(output.stdout.is_empty(), "{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 missing = dir.0.join("missing").join("out.json");
|
||||||
let output = cli().arg(cmd).arg(&script).arg("--json-out").arg(&missing).output().unwrap();
|
let output = cli().arg(cmd).arg(&script).arg("--json-out").arg(&missing).output().unwrap();
|
||||||
|
|||||||
@@ -151,3 +151,115 @@ fn mcp_without_arguments_finds_the_running_app() {
|
|||||||
assert!(!String::from_utf8_lossy(&out.stderr).contains("bridged to the running app"), "{}", String::from_utf8_lossy(&out.stderr));
|
assert!(!String::from_utf8_lossy(&out.stderr).contains("bridged to the running app"), "{}", String::from_utf8_lossy(&out.stderr));
|
||||||
std::fs::remove_dir_all(&control_dir).ok();
|
std::fs::remove_dir_all(&control_dir).ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `mcp setup` against a temporary home: the client folders it finds are the only ones it writes.
|
||||||
|
mod setup {
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
fn home(name: &str) -> PathBuf {
|
||||||
|
let h = std::env::temp_dir().join(format!("solidcraft-mcp-setup-{name}-{}", std::process::id()));
|
||||||
|
let _ = std::fs::remove_dir_all(&h);
|
||||||
|
std::fs::create_dir_all(&h).unwrap();
|
||||||
|
h
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(home: &Path, args: &[&str]) -> std::process::Output {
|
||||||
|
Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
|
||||||
|
.args(["mcp", "setup"])
|
||||||
|
.args(args)
|
||||||
|
.env_clear()
|
||||||
|
.env("HOME", home)
|
||||||
|
.env("USERPROFILE", home)
|
||||||
|
.env("APPDATA", home.join("AppData/Roaming"))
|
||||||
|
.env("LOCALAPPDATA", home.join("AppData/Local"))
|
||||||
|
.env("XDG_CONFIG_HOME", home.join(".config"))
|
||||||
|
.env("PATH", "")
|
||||||
|
.output()
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn json_of(p: &Path) -> Value {
|
||||||
|
serde_json::from_str(&std::fs::read_to_string(p).unwrap()).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exe() -> String {
|
||||||
|
let p = Path::new(env!("CARGO_BIN_EXE_solidcraft-cli")).canonicalize().unwrap();
|
||||||
|
p.to_string_lossy().trim_start_matches(r"\\?\").to_owned()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn merges_into_opencode_and_cursor_keeping_other_servers() {
|
||||||
|
let h = home("merge");
|
||||||
|
let oc = h.join(".config/opencode");
|
||||||
|
std::fs::create_dir_all(&oc).unwrap();
|
||||||
|
let old = json!({"$schema": "https://opencode.ai/config.json", "theme": "x", "mcp": {"other": {"type": "local", "command": ["o"]}}});
|
||||||
|
std::fs::write(oc.join("opencode.json"), old.to_string()).unwrap();
|
||||||
|
std::fs::create_dir_all(h.join(".cursor")).unwrap();
|
||||||
|
std::fs::write(h.join(".cursor/mcp.json"), r#"{"mcpServers": {"other": {"command": "o"}}}"#).unwrap();
|
||||||
|
|
||||||
|
let out = run(&h, &["--live"]);
|
||||||
|
assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
|
||||||
|
let v = json_of(&oc.join("opencode.json"));
|
||||||
|
assert_eq!(v["theme"], "x");
|
||||||
|
assert_eq!(v["mcp"]["other"], old["mcp"]["other"]);
|
||||||
|
assert_eq!(v["mcp"]["solidcraft"], json!({"type": "local", "command": [exe(), "mcp"], "enabled": true}));
|
||||||
|
assert_eq!(v["mcp"]["solidcraft-live"]["command"], json!([exe(), "mcp", "--connect", "127.0.0.1:7878"]));
|
||||||
|
assert_eq!(json_of(&oc.join("opencode.json.bak")), old);
|
||||||
|
let c = json_of(&h.join(".cursor/mcp.json"));
|
||||||
|
assert_eq!(c["mcpServers"]["other"], json!({"command": "o"}));
|
||||||
|
assert_eq!(c["mcpServers"]["solidcraft"], json!({"command": exe(), "args": ["mcp"]}));
|
||||||
|
|
||||||
|
// Codex (TOML) and Claude Code (a big file the CLI owns) are edited in place too.
|
||||||
|
std::fs::create_dir_all(h.join(".codex")).unwrap();
|
||||||
|
std::fs::write(h.join(".codex/config.toml"), "# mine\nmodel = \"x\"\n").unwrap();
|
||||||
|
let cc = "{\n \"numStartups\": 3,\n \"projects\": {}\n}\n";
|
||||||
|
std::fs::write(h.join(".claude.json"), cc).unwrap();
|
||||||
|
assert!(run(&h, &[]).status.success());
|
||||||
|
let toml = std::fs::read_to_string(h.join(".codex/config.toml")).unwrap();
|
||||||
|
assert!(toml.starts_with("# mine\nmodel = \"x\"\n") && toml.contains("[mcp_servers.solidcraft]"), "{toml}");
|
||||||
|
let c = json_of(&h.join(".claude.json"));
|
||||||
|
assert_eq!(c["numStartups"], 3);
|
||||||
|
assert_eq!(c["mcpServers"]["solidcraft"], json!({"type": "stdio", "command": exe(), "args": ["mcp"]}));
|
||||||
|
assert_eq!(std::fs::read_to_string(h.join(".claude.json.bak")).unwrap(), cc);
|
||||||
|
|
||||||
|
// Running again updates the same entries and leaves one of each.
|
||||||
|
assert!(run(&h, &[]).status.success());
|
||||||
|
assert_eq!(json_of(&h.join(".cursor/mcp.json"))["mcpServers"].as_object().unwrap().len(), 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn dry_run_writes_nothing_and_missing_clients_are_skipped() {
|
||||||
|
let h = home("dry");
|
||||||
|
std::fs::create_dir_all(h.join(".cursor")).unwrap();
|
||||||
|
let out = run(&h, &["--dry-run"]);
|
||||||
|
assert!(out.status.success());
|
||||||
|
let text = String::from_utf8_lossy(&out.stdout);
|
||||||
|
assert!(text.contains("would write") && text.contains("solidcraft"), "{text}");
|
||||||
|
assert!(!h.join(".cursor/mcp.json").exists());
|
||||||
|
assert!(!h.join(".config/opencode").exists(), "OpenCode was not installed, so nothing is created for it");
|
||||||
|
let out = run(&h, &["--client", "claude-desktop"]);
|
||||||
|
assert!(String::from_utf8_lossy(&out.stdout).contains("not found"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_file_that_is_not_json_is_left_alone() {
|
||||||
|
let h = home("bad");
|
||||||
|
std::fs::create_dir_all(h.join(".cursor")).unwrap();
|
||||||
|
std::fs::write(h.join(".cursor/mcp.json"), "{ // comment").unwrap();
|
||||||
|
let out = run(&h, &[]);
|
||||||
|
assert!(!out.status.success());
|
||||||
|
assert_eq!(std::fs::read_to_string(h.join(".cursor/mcp.json")).unwrap(), "{ // comment");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn claude_desktop_msix_folder_is_found() {
|
||||||
|
let h = home("msix");
|
||||||
|
let pkg = h.join("AppData/Local/Packages/Claude_abc/LocalCache/Roaming/Claude");
|
||||||
|
std::fs::create_dir_all(&pkg).unwrap();
|
||||||
|
// The MSIX folder is only read through LOCALAPPDATA, set for every platform here.
|
||||||
|
assert!(run(&h, &["--client", "claude-desktop"]).status.success());
|
||||||
|
assert!(json_of(&pkg.join("claude_desktop_config.json"))["mcpServers"]["solidcraft"].is_object());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
//! Explicit native GPU registration must not change bridged MCP ownership.
|
||||||
|
use std::process::Command;
|
||||||
|
#[test]
|
||||||
|
fn connected_application_rejects_headless_gpu_installation_before_connecting() {
|
||||||
|
let result = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(["mcp", "--render-gpu", "--connect", "127.0.0.1:1"]).output().unwrap();
|
||||||
|
assert!(!result.status.success());
|
||||||
|
let message = String::from_utf8_lossy(&result.stderr);
|
||||||
|
assert!(message.contains("connected application owns its own device"), "{message}");
|
||||||
|
}
|
||||||
@@ -22,6 +22,19 @@ impl Scratch {
|
|||||||
std::fs::write(&path, json!({"commands": [{"command": "solid.box", "params": {"length": 2, "width": 3, "height": 4}}]}).to_string()).unwrap();
|
std::fs::write(&path, json!({"commands": [{"command": "solid.box", "params": {"length": 2, "width": 3, "height": 4}}]}).to_string()).unwrap();
|
||||||
path
|
path
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn saving_script(&self) -> (PathBuf, PathBuf) {
|
||||||
|
let path = self.0.join("saving.json");
|
||||||
|
let saved = self.0.join("script-ran.solidcraft");
|
||||||
|
std::fs::write(
|
||||||
|
&path,
|
||||||
|
json!({"commands": [{"command": "solid.box", "params": {"length": 2, "width": 3, "height": 4}},
|
||||||
|
{"command": "file.save_as", "params": {"path": saved}}]})
|
||||||
|
.to_string(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
(path, saved)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Drop for Scratch {
|
impl Drop for Scratch {
|
||||||
@@ -43,6 +56,92 @@ fn body_count(path: &Path) -> Value {
|
|||||||
json_output(cli().arg("eval").arg(path).output().unwrap())["body_count"].clone()
|
json_output(cli().arg("eval").arg(path).output().unwrap())["body_count"].clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn run_rejects_invalid_options_before_script_execution_or_output_writes() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let (script, script_saved) = dir.saving_script();
|
||||||
|
let cases = [
|
||||||
|
(&["--out"][..], "--out needs a value"),
|
||||||
|
(&["--save"][..], "--save needs a value"),
|
||||||
|
(&["--in"][..], "--in needs a value"),
|
||||||
|
(&["--out", "--quiet"][..], "--out needs a value"),
|
||||||
|
(&["--ouut", "part.step"][..], "doesn't take --ouut"),
|
||||||
|
(&["--unknown"][..], "doesn't take --unknown"),
|
||||||
|
];
|
||||||
|
for existing in [false, true] {
|
||||||
|
let saved = dir.0.join(format!("{existing}.solidcraft"));
|
||||||
|
let exported = dir.0.join(format!("{existing}.step"));
|
||||||
|
let report = dir.0.join(format!("{existing}.json"));
|
||||||
|
let outputs = [&saved, &exported, &report];
|
||||||
|
if existing {
|
||||||
|
for path in outputs {
|
||||||
|
std::fs::write(path, b"existing output").unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (extra, message) in cases {
|
||||||
|
let output = cli()
|
||||||
|
.arg("run")
|
||||||
|
.arg(&script)
|
||||||
|
.arg("--save")
|
||||||
|
.arg(&saved)
|
||||||
|
.arg("--out")
|
||||||
|
.arg(&exported)
|
||||||
|
.arg("--json-out")
|
||||||
|
.arg(&report)
|
||||||
|
.args(extra)
|
||||||
|
.output()
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{extra:?}");
|
||||||
|
assert!(String::from_utf8_lossy(&output.stderr).contains(message), "{extra:?}: {}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
assert!(output.stdout.is_empty());
|
||||||
|
assert!(!script_saved.exists(), "invalid arguments must be rejected before the script runs");
|
||||||
|
for path in outputs {
|
||||||
|
if existing {
|
||||||
|
assert_eq!(std::fs::read(path).unwrap(), b"existing output");
|
||||||
|
} else {
|
||||||
|
assert!(!path.exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn eval_and_inspect_reject_invalid_options_before_script_execution_or_reporting() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let (script, script_saved) = dir.saving_script();
|
||||||
|
let cases = [
|
||||||
|
(&["--in"][..], "--in needs a value"),
|
||||||
|
(&["--in", "--quiet"][..], "--in needs a value"),
|
||||||
|
(&["--out", "part.step"][..], "doesn't take --out"),
|
||||||
|
(&["--unknown"][..], "doesn't take --unknown"),
|
||||||
|
];
|
||||||
|
for command in ["eval", "inspect"] {
|
||||||
|
for existing in [false, true] {
|
||||||
|
let report = dir.0.join(format!("{command}-{existing}.json"));
|
||||||
|
if existing {
|
||||||
|
std::fs::write(&report, b"existing report").unwrap();
|
||||||
|
}
|
||||||
|
for (extra, message) in cases {
|
||||||
|
let output = cli().arg(command).arg(&script).arg("--json-out").arg(&report).args(extra).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{command} {extra:?}");
|
||||||
|
assert!(
|
||||||
|
String::from_utf8_lossy(&output.stderr).contains(message),
|
||||||
|
"{command} {extra:?}: {}",
|
||||||
|
String::from_utf8_lossy(&output.stderr)
|
||||||
|
);
|
||||||
|
assert!(output.stdout.is_empty());
|
||||||
|
assert!(!script_saved.exists(), "invalid arguments must be rejected before the script runs");
|
||||||
|
if existing {
|
||||||
|
assert_eq!(std::fs::read(&report).unwrap(), b"existing report");
|
||||||
|
} else {
|
||||||
|
assert!(!report.exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn cli_loads_both_design_encodings_by_contents() {
|
fn cli_loads_both_design_encodings_by_contents() {
|
||||||
let dir = Scratch::new();
|
let dir = Scratch::new();
|
||||||
@@ -59,6 +158,84 @@ fn cli_loads_both_design_encodings_by_contents() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// #1369: a pending concept that did not land in the numbered release must not be silently
|
||||||
|
/// dropped on open/resave, in either encoding or before replacing an existing destination.
|
||||||
|
#[test]
|
||||||
|
fn unknown_pending_concepts_preserve_the_open_design_and_output_files() {
|
||||||
|
use solidcraft_engine::{Session, doc, io};
|
||||||
|
|
||||||
|
let dir = Scratch::new();
|
||||||
|
for version in [33, doc::format::FORMAT] {
|
||||||
|
let mut experimental = doc::Document::new("Experimental");
|
||||||
|
experimental.format = doc::format::format_string(version);
|
||||||
|
experimental.format_pending.push("experimental-card".into());
|
||||||
|
for (extension, bytes) in [("json", io::write_design(&experimental)), ("solidcraft", io::write_design_container(&experimental).unwrap())] {
|
||||||
|
let source = dir.0.join(format!("experimental-{version}.{extension}"));
|
||||||
|
std::fs::write(&source, &bytes).unwrap();
|
||||||
|
let mut session = Session::default();
|
||||||
|
session.execute("solid.box", &json!({"length": 2, "width": 3, "height": 4})).unwrap();
|
||||||
|
let original = session.doc.clone();
|
||||||
|
let original_path = session.path.clone();
|
||||||
|
let undo = session.undo.len();
|
||||||
|
let dirty = session.is_dirty();
|
||||||
|
let err = session.execute("doc.open", &json!({"path": source})).unwrap_err().to_string();
|
||||||
|
assert!(err.contains("experimental-card") && err.contains("update SolidCraft"), "{err}");
|
||||||
|
assert_eq!(session.doc, original);
|
||||||
|
assert_eq!(session.path, original_path);
|
||||||
|
assert_eq!(session.undo.len(), undo);
|
||||||
|
assert_eq!(session.is_dirty(), dirty);
|
||||||
|
|
||||||
|
for existing in [false, true] {
|
||||||
|
let destination = dir.0.join(format!("output-{version}-{extension}-{existing}.{extension}"));
|
||||||
|
let backup = io::backup_path(&destination);
|
||||||
|
if existing {
|
||||||
|
std::fs::write(&destination, b"existing design").unwrap();
|
||||||
|
std::fs::write(&backup, b"existing backup").unwrap();
|
||||||
|
}
|
||||||
|
let output = cli().args(["run", "--in"]).arg(&source).arg("--save").arg(&destination).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
let error = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert!(error.contains("experimental-card") && error.contains("update SolidCraft"), "{error}");
|
||||||
|
if existing {
|
||||||
|
assert_eq!(std::fs::read(&destination).unwrap(), b"existing design");
|
||||||
|
assert_eq!(std::fs::read(&backup).unwrap(), b"existing backup");
|
||||||
|
} else {
|
||||||
|
assert!(!destination.exists() && !backup.exists());
|
||||||
|
}
|
||||||
|
assert_eq!(std::fs::read(&source).unwrap(), bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn known_pending_concepts_and_released_files_round_trip_with_inert_metadata() {
|
||||||
|
use solidcraft_engine::{doc, io};
|
||||||
|
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let current = doc::Document::new("Supported");
|
||||||
|
let mut released = current.clone();
|
||||||
|
released.format = doc::format::format_string(33);
|
||||||
|
released.format_pending.clear();
|
||||||
|
let mut experimental = released.clone();
|
||||||
|
experimental.format_pending.push("reserved-body-names".into());
|
||||||
|
for (index, mut document) in [current, released, experimental].into_iter().enumerate() {
|
||||||
|
document.metadata.0.insert("com.example.tool".into(), json!({"format_pending": ["experimental-card"], "physical_card": {"density": 700}}));
|
||||||
|
for (extension, bytes) in [("json", io::write_design(&document)), ("solidcraft", io::write_design_container(&document).unwrap())] {
|
||||||
|
let source = dir.0.join(format!("supported-{index}.{extension}"));
|
||||||
|
let destination = dir.0.join(format!("resaved-{index}.{extension}"));
|
||||||
|
std::fs::write(&source, &bytes).unwrap();
|
||||||
|
let output = cli().args(["run", "--in"]).arg(&source).arg("--save").arg(&destination).output().unwrap();
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
let reopened = io::read_design(&std::fs::read(&destination).unwrap()).unwrap();
|
||||||
|
assert_eq!(reopened.metadata, document.metadata);
|
||||||
|
assert_eq!(reopened.name, document.name);
|
||||||
|
assert_eq!(reopened.features, document.features);
|
||||||
|
assert_eq!(std::fs::read(&source).unwrap(), bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn results_still_save_and_export_the_script_once() {
|
fn results_still_save_and_export_the_script_once() {
|
||||||
let dir = Scratch::new();
|
let dir = Scratch::new();
|
||||||
@@ -90,6 +267,110 @@ fn results_with_base_design_and_quiet_still_report_and_save() {
|
|||||||
assert_eq!(body_count(&base), 1);
|
assert_eq!(body_count(&base), 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `eval` and its alias must measure the script applied to the input design, rather than
|
||||||
|
/// silently reporting the input alone (#6861).
|
||||||
|
#[test]
|
||||||
|
fn eval_runs_its_script_on_the_in_design() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let base = dir.0.join("base.solidcraft");
|
||||||
|
let script = dir.0.join("add.json");
|
||||||
|
json_output(cli().arg("run").arg(dir.script()).arg("--save").arg(&base).output().unwrap());
|
||||||
|
let original = std::fs::read(&base).unwrap();
|
||||||
|
std::fs::write(
|
||||||
|
&script,
|
||||||
|
json!({"commands": [{"command": "solid.box", "params": {"length": 5, "width": 3, "height": 4, "corner": [10, 0, 0]}}]}).to_string(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
for command in ["eval", "inspect"] {
|
||||||
|
// Both existing one-input forms still measure just the original body.
|
||||||
|
for input in [&base, &dir.script()] {
|
||||||
|
for named_input in [false, true] {
|
||||||
|
let mut c = cli();
|
||||||
|
c.arg(command);
|
||||||
|
if named_input {
|
||||||
|
c.arg("--in");
|
||||||
|
}
|
||||||
|
let measured = json_output(c.arg(input).output().unwrap());
|
||||||
|
assert_eq!(measured["body_count"], 1);
|
||||||
|
assert!((measured["total"]["volume_mm3"].as_f64().unwrap() - 24.0).abs() < 1e-6);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for input_first in [false, true] {
|
||||||
|
for to_file in [false, true] {
|
||||||
|
let mut c = cli();
|
||||||
|
c.arg(command);
|
||||||
|
if input_first {
|
||||||
|
c.arg("--in").arg(&base).arg(&script);
|
||||||
|
} else {
|
||||||
|
c.arg(&script).arg("--in").arg(&base);
|
||||||
|
}
|
||||||
|
let report = dir.0.join("measurement.json");
|
||||||
|
if to_file {
|
||||||
|
c.arg("--json-out").arg(&report);
|
||||||
|
}
|
||||||
|
let output = c.output().unwrap();
|
||||||
|
let measured = if to_file {
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
assert!(output.stdout.is_empty());
|
||||||
|
serde_json::from_slice(&std::fs::read(&report).unwrap()).unwrap()
|
||||||
|
} else {
|
||||||
|
json_output(output)
|
||||||
|
};
|
||||||
|
assert_eq!(measured["body_count"], 2, "{command}, input_first={input_first}, to_file={to_file}");
|
||||||
|
assert!((measured["total"]["volume_mm3"].as_f64().unwrap() - 84.0).abs() < 1e-6);
|
||||||
|
assert_eq!(measured["timeline"].as_array().unwrap().len(), 2, "the script runs exactly once");
|
||||||
|
assert_eq!(std::fs::read(&base).unwrap(), original, "evaluation never saves its changes to the input");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn eval_propagates_script_errors_before_writing_a_report() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let base = dir.script();
|
||||||
|
let script = dir.0.join("bad.json");
|
||||||
|
for command in ["eval", "inspect"] {
|
||||||
|
for contents in ["{", r#"{"commands":[{"command":"missing.command","params":{}}]}"#] {
|
||||||
|
std::fs::write(&script, contents).unwrap();
|
||||||
|
let report = dir.0.join("report.json");
|
||||||
|
let output = cli().arg(command).arg(&script).arg("--in").arg(&base).arg("--json-out").arg(&report).output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
assert!(!output.stderr.is_empty());
|
||||||
|
assert!(output.stdout.is_empty());
|
||||||
|
assert!(!report.exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn eval_rejects_unknown_options_and_missing_input_values_before_writing_a_report() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = dir.script();
|
||||||
|
let report = dir.0.join("report.json");
|
||||||
|
for command in ["eval", "inspect"] {
|
||||||
|
for (options, message) in [(&["--frobnicate", "1"][..], "doesn't take --frobnicate"), (&["--in"][..], "--in needs a value")] {
|
||||||
|
for options_first in [false, true] {
|
||||||
|
std::fs::write(&report, b"previous report").unwrap();
|
||||||
|
let mut c = cli();
|
||||||
|
c.arg(command);
|
||||||
|
if options_first {
|
||||||
|
c.args(options).arg("--json-out").arg(&report).arg(&script);
|
||||||
|
} else {
|
||||||
|
c.arg(&script).args(options).arg("--json-out").arg(&report);
|
||||||
|
}
|
||||||
|
// A following option also proves that --in cannot consume a flag as its value.
|
||||||
|
let output = c.output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1), "{command}, {options:?}");
|
||||||
|
let error = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert!(error.contains(message), "{command}: {error}");
|
||||||
|
assert!(output.stdout.is_empty());
|
||||||
|
assert_eq!(std::fs::read(&report).unwrap(), b"previous report");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn results_propagate_output_errors() {
|
fn results_propagate_output_errors() {
|
||||||
let dir = Scratch::new();
|
let dir = Scratch::new();
|
||||||
@@ -209,3 +490,175 @@ fn timings_and_profile_report_each_command() {
|
|||||||
assert!(!output.status.success());
|
assert!(!output.status.success());
|
||||||
assert!(String::from_utf8_lossy(&output.stderr).contains("--timings needs a script"));
|
assert!(String::from_utf8_lossy(&output.stderr).contains("--timings needs a script"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn render_setup_script(dir: &Scratch, job: Value) -> PathBuf {
|
||||||
|
let path = dir.0.join("render.json");
|
||||||
|
std::fs::write(
|
||||||
|
&path,
|
||||||
|
json!({"commands":[
|
||||||
|
{"command":"solid.box","params":{"length":10,"width":10,"height":10}},
|
||||||
|
{"command":"render.settings.set","params":{"name":"Portable setup","set":{"width":16,"height":16,"job":job}}}
|
||||||
|
]})
|
||||||
|
.to_string(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
path
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "raytrace-cpu")]
|
||||||
|
#[test]
|
||||||
|
fn render_uses_typed_cpu_setups_from_scripts_and_saved_designs() {
|
||||||
|
for options in [json!({}), json!({"progressive":{"samples_per_pixel":3,"seed":81},"lights":[]})] {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = render_setup_script(&dir, json!({"method":"cpu_raytrace","options":options}));
|
||||||
|
let image = dir.0.join("script.png");
|
||||||
|
let result = json_output(
|
||||||
|
cli()
|
||||||
|
.arg("render")
|
||||||
|
.arg(&script)
|
||||||
|
.args(["--setup", "Portable setup", "--out"])
|
||||||
|
.arg(&image)
|
||||||
|
.env("SOLIDCRAFT_GPU", "must-not-be-read-for-cpu")
|
||||||
|
.output()
|
||||||
|
.unwrap(),
|
||||||
|
);
|
||||||
|
assert_eq!(result["preflight"]["resolved"]["executor"], "cpu-raytrace");
|
||||||
|
assert_eq!(result["export"]["frame"]["executor"], "cpu-raytrace");
|
||||||
|
assert_eq!(result["preflight"]["request"]["integrator"], "raytrace");
|
||||||
|
assert_eq!(result["preflight"]["request"]["raytrace"].get("progressive"), options.get("progressive"));
|
||||||
|
let png = image::load_from_memory(&std::fs::read(&image).unwrap()).unwrap();
|
||||||
|
assert_eq!((png.width(), png.height()), (16, 16));
|
||||||
|
|
||||||
|
let saved = dir.0.join("portable.solidcraft");
|
||||||
|
json_output(cli().arg("run").arg(&script).arg("--save").arg(&saved).output().unwrap());
|
||||||
|
let original = std::fs::read(&saved).unwrap();
|
||||||
|
let overridden = dir.0.join("overridden.png");
|
||||||
|
let result = json_output(
|
||||||
|
cli()
|
||||||
|
.arg("render")
|
||||||
|
.arg(&saved)
|
||||||
|
.args(["--setup", "Portable setup", "--out"])
|
||||||
|
.arg(&overridden)
|
||||||
|
.args(["--width", "12", "--height", "8", "--exposure", "1.25"])
|
||||||
|
.env("SOLIDCRAFT_GPU", "must-not-be-read-for-cpu")
|
||||||
|
.output()
|
||||||
|
.unwrap(),
|
||||||
|
);
|
||||||
|
assert_eq!(result["preflight"]["request"]["width"], 12);
|
||||||
|
assert_eq!(result["preflight"]["request"]["height"], 8);
|
||||||
|
assert_eq!(result["preflight"]["request"]["raytrace"]["exposure_ev"], 1.25);
|
||||||
|
assert_eq!(result["export"]["frame"]["executor"], "cpu-raytrace");
|
||||||
|
assert_eq!(result["preflight"]["request"]["raytrace"].get("progressive"), options.get("progressive"));
|
||||||
|
let png = image::load_from_memory(&std::fs::read(overridden).unwrap()).unwrap();
|
||||||
|
assert_eq!((png.width(), png.height()), (12, 8));
|
||||||
|
assert_eq!(std::fs::read(saved).unwrap(), original, "CLI overrides must not rewrite saved intent");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn render_preserves_typed_raster_and_legacy_runtime_controls() {
|
||||||
|
for job in [Value::Null, json!({"method":"raster","transparent_background":true})] {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = render_setup_script(&dir, job.clone());
|
||||||
|
let out = dir.0.join("raster.png");
|
||||||
|
let mut command = cli();
|
||||||
|
command
|
||||||
|
.arg("render")
|
||||||
|
.arg(&script)
|
||||||
|
.args(["--setup", "Portable setup", "--out"])
|
||||||
|
.arg(&out)
|
||||||
|
.env("SOLIDCRAFT_GPU", "must-not-be-read-for-raster");
|
||||||
|
if job.is_null() {
|
||||||
|
command.arg("--transparent");
|
||||||
|
}
|
||||||
|
let result = json_output(command.output().unwrap());
|
||||||
|
assert_eq!(result["preflight"]["resolved"]["executor"], "cpu-product");
|
||||||
|
assert_eq!(result["export"]["frame"]["executor"], "cpu-product");
|
||||||
|
assert_eq!(result["preflight"]["request"]["transparent_background"], true);
|
||||||
|
assert!(std::fs::read(out).unwrap().starts_with(b"\x89PNG\r\n\x1a\n"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn typed_render_rejects_explicit_runtime_flags_before_gpu_or_option_file_reads() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = render_setup_script(&dir, json!({"method":"gpu_path","options":{"samples":64,"seed":0}}));
|
||||||
|
let out = dir.0.join("existing.png");
|
||||||
|
std::fs::write(&out, b"previous completed image").unwrap();
|
||||||
|
for flags in [
|
||||||
|
&["--progressive"][..],
|
||||||
|
&["--transparent"][..],
|
||||||
|
&["--samples", "64"][..],
|
||||||
|
&["--max-depth", "8"][..],
|
||||||
|
&["--seed", "0"][..],
|
||||||
|
&["--lighting", "deliberately-missing-lighting.json"][..],
|
||||||
|
&["--tone-map", "reinhard"][..],
|
||||||
|
&["--environment", "deliberately-missing-environment.json"][..],
|
||||||
|
] {
|
||||||
|
let output = cli()
|
||||||
|
.arg("render")
|
||||||
|
.arg(&script)
|
||||||
|
.args(["--setup", "Portable setup", "--out"])
|
||||||
|
.arg(&out)
|
||||||
|
.arg("--overwrite")
|
||||||
|
.args(flags)
|
||||||
|
.env("SOLIDCRAFT_GPU", "must-not-be-read-for-conflicts")
|
||||||
|
.output()
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
let error = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert!(error.contains(&format!("{} cannot accompany a typed saved render setup", flags[0])), "{error}");
|
||||||
|
assert!(output.stdout.is_empty());
|
||||||
|
assert_eq!(std::fs::read(&out).unwrap(), b"previous completed image");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn typed_gpu_render_selects_its_host_without_a_progressive_runtime_flag() {
|
||||||
|
// A deliberately invalid policy proves that dispatch reached the GPU host
|
||||||
|
// without depending on an adapter or accepting a CPU fallback. The legacy
|
||||||
|
// --progressive path must still reach that same host-selection boundary.
|
||||||
|
for job in [json!({"method":"gpu_path","options":{"samples":2}}), Value::Null] {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = render_setup_script(&dir, job.clone());
|
||||||
|
let out = dir.0.join("gpu.png");
|
||||||
|
let mut command = cli();
|
||||||
|
command.arg("render").arg(&script).args(["--setup", "Portable setup", "--out"]).arg(&out).env("SOLIDCRAFT_GPU", "not-a-gpu-policy");
|
||||||
|
if job.is_null() {
|
||||||
|
command.arg("--progressive");
|
||||||
|
}
|
||||||
|
let output = command.output().unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
let error = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert!(error.contains("SOLIDCRAFT_GPU must be auto, hardware, software or cpu"), "{error}");
|
||||||
|
assert!(!out.exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn render_setup_overrides_obey_shared_validation_before_host_initialization() {
|
||||||
|
let dir = Scratch::new();
|
||||||
|
let script = render_setup_script(&dir, json!({"method":"cpu_raytrace","options":{"progressive":{"samples_per_pixel":64}}}));
|
||||||
|
let out = dir.0.join("invalid.png");
|
||||||
|
// 1024 * 1024 * 64 exceeds the unchanged default Compact camera-sample
|
||||||
|
// budget. Admission must name that envelope before initializing any host.
|
||||||
|
for (flags, message) in [
|
||||||
|
(&["--width", "1024", "--height", "1024"][..], "CPU Compact exceeds its 16777216 camera-sample admission"),
|
||||||
|
(&["--width", "0"][..], "render output must be at least"),
|
||||||
|
(&["--exposure", "NaN"][..], "render exposure must be finite"),
|
||||||
|
] {
|
||||||
|
let output = cli()
|
||||||
|
.arg("render")
|
||||||
|
.arg(&script)
|
||||||
|
.args(["--setup", "Portable setup", "--out"])
|
||||||
|
.arg(&out)
|
||||||
|
.args(flags)
|
||||||
|
.env("SOLIDCRAFT_GPU", "must-not-be-read-for-invalid-settings")
|
||||||
|
.output()
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(output.status.code(), Some(1));
|
||||||
|
let error = String::from_utf8_lossy(&output.stderr);
|
||||||
|
assert!(error.contains(message), "{error}");
|
||||||
|
assert!(!out.exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,11 +13,17 @@ workspace = true
|
|||||||
name = "solidcraft-web"
|
name = "solidcraft-web"
|
||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = []
|
||||||
|
bundled-render-library = ["solidcraft-engine/bundled-render-library"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
solidcraft-engine = { workspace = true }
|
solidcraft-engine = { workspace = true }
|
||||||
solidcraft-ui-egui = { workspace = true }
|
solidcraft-ui-egui = { workspace = true }
|
||||||
egui = { workspace = true }
|
egui = { workspace = true }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
|
url = "2"
|
||||||
|
percent-encoding = "2"
|
||||||
|
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||||
eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit"] }
|
eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit"] }
|
||||||
@@ -30,5 +36,6 @@ web-sys = { version = "0.3", features = [
|
|||||||
"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",
|
||||||
"IdbFactory", "IdbDatabase", "IdbObjectStore", "IdbOpenDbRequest", "IdbRequest", "IdbTransaction", "IdbTransactionMode",
|
"IdbFactory", "IdbDatabase", "IdbObjectStore", "IdbOpenDbRequest", "IdbRequest", "IdbTransaction", "IdbTransactionMode",
|
||||||
"BeforeUnloadEvent", "Event", "EventTarget", "KeyboardEvent", "Response", "MediaQueryList", "Gamepad", "Performance",
|
"Headers", "ReadableStream", "ReadableStreamDefaultReader",
|
||||||
|
"BeforeUnloadEvent", "Event", "EventTarget", "KeyboardEvent", "Response", "FormData", "RequestInit", "MediaQueryList", "Gamepad", "Performance",
|
||||||
] }
|
] }
|
||||||
@@ -114,6 +114,46 @@ pub fn opens_design(extensions: &[&str]) -> bool {
|
|||||||
extensions.is_empty() || extensions.iter().any(|e| solidcraft_engine::io::DESIGN_EXTS.contains(e))
|
extensions.is_empty() || extensions.iter().any(|e| solidcraft_engine::io::DESIGN_EXTS.contains(e))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Where an Open for `extensions` (what the command reads; `&[]`: anything) is answered.
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||||
|
pub enum OpenRoute {
|
||||||
|
/// The browser's open dialog for a design: the file keeps its handle, so Save writes back.
|
||||||
|
Disk,
|
||||||
|
/// The "Files in this browser" window, where the browser can't open a design from the disk.
|
||||||
|
Panel,
|
||||||
|
/// A plain file input that offers these types: the file is read into the engine's files and
|
||||||
|
/// the command runs on it (Insert DXF or SVG, images, meshes, imported settings).
|
||||||
|
Upload,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Choose how an Open for `extensions` asks for its file; `api`: the browser can open a file
|
||||||
|
/// from the disk and keep its handle.
|
||||||
|
pub fn open_route(api: bool, extensions: &[&str]) -> OpenRoute {
|
||||||
|
match (opens_design(extensions), api) {
|
||||||
|
(true, true) => OpenRoute::Disk,
|
||||||
|
(true, false) => OpenRoute::Panel,
|
||||||
|
(false, _) => OpenRoute::Upload,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The `accept` list of a file input for `extensions` (with or without their dot): ".dxf,.svg".
|
||||||
|
pub fn accept_list(extensions: &[&str]) -> String {
|
||||||
|
let list: Vec<String> = extensions
|
||||||
|
.iter()
|
||||||
|
.map(|e| e.trim().trim_start_matches('.'))
|
||||||
|
.filter(|e| !e.is_empty())
|
||||||
|
.map(|e| format!(".{}", e.to_ascii_lowercase()))
|
||||||
|
.collect();
|
||||||
|
list.join(",")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The largest file an upload for `extensions` reads: images go into a canvas, which has a size
|
||||||
|
/// limit, so a bigger one is refused before it is read. `None`: the importer checks the file.
|
||||||
|
pub fn upload_limit(extensions: &[&str]) -> Option<usize> {
|
||||||
|
let image = |e: &&str| ["png", "jpg", "jpeg"].contains(&e.trim_start_matches('.').to_ascii_lowercase().as_str());
|
||||||
|
(!extensions.is_empty() && extensions.iter().all(image)).then_some(solidcraft_engine::doc::canvas::MAX_CANVAS_BYTES)
|
||||||
|
}
|
||||||
|
|
||||||
/// The file type a Save As dialog offers for `name`: (description, MIME type, extension).
|
/// The file type a Save As dialog offers for `name`: (description, MIME type, extension).
|
||||||
pub fn save_type(name: &str) -> (&'static str, &'static str, &'static str) {
|
pub fn save_type(name: &str) -> (&'static str, &'static str, &'static str) {
|
||||||
let json = std::path::Path::new(name).extension().is_some_and(|e| e.eq_ignore_ascii_case("json"));
|
let json = std::path::Path::new(name).extension().is_some_and(|e| e.eq_ignore_ascii_case("json"));
|
||||||
@@ -140,7 +180,7 @@ mod web {
|
|||||||
use wasm_bindgen_futures::{JsFuture, spawn_local};
|
use wasm_bindgen_futures::{JsFuture, spawn_local};
|
||||||
use web_sys::{FileSystemFileHandle, IdbDatabase, IdbObjectStore, IdbOpenDbRequest, IdbRequest, IdbTransactionMode};
|
use web_sys::{FileSystemFileHandle, IdbDatabase, IdbObjectStore, IdbOpenDbRequest, IdbRequest, IdbTransactionMode};
|
||||||
|
|
||||||
use super::{HANDLE_MAX_AGE_MS, is_abort, make_id, opens_design, parse, path, plan_prune, save_type};
|
use super::{HANDLE_MAX_AGE_MS, is_abort, make_id, parse, path, plan_prune, save_type};
|
||||||
use crate::files::{Files, err, read_handle};
|
use crate::files::{Files, err, read_handle};
|
||||||
|
|
||||||
const DB: &str = "solidcraft-disk-handles";
|
const DB: &str = "solidcraft-disk-handles";
|
||||||
@@ -294,7 +334,7 @@ mod web {
|
|||||||
let options = Object::new();
|
let options = Object::new();
|
||||||
let _ = Reflect::set(&options, &"multiple".into(), &JsValue::FALSE);
|
let _ = Reflect::set(&options, &"multiple".into(), &JsValue::FALSE);
|
||||||
let extensions = Array::new();
|
let extensions = Array::new();
|
||||||
for e in [".solidcraft", ".solvecraft", ".json", ".step", ".stp", ".3mf", ".stl", ".obj", ".glb", ".gltf", ".fcstd", ".3dm"] {
|
for e in [".solidcraft", ".solvecraft", ".json", ".step", ".stp", ".3mf", ".stl", ".obj", ".glb", ".gltf", ".fcstd", ".3dm", ".dxf", ".svg"] {
|
||||||
extensions.push(&e.into());
|
extensions.push(&e.into());
|
||||||
}
|
}
|
||||||
let accept = Object::new();
|
let accept = Object::new();
|
||||||
@@ -315,11 +355,6 @@ mod web {
|
|||||||
p
|
p
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Does an Open for `extensions` use the browser's open dialog?
|
|
||||||
pub fn handles_open(extensions: &[&str]) -> bool {
|
|
||||||
supported() && opens_design(extensions)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- writing ------------------------------------------------------------------------
|
// ---- writing ------------------------------------------------------------------------
|
||||||
|
|
||||||
/// Queue what a command wrote to a disk path. Writes go one at a time; a newer write of the
|
/// Queue what a command wrote to a disk path. Writes go one at a time; a newer write of the
|
||||||
@@ -621,6 +656,21 @@ mod tests {
|
|||||||
assert!(!opens_design(&["json"]));
|
assert!(!opens_design(&["json"]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Insert DXF or SVG, images and other non-design files get a file input that offers their
|
||||||
|
/// types in every browser (#2052); designs keep the disk dialog or the browser's files.
|
||||||
|
#[test]
|
||||||
|
fn opens_of_other_files_use_a_file_input_for_their_types() {
|
||||||
|
assert_eq!(open_route(true, &["dxf"]), OpenRoute::Upload);
|
||||||
|
assert_eq!(open_route(false, &["png", "jpg", "jpeg"]), OpenRoute::Upload);
|
||||||
|
assert_eq!(open_route(true, &[]), OpenRoute::Disk);
|
||||||
|
assert_eq!(open_route(false, &["solidcraft"]), OpenRoute::Panel);
|
||||||
|
assert_eq!(accept_list(&["dxf"]), ".dxf");
|
||||||
|
assert_eq!(accept_list(&["png", ".JPG", "", "jpeg"]), ".png,.jpg,.jpeg");
|
||||||
|
assert_eq!(accept_list(&[]), "");
|
||||||
|
assert!(upload_limit(&["png", "jpg", "jpeg"]).is_some());
|
||||||
|
assert_eq!(upload_limit(&["dxf"]), None);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn the_save_dialog_offers_the_type_of_the_name() {
|
fn the_save_dialog_offers_the_type_of_the_name() {
|
||||||
assert_eq!(save_type("Plate.solidcraft").2, ".solidcraft");
|
assert_eq!(save_type("Plate.solidcraft").2, ".solidcraft");
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
//! Open with EasyPrint in the browser: upload the model to Printables' import endpoint with
|
||||||
|
//! `fetch` (it allows any origin) and answer with the address to open.
|
||||||
|
|
||||||
|
use std::sync::mpsc::Sender;
|
||||||
|
|
||||||
|
use js_sys::{Array, Uint8Array};
|
||||||
|
use solidcraft_engine::easyprint::{IMPORT_URL, parse_import_response};
|
||||||
|
use wasm_bindgen::JsCast as _;
|
||||||
|
use wasm_bindgen_futures::{JsFuture, spawn_local};
|
||||||
|
|
||||||
|
use crate::files::err;
|
||||||
|
|
||||||
|
/// Start the upload; the answer arrives on `done`.
|
||||||
|
pub fn upload(name: &str, bytes: Vec<u8>, done: Sender<Result<String, String>>) {
|
||||||
|
let name = name.to_string();
|
||||||
|
spawn_local(async move {
|
||||||
|
let _ = done.send(post(&name, &bytes).await);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn post(name: &str, bytes: &[u8]) -> Result<String, String> {
|
||||||
|
let window = web_sys::window().ok_or("no window")?;
|
||||||
|
let parts = Array::new();
|
||||||
|
parts.push(&Uint8Array::from(bytes));
|
||||||
|
let blob = web_sys::Blob::new_with_u8_array_sequence(&parts).map_err(err)?;
|
||||||
|
let form = web_sys::FormData::new().map_err(err)?;
|
||||||
|
form.append_with_blob_and_filename("file", &blob, name).map_err(err)?;
|
||||||
|
form.append_with_str("file_name", name).map_err(err)?;
|
||||||
|
let headers = web_sys::Headers::new().map_err(err)?;
|
||||||
|
headers.set("Accept", "application/json").map_err(err)?;
|
||||||
|
let init = web_sys::RequestInit::new();
|
||||||
|
init.set_method("POST");
|
||||||
|
init.set_body(&form);
|
||||||
|
init.set_headers(&headers);
|
||||||
|
let response = JsFuture::from(window.fetch_with_str_and_init(IMPORT_URL, &init)).await.map_err(err)?;
|
||||||
|
let response: web_sys::Response = response.dyn_into().map_err(|_| "response cast failed".to_string())?;
|
||||||
|
let status = response.status();
|
||||||
|
let text = JsFuture::from(response.text().map_err(err)?).await.map_err(err)?;
|
||||||
|
parse_import_response(status, text.as_string().unwrap_or_default().as_bytes())
|
||||||
|
}
|
||||||
@@ -448,6 +448,18 @@ pub fn recovery_path() -> String {
|
|||||||
format!("{OPFS}{RECOVERY}")
|
format!("{OPFS}{RECOVERY}")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A recovery file lives in OPFS, but its relative links belong to the original design's
|
||||||
|
/// folder (which can be on disk). Resolve them before Open sees the temporary file location.
|
||||||
|
pub fn prepare_recovery(original_path: Option<&str>) -> Result<String, String> {
|
||||||
|
let path = recovery_path();
|
||||||
|
let bytes = vfs::read(&path, solidcraft_engine::io::MAX_DESIGN_BYTES).map_err(|e| e.to_string())?;
|
||||||
|
let mut doc = solidcraft_engine::io::read_design(&bytes).map_err(|e| e.to_string())?;
|
||||||
|
solidcraft_engine::resolve_design_links(&mut doc, original_path);
|
||||||
|
let bytes = solidcraft_engine::io::write_design_container(&doc).map_err(|e| e.to_string())?;
|
||||||
|
vfs::insert(&path, bytes);
|
||||||
|
Ok(path)
|
||||||
|
}
|
||||||
|
|
||||||
/// Pick files on the computer: the File System Access picker where there is one, else an
|
/// Pick files on the computer: the File System Access picker where there is one, else an
|
||||||
/// `<input type=file>`. Read files arrive in `files.incoming`.
|
/// `<input type=file>`. Read files arrive in `files.incoming`.
|
||||||
pub fn pick_from_disk(files: &Rc<Files>, intent: Intent) {
|
pub fn pick_from_disk(files: &Rc<Files>, intent: Intent) {
|
||||||
@@ -500,8 +512,9 @@ fn input_picker(files: &Rc<Files>, intent: Intent) {
|
|||||||
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");
|
||||||
// Everything the browser build imports, from the format registry: cadmpeg is pure Rust, so
|
// Everything the browser build imports, from the format registry: cadmpeg is pure Rust, so
|
||||||
// FreeCAD and Rhino files are part of it.
|
// FreeCAD and Rhino files are part of it; plus the DXF and SVG drawings Open and Insert take.
|
||||||
let accept = solidcraft_engine::io::formats::open_extensions(true).iter().map(|e| format!(".{e}")).collect::<Vec<_>>().join(",");
|
let accept =
|
||||||
|
solidcraft_engine::io::formats::open_extensions(true).iter().chain(&["dxf", "svg"]).map(|e| format!(".{e}")).collect::<Vec<_>>().join(",");
|
||||||
input.set_accept(&accept);
|
input.set_accept(&accept);
|
||||||
// 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");
|
||||||
@@ -527,6 +540,67 @@ fn input_picker(files: &Rc<Files>, intent: Intent) {
|
|||||||
input.click();
|
input.click();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Ask for one file of these types (`extensions`, e.g. `["dxf"]`) with a plain file input, the
|
||||||
|
/// dialog every browser has. The answer is the file's path in the engine's files (under
|
||||||
|
/// [`UPLOAD`], as for a file picked in the disk dialog), so the command that asked runs on it;
|
||||||
|
/// `None` when the dialog was closed or the file could not be read.
|
||||||
|
pub fn pick_upload(files: &Rc<Files>, extensions: &[&str]) -> impl std::future::Future<Output = Option<String>> + use<> {
|
||||||
|
// Shown now, in the click: a file dialog needs the user's gesture.
|
||||||
|
let chosen = choose_file(&disk::accept_list(extensions));
|
||||||
|
let limit = disk::upload_limit(extensions);
|
||||||
|
let files = files.clone();
|
||||||
|
async move {
|
||||||
|
let read = async {
|
||||||
|
let value = JsFuture::from(chosen?).await.map_err(err)?;
|
||||||
|
// Closing the dialog answers no file: nothing to say.
|
||||||
|
let Ok(file) = value.dyn_into::<web_sys::File>() else { return Ok(None) };
|
||||||
|
let name = file.name();
|
||||||
|
if limit.is_some_and(|max| !file.size().is_finite() || file.size() > max as f64) {
|
||||||
|
return Err(format!("{name}: the file is too large"));
|
||||||
|
}
|
||||||
|
let bytes = blob_bytes(&file).await.map_err(|e| format!("{name}: {e}"))?;
|
||||||
|
let path = format!("{UPLOAD}{name}");
|
||||||
|
vfs::insert(&path, bytes);
|
||||||
|
Ok(Some(path))
|
||||||
|
};
|
||||||
|
match read.await {
|
||||||
|
Ok(path) => path,
|
||||||
|
Err(e) => {
|
||||||
|
files.say(format!("open: {e}"), true);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Show a hidden `<input type=file>` offering `accept` (call in the click). The promise answers
|
||||||
|
/// the picked `File`, or `null` when the dialog is closed (the input's `cancel` event).
|
||||||
|
fn choose_file(accept: &str) -> Result<js_sys::Promise, String> {
|
||||||
|
let doc = web_sys::window().and_then(|w| w.document()).ok_or("this page can't show a file dialog")?;
|
||||||
|
let input = doc.create_element("input").map_err(err)?.dyn_into::<web_sys::HtmlInputElement>().map_err(|_| "no file input".to_string())?;
|
||||||
|
input.set_type("file");
|
||||||
|
input.set_accept(accept);
|
||||||
|
// Attached (hidden) while it is open: some browsers ignore a click on a detached input.
|
||||||
|
input.set_attribute("style", "display:none").map_err(err)?;
|
||||||
|
doc.body().ok_or("this page has no body")?.append_child(&input).map_err(err)?;
|
||||||
|
let promise = js_sys::Promise::new(&mut |resolve: Function, _reject: Function| {
|
||||||
|
// One answer for a pick or a cancel; read from the event, so it does not keep the input.
|
||||||
|
let done = Closure::once_into_js(move |event: web_sys::Event| {
|
||||||
|
let file = event.target().and_then(|t| t.dyn_into::<web_sys::HtmlInputElement>().ok()).and_then(|input| {
|
||||||
|
input.set_onchange(None);
|
||||||
|
input.set_oncancel(None);
|
||||||
|
input.remove();
|
||||||
|
input.files().and_then(|list| list.get(0))
|
||||||
|
});
|
||||||
|
let _ = resolve.call1(&JsValue::UNDEFINED, &file.map_or(JsValue::NULL, JsValue::from));
|
||||||
|
});
|
||||||
|
input.set_onchange(Some(done.unchecked_ref()));
|
||||||
|
input.set_oncancel(Some(done.unchecked_ref()));
|
||||||
|
});
|
||||||
|
input.click();
|
||||||
|
Ok(promise)
|
||||||
|
}
|
||||||
|
|
||||||
/// Read files dropped on the page.
|
/// Read files dropped on the page.
|
||||||
pub fn take_drops(files: &Rc<Files>, raw: &mut egui::RawInput) {
|
pub fn take_drops(files: &Rc<Files>, raw: &mut egui::RawInput) {
|
||||||
for f in std::mem::take(&mut raw.dropped_files) {
|
for f in std::mem::take(&mut raw.dropped_files) {
|
||||||
|
|||||||
@@ -0,0 +1,137 @@
|
|||||||
|
//! Bounded HTTPS or same-origin downloads, handed to the normal design-open command as unsaved copies.
|
||||||
|
use std::{cell::RefCell, rc::Rc};
|
||||||
|
|
||||||
|
use js_sys::{Reflect, Uint8Array};
|
||||||
|
use solidcraft_engine::io::vfs;
|
||||||
|
use solidcraft_ui_egui::{SolveApp, ui_kit};
|
||||||
|
use wasm_bindgen::{JsCast as _, JsValue};
|
||||||
|
use wasm_bindgen_futures::{JsFuture, spawn_local};
|
||||||
|
|
||||||
|
use crate::{check_download_size, design_url};
|
||||||
|
|
||||||
|
type Reply = Result<(String, Vec<u8>), String>;
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct Download {
|
||||||
|
reply: Rc<RefCell<Option<Reply>>>,
|
||||||
|
pending: Option<(String, Vec<u8>)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Download {
|
||||||
|
pub fn start(url: Option<&str>, ctx: &egui::Context) -> Self {
|
||||||
|
let download = Self::default();
|
||||||
|
if let Some(url) = url {
|
||||||
|
let url = url.to_owned();
|
||||||
|
let slot = download.reply.clone();
|
||||||
|
let ctx = ctx.clone();
|
||||||
|
spawn_local(async move {
|
||||||
|
*slot.borrow_mut() = Some(fetch(&url).await);
|
||||||
|
ctx.request_repaint();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
download
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn tick(&mut self, app: &mut SolveApp, ctx: &egui::Context) {
|
||||||
|
if let Some(reply) = self.reply.borrow_mut().take() {
|
||||||
|
match reply {
|
||||||
|
Ok(file) => self.pending = Some(file),
|
||||||
|
Err(error) => app.set_status(format!("Could not open design link: {error}"), true),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if self.pending.is_none() || app.file_picker_busy() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if solidcraft_ui_egui::documents::any_dirty(app) {
|
||||||
|
let mut answer = None;
|
||||||
|
let closed = ui_kit::Window::new(egui::Id::new("open_link"), "status_warning", solidcraft_ui_egui::i18n::tr("web.open_link"))
|
||||||
|
.required()
|
||||||
|
.show_body(ctx, |ui| {
|
||||||
|
ui.label(solidcraft_ui_egui::i18n::tr("web.open_link_confirm"));
|
||||||
|
ui.horizontal(|ui| {
|
||||||
|
if ui_kit::button(ui, solidcraft_ui_egui::i18n::tr("ui.open"), ui_kit::Button::Normal).clicked() {
|
||||||
|
answer = Some(true);
|
||||||
|
}
|
||||||
|
if ui_kit::button(ui, solidcraft_ui_egui::i18n::tr("ui.cancel"), ui_kit::Button::Normal).clicked() {
|
||||||
|
answer = Some(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
match answer {
|
||||||
|
Some(true) => {}
|
||||||
|
Some(false) => {
|
||||||
|
self.pending = None;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
None if closed => {
|
||||||
|
self.pending = None;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
None => return,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let Some((name, bytes)) = self.pending.take() else { return };
|
||||||
|
// The extension selects the design loader even when the URL has no extension.
|
||||||
|
let path = "/linked/design.solidcraft";
|
||||||
|
vfs::insert(path, bytes);
|
||||||
|
app.open_path(path);
|
||||||
|
if app.session.path.as_deref() == Some(path) {
|
||||||
|
app.session.path = None;
|
||||||
|
app.session.doc_mut().name = name;
|
||||||
|
app.session.mark_unsaved();
|
||||||
|
} else {
|
||||||
|
app.set_status("Could not open design link: the downloaded file is not a valid SolidCraft design", true);
|
||||||
|
}
|
||||||
|
let _ = vfs::remove(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fetch(value: &str) -> Reply {
|
||||||
|
let window = web_sys::window().ok_or("No browser window")?;
|
||||||
|
let page_origin = window.location().origin().map_err(|_| "Cannot read page origin")?;
|
||||||
|
let url = design_url(value, &page_origin)?;
|
||||||
|
let name = url.path_segments().and_then(|mut segments| segments.next_back()).filter(|name| !name.is_empty()).unwrap_or("Design.solidcraft");
|
||||||
|
let decoded = js_sys::decode_uri_component(name).ok().and_then(|name| name.as_string()).unwrap_or_else(|| name.to_owned());
|
||||||
|
let name: String = decoded.strip_suffix(".solidcraft").unwrap_or(&decoded).chars().take(255).collect();
|
||||||
|
let response = JsFuture::from(window.fetch_with_str(url.as_str())).await.map_err(|_| "Network request failed or the host refused CORS access")?;
|
||||||
|
let response: web_sys::Response = response.dyn_into().map_err(|_| "Invalid download response")?;
|
||||||
|
design_url(&response.url(), &page_origin).map_err(|_| "Design redirected to a URL that does not use HTTPS or the page's own origin")?;
|
||||||
|
if !response.ok() {
|
||||||
|
return Err(format!("HTTP {} {}", response.status(), response.status_text()));
|
||||||
|
}
|
||||||
|
let length = response
|
||||||
|
.headers()
|
||||||
|
.get("Content-Length")
|
||||||
|
.map_err(|_| "Cannot read download size")?
|
||||||
|
.map(|value| value.parse::<u64>().map_err(|_| "Invalid Content-Length"))
|
||||||
|
.transpose()?;
|
||||||
|
if let Some(length) = length {
|
||||||
|
check_download_size(0, length)?;
|
||||||
|
}
|
||||||
|
let stream = response.body().ok_or("Download has no body")?;
|
||||||
|
let reader: web_sys::ReadableStreamDefaultReader = stream.get_reader().dyn_into().map_err(|_| "Cannot read download stream")?;
|
||||||
|
let result = read(&reader).await;
|
||||||
|
if result.is_err() {
|
||||||
|
let _ = JsFuture::from(reader.cancel()).await;
|
||||||
|
}
|
||||||
|
// Fetch rejects interrupted HTTP bodies and decodes Content-Encoding. Content-Length
|
||||||
|
// can describe compressed bytes, so the streamed limit also checks the decoded size.
|
||||||
|
let bytes = result?;
|
||||||
|
Ok((name, bytes))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn read(reader: &web_sys::ReadableStreamDefaultReader) -> Result<Vec<u8>, String> {
|
||||||
|
let mut bytes = Vec::new();
|
||||||
|
// Bound even a stream which keeps returning empty chunks.
|
||||||
|
for _ in 0..1_000_000 {
|
||||||
|
let chunk = JsFuture::from(reader.read()).await.map_err(|_| "Download interrupted")?;
|
||||||
|
if Reflect::get(&chunk, &JsValue::from_str("done")).map_err(|_| "Invalid download stream")?.as_bool() == Some(true) {
|
||||||
|
return Ok(bytes);
|
||||||
|
}
|
||||||
|
let value = Reflect::get(&chunk, &JsValue::from_str("value")).map_err(|_| "Invalid download chunk")?;
|
||||||
|
let chunk: Uint8Array = value.dyn_into().map_err(|_| "Invalid download bytes")?;
|
||||||
|
check_download_size(bytes.len(), u64::from(chunk.length()))?;
|
||||||
|
bytes.extend_from_slice(&chunk.to_vec());
|
||||||
|
}
|
||||||
|
Err("Download returned too many chunks".into())
|
||||||
|
}
|
||||||
@@ -11,9 +11,13 @@ mod api;
|
|||||||
#[cfg(any(target_arch = "wasm32", test))]
|
#[cfg(any(target_arch = "wasm32", test))]
|
||||||
mod disk;
|
mod disk;
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
mod easyprint;
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
mod files;
|
mod files;
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
mod install;
|
mod install;
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
mod linked;
|
||||||
#[cfg(any(target_arch = "wasm32", test))]
|
#[cfg(any(target_arch = "wasm32", test))]
|
||||||
mod space_mouse;
|
mod space_mouse;
|
||||||
|
|
||||||
@@ -25,6 +29,89 @@ fn browser_switches_tabs(key: &str, ctrl: bool) -> bool {
|
|||||||
ctrl && key == "Tab"
|
ctrl && key == "Tab"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(any(target_arch = "wasm32", test))]
|
||||||
|
fn query_flag(query: &str, name: &str) -> bool {
|
||||||
|
url::form_urlencoded::parse(query.trim_start_matches('?').as_bytes()).any(|(key, _)| key == name)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Launch options use exact query keys; URL values are decoded only once.
|
||||||
|
#[cfg(any(target_arch = "wasm32", test))]
|
||||||
|
#[derive(Default, Debug)]
|
||||||
|
struct Launch {
|
||||||
|
open: Option<String>,
|
||||||
|
embed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(any(target_arch = "wasm32", test))]
|
||||||
|
impl Launch {
|
||||||
|
fn parse(query: &str) -> Self {
|
||||||
|
let mut launch = Self::default();
|
||||||
|
let mut embed = false;
|
||||||
|
for (key, value) in url::form_urlencoded::parse(query.trim_start_matches('?').as_bytes()) {
|
||||||
|
match key.as_ref() {
|
||||||
|
"open" if launch.open.is_none() => launch.open = Some(value.into_owned()),
|
||||||
|
"embed" => embed = true,
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
launch.embed = embed && launch.open.is_some();
|
||||||
|
launch
|
||||||
|
}
|
||||||
|
|
||||||
|
fn persists(&self) -> bool {
|
||||||
|
!self.embed
|
||||||
|
}
|
||||||
|
|
||||||
|
fn full_app_url(&self, mut url: url::Url) -> String {
|
||||||
|
url.set_query(None);
|
||||||
|
url.set_fragment(None);
|
||||||
|
if let Some(open) = &self.open {
|
||||||
|
url.query_pairs_mut().append_pair("open", open);
|
||||||
|
}
|
||||||
|
url.to_string()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(any(target_arch = "wasm32", test))]
|
||||||
|
fn design_url(value: &str, page_origin: &str) -> Result<url::Url, String> {
|
||||||
|
if value.len() > 16_384 {
|
||||||
|
return Err("Design URL is too long".into());
|
||||||
|
}
|
||||||
|
let decoded = percent_encoding::percent_decode_str(value).decode_utf8().map_err(|_| "Invalid design URL encoding")?;
|
||||||
|
if decoded.chars().any(|ch| ch.is_control() || ch == '\\') {
|
||||||
|
return Err("Design links must not contain backslashes or control characters".into());
|
||||||
|
}
|
||||||
|
// Check before URL parsing normalizes away dot segments. Decode escaped slashes too.
|
||||||
|
let path = value.split(['?', '#']).next().unwrap_or_default();
|
||||||
|
let path = percent_encoding::percent_decode_str(path).collect::<Vec<_>>();
|
||||||
|
if path.split(|byte| *byte == b'/').any(|segment| segment == b"..") {
|
||||||
|
return Err("Design links must not contain parent path segments".into());
|
||||||
|
}
|
||||||
|
let page = url::Url::parse(page_origin).map_err(|_| "Invalid page origin")?;
|
||||||
|
let url = if value.starts_with('/') && !value.starts_with("//") {
|
||||||
|
page.join(value).map_err(|_| "Invalid design path")?
|
||||||
|
} else {
|
||||||
|
url::Url::parse(value).map_err(|_| "Invalid design URL")?
|
||||||
|
};
|
||||||
|
if (url.scheme() != "https" && url.origin() != page.origin())
|
||||||
|
|| url.host_str().is_none()
|
||||||
|
|| !url.username().is_empty()
|
||||||
|
|| url.password().is_some()
|
||||||
|
{
|
||||||
|
return Err("Design links must use HTTPS or the page's own origin without credentials".into());
|
||||||
|
}
|
||||||
|
Ok(url)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(any(target_arch = "wasm32", test))]
|
||||||
|
fn check_download_size(current: usize, incoming: u64) -> Result<(), String> {
|
||||||
|
let cap = solidcraft_engine::io::MAX_DESIGN_BYTES as u64;
|
||||||
|
if current as u64 > cap || incoming > cap.saturating_sub(current as u64) {
|
||||||
|
return Err(format!("Design exceeds the {} MB size limit", cap / (1024 * 1024)));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
mod web {
|
mod web {
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
@@ -112,6 +199,9 @@ mod web {
|
|||||||
|
|
||||||
struct Shell {
|
struct Shell {
|
||||||
app: SolveApp,
|
app: SolveApp,
|
||||||
|
launch: crate::Launch,
|
||||||
|
linked: crate::linked::Download,
|
||||||
|
full_url: Option<String>,
|
||||||
api: Api,
|
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`).
|
||||||
@@ -137,6 +227,9 @@ mod web {
|
|||||||
impl Shell {
|
impl Shell {
|
||||||
/// Files from the computer, writes to store, messages and the autosave.
|
/// Files from the computer, writes to store, messages and the autosave.
|
||||||
fn files_tick(&mut self, ctx: &egui::Context) {
|
fn files_tick(&mut self, ctx: &egui::Context) {
|
||||||
|
if !self.launch.persists() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
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());
|
||||||
}
|
}
|
||||||
@@ -230,13 +323,15 @@ mod web {
|
|||||||
fn sync_recents(&mut self) {
|
fn sync_recents(&mut self) {
|
||||||
let mut entries = self.files.entries.borrow().clone();
|
let mut entries = self.files.entries.borrow().clone();
|
||||||
entries.sort_by(|a, b| b.modified.total_cmp(&a.modified));
|
entries.sort_by(|a, b| b.modified.total_cmp(&a.modified));
|
||||||
|
let forgotten = self.app.home.forgotten.clone();
|
||||||
let recent = &mut self.app.home.recent;
|
let recent = &mut self.app.home.recent;
|
||||||
let known = self.files.disk_known.borrow().clone();
|
let known = self.files.disk_known.borrow().clone();
|
||||||
// A design on the computer's disk stays listed while its file is remembered.
|
// A design on the computer's disk stays listed while its file is remembered.
|
||||||
recent.retain(|p| vfs::exists(p) || disk::parse(p).is_some_and(|(id, _)| known.contains(id)));
|
recent.retain(|p| vfs::exists(p) || disk::parse(p).is_some_and(|(id, _)| known.contains(id)));
|
||||||
for e in entries.iter().filter(|e| solidcraft_engine::io::is_design_path(&e.name)) {
|
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) {
|
// A design the user removed from the list is not added back while it is stored.
|
||||||
|
if !recent.contains(&p) && !forgotten.contains(&p) {
|
||||||
recent.push(p);
|
recent.push(p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -245,6 +340,10 @@ mod web {
|
|||||||
let recovered = self.files.recovery.borrow().as_ref().and_then(|(_, p)| p.clone());
|
let recovered = self.files.recovery.borrow().as_ref().and_then(|(_, p)| p.clone());
|
||||||
let keep = recent.iter().chain(recovered.as_ref()).filter_map(|p| disk::parse(p)).map(|(id, _)| id.to_string()).collect();
|
let keep = recent.iter().chain(recovered.as_ref()).filter_map(|p| disk::parse(p)).map(|(id, _)| id.to_string()).collect();
|
||||||
disk::prune(keep);
|
disk::prune(keep);
|
||||||
|
// Drop forgotten entries whose stored design is gone, so the set does not grow without bound.
|
||||||
|
let stored: std::collections::BTreeSet<String> =
|
||||||
|
entries.iter().filter(|e| solidcraft_engine::io::is_design_path(&e.name)).map(|e| format!("{}{}", files::OPFS, e.name)).collect();
|
||||||
|
self.app.home.forgotten.retain(|p| stored.contains(p));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The stored designs: open, insert, rename, delete, download; open from the computer.
|
/// The stored designs: open, insert, rename, delete, download; open from the computer.
|
||||||
@@ -261,7 +360,7 @@ mod web {
|
|||||||
files::pick_from_disk(&self.files, Intent::Open);
|
files::pick_from_disk(&self.files, Intent::Open);
|
||||||
}
|
}
|
||||||
if ui_kit::button(ui, "Insert from computer…", ui_kit::Button::Normal)
|
if ui_kit::button(ui, "Insert from computer…", ui_kit::Button::Normal)
|
||||||
.on_hover_text("STEP, 3MF or STL into the open design")
|
.on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_drawings_hint"))
|
||||||
.clicked()
|
.clicked()
|
||||||
{
|
{
|
||||||
files::pick_from_disk(&self.files, Intent::Insert);
|
files::pick_from_disk(&self.files, Intent::Insert);
|
||||||
@@ -314,7 +413,7 @@ mod web {
|
|||||||
let design = solidcraft_engine::io::is_design_path(&e.name);
|
let design = solidcraft_engine::io::is_design_path(&e.name);
|
||||||
if !design
|
if !design
|
||||||
&& ui_kit::button(ui, "Insert", ui_kit::Button::Small)
|
&& ui_kit::button(ui, "Insert", ui_kit::Button::Small)
|
||||||
.on_hover_text("Into the open design (STEP, 3MF, STL)")
|
.on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_stored_drawings_hint"))
|
||||||
.clicked()
|
.clicked()
|
||||||
{
|
{
|
||||||
act = Some(("insert", e.name.clone()));
|
act = Some(("insert", e.name.clone()));
|
||||||
@@ -383,6 +482,8 @@ mod web {
|
|||||||
"delete" => {
|
"delete" => {
|
||||||
files::delete(&self.files, &name);
|
files::delete(&self.files, &name);
|
||||||
self.app.home.recent.retain(|r| *r != path);
|
self.app.home.recent.retain(|r| *r != path);
|
||||||
|
// The file is gone, so there is nothing left to keep forgotten.
|
||||||
|
self.app.home.forgotten.remove(&path);
|
||||||
}
|
}
|
||||||
"rename_cancel" => self.renaming = None,
|
"rename_cancel" => self.renaming = None,
|
||||||
"rename" => {
|
"rename" => {
|
||||||
@@ -396,6 +497,10 @@ mod web {
|
|||||||
*r = new.clone();
|
*r = new.clone();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// A forgotten design follows its new name.
|
||||||
|
if self.app.home.forgotten.remove(&old) {
|
||||||
|
self.app.home.forgotten.insert(new);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Err(e) => self.app.set_status(e, true),
|
Err(e) => self.app.set_status(e, true),
|
||||||
}
|
}
|
||||||
@@ -423,15 +528,25 @@ mod web {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
let Some(recover) = answer else { return };
|
let Some(recover) = answer else { return };
|
||||||
*self.files.recovery.borrow_mut() = None;
|
|
||||||
if recover {
|
if recover {
|
||||||
self.app.open_path(&files::recovery_path());
|
let recovery = match files::prepare_recovery(path.as_deref()) {
|
||||||
|
Ok(recovery) => recovery,
|
||||||
|
Err(error) => {
|
||||||
|
self.app.set_status(error, true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
self.app.open_path(&recovery);
|
||||||
|
if self.app.session.path.as_deref() != Some(recovery.as_str()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
// It belongs to its own file again (saving goes there); it is unsaved.
|
// It belongs to its own file again (saving goes there); it is unsaved.
|
||||||
self.app.session.path = path;
|
self.app.session.path = path;
|
||||||
self.app.session.doc_mut().name = name;
|
self.app.session.doc_mut().name = name;
|
||||||
self.app.session.mark_unsaved();
|
self.app.session.mark_unsaved();
|
||||||
self.app.home.open = false;
|
self.app.home.open = false;
|
||||||
}
|
}
|
||||||
|
*self.files.recovery.borrow_mut() = None;
|
||||||
files::autosave(&self.files, None);
|
files::autosave(&self.files, None);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -514,19 +629,42 @@ mod web {
|
|||||||
if let Some(delay) = self.wheel_gestures.update(raw, now) {
|
if let Some(delay) = self.wheel_gestures.update(raw, now) {
|
||||||
ctx.request_repaint_after(delay);
|
ctx.request_repaint_after(delay);
|
||||||
}
|
}
|
||||||
files::take_drops(&self.files, raw);
|
if self.launch.persists() {
|
||||||
|
files::take_drops(&self.files, raw);
|
||||||
|
} else {
|
||||||
|
raw.dropped_files.clear();
|
||||||
|
}
|
||||||
// Before the app's own hook, which adds the control channel's events.
|
// 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.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) {
|
||||||
|
self.linked.tick(&mut self.app, ui.ctx());
|
||||||
|
UNSAVED.with(|u| u.set(self.launch.persists() && solidcraft_ui_egui::documents::any_dirty(&self.app)));
|
||||||
|
if self.launch.embed {
|
||||||
|
ui_kit::Container::new(ui.ctx(), ui_kit::Surface::Chrome).edge("embed_header", ui_kit::Edge::Top).show(ui, |ui| {
|
||||||
|
if ui_kit::button(ui, solidcraft_ui_egui::i18n::tr("web.open_full"), ui_kit::Button::Normal).clicked()
|
||||||
|
&& let (Some(window), Some(url)) = (web_sys::window(), &self.full_url)
|
||||||
|
{
|
||||||
|
let _ = window.open_with_url_and_target_and_features(url, "_blank", "noopener");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
self.app.ui(ui);
|
self.app.ui(ui);
|
||||||
let ctx = ui.ctx().clone();
|
let ctx = ui.ctx().clone();
|
||||||
self.file_panel(&ctx);
|
if self.launch.persists() {
|
||||||
self.recovery_prompt(&ctx);
|
self.file_panel(&ctx);
|
||||||
|
self.recovery_prompt(&ctx);
|
||||||
|
}
|
||||||
self.watch_text_for_font(&ctx);
|
self.watch_text_for_font(&ctx);
|
||||||
}
|
}
|
||||||
|
fn persist_egui_memory(&self) -> bool {
|
||||||
|
self.launch.persists()
|
||||||
|
}
|
||||||
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
||||||
|
if !self.launch.persists() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
// 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);
|
||||||
@@ -545,15 +683,15 @@ mod web {
|
|||||||
|
|
||||||
/// Render with WebGL2: asked for now (`?webgl`, remembered) or before (until `?webgpu`).
|
/// Render with WebGL2: asked for now (`?webgl`, remembered) or before (until `?webgpu`).
|
||||||
fn webgl() -> bool {
|
fn webgl() -> bool {
|
||||||
let storage = web_sys::window().and_then(|w| w.local_storage().ok().flatten());
|
let storage = crate::Launch::parse(&query()).persists().then(|| web_sys::window().and_then(|w| w.local_storage().ok().flatten())).flatten();
|
||||||
let q = query();
|
let q = query();
|
||||||
if q.contains("webgl") {
|
if crate::query_flag(&q, "webgl") {
|
||||||
if let Some(s) = &storage {
|
if let Some(s) = &storage {
|
||||||
let _ = s.set_item(WEBGL_KEY, "1");
|
let _ = s.set_item(WEBGL_KEY, "1");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if q.contains("webgpu") {
|
if crate::query_flag(&q, "webgpu") {
|
||||||
if let Some(s) = &storage {
|
if let Some(s) = &storage {
|
||||||
let _ = s.remove_item(WEBGL_KEY);
|
let _ = s.remove_item(WEBGL_KEY);
|
||||||
}
|
}
|
||||||
@@ -579,7 +717,10 @@ mod web {
|
|||||||
eframe::WebLogger::init(log::LevelFilter::Info).ok();
|
eframe::WebLogger::init(log::LevelFilter::Info).ok();
|
||||||
wasm_bindgen_futures::spawn_local(async {
|
wasm_bindgen_futures::spawn_local(async {
|
||||||
let Some(window) = web_sys::window() else { return };
|
let Some(window) = web_sys::window() else { return };
|
||||||
ask_before_unload(&window);
|
let launch = crate::Launch::parse(&query());
|
||||||
|
if launch.persists() {
|
||||||
|
ask_before_unload(&window);
|
||||||
|
}
|
||||||
leave_tab_switching_to_browser(&window);
|
leave_tab_switching_to_browser(&window);
|
||||||
let Some(document) = window.document() else { return };
|
let Some(document) = window.document() else { return };
|
||||||
let Some(canvas) = document.get_element_by_id(CANVAS_ID).and_then(|e| e.dyn_into::<web_sys::HtmlCanvasElement>().ok()) else {
|
let Some(canvas) = document.get_element_by_id(CANVAS_ID).and_then(|e| e.dyn_into::<web_sys::HtmlCanvasElement>().ok()) else {
|
||||||
@@ -599,19 +740,24 @@ mod web {
|
|||||||
Box::new(move |cc| {
|
Box::new(move |cc| {
|
||||||
solidcraft_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);
|
if launch.persists() {
|
||||||
|
files::start(&files);
|
||||||
|
}
|
||||||
let (panel, opener, saver, shown) = (files.clone(), files.clone(), files.clone(), files.clone());
|
let (panel, opener, saver, shown) = (files.clone(), files.clone(), files.clone(), files.clone());
|
||||||
let (restorable, restorer) = (files.clone(), files.clone());
|
let (restorable, restorer) = (files.clone(), files.clone());
|
||||||
let services = Services {
|
let services = if launch.embed { Services::default() } else { Services {
|
||||||
// Open shows the browser's open dialog for a design where it has one
|
// Open shows the browser's open dialog for a design where it has one
|
||||||
// (the file keeps its handle, so Save writes back to it); otherwise,
|
// (the file keeps its handle, so Save writes back to it), else the
|
||||||
// and for inserting STEP or meshes, the browser's files window.
|
// browser's files window. A command that reads another kind of file
|
||||||
pick_open: Some(Box::new(move |exts: &[&str]| {
|
// (Insert DXF or SVG, an image, a mesh, settings) gets a file dialog
|
||||||
if disk::handles_open(exts) {
|
// offering that kind, and runs on the picked file.
|
||||||
return Box::pin(disk::pick_open(&opener));
|
pick_open: Some(Box::new(move |exts: &[&str]| match disk::open_route(disk::supported(), exts) {
|
||||||
|
disk::OpenRoute::Disk => Box::pin(disk::pick_open(&opener)),
|
||||||
|
disk::OpenRoute::Upload => Box::pin(files::pick_upload(&opener, exts)),
|
||||||
|
disk::OpenRoute::Panel => {
|
||||||
|
panel.panel.set(true);
|
||||||
|
Box::pin(std::future::ready(None))
|
||||||
}
|
}
|
||||||
panel.panel.set(true);
|
|
||||||
Box::pin(std::future::ready(None))
|
|
||||||
})),
|
})),
|
||||||
// A design is saved to a file the user picks, or kept in the browser
|
// A design is saved to a file the user picks, or kept in the browser
|
||||||
// where the browser can't pick one; everything else is downloaded.
|
// where the browser can't pick one; everything else is downloaded.
|
||||||
@@ -633,29 +779,31 @@ mod web {
|
|||||||
})),
|
})),
|
||||||
restore_file: Some(Box::new(move |path: &str| disk::restore(&restorer, path))),
|
restore_file: Some(Box::new(move |path: &str| disk::restore(&restorer, path))),
|
||||||
download_design: Some(Box::new(files::download)),
|
download_design: Some(Box::new(files::download)),
|
||||||
|
easyprint_upload: Some(std::sync::Arc::new(crate::easyprint::upload)),
|
||||||
browser_files: Some(Box::new(move || shown.panel.set(true))),
|
browser_files: Some(Box::new(move || shown.panel.set(true))),
|
||||||
install_app: Some(crate::install::service(&cc.egui_ctx)),
|
install_app: Some(crate::install::service(&cc.egui_ctx)),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
}};
|
||||||
// Thumbnails of saves and start-page cards.
|
// Thumbnails of saves and start-page cards.
|
||||||
solidcraft_ui_egui::gpu::install_cpu_picture_renderer();
|
solidcraft_ui_egui::gpu::install_cpu_picture_renderer();
|
||||||
let (sender, receiver) = std::sync::mpsc::channel();
|
let (sender, receiver) = std::sync::mpsc::channel();
|
||||||
let mut app = SolveApp::new(Session::default(), services).with_control(receiver);
|
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.embedded = launch.embed;
|
||||||
|
if launch.persists() && 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 {
|
||||||
// eframe's web painter has no stencil buffer.
|
// eframe's web painter has no stencil buffer.
|
||||||
app.set_wgpu(rs, DEPTH_BITS, 0, 1);
|
app.set_wgpu(rs, DEPTH_BITS, 0, 1);
|
||||||
}
|
}
|
||||||
if query().contains("sample") {
|
if launch.open.is_none() && crate::query_flag(&query(), "sample") {
|
||||||
if let Err(e) = app.session.run_script(&solidcraft_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 launch.open.is_none() && !crate::query_flag(&query(), "sample") {
|
||||||
// The empty design takes Units of new designs (#1205). The sample
|
// The empty design takes Units of new designs (#1205). The sample
|
||||||
// part is built in millimetres and is left that way.
|
// part is built in millimetres and is left that way.
|
||||||
solidcraft_ui_egui::prefs::apply_new_design(&mut app);
|
solidcraft_ui_egui::prefs::apply_new_design(&mut app);
|
||||||
@@ -664,8 +812,13 @@ mod web {
|
|||||||
}
|
}
|
||||||
let api = Api::install(sender, cc.egui_ctx.clone()).map_err(|e| format!("SolidCraft browser API: {e:?}"))?;
|
let api = Api::install(sender, cc.egui_ctx.clone()).map_err(|e| format!("SolidCraft browser API: {e:?}"))?;
|
||||||
let font_language = app.preferences.language.clone();
|
let font_language = app.preferences.language.clone();
|
||||||
|
let linked = crate::linked::Download::start(launch.open.as_deref(), &cc.egui_ctx);
|
||||||
|
let full_url = window.location().href().ok().and_then(|value| url::Url::parse(&value).ok()).map(|url| launch.full_app_url(url));
|
||||||
Ok(Box::new(Shell {
|
Ok(Box::new(Shell {
|
||||||
app,
|
app,
|
||||||
|
launch,
|
||||||
|
linked,
|
||||||
|
full_url,
|
||||||
api,
|
api,
|
||||||
files,
|
files,
|
||||||
autosaved_at: f64::NEG_INFINITY,
|
autosaved_at: f64::NEG_INFINITY,
|
||||||
@@ -709,6 +862,90 @@ fn main() {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn link_query_decodes_once_and_embed_disables_persistence() {
|
||||||
|
assert!(!query_flag("?open=https://example.org/webgl?sample", "webgl"));
|
||||||
|
assert!(!query_flag("?open=https://example.org/webgl?sample", "sample"));
|
||||||
|
assert!(query_flag("?embed&webgl", "webgl"));
|
||||||
|
let launch = Launch::parse("?embed&open=https%3A%2F%2Fexample.org%2Farm.solidcraft%3Fx%3Da%2520b%26y%3D1");
|
||||||
|
assert_eq!(launch.open.as_deref(), Some("https://example.org/arm.solidcraft?x=a%20b&y=1"));
|
||||||
|
assert!(launch.embed);
|
||||||
|
assert!(!launch.persists());
|
||||||
|
assert!(!Launch::parse("?embed").embed);
|
||||||
|
assert!(!Launch::parse("?other=embed&reopen=https://example.org").embed);
|
||||||
|
assert!(Launch::parse("?open=https://example.org/a").persists());
|
||||||
|
assert_eq!(Launch::parse("?open=first&open=second").open.as_deref(), Some("first"));
|
||||||
|
let launch = Launch::parse("?embed&open=/dutchman/jobs/abc/part.solidcraft%3Fx%3Da%2520b");
|
||||||
|
assert!(launch.embed);
|
||||||
|
assert!(!launch.persists());
|
||||||
|
let page = url::Url::parse("http://solidcraft.io/?embed#view").expect("synthetic page");
|
||||||
|
let full = url::Url::parse(&launch.full_app_url(page)).expect("full app URL");
|
||||||
|
let reopened = Launch::parse(full.query().unwrap_or_default());
|
||||||
|
assert_eq!(reopened.open, launch.open);
|
||||||
|
assert_eq!(reopened.open.as_deref(), Some("/dutchman/jobs/abc/part.solidcraft?x=a%20b"));
|
||||||
|
assert!(!reopened.embed);
|
||||||
|
assert!(reopened.persists());
|
||||||
|
assert!(full.fragment().is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn design_links_refuse_hostile_schemes_credentials_and_sizes() {
|
||||||
|
assert!(design_url("https://example.org/arm.solidcraft?download=1", "http://solidcraft.io").is_ok());
|
||||||
|
for value in [
|
||||||
|
"http://example.org/a",
|
||||||
|
"data:application/json,{}",
|
||||||
|
"blob:https://example.org/a",
|
||||||
|
"javascript:alert(1)",
|
||||||
|
"https://user:secret@example.org/a",
|
||||||
|
"//evil.example/x",
|
||||||
|
"/../x",
|
||||||
|
"/%2e%2e/x",
|
||||||
|
"/a/%2E./x",
|
||||||
|
"/a%2f..%2fx",
|
||||||
|
"/a\\x",
|
||||||
|
"/a%5cx",
|
||||||
|
"/a\nx",
|
||||||
|
"/a%00x",
|
||||||
|
"/a%7fx",
|
||||||
|
"/a%C2%85x",
|
||||||
|
"/a%3f/../x",
|
||||||
|
"/a/..#view",
|
||||||
|
"/a/..?download=1",
|
||||||
|
"https://solidcraft.io/a/../x",
|
||||||
|
"http://user:secret@solidcraft.io/x",
|
||||||
|
"http://solidcraft.io.evil.example/x",
|
||||||
|
"http://solidcraft.io:8080/x",
|
||||||
|
"relative.solidcraft",
|
||||||
|
"",
|
||||||
|
] {
|
||||||
|
assert!(design_url(value, "http://solidcraft.io").is_err(), "{value}");
|
||||||
|
}
|
||||||
|
assert!(design_url(&format!("https://example.org/{}", "x".repeat(16_384)), "http://solidcraft.io").is_err());
|
||||||
|
assert!(design_url("http://redirect.example.org/a", "http://solidcraft.io").is_err());
|
||||||
|
|
||||||
|
let cap = solidcraft_engine::io::MAX_DESIGN_BYTES;
|
||||||
|
assert!(check_download_size(0, cap as u64).is_ok());
|
||||||
|
assert!(check_download_size(0, cap as u64 + 1).is_err());
|
||||||
|
assert!(check_download_size(cap - 2, 2).is_ok());
|
||||||
|
assert!(check_download_size(cap - 2, 3).is_err());
|
||||||
|
assert!(check_download_size(0, u64::MAX).is_err());
|
||||||
|
assert!(check_download_size(cap, 1).is_err());
|
||||||
|
assert!(check_download_size(usize::MAX, 0).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn design_links_allow_same_origin_paths_and_redirects() {
|
||||||
|
for origin in ["http://solidcraft.io", "https://solidcraft.io", "http://solidcraft.io:8080"] {
|
||||||
|
assert_eq!(design_url("/a/b.solidcraft", origin).map(|url| url.to_string()), Ok(format!("{origin}/a/b.solidcraft")));
|
||||||
|
assert!(design_url(&format!("{origin}/x"), origin).is_ok());
|
||||||
|
// Final response URLs follow the same origin and scheme rules as the request.
|
||||||
|
assert!(design_url("https://docs.solidcraft.io/x", origin).is_ok());
|
||||||
|
assert!(design_url("http://other/x", origin).is_err());
|
||||||
|
}
|
||||||
|
assert!(design_url("http://solidcraft.io/x", "https://solidcraft.io").is_err());
|
||||||
|
assert!(design_url("http://SOLIDCRAFT.io:80/x", "http://solidcraft.io").is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn only_ctrl_tab_is_left_to_the_browser() {
|
fn only_ctrl_tab_is_left_to_the_browser() {
|
||||||
// Ctrl+Tab and Ctrl+Shift+Tab (the event's key is "Tab" either way) switch browser tabs.
|
// Ctrl+Tab and Ctrl+Shift+Tab (the event's key is "Tab" either way) switch browser tabs.
|
||||||
|
|||||||
@@ -7,9 +7,15 @@ license.workspace = true
|
|||||||
publish = false
|
publish = false
|
||||||
default-run = "solidcraft"
|
default-run = "solidcraft"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = ["raytrace-cpu", "bundled-render-library"]
|
||||||
|
bundled-render-library = ["solidcraft-engine/bundled-render-library"]
|
||||||
|
raytrace-cpu = ["solidcraft-engine/raytrace-cpu"]
|
||||||
|
|
||||||
# The workspace lints, except unsafe_code: denied, not forbidden, so that src/open_documents.rs
|
# The workspace lints, except unsafe_code: denied, not forbidden, so that src/open_documents.rs
|
||||||
# (macOS file-open events), src/native_crash.rs (Windows exception filter) and src/native_frame.rs
|
# (macOS file-open events), src/native_crash.rs (Windows exception filter), src/native_crash_macos.rs
|
||||||
# (Windows resize border) can allow it: none has a safe API. Keep the rest in sync with [workspace.lints].
|
# (macOS crash signal handler) and src/native_frame.rs (Windows resize border, taskbar icon) can
|
||||||
|
# allow it: none has a safe API. Keep the rest in sync with [workspace.lints].
|
||||||
[lints.rust]
|
[lints.rust]
|
||||||
unsafe_code = "deny"
|
unsafe_code = "deny"
|
||||||
|
|
||||||
@@ -26,6 +32,7 @@ solidcraft-ui-egui = { workspace = true }
|
|||||||
solidcraft-space-mouse = { workspace = true }
|
solidcraft-space-mouse = { workspace = true }
|
||||||
eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11", "links"] }
|
eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11", "links"] }
|
||||||
egui = { workspace = true }
|
egui = { workspace = true }
|
||||||
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
rfd = { workspace = true }
|
rfd = { workspace = true }
|
||||||
@@ -49,7 +56,8 @@ hidapi = { version = "2.6.7", default-features = false, features = ["windows-nat
|
|||||||
# The main window's handle for src/native_frame.rs (already in the tree through eframe and winit).
|
# The main window's handle for src/native_frame.rs (already in the tree through eframe and winit).
|
||||||
raw-window-handle = "0.6"
|
raw-window-handle = "0.6"
|
||||||
# Native crash capture (src/native_crash.rs): the exception filter, the faulting module, a minidump.
|
# Native crash capture (src/native_crash.rs): the exception filter, the faulting module, a minidump.
|
||||||
# The window's resize border and DPI size (src/native_frame.rs): the window procedure, hit test, DPI.
|
# The window's resize border, DPI size and class icon (src/native_frame.rs): the window procedure, hit
|
||||||
|
# test, DPI, the exe's icon.
|
||||||
# Finding 3D mice through Plug and Play without asking other devices anything (src/space_mouse/windows_hid.rs).
|
# Finding 3D mice through Plug and Play without asking other devices anything (src/space_mouse/windows_hid.rs).
|
||||||
windows-sys = { version = "0.61", features = [
|
windows-sys = { version = "0.61", features = [
|
||||||
"Win32_Devices_DeviceAndDriverInstallation",
|
"Win32_Devices_DeviceAndDriverInstallation",
|
||||||
@@ -76,11 +84,15 @@ solidcraft-3dx-client = { workspace = true }
|
|||||||
# The 3D mouse (src/space_mouse.rs), in the shared-device open mode so that a running 3DxWare
|
# The 3D mouse (src/space_mouse.rs), in the shared-device open mode so that a running 3DxWare
|
||||||
# driver does not shut the app out.
|
# driver does not shut the app out.
|
||||||
hidapi = { version = "2.6.7", default-features = false, features = ["macos-shared-device"] }
|
hidapi = { version = "2.6.7", default-features = false, features = ["macos-shared-device"] }
|
||||||
# Files opened from Finder and the Dock (src/open_documents.rs); all already come with eframe and rfd.
|
# Files opened from Finder and the Dock (src/open_documents.rs), and the fullscreen title-bar
|
||||||
|
# inset (src/main.rs); all already come with eframe and rfd.
|
||||||
objc2 = "0.6"
|
objc2 = "0.6"
|
||||||
objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder"] }
|
objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder", "NSWindow"] }
|
||||||
objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSNotification", "NSOperation", "NSProcessInfo", "NSString", "NSURL"] }
|
objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSNotification", "NSOperation", "NSProcessInfo", "NSString", "NSURL"] }
|
||||||
block2 = "0.6"
|
block2 = "0.6"
|
||||||
|
# Native crash capture (src/native_crash_macos.rs): the signal handler, the faulting module
|
||||||
|
# (already in the tree through many crates).
|
||||||
|
libc = "0.2"
|
||||||
|
|
||||||
[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
|
[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
|
||||||
winit = { version = "0.30", default-features = false, features = ["x11"] }
|
winit = { version = "0.30", default-features = false, features = ["x11"] }
|
||||||
|
|||||||
@@ -13,11 +13,15 @@ use solidcraft_engine::MAX_LINE;
|
|||||||
use solidcraft_engine::control_auth;
|
use solidcraft_engine::control_auth;
|
||||||
use solidcraft_engine::control_pending;
|
use solidcraft_engine::control_pending;
|
||||||
use solidcraft_ui_egui::ControlRequest;
|
use solidcraft_ui_egui::ControlRequest;
|
||||||
|
use solidcraft_ui_egui::control::{DESIGN_WATCH, DesignWatch, Subscriber};
|
||||||
|
|
||||||
/// Connections served at once, so a flood must not be able to spawn threads without end.
|
/// Connections served at once, so a flood must not be able to spawn threads without end.
|
||||||
const MAX_CONNECTIONS: usize = 16;
|
const MAX_CONNECTIONS: usize = 16;
|
||||||
/// Lines that are not JSON before the connection is closed, so garbage cannot loop forever.
|
/// Lines that are not JSON before the connection is closed, so garbage cannot loop forever.
|
||||||
const MAX_BAD_LINES: usize = 8;
|
const MAX_BAD_LINES: usize = 8;
|
||||||
|
/// How long a subscribed connection waits after a `design.changed` line before the next: what
|
||||||
|
/// changes meanwhile (a parameter dragged) goes out as one line, the latest (#6985).
|
||||||
|
const EVENT_GAP: Duration = Duration::from_millis(100);
|
||||||
|
|
||||||
static OPEN: AtomicUsize = AtomicUsize::new(0);
|
static OPEN: AtomicUsize = AtomicUsize::new(0);
|
||||||
/// The token files this launch wrote (its control port, the agent chat's endpoint), removed
|
/// The token files this launch wrote (its control port, the agent chat's endpoint), removed
|
||||||
@@ -35,7 +39,7 @@ fn new_token() -> Option<String> {
|
|||||||
pub fn remove_token_file() {
|
pub fn remove_token_file() {
|
||||||
if let Ok(files) = TOKEN_FILES.lock() {
|
if let Ok(files) = TOKEN_FILES.lock() {
|
||||||
for p in files.iter() {
|
for p in files.iter() {
|
||||||
let _ = std::fs::remove_file(p);
|
control_auth::remove_token_file(p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(port) = APP_PORT.lock().ok().and_then(|p| *p) {
|
if let Some(port) = APP_PORT.lock().ok().and_then(|p| *p) {
|
||||||
@@ -127,7 +131,7 @@ fn listen_on_listener(listener: TcpListener, token: String, tx: Sender<ControlRe
|
|||||||
if OPEN.fetch_add(1, Ordering::Relaxed) >= MAX_CONNECTIONS {
|
if OPEN.fetch_add(1, Ordering::Relaxed) >= MAX_CONNECTIONS {
|
||||||
OPEN.fetch_sub(1, Ordering::Relaxed);
|
OPEN.fetch_sub(1, Ordering::Relaxed);
|
||||||
let mut refused = stream;
|
let mut refused = stream;
|
||||||
let _ = writeln!(refused, "{}", json!({"ok": false, "error": "too many connections"}));
|
let _ = send(&mut refused, &json!({"ok": false, "error": "too many connections"}));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let tx = tx.clone();
|
let tx = tx.clone();
|
||||||
@@ -174,6 +178,44 @@ fn read_line(r: &mut impl BufRead, max: usize) -> std::io::Result<Option<Vec<u8>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A reply line, written to the socket at once. `writeln!` with a JSON value hands the socket each
|
||||||
|
/// of its pieces apart, a system call for every string, number and comma: half a second for a
|
||||||
|
/// design's component tree when it has thousands of components.
|
||||||
|
fn send(out: &mut impl Write, reply: &Value) -> std::io::Result<()> {
|
||||||
|
let mut line = serde_json::to_vec(reply).map_err(std::io::Error::other)?;
|
||||||
|
line.push(b'\n');
|
||||||
|
out.write_all(&line)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The `"token"` of a request line that is a JSON object, read without building the rest of it.
|
||||||
|
/// Until a connection shows the token, a line costs only its own bytes: parsed whole, a 16 MiB
|
||||||
|
/// line of `[0,0,…]` is hundreds of MB, and 16 such connections could exhaust memory before any
|
||||||
|
/// token was checked.
|
||||||
|
fn token_of(line: &str) -> Option<String> {
|
||||||
|
struct Token;
|
||||||
|
impl<'de> serde::de::Visitor<'de> for Token {
|
||||||
|
type Value = Option<String>;
|
||||||
|
fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||||
|
f.write_str("a request object")
|
||||||
|
}
|
||||||
|
fn visit_map<A: serde::de::MapAccess<'de>>(self, mut map: A) -> Result<Self::Value, A::Error> {
|
||||||
|
let mut token = None;
|
||||||
|
while let Some(key) = map.next_key::<String>()? {
|
||||||
|
if key == "token" {
|
||||||
|
token = Some(map.next_value::<String>()?);
|
||||||
|
} else {
|
||||||
|
map.next_value::<serde::de::IgnoredAny>()?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(token)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut de = serde_json::Deserializer::from_str(line);
|
||||||
|
let token = serde::Deserializer::deserialize_map(&mut de, Token).ok()?;
|
||||||
|
de.end().ok()?;
|
||||||
|
token
|
||||||
|
}
|
||||||
|
|
||||||
/// The reply to a connection that didn't show the token; the connection is then closed.
|
/// The reply to a connection that didn't show the token; the connection is then closed.
|
||||||
fn unauthorized() -> Value {
|
fn unauthorized() -> Value {
|
||||||
json!({"ok": false, "error": "unauthorized: send the control token as \"token\" (see docs/control-protocol.md)"})
|
json!({"ok": false, "error": "unauthorized: send the control token as \"token\" (see docs/control-protocol.md)"})
|
||||||
@@ -184,7 +226,7 @@ fn unauthorized() -> Value {
|
|||||||
/// the connection, and a reset can reach the client before it has read the refusal.
|
/// the connection, and a reset can reach the client before it has read the refusal.
|
||||||
fn refuse(out: &mut TcpStream, reader: &mut BufReader<TcpStream>) {
|
fn refuse(out: &mut TcpStream, reader: &mut BufReader<TcpStream>) {
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
let _ = writeln!(out, "{}", unauthorized());
|
let _ = send(out, &unauthorized());
|
||||||
let _ = out.shutdown(std::net::Shutdown::Write);
|
let _ = out.shutdown(std::net::Shutdown::Write);
|
||||||
let _ = reader.get_ref().set_read_timeout(Some(Duration::from_millis(500)));
|
let _ = reader.get_ref().set_read_timeout(Some(Duration::from_millis(500)));
|
||||||
let _ = std::io::copy(&mut reader.by_ref().take(64 * 1024), &mut std::io::sink());
|
let _ = std::io::copy(&mut reader.by_ref().take(64 * 1024), &mut std::io::sink());
|
||||||
@@ -356,10 +398,91 @@ fn busy_message(p: &Pending, method: &str) -> String {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn serve(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: egui::Context, patient: bool) {
|
/// A subscribed connection's socket, for its replies and its events: each line is written whole
|
||||||
serve_with(stream, token, tx, ctx, patient, WAITS, &RUNNING);
|
/// and alone, so an event never lands inside a reply (#6985).
|
||||||
|
struct Lines {
|
||||||
|
socket: TcpStream,
|
||||||
|
turn: Mutex<()>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Lines {
|
||||||
|
fn send(&self, line: &Value) -> std::io::Result<()> {
|
||||||
|
let _turn = self.turn.lock().unwrap_or_else(PoisonError::into_inner);
|
||||||
|
send(&mut &self.socket, line)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A connection's `control.subscribe` (#6985): its `design.changed` lines, sent from a thread of
|
||||||
|
/// their own until the connection ends.
|
||||||
|
struct Subscription {
|
||||||
|
lines: Arc<Lines>,
|
||||||
|
stop: Arc<AtomicBool>,
|
||||||
|
_counted: Subscriber,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Subscription {
|
||||||
|
/// Write `reply`, the window's answer to `control.subscribe` naming the design `seen`, on
|
||||||
|
/// `out`, then send `design`'s changes after it: the reply goes out before any event. `None`,
|
||||||
|
/// with nothing written, when no thread or socket was left for the events.
|
||||||
|
fn start(
|
||||||
|
design: &'static DesignWatch,
|
||||||
|
counted: Subscriber,
|
||||||
|
out: &TcpStream,
|
||||||
|
seen: (String, u64),
|
||||||
|
reply: &Value,
|
||||||
|
) -> Option<(Self, std::io::Result<()>)> {
|
||||||
|
let lines = Arc::new(Lines { socket: out.try_clone().ok()?, turn: Mutex::new(()) });
|
||||||
|
let stop = Arc::new(AtomicBool::new(false));
|
||||||
|
let first = lines.turn.lock().unwrap_or_else(PoisonError::into_inner);
|
||||||
|
let (l, s) = (lines.clone(), stop.clone());
|
||||||
|
std::thread::Builder::new().stack_size(64 * 1024).spawn(move || send_events(design, &l, &s, seen)).ok()?;
|
||||||
|
let sent = send(&mut &lines.socket, reply);
|
||||||
|
drop(first);
|
||||||
|
Some((Subscription { lines, stop, _counted: counted }, sent))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The design a `control.subscribe` reply names.
|
||||||
|
fn design_of(reply: &Value) -> Option<(String, u64)> {
|
||||||
|
let result = reply.get("result")?;
|
||||||
|
Some((result.get("document_id")?.as_str()?.to_string(), result.get("revision")?.as_u64()?))
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Subscription {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
self.stop.store(true, Ordering::Relaxed);
|
||||||
|
// The socket closes now, not when the thread next looks; a line blocked on a client that
|
||||||
|
// stopped reading ends too.
|
||||||
|
let _ = self.lines.socket.shutdown(std::net::Shutdown::Both);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The `design.changed` lines of a subscribed connection, each time the design differs from the
|
||||||
|
/// last one it was told of (`seen`), until `stop`.
|
||||||
|
fn send_events(design: &DesignWatch, lines: &Lines, stop: &AtomicBool, mut seen: (String, u64)) {
|
||||||
|
while !stop.load(Ordering::Relaxed) {
|
||||||
|
let Some(now) = design.wait(&seen, stop, Duration::from_secs(1)).filter(|now| *now != seen) else { continue };
|
||||||
|
if lines.send(&json!({"event": "design.changed", "params": {"document_id": now.0, "revision": now.1}})).is_err() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
seen = now;
|
||||||
|
std::thread::sleep(EVENT_GAP);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Write `reply` on the connection: through its subscription once it has one.
|
||||||
|
fn answer(out: &mut TcpStream, events: Option<&Subscription>, reply: &Value) -> std::io::Result<()> {
|
||||||
|
match events {
|
||||||
|
Some(e) => e.lines.send(reply),
|
||||||
|
None => send(out, reply),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn serve(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: egui::Context, patient: bool) {
|
||||||
|
serve_with(stream, token, tx, ctx, patient, WAITS, &RUNNING, &DESIGN_WATCH);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
fn serve_with(
|
fn serve_with(
|
||||||
stream: TcpStream,
|
stream: TcpStream,
|
||||||
token: &str,
|
token: &str,
|
||||||
@@ -368,6 +491,7 @@ fn serve_with(
|
|||||||
patient: bool,
|
patient: bool,
|
||||||
waits: Waits,
|
waits: Waits,
|
||||||
running: &'static Running,
|
running: &'static Running,
|
||||||
|
design: &'static DesignWatch,
|
||||||
) {
|
) {
|
||||||
let connection = running.connections.fetch_add(1, Ordering::Relaxed) + 1;
|
let connection = running.connections.fetch_add(1, Ordering::Relaxed) + 1;
|
||||||
let Ok(read) = stream.try_clone() else { return };
|
let Ok(read) = stream.try_clone() else { return };
|
||||||
@@ -376,30 +500,33 @@ fn serve_with(
|
|||||||
let mut bad = 0usize;
|
let mut bad = 0usize;
|
||||||
let mut authenticated = false;
|
let mut authenticated = false;
|
||||||
let mut pending: Option<Pending> = None;
|
let mut pending: Option<Pending> = None;
|
||||||
|
let mut events: Option<Subscription> = None;
|
||||||
loop {
|
loop {
|
||||||
|
// A first `control.subscribe` on its way to the window (#6985).
|
||||||
|
let mut joining = None;
|
||||||
let line = match read_line(&mut reader, MAX_LINE) {
|
let line = match read_line(&mut reader, MAX_LINE) {
|
||||||
Ok(Some(l)) => String::from_utf8_lossy(&l).into_owned(),
|
Ok(Some(l)) => String::from_utf8_lossy(&l).into_owned(),
|
||||||
Ok(None) => break,
|
Ok(None) => break,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let _ = writeln!(out, "{}", json!({"ok": false, "error": e.to_string()}));
|
let _ = answer(&mut out, events.as_ref(), &json!({"ok": false, "error": e.to_string()}));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if line.trim().is_empty() {
|
if line.trim().is_empty() {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
// The first request must carry the token; later ones on the same connection may.
|
||||||
|
if !authenticated {
|
||||||
|
match token_of(&line) {
|
||||||
|
Some(t) if control_auth::tokens_match(&t, token) => authenticated = true,
|
||||||
|
_ => {
|
||||||
|
refuse(&mut out, &mut reader);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
let reply = match serde_json::from_str::<Value>(&line) {
|
let reply = match serde_json::from_str::<Value>(&line) {
|
||||||
Ok(msg) => {
|
Ok(msg) => {
|
||||||
// The first request must carry the token; later ones on the same connection may.
|
|
||||||
if !authenticated {
|
|
||||||
match msg.get("token").and_then(Value::as_str) {
|
|
||||||
Some(t) if control_auth::tokens_match(t, token) => authenticated = true,
|
|
||||||
_ => {
|
|
||||||
refuse(&mut out, &mut reader);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let id = msg.get("id").cloned().unwrap_or(Value::Null);
|
let id = msg.get("id").cloned().unwrap_or(Value::Null);
|
||||||
let method = msg.get("method").and_then(Value::as_str).unwrap_or("").to_string();
|
let method = msg.get("method").and_then(Value::as_str).unwrap_or("").to_string();
|
||||||
let params = msg.get("params").cloned().unwrap_or(json!({}));
|
let params = msg.get("params").cloned().unwrap_or(json!({}));
|
||||||
@@ -425,6 +552,14 @@ fn serve_with(
|
|||||||
} else if let Some(p) = pending.as_ref().filter(|_| late.is_none()) {
|
} else if let Some(p) = pending.as_ref().filter(|_| late.is_none()) {
|
||||||
// Nothing more is queued behind it, to run unseen when it ends.
|
// Nothing more is queued behind it, to run unseen when it ends.
|
||||||
json!({"ok": false, "busy": true, "error": busy_message(p, &method)})
|
json!({"ok": false, "busy": true, "error": busy_message(p, &method)})
|
||||||
|
} else if method == "control.subscribe" && events.is_some() {
|
||||||
|
if late.is_some() {
|
||||||
|
// As below: finished, and the client moved on without asking.
|
||||||
|
pending = None;
|
||||||
|
}
|
||||||
|
// Its events already say how the design moves; a second answer could only
|
||||||
|
// arrive behind a newer one.
|
||||||
|
json!({"ok": false, "error": "already subscribed: this connection is sent design.changed lines; ask document.revision for the design now"})
|
||||||
} else {
|
} else {
|
||||||
if late.is_some() {
|
if late.is_some() {
|
||||||
// Finished, and the client moved on without asking: it is dropped.
|
// Finished, and the client moved on without asking: it is dropped.
|
||||||
@@ -434,6 +569,9 @@ fn serve_with(
|
|||||||
let wait = if patient || method == "engine.batch" { waits.long } else { waits.short };
|
let wait = if patient || method == "engine.batch" { waits.long } else { waits.short };
|
||||||
let what = control_pending::describe(&method, ¶ms);
|
let what = control_pending::describe(&method, ¶ms);
|
||||||
let effect = control_pending::effect(&method, ¶ms);
|
let effect = control_pending::effect(&method, ¶ms);
|
||||||
|
// Counted before the window answers, so it publishes every change from its
|
||||||
|
// answer on.
|
||||||
|
joining = (method == "control.subscribe").then(|| design.join());
|
||||||
let (req, rrx) = ControlRequest::new(method.clone(), params);
|
let (req, rrx) = ControlRequest::new(method.clone(), params);
|
||||||
let ticket = running.add(connection, &id, &req);
|
let ticket = running.add(connection, &id, &req);
|
||||||
if tx.send(req).is_err() {
|
if tx.send(req).is_err() {
|
||||||
@@ -454,16 +592,25 @@ fn serve_with(
|
|||||||
}
|
}
|
||||||
r
|
r
|
||||||
}
|
}
|
||||||
Err(_) if !authenticated => {
|
|
||||||
refuse(&mut out, &mut reader);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
bad += 1;
|
bad += 1;
|
||||||
json!({"ok": false, "error": format!("bad JSON: {e}")})
|
json!({"ok": false, "error": format!("bad JSON: {e}")})
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if writeln!(out, "{reply}").is_err() {
|
// Subscribed once the window named the design (not when it refused or timed out).
|
||||||
|
let sent = match joining.and_then(|counted| design_of(&reply).map(|seen| (counted, seen))) {
|
||||||
|
Some((counted, seen)) => match Subscription::start(design, counted, &out, seen, &reply) {
|
||||||
|
Some((subscription, sent)) => {
|
||||||
|
events = Some(subscription);
|
||||||
|
sent
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
send(&mut out, &json!({"id": reply.get("id"), "ok": false, "error": "not subscribed: no thread or socket left for the events"}))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None => answer(&mut out, events.as_ref(), &reply),
|
||||||
|
};
|
||||||
|
if sent.is_err() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if bad >= MAX_BAD_LINES {
|
if bad >= MAX_BAD_LINES {
|
||||||
@@ -503,7 +650,7 @@ mod tests {
|
|||||||
static RUNNING: Running = Running::new();
|
static RUNNING: Running = Running::new();
|
||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || {
|
||||||
if let Some(stream) = listener.incoming().flatten().next() {
|
if let Some(stream) = listener.incoming().flatten().next() {
|
||||||
serve_with(stream, token, tx, egui::Context::default(), false, waits, &RUNNING);
|
serve_with(stream, token, tx, egui::Context::default(), false, waits, &RUNNING, &DESIGN_WATCH);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
let s = TcpStream::connect(addr).unwrap();
|
let s = TcpStream::connect(addr).unwrap();
|
||||||
@@ -569,7 +716,7 @@ mod tests {
|
|||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || {
|
||||||
for stream in listener.incoming().flatten() {
|
for stream in listener.incoming().flatten() {
|
||||||
let tx = tx.clone();
|
let tx = tx.clone();
|
||||||
std::thread::spawn(move || serve_with(stream, token, tx, egui::Context::default(), false, waits, &RUNNING));
|
std::thread::spawn(move || serve_with(stream, token, tx, egui::Context::default(), false, waits, &RUNNING, &DESIGN_WATCH));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
let open = || {
|
let open = || {
|
||||||
@@ -639,6 +786,95 @@ mod tests {
|
|||||||
assert_eq!((&r["result"]["pending"], &r["result"]["done"]), (&json!(7), &json!(true)), "{r}");
|
assert_eq!((&r["result"]["pending"], &r["result"]["done"]), (&json!(7), &json!(true)), "{r}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// #6985: a connection that sends `control.subscribe` gets the design in the reply, then a
|
||||||
|
/// `design.changed` line each time the window publishes another: never before the reply,
|
||||||
|
/// none for the same design, the latest after a burst, each line whole between its replies.
|
||||||
|
/// A second subscribe is refused without reaching the window. A connection that did not
|
||||||
|
/// subscribe gets no events, and one that closed is no longer counted.
|
||||||
|
#[test]
|
||||||
|
fn subscribed_connections_are_told_of_design_changes() {
|
||||||
|
static RUNNING: Running = Running::new();
|
||||||
|
static WATCH: DesignWatch = DesignWatch::new();
|
||||||
|
let token = "0123456789abcdef0123456789abcdef";
|
||||||
|
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
|
||||||
|
let addr = listener.local_addr().unwrap();
|
||||||
|
let (tx, rx) = channel::<ControlRequest>();
|
||||||
|
// The window: it answers `control.subscribe` as the app does, publishing the design first;
|
||||||
|
// then the design changes at once, before the reply may have been written.
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
for req in rx {
|
||||||
|
if req.method == "control.subscribe" {
|
||||||
|
WATCH.publish("d-1", 3);
|
||||||
|
let _ = req.reply.send(json!({"ok": true, "result": {"document_id": "d-1", "revision": 3}}));
|
||||||
|
WATCH.publish("d-1", 4);
|
||||||
|
} else {
|
||||||
|
let _ = req.reply.send(json!({"ok": true, "result": req.method}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
for stream in listener.incoming().flatten() {
|
||||||
|
let tx = tx.clone();
|
||||||
|
std::thread::spawn(move || serve_with(stream, token, tx, egui::Context::default(), false, WAITS, &RUNNING, &WATCH));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let open = || {
|
||||||
|
let s = TcpStream::connect(addr).unwrap();
|
||||||
|
s.set_read_timeout(Some(Duration::from_secs(10))).unwrap();
|
||||||
|
(s.try_clone().unwrap(), BufReader::new(s))
|
||||||
|
};
|
||||||
|
let next = |lines: &mut BufReader<TcpStream>| -> Value {
|
||||||
|
let mut l = String::new();
|
||||||
|
lines.read_line(&mut l).unwrap();
|
||||||
|
serde_json::from_str(&l).unwrap()
|
||||||
|
};
|
||||||
|
let changed = |id: &str, revision: u64| json!({"event": "design.changed", "params": {"document_id": id, "revision": revision}});
|
||||||
|
|
||||||
|
let (mut quiet_out, mut quiet) = open();
|
||||||
|
writeln!(quiet_out, "{}", json!({"id": 1, "method": "ui.view", "token": token})).unwrap();
|
||||||
|
assert_eq!(next(&mut quiet)["id"], 1);
|
||||||
|
|
||||||
|
let (mut out, mut lines) = open();
|
||||||
|
writeln!(out, "{}", json!({"id": 1, "method": "control.subscribe", "token": token})).unwrap();
|
||||||
|
assert_eq!(next(&mut lines), json!({"id": 1, "ok": true, "result": {"document_id": "d-1", "revision": 3}}));
|
||||||
|
assert_eq!(next(&mut lines), changed("d-1", 4), "the change after the window's answer comes after the reply");
|
||||||
|
assert!(WATCH.subscribed());
|
||||||
|
// The design it was told of is no news; another revision is.
|
||||||
|
WATCH.publish("d-1", 4);
|
||||||
|
WATCH.publish("d-1", 5);
|
||||||
|
assert_eq!(next(&mut lines), changed("d-1", 5));
|
||||||
|
// A burst ends with its latest.
|
||||||
|
for revision in 6..=10 {
|
||||||
|
WATCH.publish("d-1", revision);
|
||||||
|
}
|
||||||
|
let mut last = 5;
|
||||||
|
while last < 10 {
|
||||||
|
let e = next(&mut lines);
|
||||||
|
let revision = e["params"]["revision"].as_u64().unwrap();
|
||||||
|
assert!(e["event"] == "design.changed" && revision > last, "{e} after {last}");
|
||||||
|
last = revision;
|
||||||
|
}
|
||||||
|
// Another tab: another id, whatever its revision.
|
||||||
|
WATCH.publish("d-2", 2);
|
||||||
|
assert_eq!(next(&mut lines), changed("d-2", 2));
|
||||||
|
// Subscribed already: refused here (the window would have published d-1 again).
|
||||||
|
writeln!(out, "{}", json!({"id": 2, "method": "control.subscribe"})).unwrap();
|
||||||
|
let r = next(&mut lines);
|
||||||
|
assert!(r["id"] == 2 && r["ok"] == false && r["error"].as_str().is_some_and(|e| e.starts_with("already subscribed")), "{r}");
|
||||||
|
// Replies still come, whole, and nothing else was sent meanwhile.
|
||||||
|
writeln!(out, "{}", json!({"id": 3, "method": "ui.view"})).unwrap();
|
||||||
|
assert_eq!(next(&mut lines), json!({"id": 3, "ok": true, "result": "ui.view"}));
|
||||||
|
writeln!(quiet_out, "{}", json!({"id": 2, "method": "ui.view"})).unwrap();
|
||||||
|
assert_eq!(next(&mut quiet), json!({"id": 2, "ok": true, "result": "ui.view"}), "no events without subscribing");
|
||||||
|
// Closed, it is no longer counted.
|
||||||
|
drop((out, lines));
|
||||||
|
let deadline = Instant::now() + Duration::from_secs(10);
|
||||||
|
while WATCH.subscribed() && Instant::now() < deadline {
|
||||||
|
std::thread::sleep(Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert!(!WATCH.subscribed());
|
||||||
|
}
|
||||||
|
|
||||||
/// A timed-out request that only reads is not said to "still apply", nor is one that only
|
/// A timed-out request that only reads is not said to "still apply", nor is one that only
|
||||||
/// writes a file (an export, #1989); a change is, by name.
|
/// writes a file (an export, #1989); a change is, by name.
|
||||||
#[test]
|
#[test]
|
||||||
@@ -658,6 +894,19 @@ mod tests {
|
|||||||
assert!(render.contains("will still write the file"), "{render}");
|
assert!(render.contains("will still write the file"), "{render}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The token is read from a request object without building the rest of it: other fields,
|
||||||
|
/// however large or nested, are only skipped. Anything but an object with a string token is
|
||||||
|
/// no token.
|
||||||
|
#[test]
|
||||||
|
fn token_is_read_without_parsing_the_request() {
|
||||||
|
assert_eq!(token_of(r#"{"id":1,"token":"abc","params":{"a":[1,[2,{"b":null}]]}}"#).as_deref(), Some("abc"));
|
||||||
|
let flood = format!(r#"{{"params":[{}0],"token":"t"}}"#, "0,".repeat(1 << 20));
|
||||||
|
assert_eq!(token_of(&flood).as_deref(), Some("t"));
|
||||||
|
for no in [r#"["abc"]"#, r#"{"token":5}"#, r#"{"token":"a"} x"#, r#"{"id":1}"#, "GET / HTTP/1.1", r#""token""#] {
|
||||||
|
assert_eq!(token_of(no), None, "{no}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// #205: a connection runs nothing until a request carries the launch's token; a wrong or
|
/// #205: a connection runs nothing until a request carries the launch's token; a wrong or
|
||||||
/// missing token, or garbage, is refused and the connection closed. Once shown, the token
|
/// missing token, or garbage, is refused and the connection closed. Once shown, the token
|
||||||
/// need not be repeated on that connection.
|
/// need not be repeated on that connection.
|
||||||
@@ -750,4 +999,31 @@ mod tests {
|
|||||||
let mut r = BufReader::with_capacity(64, text.as_slice());
|
let mut r = BufReader::with_capacity(64, text.as_slice());
|
||||||
assert!(read_line(&mut r, 1000).is_err());
|
assert!(read_line(&mut r, 1000).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A large reply reaches the socket in one write, not one per JSON piece (a component tree of
|
||||||
|
/// thousands of components took half a second to send), and reads back as it was.
|
||||||
|
#[test]
|
||||||
|
fn a_large_reply_is_written_at_once() {
|
||||||
|
struct Counted {
|
||||||
|
writes: usize,
|
||||||
|
bytes: Vec<u8>,
|
||||||
|
}
|
||||||
|
impl Write for Counted {
|
||||||
|
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
||||||
|
self.writes += 1;
|
||||||
|
self.bytes.extend_from_slice(buf);
|
||||||
|
Ok(buf.len())
|
||||||
|
}
|
||||||
|
fn flush(&mut self) -> std::io::Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let components: Vec<Value> = (0..2000).map(|i| json!({"id": i, "name": format!("Part {i}"), "bodies": ["a", "b"], "parent": 0})).collect();
|
||||||
|
let reply = json!({"ok": true, "id": 7, "result": {"components": components}});
|
||||||
|
let mut out = Counted { writes: 0, bytes: Vec::new() };
|
||||||
|
send(&mut out, &reply).unwrap();
|
||||||
|
assert_eq!(out.writes, 1);
|
||||||
|
assert_eq!(out.bytes.last(), Some(&b'\n'));
|
||||||
|
assert_eq!(serde_json::from_slice::<Value>(&out.bytes).unwrap(), reply);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
//! A `.step`/`.stp` file opens as a new design holding the file's bodies (an Import feature); a
|
//! A `.step`/`.stp` file opens as a new design holding the file's bodies (an Import feature); a
|
||||||
//! `.3mf`/`.stl`/`.obj`/`.glb`/`.gltf` file as a new design holding mesh bodies.
|
//! `.3mf`/`.stl`/`.obj`/`.glb`/`.gltf` file as a new design holding mesh bodies.
|
||||||
//!
|
//!
|
||||||
|
//! `SOLIDCRAFT_SETTINGS_DIR` selects an explicit absolute settings directory without legacy adoption.
|
||||||
//! `--control <port>` (or `SOLIDCRAFT_CONTROL_PORT`) starts a localhost JSON-lines control
|
//! `--control <port>` (or `SOLIDCRAFT_CONTROL_PORT`) starts a localhost JSON-lines control
|
||||||
//! server: `{"id":1,"method":"engine.execute","params":{"command":"solid.box","params":{…}}}`.
|
//! server: `{"id":1,"method":"engine.execute","params":{"command":"solid.box","params":{…}}}`.
|
||||||
//! Without them the channel still opens, on the default port, unless Preferences turns it off.
|
//! Without them the channel still opens, on the default port, unless Preferences turns it off.
|
||||||
@@ -23,10 +24,13 @@ mod control_server;
|
|||||||
mod device_lost;
|
mod device_lost;
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
mod native_crash;
|
mod native_crash;
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
mod native_crash_macos;
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
mod native_frame;
|
mod native_frame;
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
mod native_menu;
|
mod native_menu;
|
||||||
|
mod nav_bridge;
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
mod open_documents;
|
mod open_documents;
|
||||||
#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
|
#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
|
||||||
@@ -86,6 +90,8 @@ struct App {
|
|||||||
space_mouse: space_mouse::SpaceMouse,
|
space_mouse: space_mouse::SpaceMouse,
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
native_menu: Option<native_menu::NativeMenu>,
|
native_menu: Option<native_menu::NativeMenu>,
|
||||||
|
/// A device's own app moving the view (Preferences › Navigation, off by default).
|
||||||
|
nav_bridge: nav_bridge::NavBridge,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl eframe::App for App {
|
impl eframe::App for App {
|
||||||
@@ -110,6 +116,13 @@ impl eframe::App for App {
|
|||||||
ctx.send_viewport_cmd(egui::ViewportCommand::Focus);
|
ctx.send_viewport_cmd(egui::ViewportCommand::Focus);
|
||||||
}
|
}
|
||||||
solidcraft_engine::crash::phase(solidcraft_engine::crash::RUNNING);
|
solidcraft_engine::crash::phase(solidcraft_engine::crash::RUNNING);
|
||||||
|
// A DMG install has no installer step: put solidcraft-cli on PATH, quietly.
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
std::thread::spawn(solidcraft_ui_egui::cli_link::install_on_launch);
|
||||||
|
// Automation runs (a control port was asked for) leave the user's AI apps alone.
|
||||||
|
if !self.take_focus_unwanted {
|
||||||
|
solidcraft_ui_egui::ai_connect::begin(&mut self.solve);
|
||||||
|
}
|
||||||
if let Some(dir) = self.starting.take() {
|
if let Some(dir) = self.starting.take() {
|
||||||
startup::started(&dir);
|
startup::started(&dir);
|
||||||
}
|
}
|
||||||
@@ -137,6 +150,8 @@ impl eframe::App for App {
|
|||||||
if !self.solve.file_picker_busy() {
|
if !self.solve.file_picker_busy() {
|
||||||
self.space_mouse.tick(&mut self.solve, ctx);
|
self.space_mouse.tick(&mut self.solve, ctx);
|
||||||
}
|
}
|
||||||
|
// Every frame, so switching the bridge off reaches the reader while a picker is open too.
|
||||||
|
self.nav_bridge.tick(&mut self.solve, ctx);
|
||||||
if self.solve.quit_requested {
|
if self.solve.quit_requested {
|
||||||
ctx.send_viewport_cmd(egui::ViewportCommand::Close);
|
ctx.send_viewport_cmd(egui::ViewportCommand::Close);
|
||||||
}
|
}
|
||||||
@@ -146,6 +161,8 @@ impl eframe::App for App {
|
|||||||
if let Some(menu) = &mut self.native_menu {
|
if let Some(menu) = &mut self.native_menu {
|
||||||
menu.raw_input_hook(&mut self.solve, ctx, raw);
|
menu.raw_input_hook(&mut self.solve, ctx, raw);
|
||||||
}
|
}
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
macos_fullscreen_content(ctx, raw);
|
||||||
// Before the app's own hook, which adds the control channel's events.
|
// Before the app's own hook, which adds the control channel's events.
|
||||||
#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
|
#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
|
||||||
self.space_mouse.raw_input_hook(self.solve.preferences.space_mouse_enabled, raw);
|
self.space_mouse.raw_input_hook(self.solve.preferences.space_mouse_enabled, raw);
|
||||||
@@ -155,7 +172,7 @@ impl eframe::App for App {
|
|||||||
self.solve.raw_input_hook(raw);
|
self.solve.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) {
|
||||||
self.solve.ui(ui);
|
content_ui(&mut self.solve, ui);
|
||||||
}
|
}
|
||||||
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
||||||
storage.set_string(solidcraft_ui_egui::prefs::STORAGE_KEY, self.solve.prefs());
|
storage.set_string(solidcraft_ui_egui::prefs::STORAGE_KEY, self.solve.prefs());
|
||||||
@@ -165,7 +182,17 @@ impl eframe::App for App {
|
|||||||
solidcraft_ui_egui::agent_chat::shutdown(&mut self.solve);
|
solidcraft_ui_egui::agent_chat::shutdown(&mut self.solve);
|
||||||
// A save still being written ends before the app does.
|
// A save still being written ends before the app does.
|
||||||
solidcraft_ui_egui::save_job::tick(&mut self.solve, true);
|
solidcraft_ui_egui::save_job::tick(&mut self.solve, true);
|
||||||
|
// Pictures still being drawn off the window thread (Home cards, file previews) end
|
||||||
|
// before the GPU is torn down: one drawn while the process exits can crash the driver.
|
||||||
|
if !solidcraft_engine::capture::close(std::time::Duration::from_secs(5)) {
|
||||||
|
log::warn!("a picture was still being drawn as the app closed");
|
||||||
|
}
|
||||||
solidcraft_ui_egui::recovery_ui::close(&mut self.solve);
|
solidcraft_ui_egui::recovery_ui::close(&mut self.solve);
|
||||||
|
solidcraft_ui_egui::open_elsewhere::close(&mut self.solve);
|
||||||
|
// Before a restart below starts the next instance, which would otherwise get nothing from
|
||||||
|
// the 3D mouse driver (`solidcraft_3dx_client::stop`).
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
solidcraft_3dx_client::stop();
|
||||||
solidcraft_engine::crash::end_session();
|
solidcraft_engine::crash::end_session();
|
||||||
if let Some(lost_at) = self.gpu.as_ref().and_then(|g| g.lost_at) {
|
if let Some(lost_at) = self.gpu.as_ref().and_then(|g| g.lost_at) {
|
||||||
device_lost::restart(self.gpu.as_ref().is_some_and(|g| g.restart_on_software), lost_at);
|
device_lost::restart(self.gpu.as_ref().is_some_and(|g| g.restart_on_software), lost_at);
|
||||||
@@ -231,6 +258,37 @@ fn case_variants(exts: &[&str]) -> Vec<String> {
|
|||||||
all
|
all
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// egui's root Ui spans the whole viewport, including native safe areas. Lay out the app
|
||||||
|
/// inside the unobscured rectangle so its application bar can receive native pointer input.
|
||||||
|
fn content_ui(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||||
|
let content = ui.ctx().content_rect();
|
||||||
|
let above = egui::Rect::from_min_max(ui.max_rect().min, egui::pos2(ui.max_rect().right(), content.top()));
|
||||||
|
ui.painter().rect_filled(above, 0.0, solidcraft_ui_egui::theme::Tokens::get().app_bar);
|
||||||
|
ui.scope_builder(egui::UiBuilder::new().max_rect(content), |ui| app.ui(ui));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A transparent macOS title bar still intercepts clicks at the top in fullscreen (#3643).
|
||||||
|
/// `contentLayoutRect` reports the whole content view once that bar auto-hides, so reserve
|
||||||
|
/// the native titled-window height even then. AppKit supplies the height in logical points;
|
||||||
|
/// egui's UI zoom is separate from the display's Retina scale.
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
fn macos_fullscreen_content(ctx: &egui::Context, raw: &mut egui::RawInput) {
|
||||||
|
let Some(mtm) = objc2::MainThreadMarker::new() else { return };
|
||||||
|
let frame = objc2_app_kit::NSWindow::frameRectForContentRect_styleMask(Default::default(), objc2_app_kit::NSWindowStyleMask::Titled, mtm);
|
||||||
|
fullscreen_content_insets(raw, frame.size.height as f32, ctx.zoom_factor());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(any(target_os = "macos", test))]
|
||||||
|
fn fullscreen_content_insets(raw: &mut egui::RawInput, title_height: f32, zoom: f32) {
|
||||||
|
let fullscreen = raw.viewports.get(&raw.viewport_id).and_then(|v| v.fullscreen).unwrap_or(false);
|
||||||
|
let mut insets = raw.safe_area_insets.unwrap_or_default();
|
||||||
|
if fullscreen && title_height.is_finite() && title_height > 0.0 && zoom.is_finite() && zoom > 0.0 {
|
||||||
|
insets.0.top = insets.0.top.max(title_height / zoom);
|
||||||
|
}
|
||||||
|
// Explicitly reset on leaving fullscreen: None would retain the preceding frame's inset.
|
||||||
|
raw.safe_area_insets = Some(insets);
|
||||||
|
}
|
||||||
|
|
||||||
fn services(cc: &eframe::CreationContext<'_>) -> Services {
|
fn services(cc: &eframe::CreationContext<'_>) -> Services {
|
||||||
let parent = rfd::AsyncFileDialog::new().set_parent(cc);
|
let parent = rfd::AsyncFileDialog::new().set_parent(cc);
|
||||||
let open_parent = parent.clone();
|
let open_parent = parent.clone();
|
||||||
@@ -245,7 +303,9 @@ fn services(cc: &eframe::CreationContext<'_>) -> Services {
|
|||||||
dialog = dialog.add_filter(label, &case_variants(first));
|
dialog = dialog.add_filter(label, &case_variants(first));
|
||||||
}
|
}
|
||||||
// The groups come from the format registry, so a new format joins this dialog by itself.
|
// The groups come from the format registry, so a new format joins this dialog by itself.
|
||||||
dialog = dialog.add_filter("Designs, CAD files and meshes", &case_variants(&io::formats::open_extensions(true)));
|
let mut everything = io::formats::open_extensions(true);
|
||||||
|
everything.extend(["dxf", "svg"]);
|
||||||
|
dialog = dialog.add_filter(solidcraft_ui_egui::i18n::tr("file.open.drawing_filter"), &case_variants(&everything));
|
||||||
for (label, exts) in io::formats::import_filters(true) {
|
for (label, exts) in io::formats::import_filters(true) {
|
||||||
dialog = dialog.add_filter(label, &case_variants(&exts));
|
dialog = dialog.add_filter(label, &case_variants(&exts));
|
||||||
}
|
}
|
||||||
@@ -288,6 +348,7 @@ fn services(cc: &eframe::CreationContext<'_>) -> Services {
|
|||||||
let future = dialog.save_file();
|
let future = dialog.save_file();
|
||||||
Box::pin(async move { future.await.map(|p| p.path().to_string_lossy().into_owned()) })
|
Box::pin(async move { future.await.map(|p| p.path().to_string_lossy().into_owned()) })
|
||||||
})),
|
})),
|
||||||
|
graphics_adapters: Vec::new(),
|
||||||
graphics_path: graphics_path().map(|p| p.to_string_lossy().to_string()),
|
graphics_path: graphics_path().map(|p| p.to_string_lossy().to_string()),
|
||||||
window_system: window_system_now(),
|
window_system: window_system_now(),
|
||||||
http_get: Some(std::sync::Arc::new(http_get)),
|
http_get: Some(std::sync::Arc::new(http_get)),
|
||||||
@@ -297,6 +358,7 @@ fn services(cc: &eframe::CreationContext<'_>) -> Services {
|
|||||||
can_restore: None,
|
can_restore: None,
|
||||||
restore_file: None,
|
restore_file: None,
|
||||||
download_design: None,
|
download_design: None,
|
||||||
|
easyprint_upload: Some(std::sync::Arc::new(easyprint_upload)),
|
||||||
browser_files: None,
|
browser_files: None,
|
||||||
agent_http: Some(std::sync::Arc::new(agent_http)),
|
agent_http: Some(std::sync::Arc::new(agent_http)),
|
||||||
secrets: Some(std::sync::Arc::new(Keychain)),
|
secrets: Some(std::sync::Arc::new(Keychain)),
|
||||||
@@ -368,7 +430,7 @@ fn agent_http(r: &solidcraft_ui_egui::agent_chat::backend::HttpRequest) -> Resul
|
|||||||
let agent: ureq::Agent = ureq::Agent::config_builder()
|
let agent: ureq::Agent = ureq::Agent::config_builder()
|
||||||
.tls_config(tls)
|
.tls_config(tls)
|
||||||
.http_status_as_error(false)
|
.http_status_as_error(false)
|
||||||
.timeout_global(Some(Duration::from_secs(r.timeout_s.clamp(1, 900))))
|
.timeout_global(Some(Duration::from_secs(r.timeout_s.clamp(1, 3600))))
|
||||||
.timeout_connect(Some(Duration::from_secs(10)))
|
.timeout_connect(Some(Duration::from_secs(10)))
|
||||||
.user_agent("SolidCraft")
|
.user_agent("SolidCraft")
|
||||||
.max_redirects(0)
|
.max_redirects(0)
|
||||||
@@ -393,6 +455,24 @@ fn agent_http(r: &solidcraft_ui_egui::agent_chat::backend::HttpRequest) -> Resul
|
|||||||
Ok((status, body))
|
Ok((status, body))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Open with EasyPrint: upload the model to Printables' import endpoint on a worker and answer on
|
||||||
|
/// `done` with the address to open. Through [`agent_http`]: no redirects, a timeout, no cookies.
|
||||||
|
fn easyprint_upload(name: &str, bytes: Vec<u8>, done: std::sync::mpsc::Sender<Result<String, String>>) {
|
||||||
|
use solidcraft_engine::easyprint;
|
||||||
|
let name = name.to_string();
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let (content_type, body) = easyprint::multipart(&name, &bytes);
|
||||||
|
let request = solidcraft_ui_egui::agent_chat::backend::HttpRequest {
|
||||||
|
method: "POST",
|
||||||
|
url: easyprint::IMPORT_URL.into(),
|
||||||
|
headers: vec![("Content-Type".into(), content_type), ("Accept".into(), "application/json".into())],
|
||||||
|
body: Some(body),
|
||||||
|
timeout_s: 180,
|
||||||
|
};
|
||||||
|
let _ = done.send(agent_http(&request).and_then(|(status, body)| easyprint::parse_import_response(status, &body)));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/// API keys in the system keychain (service "SolidCraft agent chat", one entry per agent).
|
/// API keys in the system keychain (service "SolidCraft agent chat", one entry per agent).
|
||||||
struct Keychain;
|
struct Keychain;
|
||||||
|
|
||||||
@@ -459,14 +539,15 @@ fn http_call(url: &str, timeout: std::time::Duration) -> Result<ureq::http::Resp
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// The per-user settings folder: eframe's storage (`app.ron`) and the anti-aliasing preference.
|
/// The per-user settings folder: eframe's storage (`app.ron`) and the anti-aliasing preference.
|
||||||
fn settings_dir() -> Option<std::path::PathBuf> {
|
fn settings_dir() -> Result<Option<std::path::PathBuf>, String> {
|
||||||
eframe::storage_dir("SolidCraft")
|
let selected = std::env::var_os("SOLIDCRAFT_SETTINGS_DIR");
|
||||||
|
startup::settings_directory(selected.as_deref(), eframe::storage_dir("SolidCraft"))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The anti-aliasing preference, kept next to eframe's storage (it is needed before the
|
/// The anti-aliasing preference, kept next to eframe's storage (it is needed before the
|
||||||
/// window opens).
|
/// window opens).
|
||||||
fn graphics_path() -> Option<std::path::PathBuf> {
|
fn graphics_path() -> Option<std::path::PathBuf> {
|
||||||
settings_dir().map(|d| d.join("graphics.json"))
|
settings_dir().ok().flatten().map(|d| d.join("graphics.json"))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Compatibility shim (docs/compatibility.md): on the first launch after the rename, copy the
|
/// Compatibility shim (docs/compatibility.md): on the first launch after the rename, copy the
|
||||||
@@ -476,7 +557,7 @@ fn graphics_path() -> Option<std::path::PathBuf> {
|
|||||||
/// old app id's `~/.var/app` folder; that copy comes first, as it is the newest. The old folders
|
/// old app id's `~/.var/app` folder; that copy comes first, as it is the newest. The old folders
|
||||||
/// are never changed.
|
/// are never changed.
|
||||||
fn adopt_legacy_settings() {
|
fn adopt_legacy_settings() {
|
||||||
let (Some(current), Some(legacy)) = (settings_dir(), eframe::storage_dir("SolveCraft")) else { return };
|
let (Some(current), Some(legacy)) = (settings_dir().ok().flatten(), eframe::storage_dir("SolveCraft")) else { return };
|
||||||
let legacy_eframe = eframe::storage_dir(solidcraft_engine::io::LEGACY_APP_ID);
|
let legacy_eframe = eframe::storage_dir(solidcraft_engine::io::LEGACY_APP_ID);
|
||||||
let old_flatpak = solidcraft_engine::io::legacy_flatpak_path(¤t);
|
let old_flatpak = solidcraft_engine::io::legacy_flatpak_path(¤t);
|
||||||
if let Err(e) = adopt_settings(¤t, old_flatpak.as_deref(), &legacy, legacy_eframe.as_deref()) {
|
if let Err(e) = adopt_settings(¤t, old_flatpak.as_deref(), &legacy, legacy_eframe.as_deref()) {
|
||||||
@@ -527,13 +608,22 @@ fn scene_samples(backend: eframe::wgpu::Backend, samples: u32, supported: &[u32]
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Anti-aliasing samples from Preferences (4 when unset).
|
/// Keep the default until the installed renderer's startup check proves a fallback is needed.
|
||||||
fn msaa() -> u16 {
|
fn scene_msaa_request(saved: Option<u16>) -> u16 {
|
||||||
|
saved.unwrap_or(MSAA)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Query the scene's colour/depth intersection, rather than the depthless window's counts.
|
||||||
|
fn scene_sample_choices(depth_bits: u8, stencil_bits: u8, query: impl FnOnce(Option<eframe::wgpu::TextureFormat>) -> Vec<u32>) -> Vec<u32> {
|
||||||
|
query(eframe::egui_wgpu::depth_format_from_bits(depth_bits, stencil_bits))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An explicitly saved anti-aliasing choice, absent until Graphics changes it.
|
||||||
|
fn msaa() -> Option<u16> {
|
||||||
graphics()
|
graphics()
|
||||||
.and_then(|v| v.get("msaa").and_then(serde_json::Value::as_u64))
|
.and_then(|v| v.get("msaa").and_then(serde_json::Value::as_u64))
|
||||||
.and_then(|m| u16::try_from(m).ok())
|
.and_then(|m| u16::try_from(m).ok())
|
||||||
.filter(|m| [1, 2, 4, 8].contains(m))
|
.filter(|m| [1, 2, 4, 8].contains(m))
|
||||||
.unwrap_or(MSAA)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Windows and Linux: no OS title bar; the application bar is the title bar
|
/// Windows and Linux: no OS title bar; the application bar is the title bar
|
||||||
@@ -549,7 +639,8 @@ const FLOAT_DEPTH_BITS: u8 = 32;
|
|||||||
const STENCIL_BITS: u8 = 8;
|
const STENCIL_BITS: u8 = 8;
|
||||||
const MSAA: u16 = 4;
|
const MSAA: u16 = 4;
|
||||||
|
|
||||||
fn app_viewport() -> Result<egui::ViewportBuilder, eframe::Error> {
|
/// `custom_titlebar`: no OS decorations, the application bar is the title bar.
|
||||||
|
fn app_viewport(custom_titlebar: bool) -> Result<egui::ViewportBuilder, eframe::Error> {
|
||||||
// Let macOS use the bundle's layered icon; eframe's default bitmap would replace it.
|
// Let macOS use the bundle's layered icon; eframe's default bitmap would replace it.
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
let icon = egui::IconData::default();
|
let icon = egui::IconData::default();
|
||||||
@@ -562,7 +653,7 @@ fn app_viewport() -> Result<egui::ViewportBuilder, eframe::Error> {
|
|||||||
.with_inner_size([1600.0, 1000.0])
|
.with_inner_size([1600.0, 1000.0])
|
||||||
.with_min_inner_size([960.0, 600.0])
|
.with_min_inner_size([960.0, 600.0])
|
||||||
.with_drag_and_drop(true)
|
.with_drag_and_drop(true)
|
||||||
.with_decorations(!CUSTOM_TITLEBAR)
|
.with_decorations(!custom_titlebar)
|
||||||
.with_fullsize_content_view(true)
|
.with_fullsize_content_view(true)
|
||||||
.with_titlebar_shown(false)
|
.with_titlebar_shown(false)
|
||||||
.with_title_shown(false)
|
.with_title_shown(false)
|
||||||
@@ -572,11 +663,27 @@ fn app_viewport() -> Result<egui::ViewportBuilder, eframe::Error> {
|
|||||||
/// The window's app id: it names the desktop entry, so it is the packages' reverse-DNS id.
|
/// The window's app id: it names the desktop entry, so it is the packages' reverse-DNS id.
|
||||||
const APP_ID: &str = solidcraft_engine::io::APP_ID;
|
const APP_ID: &str = solidcraft_engine::io::APP_ID;
|
||||||
|
|
||||||
|
/// Disconnects from the 3D mouse driver when dropped, as `main` returns or a panic unwinds out
|
||||||
|
/// of it (`solidcraft_3dx_client::stop`).
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
struct DriverClient;
|
||||||
|
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
impl Drop for DriverClient {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
solidcraft_3dx_client::stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn main() -> eframe::Result {
|
fn main() -> eframe::Result {
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
objc2_foundation::NSProcessInfo::processInfo().setProcessName(objc2_foundation::ns_string!("SolidCraft"));
|
objc2_foundation::NSProcessInfo::processInfo().setProcessName(objc2_foundation::ns_string!("SolidCraft"));
|
||||||
mark("main");
|
mark("main");
|
||||||
adopt_legacy_settings();
|
// Validate before legacy adoption, crash markers or any user preference read.
|
||||||
|
let settings = settings_dir().map_err(|error| eframe::Error::AppCreation(error.into()))?;
|
||||||
|
if std::env::var_os("SOLIDCRAFT_SETTINGS_DIR").is_none() {
|
||||||
|
adopt_legacy_settings();
|
||||||
|
}
|
||||||
let mut safe_mode = startup::env_on(std::env::var(startup::SAFE_MODE_ENV).ok().as_deref());
|
let mut safe_mode = startup::env_on(std::env::var(startup::SAFE_MODE_ENV).ok().as_deref());
|
||||||
let mut control_port: Option<u16> = solidcraft_engine::geom::env::var("CONTROL_PORT").and_then(|p| p.parse().ok());
|
let mut control_port: Option<u16> = solidcraft_engine::geom::env::var("CONTROL_PORT").and_then(|p| p.parse().ok());
|
||||||
let mut files = Vec::new();
|
let mut files = Vec::new();
|
||||||
@@ -613,7 +720,6 @@ fn main() -> eframe::Result {
|
|||||||
}
|
}
|
||||||
// Settings that don't read are moved aside; launches that never got a window are counted,
|
// Settings that don't read are moved aside; launches that never got a window are counted,
|
||||||
// and after a few in a row this one starts in safe mode (docs/book/src/guide/troubleshooting.md).
|
// and after a few in a row this one starts in safe mode (docs/book/src/guide/troubleshooting.md).
|
||||||
let settings = settings_dir();
|
|
||||||
let mut notes: Vec<String> = Vec::new();
|
let mut notes: Vec<String> = Vec::new();
|
||||||
let mut failed_starts = 0;
|
let mut failed_starts = 0;
|
||||||
if let Some(dir) = &settings {
|
if let Some(dir) = &settings {
|
||||||
@@ -633,7 +739,13 @@ fn main() -> eframe::Result {
|
|||||||
if safe_mode {
|
if safe_mode {
|
||||||
notes.push("Safe mode: default settings (yours are kept for the next normal start), no recovery offer, software rendering.".into());
|
notes.push("Safe mode: default settings (yours are kept for the next normal start), no recovery offer, software rendering.".into());
|
||||||
}
|
}
|
||||||
let samples = if safe_mode { MSAA } else { msaa() };
|
let fallback_note = std::env::var(startup::FALLBACK_NOTE_ENV).ok().map(|s| s.chars().take(4096).collect::<String>());
|
||||||
|
if let Some(note) = &fallback_note {
|
||||||
|
log::warn!("{note}");
|
||||||
|
eprintln!("SolidCraft: {note}");
|
||||||
|
notes.push(note.clone());
|
||||||
|
}
|
||||||
|
let saved_samples = if safe_mode { None } else { msaa() };
|
||||||
let wgpu_options = wgpu_options(cpu_renderer, if safe_mode { None } else { backend_preference() }.as_deref());
|
let wgpu_options = wgpu_options(cpu_renderer, if safe_mode { None } else { backend_preference() }.as_deref());
|
||||||
let depth_bits = if !safe_mode && startup::float_depth_everywhere(&wgpu_options) { FLOAT_DEPTH_BITS } else { DEPTH_BITS };
|
let depth_bits = if !safe_mode && startup::float_depth_everywhere(&wgpu_options) { FLOAT_DEPTH_BITS } else { DEPTH_BITS };
|
||||||
// Crashes leave a report in the crash folder (solidcraft_engine::crash, docs/crash-reports.md).
|
// Crashes leave a report in the crash folder (solidcraft_engine::crash, docs/crash-reports.md).
|
||||||
@@ -647,14 +759,22 @@ fn main() -> eframe::Result {
|
|||||||
solidcraft_engine::crash::install(dir, build)
|
solidcraft_engine::crash::install(dir, build)
|
||||||
})
|
})
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
// A crash in native code (a graphics driver) says where it happened: the exception and the
|
// A crash in native code (a graphics driver) says where it happened: the exception or signal
|
||||||
// module on Windows, and on every system the startup step the app was in.
|
// and the module on Windows and macOS, and on every system the startup step the app was in.
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
native_crash::install();
|
native_crash::install();
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
native_crash_macos::install();
|
||||||
|
// Windows with only OpenGL to start: the system title bar instead of ours (#2063).
|
||||||
|
let started = match &wgpu_options.wgpu_setup {
|
||||||
|
eframe::egui_wgpu::WgpuSetup::CreateNew(setup) => setup.instance_descriptor.backends,
|
||||||
|
_ => eframe::wgpu::Backends::all(),
|
||||||
|
};
|
||||||
|
let custom_titlebar = CUSTOM_TITLEBAR && !startup::system_title_bar(cfg!(target_os = "windows"), started);
|
||||||
eframe::egui_wgpu::set_startup_hook(startup_step);
|
eframe::egui_wgpu::set_startup_hook(startup_step);
|
||||||
solidcraft_engine::crash::phase("window");
|
solidcraft_engine::crash::phase("window");
|
||||||
let options = eframe::NativeOptions {
|
let options = eframe::NativeOptions {
|
||||||
viewport: app_viewport()?,
|
viewport: app_viewport(custom_titlebar)?,
|
||||||
// The window's pass (egui's) has no depth and one sample: the viewport draws its scene
|
// The window's pass (egui's) has no depth and one sample: the viewport draws its scene
|
||||||
// offscreen with its own depth and MSAA, then blits it, so the UI pass pays for neither.
|
// offscreen with its own depth and MSAA, then blits it, so the UI pass pays for neither.
|
||||||
depth_buffer: 0,
|
depth_buffer: 0,
|
||||||
@@ -705,6 +825,10 @@ fn main() -> eframe::Result {
|
|||||||
let created = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
|
let created = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||||||
let created_in_app = created.clone();
|
let created_in_app = created.clone();
|
||||||
let starting = settings.clone();
|
let starting = settings.clone();
|
||||||
|
// A panic on the window's thread ends the app without `on_exit`; this disconnects from the
|
||||||
|
// 3D mouse driver then too.
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
let _driver_client = DriverClient;
|
||||||
mark("run_native");
|
mark("run_native");
|
||||||
let result = eframe::run_native(
|
let result = eframe::run_native(
|
||||||
"SolidCraft",
|
"SolidCraft",
|
||||||
@@ -718,18 +842,24 @@ fn main() -> eframe::Result {
|
|||||||
mark("fonts");
|
mark("fonts");
|
||||||
let mut app = SolveApp::new(Session::default(), services(cc));
|
let mut app = SolveApp::new(Session::default(), services(cc));
|
||||||
app.apply_off_thread = Some(solidcraft_ui_egui::dialogs::APPLY_AT_ONCE);
|
app.apply_off_thread = Some(solidcraft_ui_egui::dialogs::APPLY_AT_ONCE);
|
||||||
app.custom_titlebar = CUSTOM_TITLEBAR;
|
app.custom_titlebar = custom_titlebar;
|
||||||
// Windows: the OS hit test offers the resize border, at the window's DPI, from the
|
|
||||||
// first message (#1381).
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
{
|
{
|
||||||
app.native_resize_border = CUSTOM_TITLEBAR && native_frame::install(cc);
|
// Windows: the taskbar button shows the mark even when slow first frames keep the
|
||||||
if CUSTOM_TITLEBAR && !app.native_resize_border {
|
// taskbar waiting for the window's icon.
|
||||||
|
if !native_frame::set_class_icon(cc) {
|
||||||
|
eprintln!("SolidCraft window: no class icon; the taskbar may show a generic one");
|
||||||
|
}
|
||||||
|
// The OS hit test offers the resize border, at the window's DPI, from the first
|
||||||
|
// message (#1381).
|
||||||
|
app.native_resize_border = custom_titlebar && native_frame::install(cc);
|
||||||
|
if custom_titlebar && !app.native_resize_border {
|
||||||
eprintln!("SolidCraft window: no native resize border; egui edge zones instead");
|
eprintln!("SolidCraft window: no native resize border; egui edge zones instead");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
app.integrated_titlebar = cfg!(target_os = "macos");
|
app.integrated_titlebar = cfg!(target_os = "macos");
|
||||||
app.cpu_meshing = safe_mode;
|
app.cpu_meshing = safe_mode;
|
||||||
|
app.graphics_fallback = fallback_note.clone();
|
||||||
if let Some(p) = cc.storage.and_then(|s| solidcraft_ui_egui::prefs::stored(|k| s.get_string(k))).filter(|_| !safe_mode) {
|
if let Some(p) = cc.storage.and_then(|s| solidcraft_ui_egui::prefs::stored(|k| s.get_string(k))).filter(|_| !safe_mode) {
|
||||||
app.load_prefs(&p);
|
app.load_prefs(&p);
|
||||||
}
|
}
|
||||||
@@ -739,19 +869,37 @@ fn main() -> eframe::Result {
|
|||||||
restart_on_software: device_lost::restart_on_software(after_loss, cpu_renderer),
|
restart_on_software: device_lost::restart_on_software(after_loss, cpu_renderer),
|
||||||
lost_at: None,
|
lost_at: None,
|
||||||
});
|
});
|
||||||
|
if !safe_mode {
|
||||||
|
app.preferences.graphics_adapter =
|
||||||
|
graphics().and_then(|v| v.get("adapter").and_then(serde_json::Value::as_str).map(str::to_string)).unwrap_or_default();
|
||||||
|
}
|
||||||
if let Some(rs) = &cc.wgpu_render_state {
|
if let Some(rs) = &cc.wgpu_render_state {
|
||||||
let scene_samples = scene_samples(rs.adapter.get_info().backend, u32::from(samples), &rs.msaa_supported);
|
app.services.graphics_adapters = rs
|
||||||
|
.available_adapters
|
||||||
|
.iter()
|
||||||
|
.map(|adapter| {
|
||||||
|
let info = adapter.get_info();
|
||||||
|
(info.name.clone(), format!("{} ({:?}, {:?})", info.name, info.device_type, info.backend))
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let info = rs.adapter.get_info();
|
||||||
|
let samples = scene_msaa_request(saved_samples);
|
||||||
|
let supported = scene_sample_choices(depth_bits, STENCIL_BITS, |depth| {
|
||||||
|
eframe::egui_wgpu::supported_msaa_samples(&rs.adapter, &rs.device, rs.target_format, depth)
|
||||||
|
});
|
||||||
|
let scene_samples = scene_samples(info.backend, u32::from(samples), &supported);
|
||||||
eprintln!("SolidCraft graphics: {:?}, MSAA {scene_samples}x (requested {}x)", rs.adapter.get_info().backend, samples);
|
eprintln!("SolidCraft graphics: {:?}, MSAA {scene_samples}x (requested {}x)", rs.adapter.get_info().backend, samples);
|
||||||
solidcraft_engine::crash::phase("viewport pipelines (shader compile)");
|
solidcraft_engine::crash::phase("viewport pipelines (shader compile)");
|
||||||
app.set_wgpu_split(rs, depth_bits, STENCIL_BITS, scene_samples);
|
let scene_samples = app.set_wgpu_split(rs, depth_bits, STENCIL_BITS, scene_samples);
|
||||||
|
app.msaa_supported = supported;
|
||||||
|
app.preferences.msaa = u32::from(samples);
|
||||||
solidcraft_ui_egui::gpu::install_picture_renderer(rs);
|
solidcraft_ui_egui::gpu::install_picture_renderer(rs);
|
||||||
// The graphics driver is loaded now; it may have put its own exception filter
|
// The graphics driver is loaded now; it may have put its own exception filter
|
||||||
// in front of ours.
|
// in front of ours.
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
native_crash::reinstall();
|
native_crash::reinstall();
|
||||||
// A saved anti-aliasing the device can't do: back to the default, with a notice.
|
// Reflect a confirmed probe fallback or an unsupported saved count in Graphics.
|
||||||
solidcraft_ui_egui::prefs::check_msaa(&mut app, u32::from(samples));
|
solidcraft_ui_egui::prefs::check_msaa(&mut app, u32::from(samples));
|
||||||
let info = rs.adapter.get_info();
|
|
||||||
solidcraft_engine::crash::set_environment(&format!(
|
solidcraft_engine::crash::set_environment(&format!(
|
||||||
"Renderer: {:?} {} ({}), MSAA {scene_samples}x",
|
"Renderer: {:?} {} ({}), MSAA {scene_samples}x",
|
||||||
info.backend, info.name, info.driver
|
info.backend, info.name, info.driver
|
||||||
@@ -776,12 +924,19 @@ fn main() -> eframe::Result {
|
|||||||
app.session.mark_saved();
|
app.session.mark_saved();
|
||||||
app.session.undo.clear();
|
app.session.undo.clear();
|
||||||
}
|
}
|
||||||
|
// Lock files next to open designs: a design open on another computer says so (#5467),
|
||||||
|
// the files given at launch included.
|
||||||
|
solidcraft_ui_egui::open_elsewhere::start(&mut app);
|
||||||
// A launch from Finder: its files arrived before the window.
|
// A launch from Finder: its files arrived before the window.
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
let files = {
|
let files = {
|
||||||
open_documents::set_ui(&cc.egui_ctx);
|
open_documents::set_ui(&cc.egui_ctx);
|
||||||
[files, open_documents::take()].concat()
|
[files, open_documents::take()].concat()
|
||||||
};
|
};
|
||||||
|
// No design given: the designs open at the last quit, when the preference asks (#5542).
|
||||||
|
// Not when driven over the control channel, whose clients expect a fresh design.
|
||||||
|
let files =
|
||||||
|
if files.is_empty() && !sample && control_port.is_none() { solidcraft_ui_egui::documents::designs_to_reopen(&app) } else { files };
|
||||||
for f in &files {
|
for f in &files {
|
||||||
app.open_path_async(f);
|
app.open_path_async(f);
|
||||||
}
|
}
|
||||||
@@ -810,8 +965,9 @@ fn main() -> eframe::Result {
|
|||||||
if !notes.is_empty() {
|
if !notes.is_empty() {
|
||||||
app.set_status(notes.join(" "), true);
|
app.set_status(notes.join(" "), true);
|
||||||
}
|
}
|
||||||
|
let nav_bridge = nav_bridge::NavBridge::start(&cc.egui_ctx);
|
||||||
#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
|
#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
|
||||||
let space_mouse = space_mouse::SpaceMouse::start(&cc.egui_ctx);
|
let space_mouse = space_mouse::SpaceMouse::start(&cc.egui_ctx, nav_bridge.claim());
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
let native_menu = match native_menu::NativeMenu::new(&app, &cc.egui_ctx) {
|
let native_menu = match native_menu::NativeMenu::new(&app, &cc.egui_ctx) {
|
||||||
Ok(menu) => Some(menu),
|
Ok(menu) => Some(menu),
|
||||||
@@ -836,12 +992,13 @@ fn main() -> eframe::Result {
|
|||||||
space_mouse,
|
space_mouse,
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
native_menu,
|
native_menu,
|
||||||
|
nav_bridge,
|
||||||
}))
|
}))
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
control_server::remove_token_file();
|
control_server::remove_token_file();
|
||||||
match result {
|
match result {
|
||||||
Err(e) if !created.load(std::sync::atomic::Ordering::SeqCst) => no_window(e, cpu_renderer, settings.as_deref()),
|
Err(e) if !created.load(std::sync::atomic::Ordering::SeqCst) => no_window(e, cpu_renderer, started, settings.as_deref()),
|
||||||
r => r,
|
r => r,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -862,13 +1019,19 @@ fn wgpu_options(cpu: bool, preference: Option<&str>) -> eframe::egui_wgpu::WgpuC
|
|||||||
let mut options = eframe::egui_wgpu::WgpuConfiguration::default();
|
let mut options = eframe::egui_wgpu::WgpuConfiguration::default();
|
||||||
if let eframe::egui_wgpu::WgpuSetup::CreateNew(setup) = &mut options.wgpu_setup {
|
if let eframe::egui_wgpu::WgpuSetup::CreateNew(setup) = &mut options.wgpu_setup {
|
||||||
let env_set = std::env::var(startup::WGPU_BACKEND_ENV).is_ok_and(|v| !v.trim().is_empty());
|
let env_set = std::env::var(startup::WGPU_BACKEND_ENV).is_ok_and(|v| !v.trim().is_empty());
|
||||||
|
// A retry applies only to this launch. WGPU_BACKEND always has priority.
|
||||||
|
let retry = std::env::var(startup::RETRY_BACKEND_ENV).ok();
|
||||||
|
let preference = if cpu { preference } else { retry.as_deref().or(preference) };
|
||||||
if let Some(backends) = startup::choose_backends(cfg!(target_os = "windows"), env_set, cpu, preference, startup::has_hardware_adapter) {
|
if let Some(backends) = startup::choose_backends(cfg!(target_os = "windows"), env_set, cpu, preference, startup::has_hardware_adapter) {
|
||||||
eprintln!("SolidCraft graphics: starting {backends:?}");
|
eprintln!("SolidCraft graphics: starting {backends:?}");
|
||||||
setup.instance_descriptor.backends = backends;
|
setup.instance_descriptor.backends = backends;
|
||||||
}
|
}
|
||||||
if cpu {
|
let intel_mac = cfg!(all(target_os = "macos", target_arch = "x86_64"));
|
||||||
setup.native_adapter_selector = Some(std::sync::Arc::new(startup::pick_cpu_adapter));
|
let indirect = std::env::var(startup::INDIRECT_VALIDATION_ENV).ok();
|
||||||
}
|
setup.instance_descriptor.flags = startup::window_instance_flags(setup.instance_descriptor.flags, intel_mac, indirect.as_deref());
|
||||||
|
let environment = std::env::var("WGPU_ADAPTER_NAME").ok();
|
||||||
|
let adapter = graphics().and_then(|v| v.get("adapter").and_then(serde_json::Value::as_str).map(str::to_string));
|
||||||
|
startup::configure_adapter(setup, cpu, environment, adapter);
|
||||||
// A float depth buffer with a stencil, wherever the adapter has it (see `FLOAT_DEPTH_BITS`).
|
// A float depth buffer with a stencil, wherever the adapter has it (see `FLOAT_DEPTH_BITS`).
|
||||||
let base = setup.device_descriptor.clone();
|
let base = setup.device_descriptor.clone();
|
||||||
setup.device_descriptor = std::sync::Arc::new(move |adapter| {
|
setup.device_descriptor = std::sync::Arc::new(move |adapter| {
|
||||||
@@ -880,24 +1043,47 @@ fn wgpu_options(cpu: bool, preference: Option<&str>) -> eframe::egui_wgpu::WgpuC
|
|||||||
options
|
options
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The window never opened (no graphics adapter, a device that wouldn't start): once more on
|
/// A failed renderer returns here before app creation. A fresh process avoids reusing winit's
|
||||||
/// the software renderer, else a message box saying what failed instead of a silent exit.
|
/// event loop or a failed device; each retry advances through the APIs, then software once.
|
||||||
fn no_window(error: eframe::Error, tried_cpu: bool, settings: Option<&std::path::Path>) -> eframe::Result {
|
fn no_window(error: eframe::Error, tried_cpu: bool, failed: eframe::wgpu::Backends, settings: Option<&std::path::Path>) -> eframe::Result {
|
||||||
log::error!("the window could not open: {error}");
|
log::error!("the window could not open: {error}");
|
||||||
eprintln!("SolidCraft: the window could not open: {error}");
|
eprintln!("SolidCraft: the window could not open: {error}");
|
||||||
if !tried_cpu && let Ok(exe) = std::env::current_exe() {
|
// This failure was handled, so neither the marker nor the journal should call it a crash.
|
||||||
eprintln!("SolidCraft: trying again with the software renderer ({}=cpu)", startup::RENDERER_ENV);
|
if let Some(dir) = settings {
|
||||||
match std::process::Command::new(exe).args(std::env::args_os().skip(1)).env(startup::RENDERER_ENV, "cpu").status() {
|
startup::started(dir);
|
||||||
|
}
|
||||||
|
solidcraft_engine::crash::end_session();
|
||||||
|
let explicit = std::env::var(startup::WGPU_BACKEND_ENV).is_ok_and(|v| !v.trim().is_empty());
|
||||||
|
if let Some(next) = startup::fallback_backend(cfg!(target_os = "windows"), explicit, tried_cpu, failed)
|
||||||
|
&& let Ok(exe) = std::env::current_exe()
|
||||||
|
{
|
||||||
|
let previous = std::env::var(startup::FALLBACK_NOTE_ENV).unwrap_or_default();
|
||||||
|
let note = startup::fallback_note(&previous, failed, next, &error.to_string());
|
||||||
|
log::warn!("{note}");
|
||||||
|
eprintln!("SolidCraft: {note}");
|
||||||
|
let mut command = std::process::Command::new(exe);
|
||||||
|
command.args(std::env::args_os().skip(1)).env(startup::FALLBACK_NOTE_ENV, note);
|
||||||
|
if next == "cpu" {
|
||||||
|
command.env(startup::RENDERER_ENV, "cpu").env_remove(startup::RETRY_BACKEND_ENV);
|
||||||
|
} else {
|
||||||
|
command.env(startup::RETRY_BACKEND_ENV, next);
|
||||||
|
}
|
||||||
|
match command.status() {
|
||||||
Ok(status) if status.success() => return Ok(()),
|
Ok(status) if status.success() => return Ok(()),
|
||||||
// The second try showed its own message.
|
// The final try showed its own message.
|
||||||
Ok(_) => return Err(error),
|
Ok(_) => return Err(error),
|
||||||
Err(e) => log::error!("could not start again with the software renderer: {e}"),
|
Err(e) => log::error!("could not start again on {next}: {e}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
let message = if explicit {
|
||||||
|
format!("SolidCraft could not open its window with WGPU_BACKEND.\n\n{error}\n\nChange or remove WGPU_BACKEND to try another graphics API.")
|
||||||
|
} else {
|
||||||
|
startup::no_window_message(&error.to_string(), settings)
|
||||||
|
};
|
||||||
let _ = rfd::MessageDialog::new()
|
let _ = rfd::MessageDialog::new()
|
||||||
.set_level(rfd::MessageLevel::Error)
|
.set_level(rfd::MessageLevel::Error)
|
||||||
.set_title("SolidCraft could not start")
|
.set_title("SolidCraft could not start")
|
||||||
.set_description(startup::no_window_message(&error.to_string(), settings))
|
.set_description(message)
|
||||||
.set_buttons(rfd::MessageButtons::Ok)
|
.set_buttons(rfd::MessageButtons::Ok)
|
||||||
.show();
|
.show();
|
||||||
Err(error)
|
Err(error)
|
||||||
@@ -986,11 +1172,11 @@ mod backend_tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod icon_tests {
|
mod viewport_tests {
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
#[test]
|
#[test]
|
||||||
fn macos_preserves_the_bundle_icon_instead_of_setting_a_runtime_bitmap() {
|
fn macos_preserves_the_bundle_icon_instead_of_setting_a_runtime_bitmap() {
|
||||||
let viewport = super::app_viewport().expect("viewport");
|
let viewport = super::app_viewport(super::CUSTOM_TITLEBAR).expect("viewport");
|
||||||
assert_eq!(viewport.icon.as_deref(), Some(&eframe::egui::IconData::default()));
|
assert_eq!(viewport.icon.as_deref(), Some(&eframe::egui::IconData::default()));
|
||||||
assert_eq!(viewport.app_id.as_deref(), Some(super::APP_ID));
|
assert_eq!(viewport.app_id.as_deref(), Some(super::APP_ID));
|
||||||
}
|
}
|
||||||
@@ -998,12 +1184,89 @@ mod icon_tests {
|
|||||||
#[cfg(not(target_os = "macos"))]
|
#[cfg(not(target_os = "macos"))]
|
||||||
#[test]
|
#[test]
|
||||||
fn desktop_viewport_supplies_the_original_mark_to_the_window() {
|
fn desktop_viewport_supplies_the_original_mark_to_the_window() {
|
||||||
let viewport = super::app_viewport().expect("viewport");
|
let viewport = super::app_viewport(super::CUSTOM_TITLEBAR).expect("viewport");
|
||||||
let icon = viewport.icon.expect("running window must have an icon");
|
let icon = viewport.icon.expect("running window must have an icon");
|
||||||
assert_eq!((icon.width, icon.height), (64, 64));
|
assert_eq!((icon.width, icon.height), (64, 64));
|
||||||
assert_eq!(icon.rgba, super::app_icon::rgba(64).expect("original mark"));
|
assert_eq!(icon.rgba, super::app_icon::rgba(64).expect("original mark"));
|
||||||
assert_eq!(viewport.app_id.as_deref(), Some(super::APP_ID));
|
assert_eq!(viewport.app_id.as_deref(), Some(super::APP_ID));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fullscreen_bar_clears_native_chrome_and_undo_redo_keep_working() {
|
||||||
|
use egui::{Event, PointerButton, Pos2, RawInput, Rect, ViewportId, vec2};
|
||||||
|
use serde_json::json;
|
||||||
|
use solidcraft_ui_egui::scenario::handle_at;
|
||||||
|
|
||||||
|
// AppKit points are independent of Retina scale and of the user's UI zoom.
|
||||||
|
for (zoom, retina) in [(1.0, 1.0), (1.0, 2.0), (1.5, 2.0), (2.0, 2.0)] {
|
||||||
|
let ctx = egui::Context::default();
|
||||||
|
solidcraft_ui_egui::fonts::setup_bundled_fonts(&ctx);
|
||||||
|
ctx.set_zoom_factor(zoom);
|
||||||
|
let mut app = super::SolveApp::new(super::Session::default(), Default::default());
|
||||||
|
app.integrated_titlebar = true;
|
||||||
|
for (command, params) in [
|
||||||
|
("sketch.create", json!({"plane":"XY"})),
|
||||||
|
("sketch.rectangle.two_point", json!({"p0":[0,0],"p1":[40,30]})),
|
||||||
|
("sketch.finish", json!({})),
|
||||||
|
("solid.extrude", json!({"distance":15})),
|
||||||
|
] {
|
||||||
|
app.run(command, params).unwrap();
|
||||||
|
}
|
||||||
|
let mut time = 0.0;
|
||||||
|
let mut frame = |app: &mut super::SolveApp, fullscreen, events| {
|
||||||
|
time += 0.05;
|
||||||
|
let mut raw = RawInput {
|
||||||
|
screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1600.0, 1000.0))),
|
||||||
|
time: Some(time),
|
||||||
|
events,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let viewport = raw.viewports.get_mut(&ViewportId::ROOT).unwrap();
|
||||||
|
viewport.fullscreen = Some(fullscreen);
|
||||||
|
viewport.native_pixels_per_point = Some(retina);
|
||||||
|
super::fullscreen_content_insets(&mut raw, 32.0, zoom);
|
||||||
|
let _ = ctx.run_ui(raw, |ui| super::content_ui(app, ui));
|
||||||
|
};
|
||||||
|
// Enter, leave, and enter again: no stale inset when returning to a normal window.
|
||||||
|
for fullscreen in [false, true, false, true] {
|
||||||
|
frame(&mut app, fullscreen, vec![]);
|
||||||
|
frame(&mut app, fullscreen, vec![]);
|
||||||
|
let top = if fullscreen { 32.0 / zoom } else { 0.0 };
|
||||||
|
for name in ["appbar:file", "appbar:undo", "appbar:redo", "appbar:help"] {
|
||||||
|
let at = handle_at(name).unwrap();
|
||||||
|
assert!((at.y - top - 17.0).abs() < 0.1, "{name}: {at:?}, fullscreen={fullscreen}, zoom={zoom}");
|
||||||
|
}
|
||||||
|
for (handle, bodies) in [("appbar:undo", 0), ("appbar:redo", 1)] {
|
||||||
|
let at = handle_at(handle).unwrap();
|
||||||
|
frame(&mut app, fullscreen, vec![Event::PointerMoved(at)]);
|
||||||
|
for pressed in [true, false] {
|
||||||
|
frame(
|
||||||
|
&mut app,
|
||||||
|
fullscreen,
|
||||||
|
vec![Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
assert_eq!(app.session.model.state().bodies.len(), bodies, "{handle}, fullscreen={fullscreen}, zoom={zoom}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fullscreen_inset_preserves_existing_safe_areas_and_resets_on_exit() {
|
||||||
|
use egui::epaint::MarginF32;
|
||||||
|
use egui::{RawInput, SafeAreaInsets, ViewportId};
|
||||||
|
let mut raw = RawInput::default();
|
||||||
|
raw.viewports.get_mut(&ViewportId::ROOT).unwrap().fullscreen = Some(true);
|
||||||
|
raw.safe_area_insets = Some(SafeAreaInsets(MarginF32 { top: 40.0, left: 5.0, right: 6.0, bottom: 7.0 }));
|
||||||
|
super::fullscreen_content_insets(&mut raw, 32.0, 2.0);
|
||||||
|
assert_eq!(raw.safe_area_insets.unwrap().0, MarginF32 { top: 40.0, left: 5.0, right: 6.0, bottom: 7.0 });
|
||||||
|
|
||||||
|
raw.viewports.get_mut(&ViewportId::ROOT).unwrap().fullscreen = Some(false);
|
||||||
|
raw.safe_area_insets = None;
|
||||||
|
super::fullscreen_content_insets(&mut raw, 32.0, 1.0);
|
||||||
|
assert_eq!(raw.safe_area_insets, Some(SafeAreaInsets::default()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -1041,6 +1304,34 @@ mod msaa_tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn scene_sample_choices_include_the_scene_depth_format() {
|
||||||
|
use eframe::wgpu::TextureFormat;
|
||||||
|
for (bits, expected) in [(24, TextureFormat::Depth24PlusStencil8), (32, TextureFormat::Depth32FloatStencil8)] {
|
||||||
|
// A synthetic colour target supports 8x, but the scene depth supports only 1x/4x.
|
||||||
|
let supported = super::scene_sample_choices(bits, 8, |depth| match depth {
|
||||||
|
Some(format) if format == expected => vec![1, 4],
|
||||||
|
None => vec![1, 4, 8],
|
||||||
|
other => panic!("unexpected scene depth: {other:?}"),
|
||||||
|
});
|
||||||
|
assert_eq!(supported, [1, 4]);
|
||||||
|
assert_eq!(super::scene_samples(eframe::wgpu::Backend::Dx12, 8, &supported), 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn scene_msaa_keeps_four_samples_by_default_and_explicit_choices() {
|
||||||
|
use eframe::wgpu::Backend;
|
||||||
|
let default = super::scene_msaa_request(None);
|
||||||
|
assert_eq!(default, 4);
|
||||||
|
for backend in [Backend::Dx12, Backend::Vulkan, Backend::Metal] {
|
||||||
|
assert_eq!(super::scene_samples(backend, u32::from(default), &[1, 4]), 4);
|
||||||
|
}
|
||||||
|
for saved in [1, 2, 4, 8] {
|
||||||
|
assert_eq!(super::scene_msaa_request(Some(saved)), saved);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn the_scene_follows_the_backend_policy_too() {
|
fn the_scene_follows_the_backend_policy_too() {
|
||||||
use eframe::wgpu::Backend;
|
use eframe::wgpu::Backend;
|
||||||
|
|||||||
@@ -0,0 +1,879 @@
|
|||||||
|
//! macOS: what a crash in native code leaves behind (docs/crash-reports.md).
|
||||||
|
//!
|
||||||
|
//! A crash inside a graphics driver or another library (a segfault, an `abort()`, a stack
|
||||||
|
//! overflow) is no Rust panic: the panic hook never runs and the next start only found "an
|
||||||
|
//! unclean exit". A signal handler for SIGSEGV, SIGBUS, SIGILL, SIGFPE, SIGTRAP (how a trap
|
||||||
|
//! instruction arrives on Apple silicon) and SIGABRT now writes, before the process goes, the
|
||||||
|
//! same small JSON file as the Windows filter (`native_crash.rs`): the signal, the faulting
|
||||||
|
//! module and the offset into it, and a short frame-pointer walk, next to the run's crash journal
|
||||||
|
//! (`solidcraft_engine::crash::native_paths`). The next start puts it into the unclean exit's
|
||||||
|
//! report. The signal then goes on to the handler that was there before (the standard library's
|
||||||
|
//! stack overflow message) or to the default action, so the process still dies of it and macOS
|
||||||
|
//! still writes its own crash report (`~/Library/Logs/DiagnosticReports`; the file names the
|
||||||
|
//! `pid` the JSON records).
|
||||||
|
//!
|
||||||
|
//! Installing a signal handler and asking dyld which image holds an address have no safe API,
|
||||||
|
//! hence the `unsafe_code` allowance on this module (the app crate denies it). The handler runs
|
||||||
|
//! on a thread that may have a broken heap, or on the small alternate stack after a stack
|
||||||
|
//! overflow: it doesn't allocate, formats into a buffer on the stack, and only reads memory on
|
||||||
|
//! the thread's own stack. It writes what it knows from the signal first and only then calls
|
||||||
|
//! `dladdr` (not on POSIX's async-signal-safe list; it takes dyld's recursive reader lock and
|
||||||
|
//! doesn't allocate) to name the modules, rewriting the file, so a hang or a fault in there
|
||||||
|
//! still leaves a record.
|
||||||
|
#![allow(unsafe_code)]
|
||||||
|
|
||||||
|
use std::ffi::{CStr, CString, c_int, c_void};
|
||||||
|
use std::fmt::Write as _;
|
||||||
|
use std::os::unix::ffi::OsStrExt;
|
||||||
|
use std::sync::OnceLock;
|
||||||
|
use std::sync::atomic::{AtomicBool, AtomicI32, AtomicUsize, Ordering};
|
||||||
|
|
||||||
|
use libc::{SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV, SIGTRAP, siginfo_t};
|
||||||
|
|
||||||
|
/// The signals a crash arrives as, in the order of [`PREVIOUS`].
|
||||||
|
const SIGNALS: [c_int; 6] = [SIGSEGV, SIGBUS, SIGILL, SIGFPE, SIGTRAP, SIGABRT];
|
||||||
|
/// Frames the walk records (the faulting instruction first).
|
||||||
|
const MAX_FRAMES: usize = 24;
|
||||||
|
/// A fault this far below a thread's stack is taken for a stack overflow.
|
||||||
|
const GUARD: usize = 64 << 10;
|
||||||
|
|
||||||
|
/// Where the handler writes (NUL-terminated), set once by [`install`].
|
||||||
|
static PATH: OnceLock<CString> = OnceLock::new();
|
||||||
|
/// The handler that was installed before ours for each of [`SIGNALS`] (called after ours), as an
|
||||||
|
/// address (`SIG_DFL` is 0, `SIG_IGN` 1), and its `sa_flags`.
|
||||||
|
static PREVIOUS: [AtomicUsize; 6] = [const { AtomicUsize::new(libc::SIG_DFL) }; 6];
|
||||||
|
static PREVIOUS_FLAGS: [AtomicI32; 6] = [const { AtomicI32::new(0) }; 6];
|
||||||
|
/// The handler has started writing (a second signal while it does is only passed on).
|
||||||
|
static BUSY: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
|
/// Catch native crashes from now on (after `solidcraft_engine::crash::install`; nothing without it).
|
||||||
|
pub fn install() {
|
||||||
|
let Some((info, _)) = solidcraft_engine::crash::native_paths() else { return };
|
||||||
|
let Ok(path) = CString::new(info.as_os_str().as_bytes()) else { return };
|
||||||
|
if PATH.set(path).is_err() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (slot, &signal) in SIGNALS.iter().enumerate() {
|
||||||
|
// SAFETY: `sigaction` is plain data; all zeros is a valid (empty) value.
|
||||||
|
let mut ours: libc::sigaction = unsafe { std::mem::zeroed() };
|
||||||
|
ours.sa_sigaction = handler as *const () as usize;
|
||||||
|
// On the alternate stack the standard library gives each of its threads, so that a stack
|
||||||
|
// overflow can still be recorded.
|
||||||
|
ours.sa_flags = libc::SA_SIGINFO | libc::SA_ONSTACK;
|
||||||
|
// SAFETY: as above.
|
||||||
|
let mut old: libc::sigaction = unsafe { std::mem::zeroed() };
|
||||||
|
// SAFETY: `handler` has the signature SA_SIGINFO calls it with and stays valid for the
|
||||||
|
// process's life; both structs are valid for the call.
|
||||||
|
if unsafe { libc::sigaction(signal, &ours, &mut old) } == 0
|
||||||
|
&& old.sa_sigaction != ours.sa_sigaction
|
||||||
|
&& let (Some(p), Some(f)) = (PREVIOUS.get(slot), PREVIOUS_FLAGS.get(slot))
|
||||||
|
{
|
||||||
|
f.store(old.sa_flags, Ordering::SeqCst);
|
||||||
|
p.store(old.sa_sigaction, Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The signal handler: record, then pass the signal on.
|
||||||
|
unsafe extern "C" fn handler(signal: c_int, info: *mut siginfo_t, context: *mut c_void) {
|
||||||
|
// SAFETY: `__error` is this thread's errno, restored for whatever runs after us.
|
||||||
|
let errno = unsafe { *libc::__error() };
|
||||||
|
let slot = SIGNALS.iter().position(|&s| s == signal).unwrap_or(0);
|
||||||
|
let previous = PREVIOUS.get(slot).map_or(libc::SIG_DFL, |p| p.load(Ordering::SeqCst));
|
||||||
|
// SAFETY: the system passes a valid siginfo and the interrupted thread's context for the
|
||||||
|
// duration of an SA_SIGINFO handler.
|
||||||
|
let f = unsafe { fault(signal, info, context) };
|
||||||
|
// Someone sent a signal the app ignored before: still nothing to record.
|
||||||
|
let ignored = previous == libc::SIG_IGN && !f.fault;
|
||||||
|
if !ignored && !BUSY.swap(true, Ordering::SeqCst) {
|
||||||
|
record(&f);
|
||||||
|
}
|
||||||
|
// SAFETY: as above.
|
||||||
|
unsafe { pass_on(signal, slot, previous, f.fault, info, context) };
|
||||||
|
// SAFETY: as above.
|
||||||
|
unsafe { *libc::__error() = errno };
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The signal comes from the faulting instruction itself (not `kill`, `raise` or `abort`), so
|
||||||
|
/// returning runs it again: on arm64, the exception the thread last took matches the signal.
|
||||||
|
/// macOS gives a SIGSEGV sent with `kill` the same `si_code` as a real one (SEGV_ACCERR), but
|
||||||
|
/// the exception is then the thread's last system call (or something long past, whose fault
|
||||||
|
/// address doesn't match).
|
||||||
|
#[cfg(any(target_arch = "aarch64", test))]
|
||||||
|
fn arm64_fault(signal: c_int, si_code: c_int, addr: usize, esr: u32, far: u64) -> bool {
|
||||||
|
const ABORTS: [u32; 4] = [0x20, 0x21, 0x24, 0x25];
|
||||||
|
const SVC: u32 = 0x15;
|
||||||
|
let class = esr >> 26;
|
||||||
|
signal != SIGABRT
|
||||||
|
&& (1..0x10000).contains(&si_code)
|
||||||
|
&& match signal {
|
||||||
|
SIGSEGV | SIGBUS => ABORTS.contains(&class) && far as usize == addr,
|
||||||
|
_ => class != SVC && !ABORTS.contains(&class),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// As [`arm64_fault`], from the x86 trap number and page-fault address.
|
||||||
|
#[cfg(any(target_arch = "x86_64", test))]
|
||||||
|
fn x86_fault(signal: c_int, si_code: c_int, addr: usize, trapno: u16, faultvaddr: u64) -> bool {
|
||||||
|
signal != SIGABRT
|
||||||
|
&& (1..0x10000).contains(&si_code)
|
||||||
|
&& match signal {
|
||||||
|
SIGSEGV | SIGBUS => (trapno == 14 && faultvaddr as usize == addr) || matches!(trapno, 12 | 13),
|
||||||
|
SIGILL => trapno == 6,
|
||||||
|
SIGFPE => matches!(trapno, 0 | 16 | 19),
|
||||||
|
SIGTRAP => matches!(trapno, 1 | 3),
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Hand the signal to the previous handler, or to the default action. A crash signal that was
|
||||||
|
/// only sent goes to the default action: the handler before ours (the standard library's, for
|
||||||
|
/// SIGSEGV and SIGBUS) expects a fault that happens again when it returns.
|
||||||
|
unsafe fn pass_on(signal: c_int, slot: usize, previous: usize, fault: bool, info: *mut siginfo_t, context: *mut c_void) {
|
||||||
|
let ours = handler as *const () as usize;
|
||||||
|
if previous != libc::SIG_DFL && previous != libc::SIG_IGN && previous != ours && (fault || signal == SIGABRT) {
|
||||||
|
let flags = PREVIOUS_FLAGS.get(slot).map_or(0, |f| f.load(Ordering::SeqCst));
|
||||||
|
if flags & libc::SA_SIGINFO != 0 {
|
||||||
|
// SAFETY: the address came from `sigaction` as an SA_SIGINFO handler.
|
||||||
|
let previous: unsafe extern "C" fn(c_int, *mut siginfo_t, *mut c_void) = unsafe { std::mem::transmute(previous) };
|
||||||
|
// SAFETY: as for this handler.
|
||||||
|
unsafe { previous(signal, info, context) };
|
||||||
|
} else {
|
||||||
|
// SAFETY: the address came from `sigaction` as a plain handler.
|
||||||
|
let previous: unsafe extern "C" fn(c_int) = unsafe { std::mem::transmute(previous) };
|
||||||
|
// SAFETY: as for this handler.
|
||||||
|
unsafe { previous(signal) };
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if previous == libc::SIG_IGN && !fault {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// SAFETY: as in `install`.
|
||||||
|
let mut default: libc::sigaction = unsafe { std::mem::zeroed() };
|
||||||
|
default.sa_sigaction = libc::SIG_DFL;
|
||||||
|
// SAFETY: a valid struct; restoring the default action is async-signal-safe.
|
||||||
|
unsafe { libc::sigaction(signal, &default, std::ptr::null_mut()) };
|
||||||
|
// A fault happens again when we return, now with the default action, so macOS reports it at
|
||||||
|
// the instruction; anything else is raised again, and arrives once this handler returns.
|
||||||
|
if !fault {
|
||||||
|
// SAFETY: async-signal-safe.
|
||||||
|
unsafe { libc::raise(signal) };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The darwin `ucontext_t`, up to the pointer to the machine context (`<sys/_types/_ucontext.h>`).
|
||||||
|
#[repr(C)]
|
||||||
|
struct UContext {
|
||||||
|
_onstack: c_int,
|
||||||
|
_sigmask: u32,
|
||||||
|
_stack: libc::stack_t,
|
||||||
|
_link: *mut c_void,
|
||||||
|
_mcsize: usize,
|
||||||
|
mcontext: *const MContext,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The darwin arm64 machine context: exception state, then the general registers
|
||||||
|
/// (`<mach/arm/_structs.h>`; the floating-point state that follows isn't read).
|
||||||
|
#[cfg(target_arch = "aarch64")]
|
||||||
|
#[repr(C)]
|
||||||
|
struct MContext {
|
||||||
|
far: u64,
|
||||||
|
esr: u32,
|
||||||
|
_exception: u32,
|
||||||
|
_x: [u64; 29],
|
||||||
|
fp: u64,
|
||||||
|
_lr: u64,
|
||||||
|
_sp: u64,
|
||||||
|
pc: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The darwin x86_64 machine context: exception state, then the general registers
|
||||||
|
/// (`<mach/i386/_structs.h>`; rax rbx rcx rdx rdi rsi rbp rsp r8–r15, then rip).
|
||||||
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
#[repr(C)]
|
||||||
|
struct MContext {
|
||||||
|
trapno: u16,
|
||||||
|
_cpu: u16,
|
||||||
|
err: u32,
|
||||||
|
faultvaddr: u64,
|
||||||
|
gpr: [u64; 16],
|
||||||
|
rip: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the faulting instruction did to its address, when the processor says.
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||||
|
enum Access {
|
||||||
|
Unknown,
|
||||||
|
Read,
|
||||||
|
Write,
|
||||||
|
Execute,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What a crash signal says, read out of the signal before anything is looked up.
|
||||||
|
#[derive(Clone, Copy, Debug)]
|
||||||
|
struct Fault {
|
||||||
|
signal: c_int,
|
||||||
|
si_code: c_int,
|
||||||
|
/// `si_addr`: the address that faulted (for SIGILL, SIGFPE and SIGTRAP, the instruction).
|
||||||
|
addr: usize,
|
||||||
|
pc: usize,
|
||||||
|
fp: usize,
|
||||||
|
access: Access,
|
||||||
|
/// It comes from the faulting instruction (not `kill`, `raise` or `abort`).
|
||||||
|
fault: bool,
|
||||||
|
/// The process that sent the signal (0 or our own for a fault or an `abort()`).
|
||||||
|
sender: i32,
|
||||||
|
pid: i32,
|
||||||
|
thread: u64,
|
||||||
|
thread_name: [u8; 64],
|
||||||
|
/// The thread's stack, `[low, high)` (0, 0 when unknown).
|
||||||
|
stack: (usize, usize),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Fault {
|
||||||
|
/// The fault hit just below the thread's stack: the stack ran out.
|
||||||
|
fn overflow(&self) -> bool {
|
||||||
|
let (low, high) = self.stack;
|
||||||
|
matches!(self.signal, SIGSEGV | SIGBUS) && high > low && self.addr < low.saturating_add(4096) && self.addr >= low.saturating_sub(GUARD)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn signal_name(&self) -> &'static str {
|
||||||
|
match self.signal {
|
||||||
|
SIGSEGV => "SIGSEGV",
|
||||||
|
SIGBUS => "SIGBUS",
|
||||||
|
SIGILL => "SIGILL",
|
||||||
|
SIGFPE => "SIGFPE",
|
||||||
|
SIGTRAP => "SIGTRAP",
|
||||||
|
SIGABRT => "SIGABRT",
|
||||||
|
_ => "signal",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn name(&self) -> &'static str {
|
||||||
|
if self.overflow() {
|
||||||
|
return "stack overflow";
|
||||||
|
}
|
||||||
|
match self.signal {
|
||||||
|
SIGSEGV => "segmentation fault",
|
||||||
|
SIGBUS => "bus error",
|
||||||
|
SIGILL => "illegal instruction",
|
||||||
|
SIGFPE => "arithmetic exception",
|
||||||
|
SIGTRAP => "trap",
|
||||||
|
SIGABRT => "abort",
|
||||||
|
_ => "signal",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The `si_code` names that say something about a crash.
|
||||||
|
fn code_name(&self) -> Option<&'static str> {
|
||||||
|
Some(match (self.signal, self.si_code) {
|
||||||
|
(SIGSEGV, 1) => "SEGV_MAPERR",
|
||||||
|
(SIGSEGV, 2) => "SEGV_ACCERR",
|
||||||
|
(SIGBUS, 1) => "BUS_ADRALN",
|
||||||
|
(SIGBUS, 2) => "BUS_ADRERR",
|
||||||
|
(SIGBUS, 3) => "BUS_OBJERR",
|
||||||
|
(SIGFPE, 7) => "FPE_INTDIV",
|
||||||
|
(SIGFPE, 8) => "FPE_INTOVF",
|
||||||
|
_ => return None,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One line on what happened: the address read or written, a stack overflow, who sent it.
|
||||||
|
fn detail(&self, b: &mut Buf) {
|
||||||
|
if self.sender != 0 && self.sender != self.pid {
|
||||||
|
let _ = write!(b, "sent by process {}", self.sender);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if !self.fault {
|
||||||
|
if self.signal != SIGABRT {
|
||||||
|
let _ = b.write_str("sent with kill or raise, not a fault");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let what = match self.access {
|
||||||
|
Access::Read => "read of",
|
||||||
|
Access::Write => "write to",
|
||||||
|
Access::Execute => "execution at",
|
||||||
|
Access::Unknown => "access to",
|
||||||
|
};
|
||||||
|
if self.overflow() {
|
||||||
|
let _ = write!(b, "{what} 0x{:016X}, below the thread's stack", self.addr);
|
||||||
|
} else if matches!(self.signal, SIGSEGV | SIGBUS) {
|
||||||
|
let _ = write!(b, "{what} 0x{:016X}", self.addr);
|
||||||
|
} else {
|
||||||
|
let _ = write!(b, "at 0x{:016X}", self.addr);
|
||||||
|
}
|
||||||
|
if let Some(c) = self.code_name() {
|
||||||
|
let _ = write!(b, " ({c})");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An image that holds an address, as `dladdr` names it.
|
||||||
|
struct Module<'a> {
|
||||||
|
path: &'a [u8],
|
||||||
|
base: usize,
|
||||||
|
symbol: Option<(&'a [u8], usize)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A fixed buffer to format into without allocating (what doesn't fit is cut off).
|
||||||
|
struct Buf {
|
||||||
|
bytes: [u8; 8192],
|
||||||
|
len: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Buf {
|
||||||
|
fn new() -> Buf {
|
||||||
|
Buf { bytes: [0; 8192], len: 0 }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn room(&self) -> usize {
|
||||||
|
self.bytes.len().saturating_sub(self.len)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_bytes(&self) -> &[u8] {
|
||||||
|
self.bytes.get(..self.len).unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `s` as the inside of a JSON string, at most `max` bytes of it (bytes that aren't UTF-8
|
||||||
|
/// and control characters become `?`).
|
||||||
|
fn escaped(&mut self, s: &[u8], max: usize) {
|
||||||
|
for chunk in s.get(..s.len().min(max)).unwrap_or_default().utf8_chunks() {
|
||||||
|
for c in chunk.valid().chars() {
|
||||||
|
let _ = match c {
|
||||||
|
'"' => self.write_str("\\\""),
|
||||||
|
'\\' => self.write_str("\\\\"),
|
||||||
|
c if (c as u32) < 0x20 => self.write_str("?"),
|
||||||
|
c => self.write_char(c),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if !chunk.invalid().is_empty() {
|
||||||
|
let _ = self.write_str("?");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Write for Buf {
|
||||||
|
fn write_str(&mut self, s: &str) -> std::fmt::Result {
|
||||||
|
let n = s.len().min(self.room());
|
||||||
|
if let (Some(to), Some(from)) = (self.bytes.get_mut(self.len..self.len + n), s.as_bytes().get(..n)) {
|
||||||
|
to.copy_from_slice(from);
|
||||||
|
self.len += n;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The last part of a path.
|
||||||
|
fn file_name(path: &[u8]) -> &[u8] {
|
||||||
|
path.rsplit(|&c| c == b'/').next().unwrap_or(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The report: what the signal says, then (with `resolve`) the module of the faulting
|
||||||
|
/// instruction and the `frames`. Always valid JSON: frames stop while there is room to close it.
|
||||||
|
fn json(b: &mut Buf, f: &Fault, frames: &[usize], resolve: impl Fn(usize, bool) -> Option<Module<'static>>) {
|
||||||
|
let signal = f.signal_name();
|
||||||
|
let _ = write!(b, "{{\"signal\":\"{signal}\",\"number\":{},\"code\":\"{signal}\",\"name\":\"{}\"", f.signal, f.name());
|
||||||
|
let _ = write!(b, ",\"si_code\":{},\"address\":\"0x{:016X}\",\"thread\":{},\"pid\":{}", f.si_code, f.pc, f.thread, f.pid);
|
||||||
|
let name = f.thread_name.split(|&c| c == 0).next().unwrap_or_default();
|
||||||
|
if !name.is_empty() {
|
||||||
|
let _ = b.write_str(",\"thread_name\":\"");
|
||||||
|
b.escaped(name, 64);
|
||||||
|
let _ = b.write_str("\"");
|
||||||
|
}
|
||||||
|
let mark = b.len;
|
||||||
|
let _ = b.write_str(",\"detail\":\"");
|
||||||
|
let start = b.len;
|
||||||
|
f.detail(b);
|
||||||
|
if b.len == start {
|
||||||
|
b.len = mark;
|
||||||
|
} else {
|
||||||
|
let _ = b.write_str("\"");
|
||||||
|
}
|
||||||
|
if let Some(m) = resolve(f.pc, false) {
|
||||||
|
let _ = write!(b, ",\"offset\":\"0x{:X}\",\"module\":\"", f.pc.wrapping_sub(m.base));
|
||||||
|
b.escaped(m.path, 300);
|
||||||
|
let _ = b.write_str("\"");
|
||||||
|
}
|
||||||
|
if !frames.is_empty() {
|
||||||
|
let _ = b.write_str(",\"frames\":[");
|
||||||
|
for (i, &at) in frames.iter().enumerate() {
|
||||||
|
// A frame is at most ~300 bytes; keep room for it and the closing `]}`.
|
||||||
|
if b.room() < 400 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if i > 0 {
|
||||||
|
let _ = b.write_str(",");
|
||||||
|
}
|
||||||
|
let _ = b.write_str("\"");
|
||||||
|
// A return address points after the call: look up the call itself.
|
||||||
|
match resolve(at, i > 0) {
|
||||||
|
Some(m) => {
|
||||||
|
b.escaped(file_name(m.path), 100);
|
||||||
|
let _ = write!(b, "+0x{:X}", at.wrapping_sub(m.base));
|
||||||
|
if let Some((symbol, start)) = m.symbol {
|
||||||
|
let _ = b.write_str(" ");
|
||||||
|
b.escaped(symbol, 160);
|
||||||
|
let _ = write!(b, "+0x{:X}", at.wrapping_sub(start));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
let _ = write!(b, "0x{at:016X}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _ = b.write_str("\"");
|
||||||
|
}
|
||||||
|
let _ = b.write_str("]");
|
||||||
|
}
|
||||||
|
let _ = b.write_str("}");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The return addresses up the frame-pointer chain from `fp`, after `pc`. `read` gives the word
|
||||||
|
/// at an address; frames outside `stack`, misaligned or not going up end the walk.
|
||||||
|
fn walk(pc: usize, fp: usize, stack: (usize, usize), read: impl Fn(usize) -> Option<usize>, out: &mut [usize; MAX_FRAMES]) -> usize {
|
||||||
|
let (low, high) = stack;
|
||||||
|
let mut n = 0;
|
||||||
|
if let Some(slot) = out.get_mut(n) {
|
||||||
|
*slot = pc;
|
||||||
|
n += 1;
|
||||||
|
}
|
||||||
|
let mut fp = fp;
|
||||||
|
while n < MAX_FRAMES {
|
||||||
|
let in_stack = fp >= low && fp.checked_add(16).is_some_and(|end| end <= high);
|
||||||
|
if !fp.is_multiple_of(8) || !in_stack {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let (Some(next), Some(ret)) = (read(fp), read(fp + 8)) else { break };
|
||||||
|
let ret = strip_pointer_auth(ret);
|
||||||
|
if ret == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if let Some(slot) = out.get_mut(n) {
|
||||||
|
*slot = ret;
|
||||||
|
n += 1;
|
||||||
|
}
|
||||||
|
if next <= fp {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
fp = next;
|
||||||
|
}
|
||||||
|
n
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Return addresses saved by arm64e code carry a signature in their top bits.
|
||||||
|
fn strip_pointer_auth(addr: usize) -> usize {
|
||||||
|
if cfg!(target_arch = "aarch64") { addr & 0x0000_7FFF_FFFF_FFFF } else { addr }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Read what the signal and the interrupted thread's registers say.
|
||||||
|
unsafe fn fault(signal: c_int, info: *const siginfo_t, context: *const c_void) -> Fault {
|
||||||
|
let mut f = Fault {
|
||||||
|
signal,
|
||||||
|
si_code: 0,
|
||||||
|
addr: 0,
|
||||||
|
pc: 0,
|
||||||
|
fp: 0,
|
||||||
|
access: Access::Unknown,
|
||||||
|
fault: false,
|
||||||
|
sender: 0,
|
||||||
|
// SAFETY: async-signal-safe.
|
||||||
|
pid: unsafe { libc::getpid() },
|
||||||
|
thread: 0,
|
||||||
|
thread_name: [0; 64],
|
||||||
|
stack: (0, 0),
|
||||||
|
};
|
||||||
|
if !info.is_null() {
|
||||||
|
// SAFETY: the system passes a valid siginfo for the duration of the handler.
|
||||||
|
let info = unsafe { &*info };
|
||||||
|
f.si_code = info.si_code;
|
||||||
|
f.addr = info.si_addr as usize;
|
||||||
|
f.sender = info.si_pid;
|
||||||
|
// Without registers (never seen), the signal's own code has to do.
|
||||||
|
f.fault = signal != SIGABRT && (1..0x10000).contains(&f.si_code);
|
||||||
|
}
|
||||||
|
let context = context as *const UContext;
|
||||||
|
// SAFETY: an SA_SIGINFO handler's third argument is the interrupted thread's ucontext, whose
|
||||||
|
// machine context pointer the kernel fills in.
|
||||||
|
let mcontext = if context.is_null() { std::ptr::null() } else { unsafe { (*context).mcontext } };
|
||||||
|
if !mcontext.is_null() {
|
||||||
|
// SAFETY: as above.
|
||||||
|
let m = unsafe { &*mcontext };
|
||||||
|
#[cfg(target_arch = "aarch64")]
|
||||||
|
{
|
||||||
|
f.pc = strip_pointer_auth(m.pc as usize);
|
||||||
|
f.fp = m.fp as usize;
|
||||||
|
f.fault = arm64_fault(signal, f.si_code, f.addr, m.esr, m.far);
|
||||||
|
// A data abort says whether it was a write (WnR); an instruction abort is execution.
|
||||||
|
f.access = match m.esr >> 26 {
|
||||||
|
0x24 | 0x25 if m.esr & (1 << 6) != 0 => Access::Write,
|
||||||
|
0x24 | 0x25 => Access::Read,
|
||||||
|
0x20 | 0x21 => Access::Execute,
|
||||||
|
_ => Access::Unknown,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
{
|
||||||
|
f.pc = m.rip as usize;
|
||||||
|
f.fp = m.gpr.get(6).copied().unwrap_or(0) as usize;
|
||||||
|
f.fault = x86_fault(signal, f.si_code, f.addr, m.trapno, m.faultvaddr);
|
||||||
|
// A page fault's error code: bit 4 instruction fetch, bit 1 write.
|
||||||
|
f.access = match (m.trapno, m.err) {
|
||||||
|
(14, e) if e & 0x10 != 0 => Access::Execute,
|
||||||
|
(14, e) if e & 0x2 != 0 => Access::Write,
|
||||||
|
(14, _) => Access::Read,
|
||||||
|
_ => Access::Unknown,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if f.pc == 0 && matches!(signal, SIGILL | SIGFPE | SIGTRAP) {
|
||||||
|
f.pc = f.addr;
|
||||||
|
}
|
||||||
|
// SAFETY: these read the calling thread's own pthread structure; the buffers are as long as
|
||||||
|
// we say.
|
||||||
|
unsafe {
|
||||||
|
let me = libc::pthread_self();
|
||||||
|
libc::pthread_threadid_np(me, &mut f.thread);
|
||||||
|
libc::pthread_getname_np(me, f.thread_name.as_mut_ptr().cast(), f.thread_name.len());
|
||||||
|
let high = libc::pthread_get_stackaddr_np(me) as usize;
|
||||||
|
let size = libc::pthread_get_stacksize_np(me);
|
||||||
|
if let Some(low) = high.checked_sub(size) {
|
||||||
|
f.stack = (low, high);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The image that holds `addr` (the call before it, for a return address).
|
||||||
|
fn resolve(addr: usize, return_address: bool) -> Option<Module<'static>> {
|
||||||
|
let at = if return_address { addr.saturating_sub(1) } else { addr };
|
||||||
|
// SAFETY: `Dl_info` is plain data; all zeros is a valid value.
|
||||||
|
let mut info: libc::Dl_info = unsafe { std::mem::zeroed() };
|
||||||
|
// SAFETY: `dladdr` only reads dyld's image list; the strings it returns live as long as the
|
||||||
|
// image, which a crashing process never unloads.
|
||||||
|
unsafe {
|
||||||
|
if libc::dladdr(at as *const c_void, &mut info) == 0 || info.dli_fname.is_null() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let symbol = (!info.dli_sname.is_null()).then(|| (CStr::from_ptr(info.dli_sname).to_bytes(), info.dli_saddr as usize));
|
||||||
|
Some(Module { path: CStr::from_ptr(info.dli_fname).to_bytes(), base: info.dli_fbase as usize, symbol })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Write what the signal says into the info file, then again with the modules and frames.
|
||||||
|
fn record(f: &Fault) {
|
||||||
|
let Some(path) = PATH.get() else { return };
|
||||||
|
// SAFETY: NUL-terminated path; the descriptor is closed below.
|
||||||
|
let fd = unsafe { libc::open(path.as_ptr(), libc::O_WRONLY | libc::O_CREAT | libc::O_TRUNC | libc::O_CLOEXEC, 0o600) };
|
||||||
|
if fd < 0 {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let mut b = Buf::new();
|
||||||
|
json(&mut b, f, &[], |_, _| None);
|
||||||
|
let bytes = b.as_bytes();
|
||||||
|
// SAFETY: the buffer is as long as we say.
|
||||||
|
unsafe { libc::write(fd, bytes.as_ptr().cast(), bytes.len()) };
|
||||||
|
let mut frames = [0usize; MAX_FRAMES];
|
||||||
|
// SAFETY: `walk` only reads inside the thread's own stack, 8-byte aligned.
|
||||||
|
let n = walk(f.pc, f.fp, f.stack, |at| Some(unsafe { (at as *const usize).read() }), &mut frames);
|
||||||
|
b.len = 0;
|
||||||
|
json(&mut b, f, frames.get(..n).unwrap_or_default(), resolve);
|
||||||
|
let bytes = b.as_bytes();
|
||||||
|
// SAFETY: as above.
|
||||||
|
unsafe {
|
||||||
|
if libc::pwrite(fd, bytes.as_ptr().cast(), bytes.len(), 0) == bytes.len() as isize {
|
||||||
|
libc::ftruncate(fd, bytes.len() as libc::off_t);
|
||||||
|
}
|
||||||
|
libc::close(fd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use std::os::unix::process::ExitStatusExt;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn fault(signal: c_int, si_code: c_int, addr: usize) -> Fault {
|
||||||
|
let mut thread_name = [0u8; 64];
|
||||||
|
thread_name[..4].copy_from_slice(b"main");
|
||||||
|
Fault {
|
||||||
|
signal,
|
||||||
|
si_code,
|
||||||
|
addr,
|
||||||
|
pc: 0x1_0000_1234,
|
||||||
|
fp: 0,
|
||||||
|
access: Access::Read,
|
||||||
|
fault: true,
|
||||||
|
sender: 0,
|
||||||
|
pid: 77,
|
||||||
|
thread: 4242,
|
||||||
|
thread_name,
|
||||||
|
stack: (0x7000_0000, 0x7080_0000),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn report(f: &Fault, frames: &[usize]) -> serde_json::Value {
|
||||||
|
let mut b = Buf::new();
|
||||||
|
json(&mut b, f, frames, |at, _| {
|
||||||
|
(at >= 0x1_0000_0000).then_some(Module {
|
||||||
|
path: b"/Applications/SolidCraft.app/Contents/MacOS/solidcraft",
|
||||||
|
base: 0x1_0000_0000,
|
||||||
|
symbol: Some((b"_ZN4main17h0123456789abcdefE", 0x1_0000_1200)),
|
||||||
|
})
|
||||||
|
});
|
||||||
|
serde_json::from_slice(b.as_bytes()).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_segfault_says_the_signal_the_address_read_and_the_module() {
|
||||||
|
let v = report(&fault(SIGSEGV, 1, 0x10), &[0x1_0000_1234, 0x1_0000_2000, 0x5000]);
|
||||||
|
assert_eq!(v["signal"], "SIGSEGV");
|
||||||
|
assert_eq!(v["code"], "SIGSEGV");
|
||||||
|
assert_eq!(v["name"], "segmentation fault");
|
||||||
|
assert_eq!(v["detail"], "read of 0x0000000000000010 (SEGV_MAPERR)");
|
||||||
|
assert_eq!(v["address"], "0x0000000100001234");
|
||||||
|
assert_eq!(v["module"], "/Applications/SolidCraft.app/Contents/MacOS/solidcraft");
|
||||||
|
assert_eq!(v["offset"], "0x1234");
|
||||||
|
assert_eq!(v["thread"], 4242);
|
||||||
|
assert_eq!(v["thread_name"], "main");
|
||||||
|
assert_eq!(v["pid"], 77);
|
||||||
|
let frames: Vec<&str> = v["frames"].as_array().unwrap().iter().map(|f| f.as_str().unwrap()).collect();
|
||||||
|
assert_eq!(
|
||||||
|
frames,
|
||||||
|
["solidcraft+0x1234 _ZN4main17h0123456789abcdefE+0x34", "solidcraft+0x2000 _ZN4main17h0123456789abcdefE+0xE00", "0x0000000000005000"]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_fault_below_the_stack_is_a_stack_overflow() {
|
||||||
|
let mut f = fault(SIGBUS, 2, 0x7000_0000 - 0x100);
|
||||||
|
f.access = Access::Write;
|
||||||
|
let v = report(&f, &[]);
|
||||||
|
assert_eq!(v["name"], "stack overflow");
|
||||||
|
assert_eq!(v["code"], "SIGBUS");
|
||||||
|
assert_eq!(v["detail"], "write to 0x000000006FFFFF00, below the thread's stack (BUS_ADRERR)");
|
||||||
|
// Far below it, or inside it, it is not.
|
||||||
|
assert_eq!(report(&fault(SIGBUS, 2, 0x10), &[])["name"], "bus error");
|
||||||
|
assert_eq!(report(&fault(SIGSEGV, 2, 0x7040_0000), &[])["name"], "segmentation fault");
|
||||||
|
// Nor without knowing the stack.
|
||||||
|
let mut f = fault(SIGSEGV, 1, 0x7000_0000 - 0x100);
|
||||||
|
f.stack = (0, 0);
|
||||||
|
assert_eq!(report(&f, &[])["name"], "segmentation fault");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn an_abort_or_a_signal_sent_by_another_process_has_no_address_detail() {
|
||||||
|
let mut f = fault(SIGABRT, 0, 0);
|
||||||
|
f.fault = false;
|
||||||
|
f.sender = 77;
|
||||||
|
let v = report(&f, &[]);
|
||||||
|
assert_eq!(v["signal"], "SIGABRT");
|
||||||
|
assert_eq!(v["name"], "abort");
|
||||||
|
assert!(v.get("detail").is_none(), "{v}");
|
||||||
|
let mut f = fault(SIGSEGV, 0x10001, 0);
|
||||||
|
f.fault = false;
|
||||||
|
f.sender = 501;
|
||||||
|
assert_eq!(report(&f, &[])["detail"], "sent by process 501");
|
||||||
|
// `kill` without a sender, or `raise`.
|
||||||
|
f.sender = 0;
|
||||||
|
assert_eq!(report(&f, &[])["detail"], "sent with kill or raise, not a fault");
|
||||||
|
// A trap names the instruction.
|
||||||
|
assert_eq!(report(&fault(SIGTRAP, 1, 0x1_0000_1234), &[])["detail"], "at 0x0000000100001234");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn only_a_fault_runs_again_when_the_handler_returns() {
|
||||||
|
// Measured on an M5 Pro, macOS 27: a read of address 16, then `kill -SEGV` while the
|
||||||
|
// thread waits in a system call. Both have si_code 2.
|
||||||
|
assert!(arm64_fault(SIGSEGV, 2, 0x10, 0x9200_0046, 0x10));
|
||||||
|
assert!(!arm64_fault(SIGSEGV, 2, 0, 0x5600_0080, 0));
|
||||||
|
assert!(!arm64_fault(SIGBUS, 1, 0, 0x5600_0080, 0));
|
||||||
|
// A data abort long past, while the signal names no address.
|
||||||
|
assert!(!arm64_fault(SIGSEGV, 2, 0, 0x9200_0046, 0x10));
|
||||||
|
// A trap instruction (BRK) or an undefined one; but not a system call.
|
||||||
|
assert!(arm64_fault(SIGTRAP, 1, 0x1000, 0xF200_0001, 0));
|
||||||
|
assert!(arm64_fault(SIGILL, 1, 0x1000, 0x0200_0000, 0));
|
||||||
|
assert!(!arm64_fault(SIGILL, 1, 0x1000, 0x5600_0080, 0));
|
||||||
|
// Sent: SI_USER, no code, or an abort.
|
||||||
|
assert!(!arm64_fault(SIGSEGV, 0x10001, 0x10, 0x9200_0046, 0x10));
|
||||||
|
assert!(!arm64_fault(SIGTRAP, 0, 0, 0xF200_0001, 0));
|
||||||
|
assert!(!arm64_fault(SIGABRT, 1, 0, 0x5600_0080, 0));
|
||||||
|
// x86_64: a page fault at its address, a general protection fault, ud2, int3.
|
||||||
|
assert!(x86_fault(SIGSEGV, 1, 0x10, 14, 0x10));
|
||||||
|
assert!(!x86_fault(SIGSEGV, 1, 0, 14, 0x10));
|
||||||
|
assert!(x86_fault(SIGSEGV, 1, 0, 13, 0));
|
||||||
|
assert!(x86_fault(SIGILL, 1, 0x1000, 6, 0));
|
||||||
|
assert!(x86_fault(SIGTRAP, 1, 0x1000, 3, 0));
|
||||||
|
assert!(!x86_fault(SIGILL, 1, 0x1000, 14, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn names_with_quotes_control_characters_or_bad_utf8_stay_valid_json() {
|
||||||
|
let mut f = fault(SIGILL, 1, 0x1_0000_1234);
|
||||||
|
f.thread_name = [0; 64];
|
||||||
|
f.thread_name[..7].copy_from_slice(b"a\"b\\\n\xFFc");
|
||||||
|
let v = report(&f, &[]);
|
||||||
|
assert_eq!(v["thread_name"], "a\"b\\??c");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_report_with_long_names_still_closes_its_json() {
|
||||||
|
let long: &'static [u8] = Box::leak(vec![b'x'; 4000].into_boxed_slice());
|
||||||
|
let f = fault(SIGSEGV, 1, 0x10);
|
||||||
|
let mut b = Buf::new();
|
||||||
|
json(&mut b, &f, &[0x1_0000_1234; MAX_FRAMES], |_, _| Some(Module { path: long, base: 0x1_0000_0000, symbol: Some((long, 0x1_0000_0000)) }));
|
||||||
|
let v: serde_json::Value = serde_json::from_slice(b.as_bytes()).unwrap();
|
||||||
|
assert_eq!(v["module"].as_str().unwrap().len(), 300);
|
||||||
|
let frames = v["frames"].as_array().unwrap();
|
||||||
|
assert!(!frames.is_empty() && frames.len() <= MAX_FRAMES, "{}", frames.len());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_frame_walk_stays_on_the_stack_and_goes_up() {
|
||||||
|
let stack = (0x1000, 0x2000);
|
||||||
|
// Three frames: 0x1100 -> 0x1200 -> 0x1300 -> 0 (end).
|
||||||
|
let memory = |at: usize| match at {
|
||||||
|
0x1100 => Some(0x1200),
|
||||||
|
0x1108 => Some(0xA),
|
||||||
|
0x1200 => Some(0x1300),
|
||||||
|
0x1208 => Some(0xB),
|
||||||
|
0x1300 => Some(0),
|
||||||
|
0x1308 => Some(0xC),
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
let mut out = [0; MAX_FRAMES];
|
||||||
|
let n = walk(0x9, 0x1100, stack, memory, &mut out);
|
||||||
|
assert_eq!(&out[..n], &[0x9, 0xA, 0xB, 0xC]);
|
||||||
|
// A frame pointer off the stack, misaligned, or one that doesn't go up ends the walk.
|
||||||
|
assert_eq!(walk(0x9, 0x3000, stack, memory, &mut out), 1);
|
||||||
|
assert_eq!(walk(0x9, 0x1101, stack, memory, &mut out), 1);
|
||||||
|
let looping = |at: usize| if at.is_multiple_of(16) { Some(at) } else { Some(0xA) };
|
||||||
|
assert_eq!(walk(0x9, 0x1100, stack, looping, &mut out), 2);
|
||||||
|
// A chain that never ends stops at MAX_FRAMES.
|
||||||
|
let endless = |at: usize| if at.is_multiple_of(16) { Some(at + 16) } else { Some(0xA) };
|
||||||
|
assert_eq!(walk(0x9, 0x1000, stack, endless, &mut out), MAX_FRAMES);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The child half: install crash reporting and the handler, then crash the way
|
||||||
|
/// `SOLIDCRAFT_NATIVE_CRASH_FAULT` says.
|
||||||
|
#[test]
|
||||||
|
fn child() {
|
||||||
|
let Some(dir) = std::env::var_os("SOLIDCRAFT_NATIVE_CRASH_CHILD") else { return };
|
||||||
|
let build = solidcraft_engine::crash::Build { version: "9.9.9", commit: "abc1234", built: "2026-10-25" };
|
||||||
|
let fresh = solidcraft_engine::crash::install(PathBuf::from(dir), build);
|
||||||
|
println!("FRESH {}", serde_json::to_string(&fresh).unwrap_or_default());
|
||||||
|
let Some(fault) = std::env::var_os("SOLIDCRAFT_NATIVE_CRASH_FAULT") else {
|
||||||
|
solidcraft_engine::crash::end_session();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
super::install();
|
||||||
|
solidcraft_engine::crash::phase("device creation");
|
||||||
|
match fault.to_str() {
|
||||||
|
Some("abort") => std::process::abort(),
|
||||||
|
Some("overflow") => println!("unreachable {}", recurse(0)),
|
||||||
|
Some("raise") => {
|
||||||
|
// SAFETY: none needed; this is the crash under test.
|
||||||
|
unsafe { libc::raise(SIGSEGV) };
|
||||||
|
println!("survived");
|
||||||
|
}
|
||||||
|
_ => segfault(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Runs out of stack.
|
||||||
|
#[inline(never)]
|
||||||
|
fn recurse(n: u64) -> u64 {
|
||||||
|
let a = std::hint::black_box([n; 64]);
|
||||||
|
if n == u64::MAX { 0 } else { recurse(n + 1).wrapping_add(a[0]) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The crash under test: a read of address 16, as a null struct pointer's field would be.
|
||||||
|
#[inline(never)]
|
||||||
|
fn segfault() {
|
||||||
|
// SAFETY: none; this is the crash under test.
|
||||||
|
let v = unsafe { std::ptr::read_volatile(std::hint::black_box(16usize) as *const u64) };
|
||||||
|
println!("unreachable {v}");
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(dir: &Path, fault: Option<&str>) -> std::process::Output {
|
||||||
|
let mut c = std::process::Command::new(std::env::current_exe().unwrap());
|
||||||
|
c.args(["--exact", "native_crash_macos::tests::child", "--test-threads=1", "--nocapture"]).env("SOLIDCRAFT_NATIVE_CRASH_CHILD", dir);
|
||||||
|
if let Some(f) = fault {
|
||||||
|
c.env("SOLIDCRAFT_NATIVE_CRASH_FAULT", f);
|
||||||
|
}
|
||||||
|
c.output().unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Crash a child the way `fault` says; returns what the handler wrote and the next start's report.
|
||||||
|
fn crash(name: &str, fault: &str, signal: c_int) -> (serde_json::Value, serde_json::Value, String) {
|
||||||
|
let dir = std::env::temp_dir().join(format!("solidcraft-native-crash-{name}-{}", std::process::id()));
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
let out = run(&dir, Some(fault));
|
||||||
|
assert_eq!(out.status.signal(), Some(signal), "the child died of the signal itself: {out:?}");
|
||||||
|
let stderr = String::from_utf8_lossy(&out.stderr).into_owned();
|
||||||
|
let info =
|
||||||
|
std::fs::read_dir(dir.join("sessions")).unwrap().flatten().map(|e| e.path()).find(|p| p.to_string_lossy().ends_with(".native.json"));
|
||||||
|
let info = info.expect("the handler wrote what it caught");
|
||||||
|
let v: serde_json::Value = serde_json::from_slice(&std::fs::read(info).unwrap()).unwrap();
|
||||||
|
// The next start reports it.
|
||||||
|
let out = run(&dir, None);
|
||||||
|
assert!(out.status.success(), "{out:?}");
|
||||||
|
let reports = solidcraft_engine::crash::list(&dir);
|
||||||
|
assert_eq!(reports.len(), 1, "{reports:?}");
|
||||||
|
let r = solidcraft_engine::crash::read(&dir, &reports[0].id).unwrap();
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
(v, r, stderr)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_segfault_is_reported_with_its_signal_module_frames_and_step() {
|
||||||
|
let (v, r, _) = crash("segv", "segv", SIGSEGV);
|
||||||
|
assert_eq!(v["signal"], "SIGSEGV", "{v}");
|
||||||
|
// Address 16 is in __PAGEZERO, mapped without access: SEGV_ACCERR.
|
||||||
|
assert_eq!(v["detail"], "read of 0x0000000000000010 (SEGV_ACCERR)", "{v}");
|
||||||
|
assert!(v["module"].as_str().unwrap().contains("solidcraft"), "the fault is in the test binary: {v}");
|
||||||
|
let frames = v["frames"].as_array().unwrap();
|
||||||
|
assert!(frames.len() >= 3, "{v}");
|
||||||
|
assert!(frames.iter().any(|f| f.as_str().unwrap().contains("child")), "the walk reaches the test that crashed: {v}");
|
||||||
|
let message = r["message"].as_str().unwrap();
|
||||||
|
assert!(message.contains("segmentation fault (SIGSEGV) in solidcraft"), "{r}");
|
||||||
|
assert!(message.contains("during startup (device creation"), "{r}");
|
||||||
|
assert_eq!(r["kind"], "unclean_exit");
|
||||||
|
assert_eq!(r["native"]["signal"], "SIGSEGV");
|
||||||
|
assert!(r["backtrace"].as_array().unwrap().iter().any(|f| f.as_str().unwrap().contains("segfault")), "{r}");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn an_abort_is_reported_as_sigabrt_with_the_code_that_called_it() {
|
||||||
|
let (v, r, _) = crash("abrt", "abort", SIGABRT);
|
||||||
|
assert_eq!(v["signal"], "SIGABRT", "{v}");
|
||||||
|
assert!(v.get("detail").is_none(), "{v}");
|
||||||
|
let frames = v["frames"].as_array().unwrap();
|
||||||
|
assert!(frames.iter().any(|f| f.as_str().unwrap().contains("abort")), "{v}");
|
||||||
|
assert!(r["message"].as_str().unwrap().contains("abort (SIGABRT)"), "{r}");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_stack_overflow_is_recorded_and_the_standard_library_still_says_so() {
|
||||||
|
// The fault on the guard page is recorded on the alternate stack; the standard library's
|
||||||
|
// handler, called after ours, prints its message and aborts.
|
||||||
|
let (v, r, stderr) = crash("overflow", "overflow", SIGABRT);
|
||||||
|
assert!(matches!(v["signal"].as_str(), Some("SIGSEGV" | "SIGBUS")), "{v}");
|
||||||
|
assert_eq!(v["name"], "stack overflow", "{v}");
|
||||||
|
assert!(v["detail"].as_str().unwrap().contains("below the thread's stack"), "{v}");
|
||||||
|
assert!(stderr.contains("has overflowed its stack"), "{stderr}");
|
||||||
|
assert!(r["message"].as_str().unwrap().contains("stack overflow ("), "{r}");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_segfault_signal_that_was_only_sent_still_ends_the_app() {
|
||||||
|
// The standard library's handler, which comes before ours, returns expecting the fault
|
||||||
|
// to happen again; a sent signal never does, so it goes to the default action instead.
|
||||||
|
let (v, r, _) = crash("raise", "raise", SIGSEGV);
|
||||||
|
assert_eq!(v["detail"], "sent with kill or raise, not a fault", "{v}");
|
||||||
|
assert!(r["message"].as_str().unwrap().contains("(SIGSEGV)"), "{r}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,10 +15,14 @@
|
|||||||
//! window rescales once at the crossing and stays under the pointer, instead of the OS's move
|
//! window rescales once at the crossing and stays under the pointer, instead of the OS's move
|
||||||
//! loop and winit disagreeing about a frame the window doesn't have.
|
//! loop and winit disagreeing about a frame the window doesn't have.
|
||||||
//!
|
//!
|
||||||
//! Replacing a window procedure has no safe API, hence the `unsafe_code` allowance on this
|
//! Replacing a window procedure and setting a window class's icon have no safe API, hence the
|
||||||
//! module (the app crate denies it; see `native_crash.rs` and `open_documents.rs` for the others).
|
//! `unsafe_code` allowance on this module (the app crate denies it; see `native_crash.rs` and
|
||||||
|
//! `open_documents.rs` for the others).
|
||||||
//! The procedure is installed once, on the thread that owns the window, for the main window only,
|
//! The procedure is installed once, on the thread that owns the window, for the main window only,
|
||||||
//! and calls the previous one (winit's) for everything it doesn't answer.
|
//! and calls the previous one (winit's) for everything it doesn't answer.
|
||||||
|
//!
|
||||||
|
//! [`set_class_icon`] gives the window's class the exe's icon, so the taskbar button shows the
|
||||||
|
//! mark even when the window is too busy to answer the taskbar's request for its icon.
|
||||||
#![allow(unsafe_code)]
|
#![allow(unsafe_code)]
|
||||||
|
|
||||||
use std::sync::atomic::{AtomicIsize, Ordering};
|
use std::sync::atomic::{AtomicIsize, Ordering};
|
||||||
@@ -27,12 +31,18 @@ use raw_window_handle::{HasWindowHandle, RawWindowHandle};
|
|||||||
use solidcraft_ui_egui::titlebar;
|
use solidcraft_ui_egui::titlebar;
|
||||||
use windows_sys::Win32::Foundation::{HWND, LPARAM, LRESULT, RECT, SIZE, WPARAM};
|
use windows_sys::Win32::Foundation::{HWND, LPARAM, LRESULT, RECT, SIZE, WPARAM};
|
||||||
use windows_sys::Win32::Graphics::Gdi::{GetMonitorInfoW, MONITOR_DEFAULTTONEAREST, MONITORINFO, MonitorFromWindow};
|
use windows_sys::Win32::Graphics::Gdi::{GetMonitorInfoW, MONITOR_DEFAULTTONEAREST, MONITORINFO, MonitorFromWindow};
|
||||||
|
use windows_sys::Win32::System::LibraryLoader::GetModuleHandleW;
|
||||||
use windows_sys::Win32::UI::HiDpi::{GetDpiForWindow, GetSystemMetricsForDpi};
|
use windows_sys::Win32::UI::HiDpi::{GetDpiForWindow, GetSystemMetricsForDpi};
|
||||||
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
||||||
CallWindowProcW, GWL_STYLE, GWLP_WNDPROC, GetClientRect, GetWindowLongPtrW, GetWindowRect, HTBOTTOM, HTBOTTOMLEFT, HTBOTTOMRIGHT, HTLEFT,
|
CallWindowProcW, GCLP_HICON, GCLP_HICONSM, GWL_STYLE, GWLP_WNDPROC, GetClientRect, GetWindowLongPtrW, GetWindowRect, HTBOTTOM, HTBOTTOMLEFT,
|
||||||
HTRIGHT, HTTOP, HTTOPLEFT, HTTOPRIGHT, IsIconic, IsZoomed, SM_CXPADDEDBORDER, SM_CXSIZEFRAME, SetWindowLongPtrW, WM_GETDPISCALEDSIZE,
|
HTBOTTOMRIGHT, HTLEFT, HTRIGHT, HTTOP, HTTOPLEFT, HTTOPRIGHT, IMAGE_ICON, IsIconic, IsZoomed, LR_DEFAULTCOLOR, LoadImageW, SM_CXICON,
|
||||||
WM_NCDESTROY, WM_NCHITTEST, WNDPROC, WS_THICKFRAME,
|
SM_CXPADDEDBORDER, SM_CXSIZEFRAME, SM_CXSMICON, SetWindowLongPtrW, WM_GETDPISCALEDSIZE, WM_NCDESTROY, WM_NCHITTEST, WNDPROC, WS_THICKFRAME,
|
||||||
};
|
};
|
||||||
|
// windows-sys has SetClassLongPtrW only on 64-bit targets; on 32-bit Windows it is SetClassLongW.
|
||||||
|
#[cfg(target_pointer_width = "64")]
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::SetClassLongPtrW;
|
||||||
|
#[cfg(target_pointer_width = "32")]
|
||||||
|
use windows_sys::Win32::UI::WindowsAndMessaging::SetClassLongW as SetClassLongPtrW;
|
||||||
|
|
||||||
/// The work area (the monitor without the taskbar) of the monitor nearest the window, in physical
|
/// The work area (the monitor without the taskbar) of the monitor nearest the window, in physical
|
||||||
/// pixels: left, top, width, height.
|
/// pixels: left, top, width, height.
|
||||||
@@ -54,6 +64,48 @@ pub fn work_area(window: &impl HasWindowHandle) -> Option<(i32, i32, i32, i32)>
|
|||||||
Some((rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top))
|
Some((rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The exe's icon resource (`build.rs` embeds it as `1 ICON`).
|
||||||
|
const ICON_RESOURCE: usize = 1;
|
||||||
|
|
||||||
|
/// Give the main window's class the exe's icon, big and small. Call it before the window is
|
||||||
|
/// shown (eframe's app creator).
|
||||||
|
///
|
||||||
|
/// The taskbar asks a window for its icon when the window appears. eframe sets the window's
|
||||||
|
/// icon before that, while the window is still hidden, and then shows the window at the end of
|
||||||
|
/// its first frame; if that frame is slow, or startup kept the thread busy long enough for
|
||||||
|
/// Windows to mark the window as not responding, the request isn't answered in time. The taskbar then
|
||||||
|
/// takes the window class's icon and doesn't ask again. winit registers its class without one,
|
||||||
|
/// so the button showed Windows' generic icon for as long as the window was open.
|
||||||
|
/// `false` if it isn't a Win32 window or the exe's icon doesn't load; SetClassLongPtrW's own
|
||||||
|
/// failure can't be told from a class that had no icon (both return 0), so it isn't reported.
|
||||||
|
pub fn set_class_icon(window: &impl HasWindowHandle) -> bool {
|
||||||
|
let Ok(handle) = window.window_handle() else { return false };
|
||||||
|
let RawWindowHandle::Win32(w) = handle.as_raw() else { return false };
|
||||||
|
let hwnd = w.hwnd.get() as HWND;
|
||||||
|
// SAFETY: a plain query on the live main window.
|
||||||
|
let dpi = unsafe { GetDpiForWindow(hwnd) };
|
||||||
|
let (Some(big), Some(small)) = (exe_icon(SM_CXICON, dpi), exe_icon(SM_CXSMICON, dpi)) else { return false };
|
||||||
|
// SAFETY: `hwnd` is the live main window and both icons are valid handles. The class keeps
|
||||||
|
// them for the rest of the process, so they are never destroyed. `as _`: on 32-bit Windows
|
||||||
|
// this is SetClassLongW (see the imports), which takes an i32.
|
||||||
|
unsafe {
|
||||||
|
SetClassLongPtrW(hwnd, GCLP_HICON, big as _);
|
||||||
|
SetClassLongPtrW(hwnd, GCLP_HICONSM, small as _);
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The exe's icon at the size of system metric `metric` (`SM_CXICON`, `SM_CXSMICON`) at `dpi`.
|
||||||
|
fn exe_icon(metric: i32, dpi: u32) -> Option<windows_sys::Win32::Foundation::HANDLE> {
|
||||||
|
// SAFETY: GetModuleHandleW(null) is this exe, loaded for the life of the process; the name
|
||||||
|
// is an integer resource id (MAKEINTRESOURCE), which LoadImageW accepts in place of a string.
|
||||||
|
let icon = unsafe {
|
||||||
|
let size = GetSystemMetricsForDpi(metric, dpi);
|
||||||
|
LoadImageW(GetModuleHandleW(std::ptr::null()), std::ptr::without_provenance(ICON_RESOURCE), IMAGE_ICON, size, size, LR_DEFAULTCOLOR)
|
||||||
|
};
|
||||||
|
(!icon.is_null()).then_some(icon)
|
||||||
|
}
|
||||||
|
|
||||||
/// The window procedure ours replaced (winit's), as an address; 0 before [`install`].
|
/// The window procedure ours replaced (winit's), as an address; 0 before [`install`].
|
||||||
static PREVIOUS: AtomicIsize = AtomicIsize::new(0);
|
static PREVIOUS: AtomicIsize = AtomicIsize::new(0);
|
||||||
|
|
||||||
|
|||||||
@@ -105,6 +105,7 @@ impl NativeMenu {
|
|||||||
("messages", "Messages\u{2026}"),
|
("messages", "Messages\u{2026}"),
|
||||||
("report", "Report an Issue\u{2026}"),
|
("report", "Report an Issue\u{2026}"),
|
||||||
("crashes", "Crash Reports\u{2026}"),
|
("crashes", "Crash Reports\u{2026}"),
|
||||||
|
("install_cli", "Install solidcraft-cli command"),
|
||||||
] {
|
] {
|
||||||
let item = MenuItem::new(app.tr_label(label), true, None);
|
let item = MenuItem::new(app.tr_label(label), true, None);
|
||||||
help.append(&item)?;
|
help.append(&item)?;
|
||||||
|
|||||||
@@ -0,0 +1,463 @@
|
|||||||
|
//! The navigation bridge: a 3D input device's own program (a homemade device's driver app) moves
|
||||||
|
//! the view over a loopback connection, the way a 3D mouse driver hands its axes to the programs
|
||||||
|
//! it supports, so the device emulates no mouse and the pointer stays the user's.
|
||||||
|
//!
|
||||||
|
//! The device app listens on `127.0.0.1:<port>`; with Preferences › Navigation › "Navigate with a
|
||||||
|
//! device app" on (off by default), SolidCraft connects to it, says hello and reads one JSON
|
||||||
|
//! object per line (docs/3d-mouse.md). The reader thread only sums the motion; the egui thread
|
||||||
|
//! hands it to the view once per frame (`space_mouse::bridge_frame`). A device the app says it
|
||||||
|
//! reads is left to it by the 3D mouse reader ([`Claim`]), so the view doesn't move twice.
|
||||||
|
|
||||||
|
use std::io::{ErrorKind, Read, Write};
|
||||||
|
use std::net::{Ipv4Addr, SocketAddr, TcpStream};
|
||||||
|
use std::sync::{Arc, Mutex, MutexGuard};
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use egui::Context;
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use solidcraft_ui_egui::SolveApp;
|
||||||
|
use solidcraft_ui_egui::space_mouse::{BRIDGE_VIEWS, BridgeMotion, bridge_frame, bridge_step};
|
||||||
|
|
||||||
|
/// The longest line read; a longer one is skipped to its end.
|
||||||
|
const MAX_LINE: usize = 4096;
|
||||||
|
/// Standard views waiting for the next frame; past this many, more are a flood and dropped.
|
||||||
|
const MAX_VIEWS: usize = 8;
|
||||||
|
/// The longest name a device app may give for itself or its device, in characters.
|
||||||
|
const MAX_NAME: usize = 64;
|
||||||
|
/// How long a connection attempt waits.
|
||||||
|
const CONNECT_TIMEOUT: Duration = Duration::from_millis(500);
|
||||||
|
/// How long a read waits for data before the reader looks at the preferences again.
|
||||||
|
const READ_WAKE: Duration = Duration::from_millis(250);
|
||||||
|
/// The wait before connecting again when no device app answered or one went away.
|
||||||
|
const RETRY_AFTER: Duration = Duration::from_secs(1);
|
||||||
|
/// In zoom mode, a motion of this many points along Y is one zoom step: with 8 % a step, the 1 %
|
||||||
|
/// a point that a zoom drag moves.
|
||||||
|
const POINTS_PER_ZOOM_STEP: f64 = 8.0;
|
||||||
|
|
||||||
|
/// What the device's motion drives, as the device app last said (`mode`).
|
||||||
|
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||||
|
enum Mode {
|
||||||
|
#[default]
|
||||||
|
Orbit,
|
||||||
|
Pan,
|
||||||
|
Zoom,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the reader thread and the egui thread share.
|
||||||
|
#[derive(Debug, Default)]
|
||||||
|
struct Shared {
|
||||||
|
/// The port the preferences ask to connect to; none while the bridge is off.
|
||||||
|
wanted: Option<u16>,
|
||||||
|
/// The device app connected, by the name it gave ("?" until it gives one).
|
||||||
|
connected: Option<String>,
|
||||||
|
/// The device the connected app reads, as it named it: the 3D mouse reader leaves that one alone.
|
||||||
|
device: Option<String>,
|
||||||
|
/// Motion since the egui thread last took it.
|
||||||
|
motion: BridgeMotion,
|
||||||
|
/// Standard views asked for since then.
|
||||||
|
views: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lock(shared: &Mutex<Shared>) -> Option<MutexGuard<'_, Shared>> {
|
||||||
|
shared.lock().ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A name a device app gave, without control characters and cut to [`MAX_NAME`]; none when empty.
|
||||||
|
fn name(value: Option<&Value>) -> Option<String> {
|
||||||
|
let name: String = value?.as_str()?.chars().filter(|c| !c.is_control()).take(MAX_NAME).collect();
|
||||||
|
let name = name.trim();
|
||||||
|
(!name.is_empty()).then(|| name.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A number of a message, finite and in range; none when it isn't one.
|
||||||
|
fn number(msg: &Value, key: &str) -> f64 {
|
||||||
|
bridge_step(msg.get(key).and_then(Value::as_f64).unwrap_or(0.0))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Takes one line from the device app into `shared`. Lines that aren't a message this version
|
||||||
|
/// knows are ignored. Returns whether the view has something new to show.
|
||||||
|
fn consume(line: &[u8], mode: &mut Mode, shared: &mut Shared) -> bool {
|
||||||
|
let Ok(msg) = serde_json::from_slice::<Value>(line) else { return false };
|
||||||
|
let add = |shared: &mut Shared, motion: BridgeMotion| {
|
||||||
|
shared.motion = shared.motion.plus(motion);
|
||||||
|
!motion.is_still()
|
||||||
|
};
|
||||||
|
match msg.get("t").and_then(Value::as_str) {
|
||||||
|
Some("axis") => {
|
||||||
|
let (x, y) = (number(&msg, "x"), number(&msg, "y"));
|
||||||
|
let motion = match mode {
|
||||||
|
Mode::Orbit => BridgeMotion { orbit: [x, y], ..Default::default() },
|
||||||
|
Mode::Pan => BridgeMotion { pan: [x, y], ..Default::default() },
|
||||||
|
// Up zooms in, as a zoom drag does.
|
||||||
|
Mode::Zoom => BridgeMotion { zoom: -y / POINTS_PER_ZOOM_STEP, ..Default::default() },
|
||||||
|
};
|
||||||
|
add(shared, motion)
|
||||||
|
}
|
||||||
|
Some("zoom") => add(shared, BridgeMotion { zoom: number(&msg, "d"), ..Default::default() }),
|
||||||
|
Some("mode") => {
|
||||||
|
let on = msg.get("on").and_then(Value::as_bool).unwrap_or(false);
|
||||||
|
*mode = match msg.get("mode").and_then(Value::as_str) {
|
||||||
|
Some("pan") if on => Mode::Pan,
|
||||||
|
Some("zoom") if on => Mode::Zoom,
|
||||||
|
_ => Mode::Orbit,
|
||||||
|
};
|
||||||
|
false
|
||||||
|
}
|
||||||
|
Some("view") => {
|
||||||
|
let view = msg.get("name").and_then(Value::as_str).and_then(|n| BRIDGE_VIEWS.iter().find(|v| **v == n));
|
||||||
|
match view {
|
||||||
|
Some(view) if shared.views.len() < MAX_VIEWS => {
|
||||||
|
shared.views.push((*view).to_string());
|
||||||
|
true
|
||||||
|
}
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Some("hello") => {
|
||||||
|
shared.connected = name(msg.get("server")).or_else(|| shared.connected.clone());
|
||||||
|
shared.device = name(msg.get("device"));
|
||||||
|
true
|
||||||
|
}
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Splits what arrives into lines, across reads. A line longer than [`MAX_LINE`] is dropped up to
|
||||||
|
/// its newline, so a peer that never sends one can't make the reader hold more than that.
|
||||||
|
#[derive(Default)]
|
||||||
|
struct Lines {
|
||||||
|
line: Vec<u8>,
|
||||||
|
skipping: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Lines {
|
||||||
|
fn feed(&mut self, mut data: &[u8], mut each: impl FnMut(&[u8])) {
|
||||||
|
while !data.is_empty() {
|
||||||
|
let end = data.iter().position(|b| *b == b'\n');
|
||||||
|
let (part, rest) = match end {
|
||||||
|
Some(i) => (data.get(..i).unwrap_or_default(), data.get(i + 1..).unwrap_or_default()),
|
||||||
|
None => (data, &[][..]),
|
||||||
|
};
|
||||||
|
if !self.skipping {
|
||||||
|
let room = (MAX_LINE + 1).saturating_sub(self.line.len());
|
||||||
|
self.line.extend_from_slice(part.get(..room.min(part.len())).unwrap_or_default());
|
||||||
|
if self.line.len() > MAX_LINE {
|
||||||
|
self.line.clear();
|
||||||
|
self.skipping = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if end.is_some() {
|
||||||
|
if !self.skipping {
|
||||||
|
each(self.line.strip_suffix(b"\r").unwrap_or(&self.line));
|
||||||
|
}
|
||||||
|
self.line.clear();
|
||||||
|
self.skipping = false;
|
||||||
|
}
|
||||||
|
data = rest;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What SolidCraft says first, so the device app knows which program it is driving.
|
||||||
|
fn hello() -> Value {
|
||||||
|
json!({"t": "hello", "app": "solidcraft", "version": env!("CARGO_PKG_VERSION")})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Reads one connection until the device app closes it, it fails, or the preferences no longer
|
||||||
|
/// ask for this port; then forgets what it had.
|
||||||
|
fn serve(mut stream: TcpStream, port: u16, ctx: &Context, shared: &Mutex<Shared>) {
|
||||||
|
// Without a read timeout the reader couldn't notice the bridge being switched off.
|
||||||
|
if stream.set_read_timeout(Some(READ_WAKE)).is_err() || writeln!(stream, "{}", hello()).is_err() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let _ = stream.set_nodelay(true);
|
||||||
|
log::info!("navigation bridge: connected to 127.0.0.1:{port}");
|
||||||
|
if let Some(mut shared) = lock(shared) {
|
||||||
|
shared.connected = Some("?".into());
|
||||||
|
}
|
||||||
|
ctx.request_repaint();
|
||||||
|
let (mut lines, mut mode) = (Lines::default(), Mode::default());
|
||||||
|
let mut chunk = [0_u8; 4096];
|
||||||
|
while lock(shared).is_some_and(|shared| shared.wanted == Some(port)) {
|
||||||
|
match stream.read(&mut chunk) {
|
||||||
|
Ok(0) => break,
|
||||||
|
Ok(size) => {
|
||||||
|
let mut news = false;
|
||||||
|
if let Some(mut shared) = lock(shared) {
|
||||||
|
lines.feed(chunk.get(..size).unwrap_or_default(), |line| news |= consume(line, &mut mode, &mut shared));
|
||||||
|
}
|
||||||
|
if news {
|
||||||
|
ctx.request_repaint();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(error) if matches!(error.kind(), ErrorKind::WouldBlock | ErrorKind::TimedOut | ErrorKind::Interrupted) => {}
|
||||||
|
Err(error) => {
|
||||||
|
log::info!("navigation bridge: connection lost: {error}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(mut shared) = lock(shared) {
|
||||||
|
*shared = Shared { wanted: shared.wanted, ..Shared::default() };
|
||||||
|
}
|
||||||
|
ctx.request_repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Connects to the device app while the preferences ask for it, again whenever it goes away.
|
||||||
|
fn reader(ctx: Context, shared: Arc<Mutex<Shared>>) {
|
||||||
|
loop {
|
||||||
|
let Some(port) = lock(&shared).and_then(|shared| shared.wanted) else {
|
||||||
|
std::thread::sleep(READ_WAKE);
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
if let Ok(stream) = TcpStream::connect_timeout(&SocketAddr::from((Ipv4Addr::LOCALHOST, port)), CONNECT_TIMEOUT) {
|
||||||
|
serve(stream, port, &ctx, &shared);
|
||||||
|
}
|
||||||
|
std::thread::sleep(RETRY_AFTER);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Which 3D mouse the connected device app reads, for the 3D mouse reader to leave alone. Only
|
||||||
|
/// the Windows and macOS readers know a device's strings to compare.
|
||||||
|
#[derive(Clone)]
|
||||||
|
#[cfg_attr(not(any(target_os = "windows", target_os = "macos")), allow(dead_code))]
|
||||||
|
pub struct Claim(Arc<Mutex<Shared>>);
|
||||||
|
|
||||||
|
#[cfg_attr(not(any(target_os = "windows", target_os = "macos")), allow(dead_code))]
|
||||||
|
impl Claim {
|
||||||
|
/// Whether a device with these manufacturer and product strings is the one the connected
|
||||||
|
/// device app reads (its name appears in one, ignoring case).
|
||||||
|
pub fn claims(&self, strings: &[String]) -> bool {
|
||||||
|
let Some(device) = lock(&self.0).and_then(|shared| shared.device.clone()) else { return false };
|
||||||
|
let device = device.to_lowercase();
|
||||||
|
strings.iter().any(|s| s.to_lowercase().contains(&device))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct NavBridge {
|
||||||
|
shared: Arc<Mutex<Shared>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl NavBridge {
|
||||||
|
pub fn start(ctx: &Context) -> Self {
|
||||||
|
let shared = Arc::new(Mutex::new(Shared::default()));
|
||||||
|
let (worker_ctx, worker_state) = (ctx.clone(), Arc::clone(&shared));
|
||||||
|
if let Err(error) = std::thread::Builder::new().name("solidcraft-nav-bridge".into()).spawn(move || reader(worker_ctx, worker_state)) {
|
||||||
|
log::warn!("navigation bridge: reader could not start: {error}");
|
||||||
|
}
|
||||||
|
Self { shared }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg_attr(not(any(target_os = "windows", target_os = "macos")), allow(dead_code))]
|
||||||
|
pub fn claim(&self) -> Claim {
|
||||||
|
Claim(Arc::clone(&self.shared))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Each frame: passes the preferences to the reader, and the motion and views since the last
|
||||||
|
/// frame to the view. Motion that arrived while the window had no focus is dropped with it.
|
||||||
|
pub fn tick(&mut self, app: &mut SolveApp, ctx: &Context) {
|
||||||
|
let wanted = Some(app.preferences.nav_bridge_port).filter(|port| app.preferences.nav_bridge_enabled && *port != 0);
|
||||||
|
let Some((motion, views, connected)) = lock(&self.shared).map(|mut shared| {
|
||||||
|
shared.wanted = wanted;
|
||||||
|
(std::mem::take(&mut shared.motion), std::mem::take(&mut shared.views), shared.connected.clone())
|
||||||
|
}) else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
app.space_mouse.bridge = connected.filter(|_| wanted.is_some());
|
||||||
|
if !motion.is_still() || !views.is_empty() {
|
||||||
|
bridge_frame(app, ctx, motion, &views);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use std::io::{BufRead, BufReader};
|
||||||
|
use std::net::TcpListener;
|
||||||
|
use std::time::Instant;
|
||||||
|
|
||||||
|
fn feed(shared: &mut Shared, mode: &mut Mode, text: &str) -> bool {
|
||||||
|
let mut news = false;
|
||||||
|
Lines::default().feed(text.as_bytes(), |line| news |= consume(line, mode, shared));
|
||||||
|
news
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn axis_motion_orbits_pans_or_zooms_as_the_mode_says() {
|
||||||
|
let (mut shared, mut mode) = (Shared::default(), Mode::default());
|
||||||
|
assert!(feed(&mut shared, &mut mode, "{\"t\":\"axis\",\"x\":3,\"y\":-2}\n{\"t\":\"axis\",\"x\":1.5,\"y\":0}\n"));
|
||||||
|
assert_eq!(shared.motion, BridgeMotion { orbit: [4.5, -2.0], ..Default::default() });
|
||||||
|
feed(&mut shared, &mut mode, "{\"t\":\"mode\",\"mode\":\"pan\",\"on\":true}\n{\"t\":\"axis\",\"x\":5,\"y\":6}\n");
|
||||||
|
assert_eq!(mode, Mode::Pan);
|
||||||
|
assert_eq!(shared.motion.pan, [5.0, 6.0]);
|
||||||
|
feed(&mut shared, &mut mode, "{\"t\":\"mode\",\"mode\":\"zoom\",\"on\":true}\n{\"t\":\"axis\",\"x\":0,\"y\":-16}\n");
|
||||||
|
assert_eq!(shared.motion.zoom, 2.0, "up zooms in, 8 points a step");
|
||||||
|
// Off, whichever mode it names, is back to orbit.
|
||||||
|
feed(&mut shared, &mut mode, "{\"t\":\"mode\",\"mode\":\"pan\",\"on\":false}\n");
|
||||||
|
assert_eq!(mode, Mode::Orbit);
|
||||||
|
// The ring's steps add up with the zoom mode's.
|
||||||
|
feed(&mut shared, &mut mode, "{\"t\":\"zoom\",\"d\":-0.5}\n");
|
||||||
|
assert_eq!(shared.motion.zoom, 1.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn views_are_queued_by_their_known_names_only() {
|
||||||
|
let (mut shared, mut mode) = (Shared::default(), Mode::default());
|
||||||
|
assert!(feed(&mut shared, &mut mode, "{\"t\":\"view\",\"name\":\"iso\"}\n{\"t\":\"view\",\"name\":\"fit\"}\n"));
|
||||||
|
assert!(!feed(&mut shared, &mut mode, "{\"t\":\"view\",\"name\":\"ISO\"}\n{\"t\":\"view\",\"name\":\"../etc\"}\n{\"t\":\"view\"}\n"));
|
||||||
|
assert_eq!(shared.views, ["iso", "fit"]);
|
||||||
|
let flood = "{\"t\":\"view\",\"name\":\"top\"}\n".repeat(100);
|
||||||
|
feed(&mut shared, &mut mode, &flood);
|
||||||
|
assert_eq!(shared.views.len(), MAX_VIEWS);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hostile_lines_never_move_the_view_out_of_range() {
|
||||||
|
let (mut shared, mut mode) = (Shared::default(), Mode::default());
|
||||||
|
let lines = [
|
||||||
|
"not json",
|
||||||
|
"{\"t\":\"axis\",\"x\":\"5\",\"y\":null}",
|
||||||
|
"{\"t\":\"axis\",\"x\":1e308,\"y\":-1e308}",
|
||||||
|
"{\"t\":\"axis\",\"x\":1e999}",
|
||||||
|
"{\"t\":\"zoom\",\"d\":[1]}",
|
||||||
|
"{\"t\":42}",
|
||||||
|
"[1,2,3]",
|
||||||
|
"{\"t\":\"mode\",\"mode\":{\"x\":1},\"on\":\"yes\"}",
|
||||||
|
"\u{0}\u{1}\u{2}",
|
||||||
|
];
|
||||||
|
for line in lines {
|
||||||
|
Lines::default().feed(format!("{line}\n").as_bytes(), |l| {
|
||||||
|
consume(l, &mut mode, &mut shared);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let limit = solidcraft_ui_egui::space_mouse::BRIDGE_MAX_STEP;
|
||||||
|
let values = shared.motion.orbit.into_iter().chain(shared.motion.pan).chain([shared.motion.zoom]);
|
||||||
|
for value in values {
|
||||||
|
assert!(value.is_finite() && value.abs() <= limit, "{value}");
|
||||||
|
}
|
||||||
|
assert_eq!(mode, Mode::Orbit);
|
||||||
|
// Invalid UTF-8 is no message either.
|
||||||
|
assert!(!consume(&[0xff, 0xfe, b'{', b'}'], &mut mode, &mut shared));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn lines_split_across_reads_and_long_ones_are_skipped_to_their_end() {
|
||||||
|
let mut got = Vec::new();
|
||||||
|
let mut lines = Lines::default();
|
||||||
|
for part in ["{\"t\":", "\"zoom\"}\r\n{\"a\"", ":1}\n"] {
|
||||||
|
lines.feed(part.as_bytes(), |line| got.push(String::from_utf8_lossy(line).to_string()));
|
||||||
|
}
|
||||||
|
assert_eq!(got, ["{\"t\":\"zoom\"}", "{\"a\":1}"]);
|
||||||
|
got.clear();
|
||||||
|
let long = vec![b'x'; MAX_LINE * 3];
|
||||||
|
lines.feed(&long, |line| got.push(String::from_utf8_lossy(line).to_string()));
|
||||||
|
lines.feed(&long, |line| got.push(String::from_utf8_lossy(line).to_string()));
|
||||||
|
assert!(lines.line.len() <= MAX_LINE + 1, "never holds more than one line");
|
||||||
|
lines.feed(b"tail\nnext\n", |line| got.push(String::from_utf8_lossy(line).to_string()));
|
||||||
|
assert_eq!(got, ["next"], "the long line is dropped to its newline, the next one read");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_device_app_names_itself_and_the_device_it_leaves_alone() {
|
||||||
|
let shared = Arc::new(Mutex::new(Shared::default()));
|
||||||
|
let claim = Claim(Arc::clone(&shared));
|
||||||
|
let strings = ["STMicroelectronics".to_string(), "MAKMOUSE 3D".to_string()];
|
||||||
|
assert!(!claim.claims(&strings), "nothing is claimed before an app says so");
|
||||||
|
let mut mode = Mode::default();
|
||||||
|
if let Ok(mut shared) = shared.lock() {
|
||||||
|
let hello = format!("{{\"t\":\"hello\",\"server\":\"Dev\\u0007App {}\",\"device\":\"makmouse\"}}\n", "x".repeat(200));
|
||||||
|
feed(&mut shared, &mut mode, &hello);
|
||||||
|
assert_eq!(shared.connected.as_deref().map(|n| n.chars().count()), Some(MAX_NAME));
|
||||||
|
assert!(shared.connected.as_deref().is_some_and(|n| n.starts_with("DevApp")));
|
||||||
|
}
|
||||||
|
assert!(claim.claims(&strings), "the name matches ignoring case");
|
||||||
|
assert!(!claim.claims(&["3Dconnexion".to_string(), "SpaceMouse Compact".to_string()]), "another 3D mouse stays the reader's");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Waits until `check` holds, or fails after a few seconds.
|
||||||
|
fn wait_for(what: &str, mut check: impl FnMut() -> bool) {
|
||||||
|
let deadline = Instant::now() + Duration::from_secs(5);
|
||||||
|
while !check() {
|
||||||
|
assert!(Instant::now() < deadline, "timed out waiting for {what}");
|
||||||
|
std::thread::sleep(Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_connection_says_hello_reads_the_stream_and_ends_when_the_bridge_is_switched_off() {
|
||||||
|
let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 0)).unwrap();
|
||||||
|
let port = listener.local_addr().unwrap().port();
|
||||||
|
let shared = Arc::new(Mutex::new(Shared { wanted: Some(port), ..Default::default() }));
|
||||||
|
let client = TcpStream::connect((Ipv4Addr::LOCALHOST, port)).unwrap();
|
||||||
|
let (mut server, _) = listener.accept().unwrap();
|
||||||
|
let worker = {
|
||||||
|
let shared = Arc::clone(&shared);
|
||||||
|
std::thread::spawn(move || serve(client, port, &Context::default(), &shared))
|
||||||
|
};
|
||||||
|
let mut hello_line = String::new();
|
||||||
|
BufReader::new(server.try_clone().unwrap()).read_line(&mut hello_line).unwrap();
|
||||||
|
let hello: Value = serde_json::from_str(&hello_line).unwrap();
|
||||||
|
assert_eq!((hello["t"].as_str(), hello["app"].as_str()), (Some("hello"), Some("solidcraft")));
|
||||||
|
server
|
||||||
|
.write_all(b"{\"t\":\"hello\",\"server\":\"MAKMOUSE\",\"device\":\"MAKMOUSE\"}\n{\"t\":\"axis\",\"x\":2,\"y\":1}\n{\"t\":\"view\",\"name\":\"top\"}\n")
|
||||||
|
.unwrap();
|
||||||
|
wait_for("the stream", || shared.lock().is_ok_and(|s| s.motion.orbit == [2.0, 1.0] && s.views == ["top"]));
|
||||||
|
assert_eq!(shared.lock().unwrap().connected.as_deref(), Some("MAKMOUSE"));
|
||||||
|
// Switched off: the connection ends and what it had is forgotten.
|
||||||
|
shared.lock().unwrap().wanted = None;
|
||||||
|
worker.join().unwrap();
|
||||||
|
let after = shared.lock().unwrap();
|
||||||
|
assert!(after.connected.is_none() && after.device.is_none() && after.motion.is_still() && after.views.is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_closed_connection_forgets_the_app() {
|
||||||
|
let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 0)).unwrap();
|
||||||
|
let port = listener.local_addr().unwrap().port();
|
||||||
|
let shared = Arc::new(Mutex::new(Shared { wanted: Some(port), ..Default::default() }));
|
||||||
|
let client = TcpStream::connect((Ipv4Addr::LOCALHOST, port)).unwrap();
|
||||||
|
let (server, _) = listener.accept().unwrap();
|
||||||
|
let worker = {
|
||||||
|
let shared = Arc::clone(&shared);
|
||||||
|
std::thread::spawn(move || serve(client, port, &Context::default(), &shared))
|
||||||
|
};
|
||||||
|
wait_for("the connection", || shared.lock().is_ok_and(|s| s.connected.is_some()));
|
||||||
|
drop(server);
|
||||||
|
worker.join().unwrap();
|
||||||
|
let after = shared.lock().unwrap();
|
||||||
|
assert_eq!((after.connected.as_deref(), after.wanted), (None, Some(port)), "still wanted, so the reader connects again");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn each_frame_hands_the_view_the_motion_and_passes_the_preferences_on() {
|
||||||
|
let mut app = SolveApp::new(solidcraft_engine::Session::default(), solidcraft_ui_egui::Services::default());
|
||||||
|
app.home.open = false;
|
||||||
|
let ctx = Context::default();
|
||||||
|
let _ = ctx.run_ui(egui::RawInput { focused: true, ..Default::default() }, |_| {});
|
||||||
|
let mut bridge = NavBridge { shared: Arc::new(Mutex::new(Shared::default())) };
|
||||||
|
let queue = |bridge: &NavBridge| {
|
||||||
|
let mut shared = bridge.shared.lock().unwrap();
|
||||||
|
shared.connected = Some("MAKMOUSE".into());
|
||||||
|
shared.motion = BridgeMotion { orbit: [10.0, 0.0], ..Default::default() };
|
||||||
|
};
|
||||||
|
// Off (the default): nothing is wanted, nothing reaches the view.
|
||||||
|
queue(&bridge);
|
||||||
|
bridge.tick(&mut app, &ctx);
|
||||||
|
assert_eq!(bridge.shared.lock().unwrap().wanted, None);
|
||||||
|
assert!(app.viewport.bridge_motion.is_none() && app.space_mouse.bridge.is_none());
|
||||||
|
// On: the port is passed to the reader and the motion to the view, once.
|
||||||
|
app.preferences.nav_bridge_enabled = true;
|
||||||
|
app.preferences.nav_bridge_port = 9123;
|
||||||
|
queue(&bridge);
|
||||||
|
bridge.tick(&mut app, &ctx);
|
||||||
|
assert_eq!(bridge.shared.lock().unwrap().wanted, Some(9123));
|
||||||
|
assert_eq!(app.space_mouse.bridge.as_deref(), Some("MAKMOUSE"));
|
||||||
|
assert_eq!(app.viewport.bridge_motion.map(|m| m.orbit), Some([10.0, 0.0]));
|
||||||
|
assert!(bridge.shared.lock().unwrap().motion.is_still(), "taken, not handed over twice");
|
||||||
|
// Port 0 is no port.
|
||||||
|
app.preferences.nav_bridge_port = 0;
|
||||||
|
bridge.tick(&mut app, &ctx);
|
||||||
|
assert_eq!(bridge.shared.lock().unwrap().wanted, None);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -241,6 +241,7 @@ struct Reading {
|
|||||||
device: Option<Source>,
|
device: Option<Source>,
|
||||||
/// A source that is connected but has not yet shown a device behind it (spacenavd's socket answers
|
/// A source that is connected but has not yet shown a device behind it (spacenavd's socket answers
|
||||||
/// with no mouse plugged in; its protocol has no enumeration, so the first record is the evidence).
|
/// with no mouse plugged in; its protocol has no enumeration, so the first record is the evidence).
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
awaiting: Option<Source>,
|
awaiting: Option<Source>,
|
||||||
axes: Axes,
|
axes: Axes,
|
||||||
/// When each of X, Y, Z, Rx, Ry and Rz last arrived. Each ages on its own: a device may send
|
/// When each of X, Y, Z, Rx, Ry and Rz last arrived. Each ages on its own: a device may send
|
||||||
@@ -287,6 +288,7 @@ impl Reading {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// A record arrived from the source being waited on: there is a device.
|
/// A record arrived from the source being waited on: there is a device.
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
fn heard(&mut self) {
|
fn heard(&mut self) {
|
||||||
if self.device.is_none() {
|
if self.device.is_none() {
|
||||||
self.device = self.awaiting.take();
|
self.device = self.awaiting.take();
|
||||||
@@ -296,6 +298,7 @@ impl Reading {
|
|||||||
fn new(now: Instant) -> Self {
|
fn new(now: Instant) -> Self {
|
||||||
Self {
|
Self {
|
||||||
device: None,
|
device: None,
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
awaiting: None,
|
awaiting: None,
|
||||||
axes: Axes::default(),
|
axes: Axes::default(),
|
||||||
at: [now; 6],
|
at: [now; 6],
|
||||||
@@ -460,12 +463,20 @@ fn connected(ctx: &Context, shared: &Mutex<Reading>, source: Source) {
|
|||||||
let now = Instant::now();
|
let now = Instant::now();
|
||||||
let stale = now.checked_sub(STALE_AFTER).unwrap_or(now);
|
let stale = now.checked_sub(STALE_AFTER).unwrap_or(now);
|
||||||
// A daemon is not yet a device: it counts once a record comes from it.
|
// A daemon is not yet a device: it counts once a record comes from it.
|
||||||
let (device, awaiting) = if needs_evidence(source) { (None, Some(source)) } else { (Some(source), None) };
|
let waiting = needs_evidence(source);
|
||||||
// A HID device reports the state of its buttons, so the first state seen is a baseline; the daemon
|
// A HID device reports the state of its buttons, so the first state seen is a baseline; the daemon
|
||||||
// and the driver send presses and releases, which start from nothing down.
|
// and the driver send presses and releases, which start from nothing down.
|
||||||
let buttons_known = !matches!(source, Source::Hid(_));
|
let buttons_known = !matches!(source, Source::Hid(_));
|
||||||
let generation = CONNECTIONS.fetch_add(1, Ordering::Relaxed).wrapping_add(1);
|
let generation = CONNECTIONS.fetch_add(1, Ordering::Relaxed).wrapping_add(1);
|
||||||
*reading = Reading { device, awaiting, at: [stale; 6], buttons_known, generation, ..Reading::new(now) };
|
*reading = Reading {
|
||||||
|
device: (!waiting).then_some(source),
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
awaiting: waiting.then_some(source),
|
||||||
|
at: [stale; 6],
|
||||||
|
buttons_known,
|
||||||
|
generation,
|
||||||
|
..Reading::new(now)
|
||||||
|
};
|
||||||
}
|
}
|
||||||
ctx.request_repaint();
|
ctx.request_repaint();
|
||||||
}
|
}
|
||||||
@@ -510,43 +521,175 @@ fn hid_api() -> hidapi::HidResult<HidApi> {
|
|||||||
HidApi::new()
|
HidApi::new()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// An open 3D-mouse interface: the device, how its reports are laid out, and its vendor and
|
||||||
|
/// product ids.
|
||||||
|
#[cfg(any(target_os = "windows", target_os = "macos", test))]
|
||||||
|
struct Candidate<D> {
|
||||||
|
device: D,
|
||||||
|
layout: Layout,
|
||||||
|
ids: (u16, u16),
|
||||||
|
/// The device's manufacturer and product strings ([`device_strings`]).
|
||||||
|
#[cfg_attr(not(any(target_os = "windows", target_os = "macos")), allow(dead_code))]
|
||||||
|
strings: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Input reports read with a timeout in milliseconds: hidapi's devices, and the tests' simulated
|
||||||
|
/// ones. `Ok(0)` is a timeout; an error means the device is gone.
|
||||||
|
#[cfg(any(target_os = "windows", target_os = "macos", test))]
|
||||||
|
trait ReportSource {
|
||||||
|
fn read_report(&self, report: &mut [u8], timeout_ms: i32) -> Result<usize, String>;
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(any(target_os = "windows", target_os = "macos"))]
|
#[cfg(any(target_os = "windows", target_os = "macos"))]
|
||||||
fn reader(ctx: Context, shared: Arc<Mutex<Reading>>) {
|
impl ReportSource for hidapi::HidDevice {
|
||||||
|
fn read_report(&self, report: &mut [u8], timeout_ms: i32) -> Result<usize, String> {
|
||||||
|
self.read_timeout(report, timeout_ms).map_err(|error| error.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What following the candidates tells the reader.
|
||||||
|
#[cfg(any(target_os = "windows", target_os = "macos", test))]
|
||||||
|
enum Followed<'a> {
|
||||||
|
/// This device is the one read now, so its calibration applies. With the buttons it last
|
||||||
|
/// reported down, when it reported them while another was read: they are its baseline, so a
|
||||||
|
/// press that makes it the device in use counts as a press, not as a button already held.
|
||||||
|
Device((u16, u16), Option<u32>),
|
||||||
|
/// An input report from it.
|
||||||
|
Report(&'a Layout, &'a [u8]),
|
||||||
|
/// It is gone.
|
||||||
|
Gone,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether a report shows its device in use: an axis off zero or a button down. A cap at rest
|
||||||
|
/// sends zeros at most, and an idle 3Dconnexion Universal Receiver sends nothing at all.
|
||||||
|
#[cfg(any(target_os = "windows", target_os = "macos", test))]
|
||||||
|
fn shows_use(layout: Layout, report: &[u8]) -> bool {
|
||||||
|
layout.decode(report).is_some_and(|decoded| decoded.axes.iter().flatten().any(|axis| *axis != 0) || decoded.buttons.is_some_and(|down| down != 0))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Reads every candidate and follows the one in use (#3988). The first is followed from the start,
|
||||||
|
/// as when it was the only one read. Another takes over once it shows use while the followed one
|
||||||
|
/// has shown none for `STALE_AFTER`, so two devices moved together don't hand the reading back
|
||||||
|
/// and forth. An idle Universal Receiver opens fine and never fails; read on its own it kept a
|
||||||
|
/// SpaceMouse next to it from ever being read. A candidate that fails is dropped. If it was the
|
||||||
|
/// followed one, the reading is reset and the next takes over. Returns when none is left.
|
||||||
|
#[cfg(any(target_os = "windows", target_os = "macos", test))]
|
||||||
|
fn follow<D: ReportSource>(mut candidates: Vec<Candidate<D>>, now: impl Fn() -> Instant, mut emit: impl FnMut(Followed<'_>)) {
|
||||||
|
let Some(first) = candidates.first() else { return };
|
||||||
|
emit(Followed::Device(first.ids, None));
|
||||||
|
let mut followed = 0;
|
||||||
|
// When the followed device last showed use.
|
||||||
|
let mut used_at: Option<Instant> = None;
|
||||||
|
// The buttons each candidate last reported down, by index, as long as it has reported them.
|
||||||
|
let mut buttons: Vec<Option<u32>> = candidates.iter().map(|_| None).collect();
|
||||||
|
let mut report = [0_u8; REPORT_BUFFER_BYTES];
|
||||||
|
while !candidates.is_empty() {
|
||||||
|
// One device is waited on as before; several take turns, briefly, so none waits behind
|
||||||
|
// an idle one. Reports queue in the system meanwhile, so none is lost.
|
||||||
|
let timeout_ms = if candidates.len() == 1 { 100 } else { 10 };
|
||||||
|
let mut index = 0;
|
||||||
|
while let Some(candidate) = candidates.get(index) {
|
||||||
|
match candidate.device.read_report(&mut report, timeout_ms) {
|
||||||
|
Ok(0) => {}
|
||||||
|
Ok(size) => {
|
||||||
|
let bytes = report.get(..size).unwrap_or_default();
|
||||||
|
let before = buttons.get(index).copied().flatten();
|
||||||
|
if let (Some(seen), Some(down)) = (buttons.get_mut(index), candidate.layout.decode(bytes).and_then(|decoded| decoded.buttons)) {
|
||||||
|
*seen = Some(down);
|
||||||
|
}
|
||||||
|
if shows_use(candidate.layout, bytes) {
|
||||||
|
let at = now();
|
||||||
|
if index != followed && used_at.is_none_or(|used| at.duration_since(used) >= STALE_AFTER) {
|
||||||
|
let (vendor, product) = candidate.ids;
|
||||||
|
log::info!("3D mouse: reading {vendor:04x}:{product:04x}, the device in use");
|
||||||
|
followed = index;
|
||||||
|
emit(Followed::Device(candidate.ids, before));
|
||||||
|
}
|
||||||
|
if index == followed {
|
||||||
|
used_at = Some(at);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if index == followed {
|
||||||
|
emit(Followed::Report(&candidate.layout, bytes));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(error) => {
|
||||||
|
log::info!("3D mouse disconnected: {error}");
|
||||||
|
candidates.remove(index);
|
||||||
|
if index < buttons.len() {
|
||||||
|
buttons.remove(index);
|
||||||
|
}
|
||||||
|
if index == followed {
|
||||||
|
emit(Followed::Gone);
|
||||||
|
followed = 0;
|
||||||
|
used_at = None;
|
||||||
|
if let Some(next) = candidates.first() {
|
||||||
|
emit(Followed::Device(next.ids, buttons.first().copied().flatten()));
|
||||||
|
}
|
||||||
|
} else if index < followed {
|
||||||
|
followed -= 1;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
index += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The device's manufacturer and product strings, which say whether a device app has it
|
||||||
|
/// ([`crate::nav_bridge::Claim`]). Asked of the opened 3D mouse only.
|
||||||
|
#[cfg(any(target_os = "windows", target_os = "macos"))]
|
||||||
|
fn device_strings(device: &hidapi::HidDevice) -> Vec<String> {
|
||||||
|
[device.get_manufacturer_string(), device.get_product_string()].into_iter().filter_map(|s| s.ok().flatten()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(any(target_os = "windows", target_os = "macos"))]
|
||||||
|
fn reader(ctx: Context, shared: Arc<Mutex<Reading>>, bridge: crate::nav_bridge::Claim) {
|
||||||
let Ok(mut api) = hid_api() else {
|
let Ok(mut api) = hid_api() else {
|
||||||
log::warn!("3D mouse: HID initialization failed");
|
log::warn!("3D mouse: HID initialization failed");
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
loop {
|
loop {
|
||||||
if let Some((device, layout, ids)) = candidates(&mut api).into_iter().find_map(|path| {
|
let open: Vec<_> = candidates(&mut api)
|
||||||
let device = api
|
.into_iter()
|
||||||
.open_path(&path)
|
.filter_map(|path| {
|
||||||
.inspect_err(|error| {
|
let device = api
|
||||||
// On macOS: missing Input Monitoring permission, or the 3DxWare helper holding the device.
|
.open_path(&path)
|
||||||
// The driver having the device is the reason it cannot be opened, not a problem.
|
.inspect_err(|error| {
|
||||||
if !DRIVER_CONNECTED.load(Ordering::Relaxed) && !DRIVER_REGISTERED.load(Ordering::Relaxed) {
|
// On macOS: missing Input Monitoring permission, or the 3DxWare helper holding the device.
|
||||||
log::warn!("3D mouse: cannot open the device: {error}");
|
// The driver having the device is the reason it cannot be opened, not a problem.
|
||||||
}
|
if !DRIVER_CONNECTED.load(Ordering::Relaxed) && !DRIVER_REGISTERED.load(Ordering::Relaxed) {
|
||||||
})
|
log::warn!("3D mouse: cannot open the device: {error}");
|
||||||
.ok()?;
|
}
|
||||||
// Read when the device was opened, from this device alone.
|
})
|
||||||
let info = device.get_device_info().ok()?;
|
.ok()?;
|
||||||
let layout = device_layout(&device, info.vendor_id())?;
|
// Read when the device was opened, from this device alone.
|
||||||
Some((device, layout, (info.vendor_id(), info.product_id())))
|
let info = device.get_device_info().ok()?;
|
||||||
}) {
|
let layout = device_layout(&device, info.vendor_id())?;
|
||||||
connected(&ctx, &shared, Source::Hid(Some(ids)));
|
let strings = device_strings(&device);
|
||||||
let mut report = [0_u8; REPORT_BUFFER_BYTES];
|
Some(Candidate { device, layout, ids: (info.vendor_id(), info.product_id()), strings })
|
||||||
loop {
|
})
|
||||||
match device.read_timeout(&mut report, 100) {
|
.collect();
|
||||||
Ok(0) => {}
|
let names: Vec<_> = open.iter().map(|candidate| (candidate.ids, candidate.strings.clone())).collect();
|
||||||
Ok(size) => publish(&ctx, &shared, layout, report.get(..size).unwrap_or_default()),
|
// Whether the device read now is one a device app has: it moves the view over the navigation
|
||||||
Err(error) => {
|
// bridge, so read here as well the device would move it twice. What was read before ages out.
|
||||||
log::info!("3D mouse disconnected: {error}");
|
let mut strings: &[String] = &[];
|
||||||
break;
|
follow(open, Instant::now, |event| match event {
|
||||||
}
|
Followed::Device(ids, buttons) => {
|
||||||
|
strings = names.iter().find(|(known, _)| *known == ids).map_or(&[][..], |(_, strings)| strings.as_slice());
|
||||||
|
connected(&ctx, &shared, Source::Hid(Some(ids)));
|
||||||
|
// Taken over from another device: what it reported meanwhile is its baseline.
|
||||||
|
if let Some(buttons) = buttons
|
||||||
|
&& let Ok(mut reading) = shared.lock()
|
||||||
|
{
|
||||||
|
reading.set_buttons(buttons);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
reset(&ctx, &shared);
|
Followed::Report(..) if bridge.claims(strings) => {}
|
||||||
}
|
Followed::Report(layout, report) => publish(&ctx, &shared, *layout, report),
|
||||||
|
Followed::Gone => reset(&ctx, &shared),
|
||||||
|
});
|
||||||
std::thread::sleep(RETRY_AFTER);
|
std::thread::sleep(RETRY_AFTER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -928,7 +1071,8 @@ pub struct SpaceMouse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl SpaceMouse {
|
impl SpaceMouse {
|
||||||
pub fn start(ctx: &Context) -> Self {
|
/// Starts the reader. A device that `bridge` says its own app reads is left to that app.
|
||||||
|
pub fn start(ctx: &Context, bridge: crate::nav_bridge::Claim) -> Self {
|
||||||
let now = Instant::now();
|
let now = Instant::now();
|
||||||
let shared = Arc::new(Mutex::new(Reading::new(now)));
|
let shared = Arc::new(Mutex::new(Reading::new(now)));
|
||||||
let worker_state = Arc::clone(&shared);
|
let worker_state = Arc::clone(&shared);
|
||||||
@@ -937,11 +1081,14 @@ impl SpaceMouse {
|
|||||||
let drivers = Arc::new(Drivers::default());
|
let drivers = Arc::new(Drivers::default());
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
let worker_drivers = Arc::clone(&drivers);
|
let worker_drivers = Arc::clone(&drivers);
|
||||||
|
// hidraw names no device's strings to compare (`Claim`).
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
let _ = bridge;
|
||||||
let spawned = std::thread::Builder::new().name("solidcraft-3d-mouse".into()).spawn(move || {
|
let spawned = std::thread::Builder::new().name("solidcraft-3d-mouse".into()).spawn(move || {
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
reader(worker_ctx, worker_state, worker_drivers, Machine);
|
reader(worker_ctx, worker_state, worker_drivers, Machine);
|
||||||
#[cfg(not(target_os = "linux"))]
|
#[cfg(not(target_os = "linux"))]
|
||||||
reader(worker_ctx, worker_state);
|
reader(worker_ctx, worker_state, bridge);
|
||||||
});
|
});
|
||||||
if let Err(error) = spawned {
|
if let Err(error) = spawned {
|
||||||
log::warn!("3D mouse: reader could not start: {error}");
|
log::warn!("3D mouse: reader could not start: {error}");
|
||||||
@@ -1283,6 +1430,175 @@ mod tests {
|
|||||||
assert!(shared.lock().unwrap().arrived, "but the report did arrive");
|
assert!(shared.lock().unwrap().arrived, "but the report did arrive");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A simulated 3D-mouse interface. Each read takes the next scripted step, a report or a
|
||||||
|
/// timeout (empty), and sets the shared clock to the step's time. Once the script runs out,
|
||||||
|
/// the device is unplugged.
|
||||||
|
struct Simulated<'a> {
|
||||||
|
clock: &'a std::cell::Cell<Instant>,
|
||||||
|
start: Instant,
|
||||||
|
steps: std::cell::RefCell<std::collections::VecDeque<(u64, Vec<u8>)>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ReportSource for Simulated<'_> {
|
||||||
|
fn read_report(&self, report: &mut [u8], _timeout_ms: i32) -> Result<usize, String> {
|
||||||
|
let (ms, bytes) = self.steps.borrow_mut().pop_front().ok_or_else(|| "unplugged".to_string())?;
|
||||||
|
self.clock.set(self.start + Duration::from_millis(ms));
|
||||||
|
report.get_mut(..bytes.len()).ok_or_else(|| "report too long".to_string())?.copy_from_slice(&bytes);
|
||||||
|
Ok(bytes.len())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
enum Seen {
|
||||||
|
/// The product id now read.
|
||||||
|
Device(u16),
|
||||||
|
/// The buttons it had reported down before it was read, its baseline.
|
||||||
|
Baseline(u32),
|
||||||
|
/// A report published, the product id read when it was, and whether it showed use.
|
||||||
|
Report(u16, Vec<u8>, bool),
|
||||||
|
Gone,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Follows simulated devices, given as (product id, scripted steps in ms), and returns what
|
||||||
|
/// the reader was told.
|
||||||
|
fn follow_simulated(devices: &[(u16, &[(u64, &[u8])])]) -> Vec<Seen> {
|
||||||
|
follow_simulated_with(Layout::default(), devices)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// As `follow_simulated`, with every device's reports laid out as `layout`.
|
||||||
|
fn follow_simulated_with(layout: Layout, devices: &[(u16, &[(u64, &[u8])])]) -> Vec<Seen> {
|
||||||
|
let start = Instant::now();
|
||||||
|
let clock = std::cell::Cell::new(start);
|
||||||
|
let candidates = devices
|
||||||
|
.iter()
|
||||||
|
.map(|(product, steps)| Candidate {
|
||||||
|
device: Simulated {
|
||||||
|
clock: &clock,
|
||||||
|
start,
|
||||||
|
steps: std::cell::RefCell::new(steps.iter().map(|(ms, bytes)| (*ms, bytes.to_vec())).collect()),
|
||||||
|
},
|
||||||
|
layout,
|
||||||
|
ids: (0x256f, *product),
|
||||||
|
strings: Vec::new(),
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let (mut seen, mut read) = (Vec::new(), 0);
|
||||||
|
follow(
|
||||||
|
candidates,
|
||||||
|
|| clock.get(),
|
||||||
|
|event| match event {
|
||||||
|
Followed::Device((_, product), buttons) => {
|
||||||
|
read = product;
|
||||||
|
seen.push(Seen::Device(product));
|
||||||
|
seen.extend(buttons.map(Seen::Baseline));
|
||||||
|
}
|
||||||
|
Followed::Report(layout, bytes) => seen.push(Seen::Report(read, bytes.to_vec(), shows_use(*layout, bytes))),
|
||||||
|
Followed::Gone => seen.push(Seen::Gone),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
seen
|
||||||
|
}
|
||||||
|
|
||||||
|
const RECEIVER: u16 = 0xc652;
|
||||||
|
const SPACEMOUSE: u16 = 0xc63a;
|
||||||
|
const PUSH_X: &[u8] = &[1, 100, 0, 0, 0, 0, 0];
|
||||||
|
const AT_REST: &[u8] = &[1, 0, 0, 0, 0, 0, 0];
|
||||||
|
const TILT: &[u8] = &[2, 0, 0, 50, 0, 0, 0];
|
||||||
|
|
||||||
|
/// #3988: a Universal Receiver with nothing paired is found first and never fails, and a wired
|
||||||
|
/// SpaceMouse next to it was never read. The receiver is followed only until the SpaceMouse
|
||||||
|
/// moves; the SpaceMouse's reports, its zeros included, are read from then on.
|
||||||
|
#[test]
|
||||||
|
fn an_idle_receiver_does_not_keep_a_spacemouse_from_being_read() {
|
||||||
|
let receiver: &[(u64, &[u8])] = &[(0, &[]), (10, &[]), (20, &[]), (30, &[])];
|
||||||
|
let spacemouse: &[(u64, &[u8])] = &[(5, &[]), (15, PUSH_X), (25, AT_REST), (35, TILT)];
|
||||||
|
assert_eq!(
|
||||||
|
follow_simulated(&[(RECEIVER, receiver), (SPACEMOUSE, spacemouse)]),
|
||||||
|
[
|
||||||
|
Seen::Device(RECEIVER),
|
||||||
|
Seen::Device(SPACEMOUSE),
|
||||||
|
Seen::Report(SPACEMOUSE, PUSH_X.to_vec(), true),
|
||||||
|
Seen::Report(SPACEMOUSE, AT_REST.to_vec(), false),
|
||||||
|
Seen::Report(SPACEMOUSE, TILT.to_vec(), true),
|
||||||
|
// The receiver is unplugged first, then the SpaceMouse, the one being read.
|
||||||
|
Seen::Gone,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Two devices in use at once don't trade the reading: the other takes over only after the
|
||||||
|
/// followed one has shown no use for `STALE_AFTER`. A report at rest or with an id the layout
|
||||||
|
/// doesn't know shows no use, and only the followed device's reports are published.
|
||||||
|
#[test]
|
||||||
|
fn another_device_takes_over_only_once_the_followed_one_is_still() {
|
||||||
|
let unknown_id: &[u8] = &[0x17, 80];
|
||||||
|
let first: &[(u64, &[u8])] = &[(0, PUSH_X), (100, AT_REST), (200, &[])];
|
||||||
|
let second: &[(u64, &[u8])] = &[(50, PUSH_X), (150, unknown_id), (250, TILT)];
|
||||||
|
assert_eq!(
|
||||||
|
follow_simulated(&[(0xc635, first), (SPACEMOUSE, second)]),
|
||||||
|
[
|
||||||
|
Seen::Device(0xc635),
|
||||||
|
Seen::Report(0xc635, PUSH_X.to_vec(), true),
|
||||||
|
// The second moves 50 ms after the first did: not yet. The first's own rest
|
||||||
|
// report is read, and the second's unknown report is not.
|
||||||
|
Seen::Report(0xc635, AT_REST.to_vec(), false),
|
||||||
|
// 250 ms after the first last moved, the second takes over.
|
||||||
|
Seen::Device(SPACEMOUSE),
|
||||||
|
Seen::Report(SPACEMOUSE, TILT.to_vec(), true),
|
||||||
|
Seen::Gone,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One device is read as before: every report, until it fails. When the followed one of
|
||||||
|
/// several fails, the reading is reset and the next one is read.
|
||||||
|
#[test]
|
||||||
|
fn a_device_that_fails_hands_the_reading_to_the_next() {
|
||||||
|
let only: &[(u64, &[u8])] = &[(0, &[]), (1, AT_REST), (2, &[0x17, 80])];
|
||||||
|
assert_eq!(
|
||||||
|
follow_simulated(&[(SPACEMOUSE, only)]),
|
||||||
|
[
|
||||||
|
Seen::Device(SPACEMOUSE),
|
||||||
|
Seen::Report(SPACEMOUSE, AT_REST.to_vec(), false),
|
||||||
|
Seen::Report(SPACEMOUSE, vec![0x17, 80], false),
|
||||||
|
Seen::Gone
|
||||||
|
]
|
||||||
|
);
|
||||||
|
let unplugged: &[(u64, &[u8])] = &[];
|
||||||
|
let next: &[(u64, &[u8])] = &[(1, PUSH_X)];
|
||||||
|
assert_eq!(
|
||||||
|
follow_simulated(&[(SPACEMOUSE, unplugged), (RECEIVER, next)]),
|
||||||
|
[Seen::Device(SPACEMOUSE), Seen::Gone, Seen::Device(RECEIVER), Seen::Report(RECEIVER, PUSH_X.to_vec(), true), Seen::Gone]
|
||||||
|
);
|
||||||
|
assert_eq!(follow_simulated(&[]), []);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A button press that makes a device the one in use is a press. The buttons it reported while
|
||||||
|
/// another was read are its baseline; the reader keeps them, so the press isn't taken for a
|
||||||
|
/// button already held, as a device's first button report is.
|
||||||
|
#[test]
|
||||||
|
fn a_press_that_takes_over_counts_as_a_press() {
|
||||||
|
let mut layout = Layout::default();
|
||||||
|
layout.buttons[0] =
|
||||||
|
Some(solidcraft_space_mouse::Field { report_id: 3, bit_offset: 0, bits: 1, logical_min: 0, logical_max: 1, relative: false });
|
||||||
|
let (none_down, first_down): (&[u8], &[u8]) = (&[3, 0], &[3, 1]);
|
||||||
|
let receiver: &[(u64, &[u8])] = &[(0, &[]), (10, &[]), (20, &[])];
|
||||||
|
let spacemouse: &[(u64, &[u8])] = &[(5, none_down), (15, first_down), (25, &[])];
|
||||||
|
assert_eq!(
|
||||||
|
follow_simulated_with(layout, &[(RECEIVER, receiver), (SPACEMOUSE, spacemouse)]),
|
||||||
|
[Seen::Device(RECEIVER), Seen::Device(SPACEMOUSE), Seen::Baseline(0), Seen::Report(SPACEMOUSE, first_down.to_vec(), true), Seen::Gone,]
|
||||||
|
);
|
||||||
|
// What the reader does with that: the press after the baseline is a tap.
|
||||||
|
let mut reading = Reading { buttons_known: false, ..Reading::new(Instant::now()) };
|
||||||
|
reading.set_buttons(0);
|
||||||
|
assert!(decode_report(first_down, layout, &mut reading, Instant::now()));
|
||||||
|
assert_eq!((reading.buttons, reading.taps), (1, 1));
|
||||||
|
// Without one, the same report is the baseline: held, not pressed.
|
||||||
|
let mut unseen = Reading { buttons_known: false, ..Reading::new(Instant::now()) };
|
||||||
|
assert!(decode_report(first_down, layout, &mut unseen, Instant::now()));
|
||||||
|
assert_eq!((unseen.buttons, unseen.taps), (1, 0));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_held_reading_stays_until_the_next_one_and_a_hid_reading_goes_stale() {
|
fn a_held_reading_stays_until_the_next_one_and_a_hid_reading_goes_stale() {
|
||||||
let now = Instant::now();
|
let now = Instant::now();
|
||||||
|
|||||||
@@ -8,8 +8,9 @@
|
|||||||
//! row the next launch starts in safe mode by itself.
|
//! row the next launch starts in safe mode by itself.
|
||||||
//! - **Safe mode** (`--safe-mode` or `SOLIDCRAFT_SAFE_MODE=1`): default settings (the saved ones
|
//! - **Safe mode** (`--safe-mode` or `SOLIDCRAFT_SAFE_MODE=1`): default settings (the saved ones
|
||||||
//! are left untouched), no recovery offer, the software renderer and CPU meshing.
|
//! are left untouched), no recovery offer, the software renderer and CPU meshing.
|
||||||
//! - **No usable graphics device**: one retry on the software renderer
|
//! - **A renderer that cannot start**: on Windows, try the remaining graphics APIs in order,
|
||||||
//! (`SOLIDCRAFT_RENDERER=cpu`), then a message box saying what failed and what to try.
|
//! then the software renderer (`SOLIDCRAFT_RENDERER=cpu`). An explicit `WGPU_BACKEND` fails
|
||||||
|
//! cleanly without switching. Exhausted retries show a message box with the error.
|
||||||
|
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
@@ -21,6 +22,25 @@ pub const RENDERER_ENV: &str = "SOLIDCRAFT_RENDERER";
|
|||||||
pub const FAILED_STARTS_FOR_SAFE_MODE: u32 = 2;
|
pub const FAILED_STARTS_FOR_SAFE_MODE: u32 = 2;
|
||||||
const MARKER: &str = "starting";
|
const MARKER: &str = "starting";
|
||||||
|
|
||||||
|
/// Explicit application-settings isolation for side-by-side builds and native UI
|
||||||
|
/// acceptance. A supplied invalid path refuses startup rather than falling back
|
||||||
|
/// to the user's ordinary settings. No directory is read or created here.
|
||||||
|
pub fn settings_directory(override_path: Option<&std::ffi::OsStr>, default: Option<PathBuf>) -> Result<Option<PathBuf>, String> {
|
||||||
|
match override_path {
|
||||||
|
None => Ok(default),
|
||||||
|
Some(raw) => {
|
||||||
|
let path = PathBuf::from(raw);
|
||||||
|
if raw.is_empty() || !path.is_absolute() {
|
||||||
|
return Err("SOLIDCRAFT_SETTINGS_DIR must be a nonempty absolute directory path".into());
|
||||||
|
}
|
||||||
|
if path.exists() && !path.is_dir() {
|
||||||
|
return Err("SOLIDCRAFT_SETTINGS_DIR names a file, not a directory".into());
|
||||||
|
}
|
||||||
|
Ok(Some(path))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Whether an environment value switches something on.
|
/// Whether an environment value switches something on.
|
||||||
pub fn env_on(v: Option<&str>) -> bool {
|
pub fn env_on(v: Option<&str>) -> bool {
|
||||||
v.map(str::trim).is_some_and(|v| !v.is_empty() && v != "0" && !v.eq_ignore_ascii_case("false"))
|
v.map(str::trim).is_some_and(|v| !v.is_empty() && v != "0" && !v.eq_ignore_ascii_case("false"))
|
||||||
@@ -110,6 +130,48 @@ pub fn pick_cpu_adapter(adapters: &[eframe::wgpu::Adapter], surface: Option<&efr
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Adapter properties used to choose a card without opening a device.
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
pub struct AdapterChoice {
|
||||||
|
pub name: String,
|
||||||
|
pub compatible: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Choose only surface-compatible adapters. Names saved in preferences are exact; the
|
||||||
|
/// environment override follows wgpu's case-insensitive substring convention.
|
||||||
|
/// No match leaves selection to the normal wgpu request.
|
||||||
|
pub fn choose_adapter(adapters: &[AdapterChoice], environment: Option<&str>, preference: Option<&str>) -> Option<usize> {
|
||||||
|
// wgpu's environment helper panics on a missing name; an override must remain recoverable.
|
||||||
|
let compatible = || adapters.iter().enumerate().filter(|(_, a)| a.compatible);
|
||||||
|
if let Some(name) = environment.filter(|s| !s.is_empty()) {
|
||||||
|
let name = name.to_lowercase();
|
||||||
|
if let Some((index, _)) = compatible().find(|(_, a)| a.name.to_lowercase().contains(&name)) {
|
||||||
|
return Some(index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(name) = preference.filter(|s| !s.is_empty())
|
||||||
|
&& let Some((index, _)) = compatible().find(|(_, a)| a.name == name)
|
||||||
|
{
|
||||||
|
return Some(index);
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Leave Automatic on wgpu's normal request path; named choices may defer to it too.
|
||||||
|
pub fn configure_adapter(setup: &mut eframe::egui_wgpu::WgpuSetupCreateNew, cpu: bool, environment: Option<String>, preference: Option<String>) {
|
||||||
|
if cpu {
|
||||||
|
setup.native_adapter_selector = Some(std::sync::Arc::new(|adapters, surface| pick_cpu_adapter(adapters, surface).map(Some)));
|
||||||
|
} else if environment.as_deref().is_some_and(|s| !s.is_empty()) || preference.as_deref().is_some_and(|s| !s.is_empty()) {
|
||||||
|
setup.native_adapter_selector = Some(std::sync::Arc::new(move |adapters, surface| {
|
||||||
|
let choices: Vec<_> = adapters
|
||||||
|
.iter()
|
||||||
|
.map(|a| AdapterChoice { name: a.get_info().name, compatible: surface.is_none_or(|s| a.is_surface_supported(s)) })
|
||||||
|
.collect();
|
||||||
|
Ok(choose_adapter(&choices, environment.as_deref(), preference.as_deref()).and_then(|i| adapters.get(i)).cloned())
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// `WGPU_BACKEND`: when set, wgpu picks the backends from it and the order below is not used.
|
/// `WGPU_BACKEND`: when set, wgpu picks the backends from it and the order below is not used.
|
||||||
pub const WGPU_BACKEND_ENV: &str = "WGPU_BACKEND";
|
pub const WGPU_BACKEND_ENV: &str = "WGPU_BACKEND";
|
||||||
|
|
||||||
@@ -157,6 +219,34 @@ pub fn choose_backends(
|
|||||||
Some(WINDOWS_ORDER.into_iter().find(|b| has_hardware(*b)).unwrap_or(Backends::DX12))
|
Some(WINDOWS_ORDER.into_iter().find(|b| has_hardware(*b)).unwrap_or(Backends::DX12))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Internal, process-local retry choice; never written to the graphics preference.
|
||||||
|
pub const RETRY_BACKEND_ENV: &str = "SOLIDCRAFT_STARTUP_BACKEND";
|
||||||
|
/// Why this launch is using a fallback, carried to the new process for status and Preferences.
|
||||||
|
pub const FALLBACK_NOTE_ENV: &str = "SOLIDCRAFT_GRAPHICS_FALLBACK";
|
||||||
|
|
||||||
|
/// A handled startup failure tries each remaining Windows API once, then software rendering.
|
||||||
|
/// An explicit environment choice is final, including when software rendering was requested.
|
||||||
|
pub fn fallback_backend(windows: bool, explicit: bool, cpu: bool, failed: eframe::wgpu::Backends) -> Option<&'static str> {
|
||||||
|
if explicit || cpu {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
if windows {
|
||||||
|
let last = WINDOWS_ORDER.iter().rposition(|backend| failed.intersects(*backend));
|
||||||
|
if let Some(next) = last.and_then(|i| WINDOWS_ORDER.get(i + 1)) {
|
||||||
|
return Some(if *next == eframe::wgpu::Backends::VULKAN { "vulkan" } else { "gl" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Some("cpu")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keep driver diagnostics on one bounded line, including across the finite retry chain.
|
||||||
|
pub fn fallback_note(previous: &str, failed: eframe::wgpu::Backends, next: &str, error: &str) -> String {
|
||||||
|
let previous: String = previous.chars().take(2048).collect();
|
||||||
|
let error: String = error.chars().take(1024).collect();
|
||||||
|
let line = format!("{previous} Graphics fallback: {failed:?} failed ({error}); trying {next}.");
|
||||||
|
line.split_whitespace().collect::<Vec<_>>().join(" ").chars().take(4096).collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// The device feature for a 32-bit float depth buffer with a stencil (reversed depth, #1434).
|
/// The device feature for a 32-bit float depth buffer with a stencil (reversed depth, #1434).
|
||||||
pub const FLOAT_DEPTH_STENCIL: eframe::wgpu::Features = eframe::wgpu::Features::DEPTH32FLOAT_STENCIL8;
|
pub const FLOAT_DEPTH_STENCIL: eframe::wgpu::Features = eframe::wgpu::Features::DEPTH32FLOAT_STENCIL8;
|
||||||
|
|
||||||
@@ -189,6 +279,29 @@ pub fn has_hardware_adapter(backends: eframe::wgpu::Backends) -> bool {
|
|||||||
adapters.iter().any(|a| a.get_info().device_type != eframe::wgpu::DeviceType::Cpu)
|
adapters.iter().any(|a| a.get_info().device_type != eframe::wgpu::DeviceType::Cpu)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The environment variable that switches wgpu's indirect-call validation on or off.
|
||||||
|
pub const INDIRECT_VALIDATION_ENV: &str = "WGPU_VALIDATION_INDIRECT_CALL";
|
||||||
|
|
||||||
|
/// The instance flags for the window. wgpu's indirect-call validation compiles a compute shader
|
||||||
|
/// when the device is created, and on Intel Macs (macOS 12 with Intel Iris graphics, #3024,
|
||||||
|
/// #3080, #4605) the Metal compiler refuses it: the device is lost and the window never opens.
|
||||||
|
/// So on an Intel Mac the validation is left off, unless the user turned it on or off with
|
||||||
|
/// `WGPU_VALIDATION_INDIRECT_CALL` themselves.
|
||||||
|
pub fn window_instance_flags(flags: eframe::wgpu::InstanceFlags, intel_mac: bool, env: Option<&str>) -> eframe::wgpu::InstanceFlags {
|
||||||
|
if intel_mac && env.map(str::trim).is_none_or(str::is_empty) { flags - eframe::wgpu::InstanceFlags::VALIDATION_INDIRECT_CALL } else { flags }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Windows with OpenGL: the window keeps the system title bar (#2063). The window without OS
|
||||||
|
/// decorations keeps its caption style while having no frame, and some OpenGL drivers (older
|
||||||
|
/// Intel HD/UHD) then show the picture a caption's height lower than the window, so it no longer
|
||||||
|
/// lines up with the pointer. Direct3D 12 and Vulkan draw it in place and keep the application bar
|
||||||
|
/// as the title bar. `backends` are the ones wgpu starts: OpenGL alone is decided before the
|
||||||
|
/// window opens.
|
||||||
|
pub fn system_title_bar(windows: bool, backends: eframe::wgpu::Backends) -> bool {
|
||||||
|
use eframe::wgpu::Backends;
|
||||||
|
windows && backends.contains(Backends::GL) && !backends.intersects(Backends::DX12 | Backends::VULKAN)
|
||||||
|
}
|
||||||
|
|
||||||
/// The message shown when no window could be opened at all.
|
/// The message shown when no window could be opened at all.
|
||||||
pub fn no_window_message(error: &str, settings: Option<&Path>) -> String {
|
pub fn no_window_message(error: &str, settings: Option<&Path>) -> String {
|
||||||
let folder = settings.map(|d| d.display().to_string()).unwrap_or_else(|| "the SolidCraft settings folder".into());
|
let folder = settings.map(|d| d.display().to_string()).unwrap_or_else(|| "the SolidCraft settings folder".into());
|
||||||
@@ -207,6 +320,48 @@ pub fn no_window_message(error: &str, settings: Option<&Path>) -> String {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
fn cards() -> Vec<AdapterChoice> {
|
||||||
|
["Integrated", "Discrete small", "Discrete large"].into_iter().map(|name| AdapterChoice { name: name.into(), compatible: true }).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn adapter_names_environment_override_and_missing_card_fallback() {
|
||||||
|
let cards = cards();
|
||||||
|
assert_eq!(choose_adapter(&cards, None, Some("Discrete small")), Some(1));
|
||||||
|
assert_eq!(choose_adapter(&cards, Some("LARGE"), Some("Discrete small")), Some(2));
|
||||||
|
assert_eq!(choose_adapter(&cards, None, Some("removed")), None);
|
||||||
|
assert_eq!(choose_adapter(&cards, Some("missing"), Some("Discrete small")), Some(1));
|
||||||
|
assert_eq!(choose_adapter(&cards, Some(""), Some("Discrete small")), Some(1));
|
||||||
|
assert_eq!(choose_adapter(&cards, None, Some("Discrete")), None, "saved names are exact");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn automatic_adapter_leaves_selection_to_wgpu() {
|
||||||
|
let mut cards = cards();
|
||||||
|
assert_eq!(choose_adapter(&cards, None, None), None);
|
||||||
|
assert_eq!(choose_adapter(&cards, Some(""), Some("")), None);
|
||||||
|
cards[2].compatible = false;
|
||||||
|
assert_eq!(choose_adapter(&cards, Some("large"), Some("Discrete large")), None);
|
||||||
|
assert_eq!(choose_adapter(&cards, Some("small"), None), Some(1));
|
||||||
|
assert_eq!(choose_adapter(&[], None, None), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn automatic_adapter_preserves_the_previous_request_configuration() {
|
||||||
|
use eframe::egui_wgpu::WgpuSetupCreateNew;
|
||||||
|
let previous = WgpuSetupCreateNew::without_display_handle();
|
||||||
|
for preference in [None, Some(String::new())] {
|
||||||
|
let mut setup = WgpuSetupCreateNew::without_display_handle();
|
||||||
|
configure_adapter(&mut setup, false, None, preference);
|
||||||
|
assert!(setup.native_adapter_selector.is_none(), "Automatic must use the normal wgpu request");
|
||||||
|
assert_eq!(setup.power_preference, previous.power_preference);
|
||||||
|
assert_eq!(setup.instance_descriptor.backends, previous.instance_descriptor.backends);
|
||||||
|
}
|
||||||
|
let mut setup = WgpuSetupCreateNew::without_display_handle();
|
||||||
|
configure_adapter(&mut setup, false, Some("missing".into()), Some("removed".into()));
|
||||||
|
assert!(setup.native_adapter_selector.unwrap()(&[], None).unwrap().is_none(), "missing names must use the normal request too");
|
||||||
|
}
|
||||||
|
|
||||||
fn scratch(name: &str) -> PathBuf {
|
fn scratch(name: &str) -> PathBuf {
|
||||||
let d = std::env::temp_dir().join(format!("solidcraft-startup-{name}-{}", std::process::id()));
|
let d = std::env::temp_dir().join(format!("solidcraft-startup-{name}-{}", std::process::id()));
|
||||||
let _ = std::fs::remove_dir_all(&d);
|
let _ = std::fs::remove_dir_all(&d);
|
||||||
@@ -214,6 +369,32 @@ mod tests {
|
|||||||
d
|
d
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn isolated_settings_are_explicit_absolute_and_never_fall_back() {
|
||||||
|
let default = std::env::temp_dir().join("ordinary-settings");
|
||||||
|
assert_eq!(settings_directory(None, Some(default.clone())).unwrap(), Some(default.clone()));
|
||||||
|
let selected = std::env::temp_dir().join("solidcraft-isolated-settings-fixture");
|
||||||
|
assert_eq!(settings_directory(Some(selected.as_os_str()), Some(default.clone())).unwrap(), Some(selected));
|
||||||
|
for raw in ["", "relative/settings", "../ordinary"] {
|
||||||
|
assert!(settings_directory(Some(std::ffi::OsStr::new(raw)), Some(default.clone())).is_err());
|
||||||
|
}
|
||||||
|
let file = std::env::current_exe().unwrap();
|
||||||
|
assert!(settings_directory(Some(file.as_os_str()), Some(default)).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn intel_macs_start_without_indirect_call_validation() {
|
||||||
|
use eframe::wgpu::InstanceFlags as F;
|
||||||
|
let on = F::VALIDATION | F::VALIDATION_INDIRECT_CALL;
|
||||||
|
assert_eq!(window_instance_flags(on, true, None), F::VALIDATION);
|
||||||
|
assert_eq!(window_instance_flags(on, true, Some(" ")), F::VALIDATION);
|
||||||
|
// The user's own choice stands, on or off.
|
||||||
|
assert_eq!(window_instance_flags(on, true, Some("1")), on);
|
||||||
|
assert_eq!(window_instance_flags(F::VALIDATION, true, Some("0")), F::VALIDATION);
|
||||||
|
// Every other machine keeps what it had.
|
||||||
|
assert_eq!(window_instance_flags(on, false, None), on);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn switches_read_from_the_environment() {
|
fn switches_read_from_the_environment() {
|
||||||
assert!(env_on(Some("1")) && env_on(Some("yes")) && !env_on(Some("0")) && !env_on(Some(" ")) && !env_on(None) && !env_on(Some("false")));
|
assert!(env_on(Some("1")) && env_on(Some("yes")) && !env_on(Some("0")) && !env_on(Some(" ")) && !env_on(None) && !env_on(Some("false")));
|
||||||
@@ -290,6 +471,54 @@ mod tests {
|
|||||||
assert_eq!(choose_backends(true, false, false, Some(""), probe(&[Backends::GL])), Some(Backends::GL));
|
assert_eq!(choose_backends(true, false, false, Some(""), probe(&[Backends::GL])), Some(Backends::GL));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn failed_windows_backends_fall_back_in_order_and_stop_after_software() {
|
||||||
|
use eframe::wgpu::Backends as B;
|
||||||
|
assert_eq!(fallback_backend(true, false, false, B::DX12), Some("vulkan"));
|
||||||
|
assert_eq!(fallback_backend(true, false, false, B::VULKAN), Some("gl"));
|
||||||
|
assert_eq!(fallback_backend(true, false, false, B::GL), Some("cpu"));
|
||||||
|
assert_eq!(fallback_backend(true, false, true, B::DX12), None);
|
||||||
|
assert_eq!(fallback_backend(true, false, false, B::DX12 | B::VULKAN), Some("gl"));
|
||||||
|
assert_eq!(fallback_backend(false, false, false, B::VULKAN), Some("cpu"));
|
||||||
|
let note = fallback_note("", B::DX12, "vulkan", "egui_pipeline\n0x80070057");
|
||||||
|
assert!(note.contains("egui_pipeline 0x80070057") && note.contains("vulkan") && !note.contains('\n'));
|
||||||
|
let long = fallback_note(&"x".repeat(5000), B::VULKAN, "gl", &"y".repeat(5000));
|
||||||
|
assert!(long.chars().count() <= 4096 && long.ends_with("trying gl."));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn explicit_backend_failure_never_switches_api_or_retries_software() {
|
||||||
|
use eframe::wgpu::Backends as B;
|
||||||
|
for windows in [false, true] {
|
||||||
|
for cpu in [false, true] {
|
||||||
|
for backend in [B::DX12, B::VULKAN, B::GL, B::all()] {
|
||||||
|
assert_eq!(fallback_backend(windows, true, cpu, backend), None);
|
||||||
|
let mut probed = false;
|
||||||
|
assert_eq!(
|
||||||
|
choose_backends(windows, true, cpu, Some("vulkan"), |_| {
|
||||||
|
probed = true;
|
||||||
|
false
|
||||||
|
}),
|
||||||
|
None
|
||||||
|
);
|
||||||
|
assert!(!probed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn only_opengl_on_windows_gets_the_system_title_bar() {
|
||||||
|
use eframe::wgpu::Backends;
|
||||||
|
assert!(system_title_bar(true, Backends::GL));
|
||||||
|
for b in [Backends::DX12, Backends::VULKAN, Backends::DX12 | Backends::GL, Backends::VULKAN | Backends::GL, Backends::all()] {
|
||||||
|
assert!(!system_title_bar(true, b), "{b:?}");
|
||||||
|
}
|
||||||
|
for b in [Backends::GL, Backends::VULKAN, Backends::METAL] {
|
||||||
|
assert!(!system_title_bar(false, b), "{b:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn wgpu_backend_the_preference_and_the_software_renderer_override_the_order() {
|
fn wgpu_backend_the_preference_and_the_software_renderer_override_the_order() {
|
||||||
use eframe::wgpu::Backends;
|
use eframe::wgpu::Backends;
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ assets/
|
|||||||
fonts/{liberation-sans,biz-udp-gothic}/ # unmodified fonts and OFL licences
|
fonts/{liberation-sans,biz-udp-gothic}/ # unmodified fonts and OFL licences
|
||||||
locales/{en,de,ja,ko}.json # shared offline catalogs
|
locales/{en,de,ja,ko}.json # shared offline catalogs
|
||||||
platforms/{macos,linux,windows}/ # bundle, freedesktop and WiX templates
|
platforms/{macos,linux,windows}/ # bundle, freedesktop and WiX templates
|
||||||
|
platforms/macos/dmg/ # disk image window: layout, dmgbuild settings, background art
|
||||||
archive/icons/macos-v1/
|
archive/icons/macos-v1/
|
||||||
source/icon.vectorcraft # earlier editable work, retained
|
source/icon.vectorcraft # earlier editable work, retained
|
||||||
# redundant historical exports are retired
|
# redundant historical exports are retired
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
//! Original illustrative opaque finishes; not measured optical or engineering data.
|
||||||
|
//! (name, sRGB color, metal fraction, perceptual roughness). IOR is an illustrative 1.5.
|
||||||
|
//! Separate names preserve the scalar library's appearance and saved assignments.
|
||||||
|
pub const OPAQUE_FINISHES: [(&str, [u8; 3], f64, f64); 6] = [
|
||||||
|
("Steel - Satin PBR", [158, 164, 172], 1.0, 0.4),
|
||||||
|
("Aluminum - Satin PBR", [204, 208, 214], 1.0, 0.3),
|
||||||
|
("Copper - Clean PBR", [204, 122, 80], 1.0, 0.25),
|
||||||
|
("ABS - Molded PBR", [222, 222, 216], 0.0, 0.4),
|
||||||
|
("PLA - Smooth PBR", [110, 160, 222], 0.0, 0.35),
|
||||||
|
("Wood - Oak Uniform PBR Preview", [190, 146, 92], 0.0, 0.65),
|
||||||
|
];
|
||||||
@@ -0,0 +1,292 @@
|
|||||||
|
//! Original starter visual data, MIT OR Apache-2.0. No external material library.
|
||||||
|
use crate::appearance_pack::{Category, GlassBoundary, GlassRecipe, OpaqueRecipe, TextureAxis, TextureRecipe, VisualPreset};
|
||||||
|
|
||||||
|
const WOOD: &str = "Uniform opaque preview only; grain resources/mapping are not applied";
|
||||||
|
const SOLAR: &str = "Uniform opaque preview only; no cell grid, busbars, electricity or efficiency claim";
|
||||||
|
const REGOLITH: &str = "Uniform opaque preview only; no granular displacement or measured lunar optical data";
|
||||||
|
const OPAQUE: &str = "Illustrative opaque isotropic PBR; no measured alloy, polymer or engineering properties";
|
||||||
|
|
||||||
|
const fn look(color: [u8; 3], metallic: f64, roughness: f64, dielectric_ior: f64) -> OpaqueRecipe {
|
||||||
|
OpaqueRecipe { color, metallic, roughness, dielectric_ior }
|
||||||
|
}
|
||||||
|
const fn maps(id: &'static str, repeat_mm: [f64; 2], grain: bool) -> Option<TextureRecipe> {
|
||||||
|
Some(TextureRecipe { id, repeat_mm, grain_axis: if grain { Some(TextureAxis::V) } else { None } })
|
||||||
|
}
|
||||||
|
const fn glass(transmission_linear_rgb: [f64; 3], ior: f64, reference_path_mm: f64, boundary: GlassBoundary) -> GlassRecipe {
|
||||||
|
GlassRecipe { transmission_linear_rgb, dielectric_ior: ior, reference_path_mm, boundary }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub const STARTER_PACK: [VisualPreset; 40] = [
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.wood.oak-honey",
|
||||||
|
"Wood - Honey Oak Uniform Preview",
|
||||||
|
Category::Wood,
|
||||||
|
look([190, 145, 88], 0.0, 0.64, 1.5),
|
||||||
|
WOOD,
|
||||||
|
maps("starter.wood.oak-honey.maps-v1", [120.0, 240.0], true),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.wood.oak-smoked",
|
||||||
|
"Wood - Smoked Oak Uniform Preview",
|
||||||
|
Category::Wood,
|
||||||
|
look([91, 72, 55], 0.0, 0.68, 1.5),
|
||||||
|
WOOD,
|
||||||
|
maps("starter.wood.oak-smoked.maps-v1", [120.0, 240.0], true),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.wood.walnut-dark",
|
||||||
|
"Wood - Dark Walnut Uniform Preview",
|
||||||
|
Category::Wood,
|
||||||
|
look([99, 66, 43], 0.0, 0.60, 1.5),
|
||||||
|
WOOD,
|
||||||
|
maps("starter.wood.walnut-dark.maps-v1", [100.0, 220.0], true),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.wood.maple-light",
|
||||||
|
"Wood - Light Maple Uniform Preview",
|
||||||
|
Category::Wood,
|
||||||
|
look([221, 192, 141], 0.0, 0.57, 1.5),
|
||||||
|
WOOD,
|
||||||
|
maps("starter.wood.maple-light.maps-v1", [100.0, 200.0], true),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.wood.cherry-warm",
|
||||||
|
"Wood - Warm Cherry Uniform Preview",
|
||||||
|
Category::Wood,
|
||||||
|
look([164, 99, 65], 0.0, 0.58, 1.5),
|
||||||
|
WOOD,
|
||||||
|
maps("starter.wood.cherry-warm.maps-v1", [110.0, 220.0], true),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.wood.ash-pale",
|
||||||
|
"Wood - Pale Ash Uniform Preview",
|
||||||
|
Category::Wood,
|
||||||
|
look([209, 186, 146], 0.0, 0.70, 1.5),
|
||||||
|
WOOD,
|
||||||
|
maps("starter.wood.ash-pale.maps-v1", [120.0, 260.0], true),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.wood.birch-cream",
|
||||||
|
"Wood - Cream Birch Uniform Preview",
|
||||||
|
Category::Wood,
|
||||||
|
look([228, 206, 163], 0.0, 0.63, 1.5),
|
||||||
|
WOOD,
|
||||||
|
maps("starter.wood.birch-cream.maps-v1", [100.0, 200.0], true),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.wood.teak-golden",
|
||||||
|
"Wood - Golden Teak Uniform Preview",
|
||||||
|
Category::Wood,
|
||||||
|
look([167, 122, 66], 0.0, 0.61, 1.5),
|
||||||
|
WOOD,
|
||||||
|
maps("starter.wood.teak-golden.maps-v1", [110.0, 250.0], true),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.carbon-steel-polished",
|
||||||
|
"Metal - Polished Carbon Steel",
|
||||||
|
Category::Metal,
|
||||||
|
look([161, 166, 173], 1.0, 0.16, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.stainless-soft-satin",
|
||||||
|
"Metal - Soft Satin Stainless",
|
||||||
|
Category::Metal,
|
||||||
|
look([187, 193, 201], 1.0, 0.36, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.aluminum-bead-blast",
|
||||||
|
"Metal - Bead Blast Aluminum",
|
||||||
|
Category::Metal,
|
||||||
|
look([195, 201, 210], 1.0, 0.58, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.aluminum-silver-polish",
|
||||||
|
"Metal - Silver Polish Aluminum",
|
||||||
|
Category::Metal,
|
||||||
|
look([218, 224, 232], 1.0, 0.13, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.copper-aged-warm",
|
||||||
|
"Metal - Warm Aged Copper",
|
||||||
|
Category::Metal,
|
||||||
|
look([171, 95, 57], 1.0, 0.48, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.brass-champagne",
|
||||||
|
"Metal - Champagne Satin Brass",
|
||||||
|
Category::Metal,
|
||||||
|
look([205, 173, 102], 1.0, 0.32, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.bronze-dark-cast",
|
||||||
|
"Metal - Dark Cast Bronze",
|
||||||
|
Category::Metal,
|
||||||
|
look([133, 95, 58], 1.0, 0.66, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.titanium-matte",
|
||||||
|
"Metal - Matte Gray Titanium",
|
||||||
|
Category::Metal,
|
||||||
|
look([147, 149, 157], 1.0, 0.53, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.gold-warm",
|
||||||
|
"Metal - Warm Reflective Gold",
|
||||||
|
Category::Metal,
|
||||||
|
look([235, 190, 82], 1.0, 0.18, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.metal.silver-cool",
|
||||||
|
"Metal - Cool Reflective Silver",
|
||||||
|
Category::Metal,
|
||||||
|
look([225, 230, 237], 1.0, 0.12, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.plastic.abs-charcoal",
|
||||||
|
"Plastic - Charcoal ABS",
|
||||||
|
Category::Plastic,
|
||||||
|
look([43, 45, 48], 0.0, 0.44, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.plastic.abs-warm-white",
|
||||||
|
"Plastic - Warm White ABS",
|
||||||
|
Category::Plastic,
|
||||||
|
look([232, 229, 220], 0.0, 0.40, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque("starter.plastic.pla-coral", "Plastic - Coral PLA", Category::Plastic, look([218, 99, 83], 0.0, 0.43, 1.5), OPAQUE, None),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.plastic.petg-cyan-opaque",
|
||||||
|
"Plastic - Opaque Cyan PETG",
|
||||||
|
Category::Plastic,
|
||||||
|
look([36, 148, 167], 0.0, 0.29, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.plastic.nylon-ivory",
|
||||||
|
"Plastic - Ivory Nylon",
|
||||||
|
Category::Plastic,
|
||||||
|
look([220, 213, 190], 0.0, 0.62, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.plastic.pc-graphite-opaque",
|
||||||
|
"Plastic - Opaque Graphite PC",
|
||||||
|
Category::Plastic,
|
||||||
|
look([70, 76, 84], 0.0, 0.27, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.plastic.hdpe-natural-opaque",
|
||||||
|
"Plastic - Opaque Natural HDPE",
|
||||||
|
Category::Plastic,
|
||||||
|
look([221, 222, 207], 0.0, 0.48, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque("starter.plastic.pom-black", "Plastic - Black POM", Category::Plastic, look([29, 31, 35], 0.0, 0.32, 1.5), OPAQUE, None),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.plastic.tpu-matte-black",
|
||||||
|
"Plastic - Matte Black TPU",
|
||||||
|
Category::Plastic,
|
||||||
|
look([31, 30, 32], 0.0, 0.83, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.plastic.peek-amber-opaque",
|
||||||
|
"Plastic - Opaque Amber PEEK",
|
||||||
|
Category::Plastic,
|
||||||
|
look([157, 119, 62], 0.0, 0.51, 1.5),
|
||||||
|
OPAQUE,
|
||||||
|
None,
|
||||||
|
),
|
||||||
|
VisualPreset::glass(
|
||||||
|
"starter.glass.clear-soda-lime",
|
||||||
|
"Glass Recipe - Clear Soda Lime",
|
||||||
|
glass([0.92, 0.98, 0.96], 1.52, 3.0, GlassBoundary::Closed),
|
||||||
|
),
|
||||||
|
VisualPreset::glass("starter.glass.low-iron-clear", "Glass Recipe - Low Iron Clear", glass([0.98, 0.99, 1.0], 1.50, 4.0, GlassBoundary::Closed)),
|
||||||
|
VisualPreset::glass("starter.glass.smoky-neutral", "Glass Recipe - Smoky Neutral", glass([0.35, 0.38, 0.42], 1.52, 3.0, GlassBoundary::Closed)),
|
||||||
|
VisualPreset::glass("starter.glass.amber-tint", "Glass Recipe - Amber Tint", glass([0.84, 0.38, 0.08], 1.51, 3.0, GlassBoundary::Closed)),
|
||||||
|
VisualPreset::glass("starter.glass.cobalt-blue", "Glass Recipe - Cobalt Blue", glass([0.06, 0.14, 0.76], 1.53, 3.0, GlassBoundary::Closed)),
|
||||||
|
VisualPreset::glass(
|
||||||
|
"starter.glass.thin-clear",
|
||||||
|
"Glass Recipe - Thin Clear Sheet",
|
||||||
|
glass([0.95, 0.98, 0.99], 1.50, 2.0, GlassBoundary::Thin { thickness_mm: 2.0 }),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.solar.mono-blue",
|
||||||
|
"Solar Panel - Mono Blue Uniform Preview",
|
||||||
|
Category::Solar,
|
||||||
|
look([20, 41, 85], 0.0, 0.20, 1.5),
|
||||||
|
SOLAR,
|
||||||
|
maps("starter.solar.mono-blue.maps-v1", [160.0, 160.0], false),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.solar.thin-film-dark",
|
||||||
|
"Solar Panel - Dark Thin Film Uniform Preview",
|
||||||
|
Category::Solar,
|
||||||
|
look([28, 33, 42], 0.0, 0.28, 1.5),
|
||||||
|
SOLAR,
|
||||||
|
maps("starter.solar.thin-film-dark.maps-v1", [100.0, 200.0], false),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.regolith.mare-charcoal",
|
||||||
|
"Regolith - Mare Charcoal Uniform Preview",
|
||||||
|
Category::Regolith,
|
||||||
|
look([56, 56, 55], 0.0, 0.97, 1.5),
|
||||||
|
REGOLITH,
|
||||||
|
maps("starter.regolith.mare-charcoal.maps-v1", [200.0, 200.0], false),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.regolith.highland-pale",
|
||||||
|
"Regolith - Highland Pale Uniform Preview",
|
||||||
|
Category::Regolith,
|
||||||
|
look([116, 113, 106], 0.0, 0.93, 1.5),
|
||||||
|
REGOLITH,
|
||||||
|
maps("starter.regolith.highland-pale.maps-v1", [200.0, 200.0], false),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.regolith.dust-neutral",
|
||||||
|
"Regolith - Neutral Dust Uniform Preview",
|
||||||
|
Category::Regolith,
|
||||||
|
look([86, 85, 81], 0.0, 1.0, 1.5),
|
||||||
|
REGOLITH,
|
||||||
|
maps("starter.regolith.dust-neutral.maps-v1", [150.0, 150.0], false),
|
||||||
|
),
|
||||||
|
VisualPreset::opaque(
|
||||||
|
"starter.regolith.agglutinate-dark",
|
||||||
|
"Regolith - Dark Agglutinate Uniform Preview",
|
||||||
|
Category::Regolith,
|
||||||
|
look([66, 63, 60], 0.0, 0.89, 1.5),
|
||||||
|
REGOLITH,
|
||||||
|
maps("starter.regolith.agglutinate-dark.maps-v1", [200.0, 200.0], false),
|
||||||
|
),
|
||||||
|
];
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
# Render workspace icon drafts
|
||||||
|
|
||||||
|
All ids below are **Open** for owner review, except `render_scene` and `render_image`,
|
||||||
|
which are existing accepted icons used only as references. No commands, toolbar
|
||||||
|
entries, browser selectors or runtime request manifests are changed by this draft set.
|
||||||
|
`render_remove_override` is the one remaining alias (of `render_from_material`);
|
||||||
|
`render_execute`, `render_environment` and `render_fit_product` now have their own
|
||||||
|
masters in `design/svg/model/`. Accepted source masters stay unchanged.
|
||||||
|
|
||||||
|
Review with `python3 -B assets/icons/ui/design/tools/icon_status.py --serve`,
|
||||||
|
search `render_`, and select Open. See [STYLE_GUIDE.md](STYLE_GUIDE.md) for
|
||||||
|
acceptance; drafts do not imply implemented commands.
|
||||||
|
|
||||||
|
The finished references in each row were read and previewed in both themes
|
||||||
|
before authoring. Draft contact sheets (96, 24 and 16 px, both themes) are local
|
||||||
|
review evidence, not shipped assets. The icons are grouped in five families, each
|
||||||
|
with one shared design rule.
|
||||||
|
|
||||||
|
## Lights
|
||||||
|
|
||||||
|
Rule: a slate source glyph with light passive fill, 2.55-unit outlines and a dotted
|
||||||
|
accent stem (three dots, 4.25 diameter, 7 units apart) showing the direction.
|
||||||
|
|
||||||
|
| Meaning | Id | Finished references | Drawing |
|
||||||
|
|---|---|---|---|
|
||||||
|
| Light area | `render_light_area` | `box`, `camera` | Slanted flat panel on the canonical axes above the dotted stem. |
|
||||||
|
| Light spot | `render_light_spot` | `camera`, `material` | Cone with a curved rim above the dotted stem. |
|
||||||
|
| Light point | `render_light_point` | `camera`, `material` | Round source disc with a centre dot above the dotted stem. |
|
||||||
|
| Sun | `render_sun` | `sphere`, `camera` | Source disc of the same size with eight short radial rays instead of a stem. |
|
||||||
|
| Light by highlight | `render_light_by_highlight` | `sphere`, `material` | Shaded sphere with a ringed highlight target; the dotted stem arrives from above. |
|
||||||
|
| Solo light | `render_solo_light` | `fit`, `camera` | Point source and stem inside four corner focus brackets. |
|
||||||
|
|
||||||
|
## Looks
|
||||||
|
|
||||||
|
Rule: the lit look sphere (top-left highlight, bottom-right shade) plus one cue that
|
||||||
|
says what happens to it; receiving bodies stay canonical grey or cube shapes.
|
||||||
|
|
||||||
|
| Meaning | Id | Finished references | Drawing |
|
||||||
|
|---|---|---|---|
|
||||||
|
| Appearance | `render_appearance` | `material`, `box` | Shaded look sphere on the top corner of an accent-shaded cube: a look assigned to a body. |
|
||||||
|
| Paint | `render_paint` | `material`, `paste` | Flat brush with an accent tip, light ferrule and slate handle. |
|
||||||
|
| Pick up | `render_pick_up` | `material`, `copy` | Eyedropper with a grey bulb, slate crossbar and accent sampling tip. |
|
||||||
|
| Replace all | `render_replace_all` | `copy`, `box` | Grey sample sphere with an arrow to an accent sphere, beside a second accent sphere. |
|
||||||
|
| Copy look | `render_copy_look` | `material`, `copy` | Look sphere in a square frame, offset from a second frame outline. |
|
||||||
|
| Remove override | `render_remove_override` | `appearance`, `box` | Alias of `render_from_material`: the custom look is crossed off. |
|
||||||
|
| Same look | `render_same_look` | `select`, `box` | Look sphere and three cubes; the two matching cubes are ringed. |
|
||||||
|
| From material | `render_from_material` | `material`, `extrude` | Look sphere struck through above a plain grey slab, so the material shows. |
|
||||||
|
|
||||||
|
## Studio
|
||||||
|
|
||||||
|
Rule: the standard grey cube stands in the set-up it is lit or placed in.
|
||||||
|
|
||||||
|
| Meaning | Id | Finished references | Drawing |
|
||||||
|
|---|---|---|---|
|
||||||
|
| Library | `render_library` | `library`, `copy` | Row of three look spheres, the middle one accent, on a shelf bar. |
|
||||||
|
| Lighting presets | `render_lighting_presets` | `new`, `render_scene` | Two stacked cards, the front one holding a light bulb. |
|
||||||
|
| Environment | `render_environment` | `environment_map`, `render_scene` | Dome with a grey cube inside. |
|
||||||
|
| Ground | `render_ground` | `box`, `render_scene` | Grey cube on a slab with an accent contact patch. |
|
||||||
|
| Backdrop | `render_backdrop` | `render_scene`, `render_image` | Grey cube in front of a tall upright accent panel. |
|
||||||
|
|
||||||
|
## Camera and shots
|
||||||
|
|
||||||
|
Rule: one chunky camera body with a lower-right round badge for shot actions; the
|
||||||
|
other camera icons are simple frames.
|
||||||
|
|
||||||
|
| Meaning | Id | Finished references | Drawing |
|
||||||
|
|---|---|---|---|
|
||||||
|
| Shot | `render_shot` | `camera`, `new` | Camera body with a plus badge: save a shot. |
|
||||||
|
| Update shot | `render_update_shot` | `camera`, `undo` | Camera body with a refresh badge. |
|
||||||
|
| Render all shots | `render_all_shots` | `copy`, `render_image` | Stacked camera bodies with a play badge. |
|
||||||
|
| Shots strip | `render_shots_strip` | `camera`, `copy` | Strip of three small frames, the middle one in accent. |
|
||||||
|
| Fit product | `render_fit_product` | `fit`, `camera` | Grey cube inside four corner brackets. |
|
||||||
|
| Lens / field of view | `render_lens` | `camera`, `fit` | Concentric lens rings around an accent centre. |
|
||||||
|
| Exposure | `render_exposure` | `material`, `environment_map` | Disc split light and accent, with plus and minus marks. |
|
||||||
|
| Aspect frame | `render_aspect_frame` | `render_image`, `fit` | Wide rounded frame with two opposite corner brackets. |
|
||||||
|
| Frame guides | `render_frame_guides` | `render_image`, `fit` | Rounded frame with a rule-of-thirds grid and four accent nodes. |
|
||||||
|
|
||||||
|
## Output and result
|
||||||
|
|
||||||
|
Rule: one picture base (frame with landscape) with a lower-right round badge; the
|
||||||
|
size, background and quality icons draw their own simple subject.
|
||||||
|
|
||||||
|
| Meaning | Id | Finished references | Drawing |
|
||||||
|
|---|---|---|---|
|
||||||
|
| Render image | `render_execute` | `render_image`, `camera` | Picture with a play badge: create a rendered image. |
|
||||||
|
| Render output size | `render_output_size` | `render_image`, `fit` | Picture frame with a diagonal double-headed dimension arrow. |
|
||||||
|
| Transparent background | `render_transparent_background` | `material`, `render_image` | Grey cube on a checker tile. |
|
||||||
|
| Quality | `render_quality` | `list`, `library` | Three rising bars, the tallest in accent. |
|
||||||
|
| Check render | `render_check` | `render_image`, `new` | Picture with a check badge. |
|
||||||
|
| Cancel render | `render_cancel` | `render_image`, `delete` | Picture with a square stop badge. |
|
||||||
|
| Export image | `render_export_image` | `render_image`, `copy` | Picture with a large outward diagonal arrow at the upper right. |
|
||||||
|
| Compare | `render_compare` | `render_image`, `material` | Two grey pictures split by a vertical slider with opposed arrows. |
|
||||||
|
| Results | `render_results` | `render_image`, `copy` | Stack of two pictures, the front one showing a landscape. |
|
||||||
@@ -45,3 +45,7 @@ sketch_chamfer_equal = { master = "sketch_chamfer", accent = "sketch" }
|
|||||||
sketch_chamfer_two = { master = "sketch_chamfer_two_distances", accent = "sketch" }
|
sketch_chamfer_two = { master = "sketch_chamfer_two_distances", accent = "sketch" }
|
||||||
offset_one_side = { master = "offset", accent = "sketch" }
|
offset_one_side = { master = "offset", accent = "sketch" }
|
||||||
bom = "list"
|
bom = "list"
|
||||||
|
|
||||||
|
# Render workspace drafts: shared meanings; owner review remains Open.
|
||||||
|
# Removing a look override returns the body to its material look.
|
||||||
|
render_remove_override = "render_from_material"
|
||||||
@@ -48,6 +48,38 @@ source = "#236ead"
|
|||||||
light = "#236ead"
|
light = "#236ead"
|
||||||
dark = "#2976b8"
|
dark = "#2976b8"
|
||||||
|
|
||||||
|
# Simultaneous component colours for inspection icons; existing workspace ramps stay unchanged.
|
||||||
|
|
||||||
|
[roles.component-orange-1]
|
||||||
|
source = "#f1d2af"
|
||||||
|
light = "#f1d2af"
|
||||||
|
dark = "#ba8f6a"
|
||||||
|
|
||||||
|
[roles.component-orange-2]
|
||||||
|
source = "#c06f00"
|
||||||
|
light = "#c06f00"
|
||||||
|
dark = "#b86f04"
|
||||||
|
|
||||||
|
[roles.component-orange-3]
|
||||||
|
source = "#a45000"
|
||||||
|
light = "#a45000"
|
||||||
|
dark = "#95682d"
|
||||||
|
|
||||||
|
[roles.component-yellow-1]
|
||||||
|
source = "#e5d99b"
|
||||||
|
light = "#e5d99b"
|
||||||
|
dark = "#a9985f"
|
||||||
|
|
||||||
|
[roles.component-yellow-2]
|
||||||
|
source = "#a28200"
|
||||||
|
light = "#a28200"
|
||||||
|
dark = "#9a8100"
|
||||||
|
|
||||||
|
[roles.component-yellow-3]
|
||||||
|
source = "#826700"
|
||||||
|
light = "#826700"
|
||||||
|
dark = "#857100"
|
||||||
|
|
||||||
[strokes] # on the 64 grid
|
[strokes] # on the 64 grid
|
||||||
geometry = 2.55
|
geometry = 2.55
|
||||||
action = 4.25
|
action = 4.25
|
||||||
|
|||||||
@@ -57,10 +57,13 @@ circle_tt false
|
|||||||
circle_ttt false
|
circle_ttt false
|
||||||
close false
|
close false
|
||||||
coil false
|
coil false
|
||||||
|
colored_components false
|
||||||
|
colored_components_off false
|
||||||
combine false
|
combine false
|
||||||
compare false
|
compare false
|
||||||
component false
|
component false
|
||||||
compute false
|
compute false
|
||||||
|
cone false
|
||||||
configuration_table false
|
configuration_table false
|
||||||
conic false
|
conic false
|
||||||
constrainer false
|
constrainer false
|
||||||
@@ -148,6 +151,7 @@ origin false
|
|||||||
pan false
|
pan false
|
||||||
params false
|
params false
|
||||||
paste false
|
paste false
|
||||||
|
path_flange false
|
||||||
pattern_circ false
|
pattern_circ false
|
||||||
pattern_path false
|
pattern_path false
|
||||||
pattern_rect false
|
pattern_rect false
|
||||||
@@ -244,6 +248,7 @@ status_error false
|
|||||||
status_recovery false
|
status_recovery false
|
||||||
style false
|
style false
|
||||||
suppress false
|
suppress false
|
||||||
|
surface false
|
||||||
surface_blend false
|
surface_blend false
|
||||||
surface_boundary false
|
surface_boundary false
|
||||||
surface_extend false
|
surface_extend false
|
||||||
|
|||||||
@@ -101,6 +101,7 @@
|
|||||||
"error": "b7188fcdfadf1512ddd2896805a14618179789f87047b219560a7dab74bd360f",
|
"error": "b7188fcdfadf1512ddd2896805a14618179789f87047b219560a7dab74bd360f",
|
||||||
"explode": "2aecb05d5f05aff1ab629066cb9bea8718ea213ac70948ef71a3ced3321f4cb2",
|
"explode": "2aecb05d5f05aff1ab629066cb9bea8718ea213ac70948ef71a3ced3321f4cb2",
|
||||||
"export": "c8c2abf007e43e896479d78798e3976ba9eda809507c820bb38538f77db696ac",
|
"export": "c8c2abf007e43e896479d78798e3976ba9eda809507c820bb38538f77db696ac",
|
||||||
|
"export_tray": "f18606e1f63726c57a0787dced4fb8a221b4a4fc18b88b0bbdee743e546cb489",
|
||||||
"extend": "28c63df352c77d02feffe44cf09fb0fc1d48f7905aaabbfa6dba601dbb70f8e8",
|
"extend": "28c63df352c77d02feffe44cf09fb0fc1d48f7905aaabbfa6dba601dbb70f8e8",
|
||||||
"extrude": "9cc1538971c5d25467aaed23f739899d9d102fd07f86472ac3197c54ca2e1144",
|
"extrude": "9cc1538971c5d25467aaed23f739899d9d102fd07f86472ac3197c54ca2e1144",
|
||||||
"eye": "2449167c8410826dc1106b687c12a309d5bea8f7817b897943e80f182a163c2d",
|
"eye": "2449167c8410826dc1106b687c12a309d5bea8f7817b897943e80f182a163c2d",
|
||||||
@@ -122,6 +123,7 @@
|
|||||||
"hole": "f82d47751f826e08682db847a270897474661bfe9f35b6d3678f49a203172563",
|
"hole": "f82d47751f826e08682db847a270897474661bfe9f35b6d3678f49a203172563",
|
||||||
"home": "ab5f1c41d377687e4c5a808dfdccf2757b33dd43f934d44df43d6e9118176853",
|
"home": "ab5f1c41d377687e4c5a808dfdccf2757b33dd43f934d44df43d6e9118176853",
|
||||||
"import": "e343540eb49fdb1e53c4d54b9e60ae513b3103df6c9133048bed878e58067455",
|
"import": "e343540eb49fdb1e53c4d54b9e60ae513b3103df6c9133048bed878e58067455",
|
||||||
|
"import_tray": "c6aec9556dc8ecb6c953d6bf1f384f220c68167a92e444950c24ded81f66a0b6",
|
||||||
"include": "f5b80ad3e06e3b863fcfbe415ec912e4e09653dd519f9ac207819339fe34730f",
|
"include": "f5b80ad3e06e3b863fcfbe415ec912e4e09653dd519f9ac207819339fe34730f",
|
||||||
"infinite": "53fb781131078d2f8e71be23aa610d9f9d9c8bb79ba5f97fa397475e9ff8c3bd",
|
"infinite": "53fb781131078d2f8e71be23aa610d9f9d9c8bb79ba5f97fa397475e9ff8c3bd",
|
||||||
"inspect": "d2b4644b2d5f1aa50cb576b9265e275fa91201e296c2bc79865f810067d538e9",
|
"inspect": "d2b4644b2d5f1aa50cb576b9265e275fa91201e296c2bc79865f810067d538e9",
|
||||||
@@ -206,8 +208,45 @@
|
|||||||
"redo": "28e925493fa9e5f52e2c8e3beeb288af13fdb4f85f3cd92270096a10561e7a1a",
|
"redo": "28e925493fa9e5f52e2c8e3beeb288af13fdb4f85f3cd92270096a10561e7a1a",
|
||||||
"refold": "1fa6a8604af7d04c01bc31d0e5875eb2cc91f5fa6bfc5491dd6680d3299eb26f",
|
"refold": "1fa6a8604af7d04c01bc31d0e5875eb2cc91f5fa6bfc5491dd6680d3299eb26f",
|
||||||
"rename": "6887c5467101dca1d213154020d3b03be9b2704ac310de9d0a8ebde62c013bf5",
|
"rename": "6887c5467101dca1d213154020d3b03be9b2704ac310de9d0a8ebde62c013bf5",
|
||||||
|
"render_all_shots": "9c04f49624cc2685472041cb3f3e95da2c5f32deeebb9723f4a8e3c369680a5b",
|
||||||
|
"render_appearance": "53287b30915a266d8a3858d5bef24b93ed11f8d612c20c445d3032f400a925cc",
|
||||||
|
"render_aspect_frame": "5d74b263eeb03eb0494b3774817135b8f119caff205a8b31c480d7dd0e5a8554",
|
||||||
|
"render_backdrop": "d27f7d6da7a31c5944dd0ff67c21838690f000f2d87b0bf5274bef0744de34ce",
|
||||||
|
"render_cancel": "2f1d8b3039007ccfc224390758e05d6202fa2eabf63724c744217dcab5d58e5e",
|
||||||
|
"render_check": "65ccf0407d80937c6931cbf87b6d0e628cfb62ca3e841483d02dd9de19c3717c",
|
||||||
|
"render_compare": "1b2d3f3920782490b96b4d14a7cc9506eff98ff2efae00f86d911fabcabc7cb0",
|
||||||
|
"render_copy_look": "25e9138a839a7e6b8225b48cd2f36daba42a928eff541fe616f3df39a1bc82b7",
|
||||||
|
"render_environment": "50cb18380d9310f6e04084c24ac85529599966b1d90c6bef514f4e63f9b30854",
|
||||||
|
"render_execute": "e4d9a66f4569e00c4b4b2ac05a80a9f3eba4e59802c62d3af5bb951ba9153cbf",
|
||||||
|
"render_export_image": "2456f55fa3b50ab84ae871963d4a6b6e92f486cf6ed3039f3a2f07f11192a655",
|
||||||
|
"render_exposure": "60eb5fa040aefe872ab2de66099493513a494ab758a23d443753d033eaf3a05d",
|
||||||
|
"render_fit_product": "8e58b293a39a06fca4cda0543adc2afef3d0041fe34b0bc0c800afb2d5635123",
|
||||||
|
"render_frame_guides": "cb1df01051de42047e38de9dd2a96fcb5b67bd5979cb5756412890400b69e5bc",
|
||||||
|
"render_from_material": "c928daa803a28f90ce24096731b8de711c6cd3215259ac9cd761b6be2e1b9618",
|
||||||
|
"render_ground": "2b900b433870cbc4bd0282e54c604ec696aa28354c753a13b09806f5e87d99c3",
|
||||||
"render_image": "e3dd622591de4fdc211f9bd3c6dcb54b01a308e8bcebd02bb80dd6b3982ce2a5",
|
"render_image": "e3dd622591de4fdc211f9bd3c6dcb54b01a308e8bcebd02bb80dd6b3982ce2a5",
|
||||||
|
"render_lens": "79bb615d46a05ea5ffc9e2e905cc25f266b3b7e761c160f7d25bbdb3dea0a430",
|
||||||
|
"render_library": "828af74034a62616c774ab0cbe70b7cf9fd42778b574febfb1812f8aa17fd49b",
|
||||||
|
"render_light_area": "b1f3ee596ee1d35f6e8444b54e94f36a34c2129697c88e5286dbf38565f50816",
|
||||||
|
"render_light_by_highlight": "5b37c8c6aa27ac2002dd8c8094e415c64e9eb315a55c4f146e328314e8f639a2",
|
||||||
|
"render_light_point": "a602cb5fa26f04f1bb9be7c14e5a9a9ce52b37550dfd3211a55e915f941f5803",
|
||||||
|
"render_light_spot": "a9413de906266bec0165b4cb06ecac8e36dce0b6ddec4bc4cc6ff4f152601483",
|
||||||
|
"render_lighting_presets": "e0a08433f548a9dd139296107b04b1d4c57ff04303c9bee32d896e2ea06a8d07",
|
||||||
|
"render_output_size": "f08fe354e4d5a6dd21af29cb077ceed96c413c68f48d9f72548ae1614337f88b",
|
||||||
|
"render_paint": "e3d3202205a5a90906348cae519340d38f475e42039a7f60c835cf7a21081da1",
|
||||||
|
"render_pick_up": "df67d10f333a3c9e367897d599a4be510f10ed36c24763c26817f22d24ff35b7",
|
||||||
|
"render_quality": "28fe44cdd2b2f58b91d91dcf20a6dfbd22cf3db6008e1db179717523ecc4889e",
|
||||||
|
"render_remove_override": "c928daa803a28f90ce24096731b8de711c6cd3215259ac9cd761b6be2e1b9618",
|
||||||
|
"render_replace_all": "3bbf830619a91be186b9dc91726b8e47c293556d2ac8c93d87c71014c9f3abcd",
|
||||||
|
"render_results": "94e78898d88eef415e56ca5ec1e056089a2a5aa709abc69e5b8103d6096a019c",
|
||||||
|
"render_same_look": "2b5c69c523a1c949c22638c378803e77123095fddd36cfa58e94b2fd91ca61d7",
|
||||||
"render_scene": "1c4d7350f6f17ad637a7d633cb65a64c298af20321b1dbdac01b51d47a0e2822",
|
"render_scene": "1c4d7350f6f17ad637a7d633cb65a64c298af20321b1dbdac01b51d47a0e2822",
|
||||||
|
"render_shot": "4428080faa94f276c8a1d20eb38d04835ee5ae9d6337402371a5edf09f97ddc5",
|
||||||
|
"render_shots_strip": "1dcf5cc8e704691985284e0ca06e03b22540ea9d4cd23f4fb8675801ae7e69ec",
|
||||||
|
"render_solo_light": "abb9f8993be108a79d491bfaca32cde59d07a69db3ead58195e8ca0d8e8d909b",
|
||||||
|
"render_sun": "d86b51f3d4d83df4e932a22bb20d567513529a2eaaa42b93f744412eed2be901",
|
||||||
|
"render_transparent_background": "71dab4763516053734d4eec964b0899716d617597fe0d09e3bfa0cc36224dd7a",
|
||||||
|
"render_update_shot": "22d82ad332f8325395596c4bec4c1ec9bbb72d9fc4cd62ad658a93d7f5f803b9",
|
||||||
"reorder": "c45755c8f23575415397bffb316eed9f2d8c014f451ab6f8c3123aca1a99b675",
|
"reorder": "c45755c8f23575415397bffb316eed9f2d8c014f451ab6f8c3123aca1a99b675",
|
||||||
"replace_face": "fcee556c684a1138a30a2574ea565c98ff29f9368c2e861d0fb861155a57d28b",
|
"replace_face": "fcee556c684a1138a30a2574ea565c98ff29f9368c2e861d0fb861155a57d28b",
|
||||||
"rest": "eab64961b5340bdbbd92affe0c9b8477dc297a3b49e05e39d5fa71c0f2fda66c",
|
"rest": "eab64961b5340bdbbd92affe0c9b8477dc297a3b49e05e39d5fa71c0f2fda66c",
|
||||||
@@ -224,10 +263,17 @@
|
|||||||
"screw": "5e30570785360d6a591ea22862a82f1cf62228385c1e96382536db8a453ac791",
|
"screw": "5e30570785360d6a591ea22862a82f1cf62228385c1e96382536db8a453ac791",
|
||||||
"section": "cdd13f99f15f6d59bfa21c747810608d6afd00cb8207faf0337928c8521e7eae",
|
"section": "cdd13f99f15f6d59bfa21c747810608d6afd00cb8207faf0337928c8521e7eae",
|
||||||
"select": "fdf6431270006ca7409c60c37cfed59572de04229f104ec723e6010ffa2b7163",
|
"select": "fdf6431270006ca7409c60c37cfed59572de04229f104ec723e6010ffa2b7163",
|
||||||
|
"send": "f83b6cdab792f9567a81d46d7828ed20795513c57a2c7d00fbbe6bd14d2f5848",
|
||||||
"settings": "9193dd3a1007c43660d0d47b6499cb2571338b67949e1a99df112057b9bf2b8a",
|
"settings": "9193dd3a1007c43660d0d47b6499cb2571338b67949e1a99df112057b9bf2b8a",
|
||||||
|
"settings_keyboard": "4968c70788094365af9c6e2b1c15b2aac45cf21212a14b8a256daf1ffe17f41a",
|
||||||
|
"settings_monitor": "6fcea26e2fc1673c76c6e7fadac4a91812ed43250cfb363c4f40c0cacfbd7aa5",
|
||||||
|
"settings_mouse": "47754752ea6fb37ec9686c0460740935a4db30fb267f1136a9246aec9a17b3f1",
|
||||||
|
"settings_palette": "a060015a750ff4367c65c04b83bf43720e13a38d8dee35330e1d8880f89eaa22",
|
||||||
|
"settings_plug": "79c00b84b2d1d28e3bf6096639c75476b7e1ee0a326c34ad76a79ad866c0102e",
|
||||||
"sheet": "774e30923ef6f37dd9c0b2bc3e45705e83b3a76700bf071cd41155a365d0daa4",
|
"sheet": "774e30923ef6f37dd9c0b2bc3e45705e83b3a76700bf071cd41155a365d0daa4",
|
||||||
"sheet_rules": "5d3a2f37d3b4a4262b3ddbdae53d61f29e0f8e284dd54006da25a7acebfa1114",
|
"sheet_rules": "5d3a2f37d3b4a4262b3ddbdae53d61f29e0f8e284dd54006da25a7acebfa1114",
|
||||||
"shell": "a1959ea0d0441a479bf654b6e549e2e44a0bfdc9cda4eb46fe1fbfd884de7e38",
|
"shell": "a1959ea0d0441a479bf654b6e549e2e44a0bfdc9cda4eb46fe1fbfd884de7e38",
|
||||||
|
"shield": "5e2d2d157309e0daa72f7c53073dfdb0a474def972a041cd172567f1d1e485ec",
|
||||||
"silhouette": "2a848aed2f247b1c0439f830a34a513c93bc5493c40044c821d493d863ad996e",
|
"silhouette": "2a848aed2f247b1c0439f830a34a513c93bc5493c40044c821d493d863ad996e",
|
||||||
"sketch": "b52e5862b1709a9a7e3ca00d7436d126fbfc01b38080006fa4e17dc581dfa103",
|
"sketch": "b52e5862b1709a9a7e3ca00d7436d126fbfc01b38080006fa4e17dc581dfa103",
|
||||||
"sketch_break": "67a5fab332616e6d6a9aeae3bedc04ee0768179143ba34b795bdd98cea04bb24",
|
"sketch_break": "67a5fab332616e6d6a9aeae3bedc04ee0768179143ba34b795bdd98cea04bb24",
|
||||||
@@ -261,6 +307,7 @@
|
|||||||
"status_error": "b7188fcdfadf1512ddd2896805a14618179789f87047b219560a7dab74bd360f",
|
"status_error": "b7188fcdfadf1512ddd2896805a14618179789f87047b219560a7dab74bd360f",
|
||||||
"status_warning": "1ac4f0ccfac2c01f6f66cb42188f9ae053c4aef9c5bbd249f1fb09611eb4d825",
|
"status_warning": "1ac4f0ccfac2c01f6f66cb42188f9ae053c4aef9c5bbd249f1fb09611eb4d825",
|
||||||
"stitch": "6c3205d64007b771ed78d6f8055867578439fb25d591563b32dbd3343c98732d",
|
"stitch": "6c3205d64007b771ed78d6f8055867578439fb25d591563b32dbd3343c98732d",
|
||||||
|
"stop": "36967eb4d423370d0d6c679b0a71f8d09f4fb2c73eed3e8cc50c604c44b0c32b",
|
||||||
"style": "6c2b04234b82ea4858c80190cc7208c60f549358253005afc35ab4e29506b578",
|
"style": "6c2b04234b82ea4858c80190cc7208c60f549358253005afc35ab4e29506b578",
|
||||||
"suppress": "c54fbc01c12c0175d78cd63f692e8aaf73fc2cac79752b2a3ad821ac32734343",
|
"suppress": "c54fbc01c12c0175d78cd63f692e8aaf73fc2cac79752b2a3ad821ac32734343",
|
||||||
"surface": "ba0e839ce0ee03e7ff95a2389a5ecb20bd80c713064d9b1bd5f461f4a80d1921",
|
"surface": "ba0e839ce0ee03e7ff95a2389a5ecb20bd80c713064d9b1bd5f461f4a80d1921",
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Colored components</title>
|
||||||
|
<path d="M9.235 17.706L15.059 20.882L15.059 48.941L9.235 44.926Z" fill="#c06f00"/>
|
||||||
|
<path d="M35.176 9.235L15.059 20.882L15.059 48.941L36.765 35.139Z" fill="#a45000"/>
|
||||||
|
<path d="M29.046 5L35.176 8.176L15.196 19.718L9.066 16.541Z" fill="#f1d2af"/>
|
||||||
|
<path d="M29.046 5.529L35.176 8.706L35.176 36.235L15.059 49.471L9.235 45.765L9.066 17.071Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M9.066 17.6L15.059 20.882L34.647 9.235" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M15.059 20.882L15.059 47.067" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M32.222 18.595L44.949 25.944L44.949 51.122L32.222 43.774Z" fill="#328bd3"/>
|
||||||
|
<path d="M54.934 20.173L44.949 25.944L44.949 51.122L54.934 45.352Z" fill="#236ead"/>
|
||||||
|
<path d="M42.059 12.412L54.934 20.173L44.949 25.944L32 17.706Z" fill="#b9ddf8"/>
|
||||||
|
<path d="M41.159 11.766L54.934 20.173L54.934 45.352L44.949 51.122L31.164 42.715L31.164 17.536Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M32.222 18.595L44.949 25.944L54.934 20.173" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M44.949 25.944L44.949 51.122" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M18.299 39.062L31.015 46.411L31.015 59L18.299 51.652Z" fill="#a28200"/>
|
||||||
|
<path d="M41.921 40.121L31.015 46.411L31.015 59L41.921 52.711Z" fill="#826700"/>
|
||||||
|
<path d="M29.194 32.773L41.921 40.121L31.015 46.411L18.299 39.062Z" fill="#e5d99b"/>
|
||||||
|
<path d="M29.194 32.773L41.921 40.121L41.921 52.711L31.015 59L18.299 51.652L18.299 39.062Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M18.299 39.062L31.015 46.411L41.921 40.121" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M31.015 46.411L31.015 59" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.3 KiB |
@@ -0,0 +1,21 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Disable component colors</title>
|
||||||
|
<path d="M9.235 17.706L15.059 20.882L15.059 48.941L9.235 44.926Z" fill="#328bd3"/>
|
||||||
|
<path d="M35.176 9.235L15.059 20.882L15.059 48.941L36.765 35.139Z" fill="#236ead"/>
|
||||||
|
<path d="M29.046 5L35.176 8.176L15.196 19.718L9.066 16.541Z" fill="#b9ddf8"/>
|
||||||
|
<path d="M29.046 5.529L35.176 8.706L35.176 36.235L15.059 49.471L9.235 45.765L9.066 17.071Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M9.066 17.6L15.059 20.882L34.647 9.235" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M15.059 20.882L15.059 47.067" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M32.222 18.595L44.949 25.944L44.949 51.122L32.222 43.774Z" fill="#328bd3"/>
|
||||||
|
<path d="M54.934 20.173L44.949 25.944L44.949 51.122L54.934 45.352Z" fill="#236ead"/>
|
||||||
|
<path d="M42.059 12.412L54.934 20.173L44.949 25.944L32 17.706Z" fill="#b9ddf8"/>
|
||||||
|
<path d="M41.159 11.766L54.934 20.173L54.934 45.352L44.949 51.122L31.164 42.715L31.164 17.536Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M32.222 18.595L44.949 25.944L54.934 20.173" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M44.949 25.944L44.949 51.122" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M18.299 39.062L31.015 46.411L31.015 59L18.299 51.652Z" fill="#328bd3"/>
|
||||||
|
<path d="M41.921 40.121L31.015 46.411L31.015 59L41.921 52.711Z" fill="#236ead"/>
|
||||||
|
<path d="M29.194 32.773L41.921 40.121L31.015 46.411L18.299 39.062Z" fill="#b9ddf8"/>
|
||||||
|
<path d="M29.194 32.773L41.921 40.121L41.921 52.711L31.015 59L18.299 51.652L18.299 39.062Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M18.299 39.062L31.015 46.411L41.921 40.121" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M31.015 46.411L31.015 59" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.3 KiB |
@@ -0,0 +1,6 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Cone</title>
|
||||||
|
<path d="M32 5L12.7 45.97A20 11.55 0 1 0 51.3 45.97Z" fill="#328bd3"/>
|
||||||
|
<path d="M32 5L39 59.82A20 11.55 0 0 0 51.3 45.97Z" fill="#236ead"/>
|
||||||
|
<path d="M32 5L12.7 45.97A20 11.55 0 1 0 51.3 45.97Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 388 B |
@@ -0,0 +1,6 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Path Flange</title>
|
||||||
|
<path d="M9.5 44L23.5 44A6 6 0 0 0 29.5 38L29.5 26A6 6 0 0 1 35.5 20L43.5 20A6 6 0 0 1 47.74 21.76L54.81 28.83" fill="none" stroke="#34465b" stroke-width="11.4" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M9.5 44L23.5 44" fill="none" stroke="#b8c3cf" stroke-width="6.3" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M23.5 44A6 6 0 0 0 29.5 38L29.5 26A6 6 0 0 1 35.5 20L43.5 20A6 6 0 0 1 47.74 21.76L54.81 28.83" fill="none" stroke="#328bd3" stroke-width="6.3" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 638 B |
@@ -0,0 +1,10 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Render all shots — every saved camera view at once</title>
|
||||||
|
<path d="M27.1 12L29.26 12L31.42 6.96Q31.85 5.52 33.22 5.52L36.82 5.52Q38.19 5.52 38.62 6.96L40.78 12L51.58 12Q55.18 12 55.18 15.6L55.18 31.44Q55.18 35.04 51.58 35.04L27.1 35.04Q23.5 35.04 23.5 31.44L23.5 15.6Q23.5 12 27.1 12Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M16.6 21L18.76 21L20.92 15.96Q21.35 14.52 22.72 14.52L26.32 14.52Q27.69 14.52 28.12 15.96L30.28 21L41.08 21Q44.68 21 44.68 24.6L44.68 40.44Q44.68 44.04 41.08 44.04L16.6 44.04Q13 44.04 13 40.44L13 24.6Q13 21 16.6 21Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M6.1 30L8.26 30L10.42 24.96Q10.85 23.52 12.22 23.52L15.82 23.52Q17.19 23.52 17.62 24.96L19.78 30L30.58 30Q34.18 30 34.18 33.6L34.18 49.44Q34.18 53.04 30.58 53.04L6.1 53.04Q2.5 53.04 2.5 49.44L2.5 33.6Q2.5 30 6.1 30Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="18.34" cy="41.52" r="7.56" fill="#b9ddf8" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="14" fill="#ffffff"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="12" fill="#236ead"/>
|
||||||
|
<path d="M43.9 41.7L53.3 47.5L43.9 53.3Z" fill="#ffffff" stroke="#ffffff" stroke-width="1.6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -0,0 +1,14 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Appearance — a body wearing the look sphere</title>
|
||||||
|
<path d="M17.33 24.8L38.98 37.3L38.98 62.3L17.33 49.8Z" fill="#328bd3"/>
|
||||||
|
<path d="M60.63 24.8L38.98 37.3L38.98 62.3L60.63 49.8Z" fill="#236ead"/>
|
||||||
|
<path d="M38.98 12.3L60.63 24.8L38.98 37.3L17.33 24.8Z" fill="#b9ddf8"/>
|
||||||
|
<path d="M38.98 12.3L60.63 24.8L60.63 49.8L38.98 62.3L17.33 49.8L17.33 24.8Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M17.33 24.8L38.98 37.3L60.63 24.8" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M38.98 37.3L38.98 62.3" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="18.98" cy="17.3" r="16.88" fill="#ffffff"/>
|
||||||
|
<circle cx="18.98" cy="17.3" r="14" fill="#328bd3"/>
|
||||||
|
<path d="M32.14 12.51A14 14 0 0 1 14.19 30.46A18.31 18.31 0 0 0 32.14 12.51Z" fill="#236ead"/>
|
||||||
|
<circle cx="14.22" cy="12.54" r="3.78" fill="#b9ddf8"/>
|
||||||
|
<circle cx="18.98" cy="17.3" r="14" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.2 KiB |
@@ -0,0 +1,6 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Aspect frame — the shape of the picture</title>
|
||||||
|
<path d="M13 17L51 17A4 4 0 0 1 55 21L55 43A4 4 0 0 1 51 47L13 47A4 4 0 0 1 9 43L9 21A4 4 0 0 1 13 17Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M4.5 23.5L4.5 12.5L15.5 12.5" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M59.5 40.5L59.5 51.5L48.5 51.5" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 614 B |
@@ -0,0 +1,10 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Backdrop — the coloured wall behind the product</title>
|
||||||
|
<path d="M30.69 4L54.25 17.6L54.25 41.6L30.69 28Z" fill="#328bd3" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M18.91 29.2L30 35.6L30 48.4L18.91 42Z" fill="#b8c3cf"/>
|
||||||
|
<path d="M41.09 29.2L30 35.6L30 48.4L41.09 42Z" fill="#8e9faf"/>
|
||||||
|
<path d="M30 22.8L41.09 29.2L30 35.6L18.91 29.2Z" fill="#e2e8ef"/>
|
||||||
|
<path d="M30 22.8L41.09 29.2L41.09 42L30 48.4L18.91 42L18.91 29.2Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M18.91 29.2L30 35.6L41.09 29.2" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M30 35.6L30 48.4" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 928 B |
@@ -0,0 +1,13 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Cancel render — stop the running render</title>
|
||||||
|
<path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="#e2e8ef"/>
|
||||||
|
<defs><clipPath id="pic1"><path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="none"/></clipPath></defs>
|
||||||
|
<g clip-path="url(#pic1)">
|
||||||
|
<path d="M4 40.8L17.8 27.12L30.68 38.64L38.04 32.88L50 42.96L50 48L4 48Z" fill="#8e9faf"/>
|
||||||
|
</g>
|
||||||
|
<circle cx="36.2" cy="22.8" r="4.2" fill="#8e9faf"/>
|
||||||
|
<path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="14" fill="#ffffff"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="12" fill="#236ead"/>
|
||||||
|
<path d="M44.1 42.9L50.9 42.9A1.2 1.2 0 0 1 52.1 44.1L52.1 50.9A1.2 1.2 0 0 1 50.9 52.1L44.1 52.1A1.2 1.2 0 0 1 42.9 50.9L42.9 44.1A1.2 1.2 0 0 1 44.1 42.9Z" fill="#ffffff" stroke="#ffffff" stroke-width="1.2" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1,13 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Check render — verify the request is ready, without rendering</title>
|
||||||
|
<path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="#e2e8ef"/>
|
||||||
|
<defs><clipPath id="pic1"><path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="none"/></clipPath></defs>
|
||||||
|
<g clip-path="url(#pic1)">
|
||||||
|
<path d="M4 40.8L17.8 27.12L30.68 38.64L38.04 32.88L50 42.96L50 48L4 48Z" fill="#8e9faf"/>
|
||||||
|
</g>
|
||||||
|
<circle cx="36.2" cy="22.8" r="4.2" fill="#8e9faf"/>
|
||||||
|
<path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="14" fill="#ffffff"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="12" fill="#236ead"/>
|
||||||
|
<path d="M41.9 47.7L45.9 51.9L53.3 43.1" fill="none" stroke="#ffffff" stroke-width="3.6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.0 KiB |
@@ -0,0 +1,19 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Compare — live preview and render side by side</title>
|
||||||
|
<path d="M9 12L55 12A5 5 0 0 1 60 17L60 47A5 5 0 0 1 55 52L9 52A5 5 0 0 1 4 47L4 17A5 5 0 0 1 9 12Z" fill="#e2e8ef"/>
|
||||||
|
<defs><clipPath id="cmpL"><path d="M4 12L32 12L32 52L4 52Z" fill="none"/></clipPath></defs>
|
||||||
|
<g clip-path="url(#cmpL)">
|
||||||
|
<path d="M9 12L55 12A5 5 0 0 1 60 17L60 47A5 5 0 0 1 55 52L9 52A5 5 0 0 1 4 47L4 17A5 5 0 0 1 9 12Z" fill="#b8c3cf"/>
|
||||||
|
</g>
|
||||||
|
<defs><clipPath id="cmp"><path d="M9 12L55 12A5 5 0 0 1 60 17L60 47A5 5 0 0 1 55 52L9 52A5 5 0 0 1 4 47L4 17A5 5 0 0 1 9 12Z" fill="none"/></clipPath></defs>
|
||||||
|
<g clip-path="url(#cmp)">
|
||||||
|
<path d="M4 44L20.8 28.8L36.48 41.6L45.44 35.2L60 46.4L60 52L4 52Z" fill="#8e9faf"/>
|
||||||
|
</g>
|
||||||
|
<path d="M9 12L55 12A5 5 0 0 1 60 17L60 47A5 5 0 0 1 55 52L9 52A5 5 0 0 1 4 47L4 17A5 5 0 0 1 9 12Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M32 5L32 59" fill="none" stroke="#ffffff" stroke-width="8.6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="32" r="14.5" fill="#ffffff"/>
|
||||||
|
<path d="M32 5L32 59" fill="none" stroke="#236ead" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="32" r="12.8" fill="#236ead"/>
|
||||||
|
<path d="M23.4 32L29.8 25.6L29.8 38.4Z" fill="#ffffff" stroke="#ffffff" stroke-width="1.2" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M40.6 32L34.2 25.6L34.2 38.4Z" fill="#ffffff" stroke="#ffffff" stroke-width="1.2" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.6 KiB |
@@ -0,0 +1,9 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Copy Look — the look in front of a copy outline</title>
|
||||||
|
<path d="M8 40L8 12.5A4.5 4.5 0 0 1 12.5 8L40 8" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M24 19L51 19A5 5 0 0 1 56 24L56 51A5 5 0 0 1 51 56L24 56A5 5 0 0 1 19 51L19 24A5 5 0 0 1 24 19Z" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="37.5" cy="37.5" r="12" fill="#328bd3"/>
|
||||||
|
<path d="M48.78 33.4A12 12 0 0 1 33.4 48.78A15.69 15.69 0 0 0 48.78 33.4Z" fill="#236ead"/>
|
||||||
|
<circle cx="33.42" cy="33.42" r="3.24" fill="#b9ddf8"/>
|
||||||
|
<circle cx="37.5" cy="37.5" r="12" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 841 B |
@@ -0,0 +1,10 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Environment — a sky dome lighting the product</title>
|
||||||
|
<path d="M4.04 42A25.96 25.96 0 0 1 55.96 42A25.96 14.99 0 0 1 4.04 42Z" fill="#b9ddf8" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M18.91 29.2L30 35.6L30 48.4L18.91 42Z" fill="#b8c3cf"/>
|
||||||
|
<path d="M41.09 29.2L30 35.6L30 48.4L41.09 42Z" fill="#8e9faf"/>
|
||||||
|
<path d="M30 22.8L41.09 29.2L30 35.6L18.91 29.2Z" fill="#e2e8ef"/>
|
||||||
|
<path d="M30 22.8L41.09 29.2L41.09 42L30 48.4L18.91 42L18.91 29.2Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M18.91 29.2L30 35.6L41.09 29.2" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M30 35.6L30 48.4" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 948 B |
@@ -0,0 +1,12 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Render image — start rendering the picture</title>
|
||||||
|
<path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="#e2e8ef"/>
|
||||||
|
<defs><clipPath id="pic1"><path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="none"/></clipPath></defs>
|
||||||
|
<g clip-path="url(#pic1)">
|
||||||
|
<path d="M4 40.8L17.8 27.12L30.68 38.64L38.04 32.88L50 42.96L50 48L4 48Z" fill="#328bd3"/>
|
||||||
|
</g>
|
||||||
|
<path d="M9 12L45 12A5 5 0 0 1 50 17L50 43A5 5 0 0 1 45 48L9 48A5 5 0 0 1 4 43L4 17A5 5 0 0 1 9 12Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="14" fill="#ffffff"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="12" fill="#236ead"/>
|
||||||
|
<path d="M43.9 41.7L53.3 47.5L43.9 53.3Z" fill="#ffffff" stroke="#ffffff" stroke-width="1.6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 993 B |
@@ -0,0 +1,13 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Export image — save the finished picture as a PNG file</title>
|
||||||
|
<path d="M9 18L43 18A5 5 0 0 1 48 23L48 49A5 5 0 0 1 43 54L9 54A5 5 0 0 1 4 49L4 23A5 5 0 0 1 9 18Z" fill="#e2e8ef"/>
|
||||||
|
<defs><clipPath id="pic1"><path d="M9 18L43 18A5 5 0 0 1 48 23L48 49A5 5 0 0 1 43 54L9 54A5 5 0 0 1 4 49L4 23A5 5 0 0 1 9 18Z" fill="none"/></clipPath></defs>
|
||||||
|
<g clip-path="url(#pic1)">
|
||||||
|
<path d="M4 46.8L17.2 33.12L29.52 44.64L36.56 38.88L48 48.96L48 54L4 54Z" fill="#8e9faf"/>
|
||||||
|
</g>
|
||||||
|
<path d="M9 18L43 18A5 5 0 0 1 48 23L48 49A5 5 0 0 1 43 54L9 54A5 5 0 0 1 4 49L4 23A5 5 0 0 1 9 18Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M28 36L47.77 17.55" fill="none" stroke="#ffffff" stroke-width="11.6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M58 8L53.52 25.18L40.55 11.29Z" fill="#ffffff" stroke="#ffffff" stroke-width="6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M28 36L47.77 17.55" fill="none" stroke="#236ead" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M58 8L53.52 25.18L40.55 11.29Z" fill="#236ead" stroke="#236ead" stroke-width="2" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.3 KiB |
@@ -0,0 +1,8 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Exposure — brighten or darken the picture</title>
|
||||||
|
<circle cx="32" cy="32" r="25" fill="#e2e8ef"/>
|
||||||
|
<path d="M32 7A25 25 0 0 1 32 57Z" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="32" r="25" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M14 32L27 32M20.5 25.5L20.5 38.5" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M37 32L50 32" fill="none" stroke="#ffffff" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 630 B |
@@ -0,0 +1,13 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Fit product — frame the whole product in the view</title>
|
||||||
|
<path d="M15.98 22.75L32 32L32 50.5L15.98 41.25Z" fill="#b8c3cf"/>
|
||||||
|
<path d="M48.02 22.75L32 32L32 50.5L48.02 41.25Z" fill="#8e9faf"/>
|
||||||
|
<path d="M32 13.5L48.02 22.75L32 32L15.98 22.75Z" fill="#e2e8ef"/>
|
||||||
|
<path d="M32 13.5L48.02 22.75L48.02 41.25L32 50.5L15.98 41.25L15.98 22.75Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M15.98 22.75L32 32L48.02 22.75" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M32 32L32 50.5" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M5.5 18.5L5.5 5.5L18.5 5.5" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M58.5 18.5L58.5 5.5L45.5 5.5" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M58.5 45.5L58.5 58.5L45.5 58.5" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M5.5 45.5L5.5 58.5L18.5 58.5" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.3 KiB |
@@ -0,0 +1,9 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Frame guides — rule of thirds over the picture</title>
|
||||||
|
<path d="M10 14L54 14A4 4 0 0 1 58 18L58 46A4 4 0 0 1 54 50L10 50A4 4 0 0 1 6 46L6 18A4 4 0 0 1 10 14Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M23.33 15.3L23.33 48.7M7.3 26L56.7 26M40.67 15.3L40.67 48.7M7.3 38L56.7 38" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="23.33" cy="26" r="3.6" fill="#236ead"/>
|
||||||
|
<circle cx="23.33" cy="38" r="3.6" fill="#236ead"/>
|
||||||
|
<circle cx="40.67" cy="26" r="3.6" fill="#236ead"/>
|
||||||
|
<circle cx="40.67" cy="38" r="3.6" fill="#236ead"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 742 B |
@@ -0,0 +1,15 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>From Material — custom look crossed off, material shows</title>
|
||||||
|
<path d="M6 38L32 53.01L32 57.01L6 42Z" fill="#b8c3cf"/>
|
||||||
|
<path d="M58 38L32 53.01L32 57.01L58 42Z" fill="#8e9faf"/>
|
||||||
|
<path d="M32 22.99L58 38L32 53.01L6 38Z" fill="#e2e8ef"/>
|
||||||
|
<path d="M32 22.99L58 38L58 42L32 57.01L6 42L6 38Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M6 38L32 53.01L58 38" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M32 53.01L32 57.01" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="22" r="15" fill="#328bd3"/>
|
||||||
|
<path d="M46.1 16.87A15 15 0 0 1 26.87 36.1A19.62 19.62 0 0 0 46.1 16.87Z" fill="#236ead"/>
|
||||||
|
<circle cx="26.9" cy="16.9" r="4.05" fill="#b9ddf8"/>
|
||||||
|
<circle cx="32" cy="22" r="15" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M21 11L43 33M43 11L21 33" fill="none" stroke="#ffffff" stroke-width="6.65" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M21 11L43 33M43 11L21 33" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.3 KiB |
@@ -0,0 +1,16 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Ground — the floor the product stands on, with its contact shadow</title>
|
||||||
|
<path d="M5.06 42L30 56.4L30 58.8L5.06 44.4Z" fill="#328bd3"/>
|
||||||
|
<path d="M54.94 42L30 56.4L30 58.8L54.94 44.4Z" fill="#236ead"/>
|
||||||
|
<path d="M30 27.6L54.94 42L30 56.4L5.06 42Z" fill="#b9ddf8"/>
|
||||||
|
<path d="M30 27.6L54.94 42L54.94 44.4L30 58.8L5.06 44.4L5.06 42Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M5.06 42L30 56.4L54.94 42" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M30 56.4L30 58.8" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M30 35.6L45.93 44.8L34.85 51.2L18.91 42Z" fill="#328bd3"/>
|
||||||
|
<path d="M18.91 29.2L30 35.6L30 48.4L18.91 42Z" fill="#b8c3cf"/>
|
||||||
|
<path d="M41.09 29.2L30 35.6L30 48.4L41.09 42Z" fill="#8e9faf"/>
|
||||||
|
<path d="M30 22.8L41.09 29.2L30 35.6L18.91 29.2Z" fill="#e2e8ef"/>
|
||||||
|
<path d="M30 22.8L41.09 29.2L41.09 42L30 48.4L18.91 42L18.91 29.2Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M18.91 29.2L30 35.6L41.09 29.2" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M30 35.6L30 48.4" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -0,0 +1,7 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Lens — the camera lens and its field of view</title>
|
||||||
|
<circle cx="32" cy="32" r="27" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="32" r="19" fill="#b9ddf8" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="32" r="8.5" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="21.75" cy="21.75" r="3" fill="#e2e8ef"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 587 B |
@@ -0,0 +1,17 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Appearance library — looks on a shelf</title>
|
||||||
|
<circle cx="13" cy="28.35" r="9.5" fill="#b8c3cf"/>
|
||||||
|
<path d="M21.93 25.1A9.5 9.5 0 0 1 9.75 37.28A12.42 12.42 0 0 0 21.93 25.1Z" fill="#8e9faf"/>
|
||||||
|
<circle cx="9.77" cy="25.12" r="2.57" fill="#e2e8ef"/>
|
||||||
|
<circle cx="13" cy="28.35" r="9.5" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="51" cy="28.35" r="9.5" fill="#b8c3cf"/>
|
||||||
|
<path d="M59.93 25.1A9.5 9.5 0 0 1 47.75 37.28A12.42 12.42 0 0 0 59.93 25.1Z" fill="#8e9faf"/>
|
||||||
|
<circle cx="47.77" cy="25.12" r="2.57" fill="#e2e8ef"/>
|
||||||
|
<circle cx="51" cy="28.35" r="9.5" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="28.35" r="13.97" fill="#ffffff"/>
|
||||||
|
<circle cx="32" cy="28.35" r="11.5" fill="#328bd3"/>
|
||||||
|
<path d="M42.81 24.42A11.5 11.5 0 0 1 28.07 39.16A15.04 15.04 0 0 0 42.81 24.42Z" fill="#236ead"/>
|
||||||
|
<circle cx="28.09" cy="24.44" r="3.11" fill="#b9ddf8"/>
|
||||||
|
<circle cx="32" cy="28.35" r="11.5" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M7 42.35L57 42.35A2 2 0 0 1 59 44.35L59 46.35A2 2 0 0 1 57 48.35L7 48.35A2 2 0 0 1 5 46.35L5 44.35A2 2 0 0 1 7 42.35Z" fill="#8e9faf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.4 KiB |
@@ -0,0 +1,7 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Area light — angled panel and dotted direction stem</title>
|
||||||
|
<path d="M23.34 11L54.52 29L40.66 37L9.48 19Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="44" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="51" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="58" r="2.125" fill="#236ead"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 448 B |
@@ -0,0 +1,10 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Light by highlight — dotted aim stem and sphere target</title>
|
||||||
|
<circle cx="32" cy="9" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="16" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="23" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="42" r="15" fill="#e2e8ef"/>
|
||||||
|
<path d="M44.29 33.4A15 15 0 0 1 23.4 54.29A19.62 19.62 0 0 0 44.29 33.4Z" fill="#b8c3cf"/>
|
||||||
|
<circle cx="32" cy="42" r="15" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="37.5" r="5.5" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 712 B |
@@ -0,0 +1,8 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Point light — source disc and dotted direction stem</title>
|
||||||
|
<circle cx="32" cy="23" r="15" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="23" r="2.125" fill="#34465b"/>
|
||||||
|
<circle cx="32" cy="44" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="51" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="58" r="2.125" fill="#236ead"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 485 B |
@@ -0,0 +1,7 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Spot light — cone source and dotted direction stem</title>
|
||||||
|
<path d="M32 8L49 33Q32 43 15 33Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="44" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="51" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="58" r="2.125" fill="#236ead"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 435 B |
@@ -0,0 +1,7 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Lighting presets — a stack of ready-made light set-ups</title>
|
||||||
|
<path d="M24 5L54 5A5 5 0 0 1 59 10L59 40A5 5 0 0 1 54 45L24 45A5 5 0 0 1 19 40L19 10A5 5 0 0 1 24 5Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M10 17L42 17A5 5 0 0 1 47 22L47 54A5 5 0 0 1 42 59L10 59A5 5 0 0 1 5 54L5 22A5 5 0 0 1 10 17Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M18.3 41.55A11.5 11.5 0 1 1 33.7 41.55L33.2 45.55L18.8 45.55Z" fill="#b9ddf8" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M21.3 45.55L30.7 45.55A2.5 2.5 0 0 1 33.2 48.05L33.2 50.05A2.5 2.5 0 0 1 30.7 52.55L21.3 52.55A2.5 2.5 0 0 1 18.8 50.05L18.8 48.05A2.5 2.5 0 0 1 21.3 45.55Z" fill="#8e9faf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1000 B |
@@ -0,0 +1,7 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Output size — the picture size in pixels</title>
|
||||||
|
<path d="M9 12L55 12A5 5 0 0 1 60 17L60 47A5 5 0 0 1 55 52L9 52A5 5 0 0 1 4 47L4 17A5 5 0 0 1 9 12Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M22.08 38.79L41.92 25.21" fill="none" stroke="#236ead" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M51 19L45.33 31.97L36.86 19.59Z" fill="#236ead" stroke="#236ead" stroke-width="2" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M13 45L18.67 32.03L27.14 44.41Z" fill="#236ead" stroke="#236ead" stroke-width="2" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 750 B |
@@ -0,0 +1,5 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Paint — flat brush with look-coloured bristles</title>
|
||||||
|
<path d="M26.13 59.09L22.24 55.2L22.94 48.83L16.58 49.54L14.46 47.42L15.17 41.06L8.8 41.76L4.91 37.87L19.06 23.73L40.27 44.94Z" fill="#328bd3" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M22.24 20.55L28.25 14.54L37.09 16.31L46.28 7.11A7.5 7.5 0 0 1 56.89 17.72L47.69 26.91L49.46 35.75L43.45 41.76Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 589 B |
@@ -0,0 +1,6 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Pick Up — eyedropper with a look-coloured tube</title>
|
||||||
|
<path d="M8.96 52.22Q15.32 44.44 14.97 37.01L28.4 23.58L40.42 35.6L26.99 49.03Q19.56 48.68 11.78 55.04Z" fill="#328bd3" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M30.52 20.04L39.01 11.56A9.5 9.5 0 0 1 52.44 24.99L43.96 33.48Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M25.22 18.98L29.46 14.74L49.26 34.54L45.02 38.78Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 682 B |
@@ -0,0 +1,6 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Render quality — draft, balanced or high</title>
|
||||||
|
<path d="M10 38L17 38A3.5 3.5 0 0 1 20.5 41.5L20.5 52.5A3.5 3.5 0 0 1 17 56L10 56A3.5 3.5 0 0 1 6.5 52.5L6.5 41.5A3.5 3.5 0 0 1 10 38Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M28.5 24L35.5 24A3.5 3.5 0 0 1 39 27.5L39 52.5A3.5 3.5 0 0 1 35.5 56L28.5 56A3.5 3.5 0 0 1 25 52.5L25 27.5A3.5 3.5 0 0 1 28.5 24Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M47 8L54 8A3.5 3.5 0 0 1 57.5 11.5L57.5 52.5A3.5 3.5 0 0 1 54 56L47 56A3.5 3.5 0 0 1 43.5 52.5L43.5 11.5A3.5 3.5 0 0 1 47 8Z" fill="#328bd3" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 848 B |
@@ -0,0 +1,18 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Replace All — every use of a look switched to another</title>
|
||||||
|
<circle cx="12.5" cy="13.3" r="10" fill="#b8c3cf"/>
|
||||||
|
<path d="M21.9 9.88A10 10 0 0 1 9.08 22.7A13.08 13.08 0 0 0 21.9 9.88Z" fill="#8e9faf"/>
|
||||||
|
<circle cx="9.1" cy="9.9" r="2.7" fill="#e2e8ef"/>
|
||||||
|
<circle cx="12.5" cy="13.3" r="10" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M36 36.8L25.39 34.68L33.88 26.19Z" fill="#236ead"/>
|
||||||
|
<path d="M21 21.8L30.34 31.14" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="52.5" cy="35.3" r="9" fill="#328bd3"/>
|
||||||
|
<path d="M60.96 32.22A9 9 0 0 1 49.42 43.76A11.77 11.77 0 0 0 60.96 32.22Z" fill="#236ead"/>
|
||||||
|
<circle cx="49.44" cy="32.24" r="2.43" fill="#b9ddf8"/>
|
||||||
|
<circle cx="52.5" cy="35.3" r="9" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="46.5" cy="47.3" r="14.68" fill="#ffffff"/>
|
||||||
|
<circle cx="46.5" cy="47.3" r="12" fill="#328bd3"/>
|
||||||
|
<path d="M57.78 43.2A12 12 0 0 1 42.4 58.58A15.69 15.69 0 0 0 57.78 43.2Z" fill="#236ead"/>
|
||||||
|
<circle cx="42.42" cy="43.22" r="3.24" fill="#b9ddf8"/>
|
||||||
|
<circle cx="46.5" cy="47.3" r="12" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.4 KiB |
@@ -0,0 +1,11 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Render results — open the finished renders</title>
|
||||||
|
<path d="M21 6L55 6A5 5 0 0 1 60 11L60 35A5 5 0 0 1 55 40L21 40A5 5 0 0 1 16 35L16 11A5 5 0 0 1 21 6Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M9 17.5L43 17.5A7.5 7.5 0 0 1 50.5 25L50.5 51A7.5 7.5 0 0 1 43 58.5L9 58.5A7.5 7.5 0 0 1 1.5 51L1.5 25A7.5 7.5 0 0 1 9 17.5Z" fill="#ffffff"/>
|
||||||
|
<path d="M9 20L43 20A5 5 0 0 1 48 25L48 51A5 5 0 0 1 43 56L9 56A5 5 0 0 1 4 51L4 25A5 5 0 0 1 9 20Z" fill="#e2e8ef"/>
|
||||||
|
<defs><clipPath id="res"><path d="M9 20L43 20A5 5 0 0 1 48 25L48 51A5 5 0 0 1 43 56L9 56A5 5 0 0 1 4 51L4 25A5 5 0 0 1 9 20Z" fill="none"/></clipPath></defs>
|
||||||
|
<g clip-path="url(#res)">
|
||||||
|
<path d="M4 48.8L17.2 35.12L29.52 46.64L36.56 40.88L48 50.96L48 56L4 56Z" fill="#328bd3"/>
|
||||||
|
</g>
|
||||||
|
<path d="M9 20L43 20A5 5 0 0 1 48 25L48 51A5 5 0 0 1 43 56L9 56A5 5 0 0 1 4 51L4 25A5 5 0 0 1 9 20Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1,27 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Same Look — the bodies wearing this look selected</title>
|
||||||
|
<path d="M6.3 41.5L15.83 47L15.83 58L6.3 52.5Z" fill="#b8c3cf"/>
|
||||||
|
<path d="M25.36 41.5L15.83 47L15.83 58L25.36 52.5Z" fill="#8e9faf"/>
|
||||||
|
<path d="M15.83 36L25.36 41.5L15.83 47L6.3 41.5Z" fill="#e2e8ef"/>
|
||||||
|
<path d="M15.83 36L25.36 41.5L25.36 52.5L15.83 58L6.3 52.5L6.3 41.5Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M6.3 41.5L15.83 47L25.36 41.5" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M15.83 47L15.83 58" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M37.17 12L45.83 17L45.83 27L37.17 22Z" fill="#328bd3"/>
|
||||||
|
<path d="M54.48 12L45.83 17L45.83 27L54.48 22Z" fill="#236ead"/>
|
||||||
|
<path d="M45.83 7L54.48 12L45.83 17L37.17 12Z" fill="#b9ddf8"/>
|
||||||
|
<path d="M45.83 7L54.48 12L54.48 22L45.83 27L37.17 22L37.17 12Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M37.17 12L45.83 17L54.48 12" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M45.83 17L45.83 27" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M37.33 4L54.33 4A4.5 4.5 0 0 1 58.83 8.5L58.83 25.5A4.5 4.5 0 0 1 54.33 30L37.33 30A4.5 4.5 0 0 1 32.83 25.5L32.83 8.5A4.5 4.5 0 0 1 37.33 4Z" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M37.17 42L45.83 47L45.83 57L37.17 52Z" fill="#328bd3"/>
|
||||||
|
<path d="M54.48 42L45.83 47L45.83 57L54.48 52Z" fill="#236ead"/>
|
||||||
|
<path d="M45.83 37L54.48 42L45.83 47L37.17 42Z" fill="#b9ddf8"/>
|
||||||
|
<path d="M45.83 37L54.48 42L54.48 52L45.83 57L37.17 52L37.17 42Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M37.17 42L45.83 47L54.48 42" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M45.83 47L45.83 57" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M37.33 34L54.33 34A4.5 4.5 0 0 1 58.83 38.5L58.83 55.5A4.5 4.5 0 0 1 54.33 60L37.33 60A4.5 4.5 0 0 1 32.83 55.5L32.83 38.5A4.5 4.5 0 0 1 37.33 34Z" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="15.83" cy="17" r="11.5" fill="#328bd3"/>
|
||||||
|
<path d="M26.64 13.07A11.5 11.5 0 0 1 11.9 27.81A15.04 15.04 0 0 0 26.64 13.07Z" fill="#236ead"/>
|
||||||
|
<circle cx="11.92" cy="13.09" r="3.11" fill="#b9ddf8"/>
|
||||||
|
<circle cx="15.83" cy="17" r="11.5" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.8 KiB |
@@ -0,0 +1,8 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Shot — save the camera view as a named shot</title>
|
||||||
|
<path d="M9 19L12 19L15 12Q15.6 10 17.5 10L22.5 10Q24.4 10 25 12L28 19L43 19Q48 19 48 24L48 46Q48 51 43 51L9 51Q4 51 4 46L4 24Q4 19 9 19Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="26" cy="35" r="10.5" fill="#b9ddf8" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="14" fill="#ffffff"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="12" fill="#236ead"/>
|
||||||
|
<path d="M42 47.5L53 47.5M47.5 42L47.5 53" fill="none" stroke="#ffffff" stroke-width="3.4" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 759 B |
@@ -0,0 +1,7 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Shots strip — show or hide the strip of shot thumbnails</title>
|
||||||
|
<path d="M8 19L56 19A5 5 0 0 1 61 24L61 40A5 5 0 0 1 56 45L8 45A5 5 0 0 1 3 40L3 24A5 5 0 0 1 8 19Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M10.5 24.5L19.5 24.5A2.5 2.5 0 0 1 22 27L22 37A2.5 2.5 0 0 1 19.5 39.5L10.5 39.5A2.5 2.5 0 0 1 8 37L8 27A2.5 2.5 0 0 1 10.5 24.5Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M27.5 24.5L36.5 24.5A2.5 2.5 0 0 1 39 27L39 37A2.5 2.5 0 0 1 36.5 39.5L27.5 39.5A2.5 2.5 0 0 1 25 37L25 27A2.5 2.5 0 0 1 27.5 24.5Z" fill="#328bd3" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M44.5 24.5L53.5 24.5A2.5 2.5 0 0 1 56 27L56 37A2.5 2.5 0 0 1 53.5 39.5L44.5 39.5A2.5 2.5 0 0 1 42 37L42 27A2.5 2.5 0 0 1 44.5 24.5Z" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1,9 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Solo light — point source and dotted stem inside focus brackets</title>
|
||||||
|
<path d="M13.5 5L5.5 5L5.5 13M50.5 5L58.5 5L58.5 13M58.5 51.5L58.5 59.5L50.5 59.5M13.5 59.5L5.5 59.5L5.5 51.5" fill="none" stroke="currentColor" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="23" r="15" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="32" cy="23" r="2.125" fill="#34465b"/>
|
||||||
|
<circle cx="32" cy="44" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="51" r="2.125" fill="#236ead"/>
|
||||||
|
<circle cx="32" cy="58" r="2.125" fill="#236ead"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 713 B |
@@ -0,0 +1,5 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Sun — source disc with short radial rays</title>
|
||||||
|
<circle cx="32" cy="32" r="15" fill="#e2e8ef" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M32 5.5L32 10.5M32 53.5L32 58.5M5.5 32L10.5 32M53.5 32L58.5 32M13.26 13.26L16.8 16.8M47.2 47.2L50.74 50.74M13.26 50.74L16.8 47.2M47.2 16.8L50.74 13.26" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 523 B |
@@ -0,0 +1,16 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Transparent background — render with an alpha background</title>
|
||||||
|
<path d="M11 6L53 6A5 5 0 0 1 58 11L58 53A5 5 0 0 1 53 58L11 58A5 5 0 0 1 6 53L6 11A5 5 0 0 1 11 6Z" fill="#e2e8ef"/>
|
||||||
|
<defs><clipPath id="chk"><path d="M11 6L53 6A5 5 0 0 1 58 11L58 53A5 5 0 0 1 53 58L11 58A5 5 0 0 1 6 53L6 11A5 5 0 0 1 11 6Z" fill="none"/></clipPath></defs>
|
||||||
|
<g clip-path="url(#chk)">
|
||||||
|
<path d="M6 19L19 19L19 32L6 32ZM6 45L19 45L19 58L6 58ZM19 6L32 6L32 19L19 19ZM19 32L32 32L32 45L19 45ZM32 19L45 19L45 32L32 32ZM32 45L45 45L45 58L32 58ZM45 6L58 6L58 19L45 19ZM45 32L58 32L58 45L45 45Z" fill="#b9ddf8"/>
|
||||||
|
</g>
|
||||||
|
<path d="M11 6L53 6A5 5 0 0 1 58 11L58 53A5 5 0 0 1 53 58L11 58A5 5 0 0 1 6 53L6 11A5 5 0 0 1 11 6Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M32 18L44.12 25L44.12 39L32 46L19.88 39L19.88 25Z" fill="#ffffff" stroke="#ffffff" stroke-width="7.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M19.88 25L32 32L32 46L19.88 39Z" fill="#b8c3cf"/>
|
||||||
|
<path d="M44.12 25L32 32L32 46L44.12 39Z" fill="#8e9faf"/>
|
||||||
|
<path d="M32 18L44.12 25L32 32L19.88 25Z" fill="#e2e8ef"/>
|
||||||
|
<path d="M32 18L44.12 25L44.12 39L32 46L19.88 39L19.88 25Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M19.88 25L32 32L44.12 25" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M32 32L32 46" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.6 KiB |
@@ -0,0 +1,9 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<title>Update shot — overwrite the active shot with the current camera</title>
|
||||||
|
<path d="M9 19L12 19L15 12Q15.6 10 17.5 10L22.5 10Q24.4 10 25 12L28 19L43 19Q48 19 48 24L48 46Q48 51 43 51L9 51Q4 51 4 46L4 24Q4 19 9 19Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="26" cy="35" r="10.5" fill="#b9ddf8" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="14" fill="#ffffff"/>
|
||||||
|
<circle cx="47.5" cy="47.5" r="12" fill="#236ead"/>
|
||||||
|
<path d="M50.97 43.36A5.4 5.4 0 1 1 43.08 44.4" fill="none" stroke="#ffffff" stroke-width="3" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
<path d="M46.06 40.14L39.8 42.11L46.35 46.7Z" fill="#ffffff" stroke="#ffffff" stroke-width="0.8" stroke-linejoin="round" stroke-linecap="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 930 B |
@@ -108,8 +108,8 @@ pub(crate) fn glyph_icon(name: &str) -> Option<&'static str> {
|
|||||||
}
|
}
|
||||||
pub(crate) fn glyph_letter(name: &str) -> &'static str {
|
pub(crate) fn glyph_letter(name: &str) -> &'static str {
|
||||||
match name {
|
match name {
|
||||||
"Horizontal" => "H",
|
"Horizontal" => "-",
|
||||||
"Vertical" => "V",
|
"Vertical" => "|",
|
||||||
_ => "?",
|
_ => "?",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -152,11 +152,11 @@ pub(crate) fn curved_arrow(painter: &egui::Painter, at: Pos2, clockwise: bool, h
|
|||||||
pub(crate) const AXIS_RADIUS: f32 = 15.0;
|
pub(crate) const AXIS_RADIUS: f32 = 15.0;
|
||||||
pub(crate) fn axis_tip(painter: &egui::Painter, c: Pos2, name: &str, d: &Vec3, at: Pos2, depth: f64, hovered: bool, t: Tokens) {
|
pub(crate) fn axis_tip(painter: &egui::Painter, c: Pos2, name: &str, d: &Vec3, at: Pos2, depth: f64, hovered: bool, t: Tokens) {
|
||||||
let col = if d.x != 0.0 {
|
let col = if d.x != 0.0 {
|
||||||
t.triad[0]
|
t.axis_x
|
||||||
} else if d.y != 0.0 {
|
} else if d.y != 0.0 {
|
||||||
t.triad[1]
|
t.axis_y
|
||||||
} else {
|
} else {
|
||||||
t.triad[2]
|
t.axis_z
|
||||||
};
|
};
|
||||||
let positive = !name.starts_with('-');
|
let positive = !name.starts_with('-');
|
||||||
let light = t.panel.r() > 128;
|
let light = t.panel.r() > 128;
|
||||||
|
|||||||
@@ -72,6 +72,7 @@
|
|||||||
"Choose…": "Vybrat…",
|
"Choose…": "Vybrat…",
|
||||||
"Circular": "Kruhově",
|
"Circular": "Kruhově",
|
||||||
"Circumference": "Obvod",
|
"Circumference": "Obvod",
|
||||||
|
"Clockwise": "Ve směru hodinových ručiček",
|
||||||
"Close draft": "Zavřít koncept",
|
"Close draft": "Zavřít koncept",
|
||||||
"Collisions": "Kolize",
|
"Collisions": "Kolize",
|
||||||
"Colour": "Barva",
|
"Colour": "Barva",
|
||||||
@@ -269,7 +270,7 @@
|
|||||||
"Preview Row": "Náhled řádku",
|
"Preview Row": "Náhled řádku",
|
||||||
"Preview leaves the current design unchanged.": "Náhled aktuální návrh nemění.",
|
"Preview leaves the current design unchanged.": "Náhled aktuální návrh nemění.",
|
||||||
"Profiles/Curves": "Profily/křivky",
|
"Profiles/Curves": "Profily/křivky",
|
||||||
"Quantity": "Množství",
|
"Quantity": "Počet",
|
||||||
"RECENT": "NEDÁVNÉ",
|
"RECENT": "NEDÁVNÉ",
|
||||||
"REFERENCE": "REFERENCE",
|
"REFERENCE": "REFERENCE",
|
||||||
"RULED SURFACE": "PŘÍMKOVÁ PLOCHA",
|
"RULED SURFACE": "PŘÍMKOVÁ PLOCHA",
|
||||||
@@ -322,6 +323,7 @@
|
|||||||
"Search commands": "Hledat příkazy",
|
"Search commands": "Hledat příkazy",
|
||||||
"Search this library": "Prohledat tuto knihovnu",
|
"Search this library": "Prohledat tuto knihovnu",
|
||||||
"Section": "Řez",
|
"Section": "Řez",
|
||||||
|
"Section position": "Poloha průřezu",
|
||||||
"Select Other: hold the left button still on the model (or right-click › Select Other…) to list everything under the cursor; click again on the same spot to select the next thing there. Double-click the middle button to go Home (Preferences › Navigation).": "Vybrat jiné: podržte levé tlačítko na modelu (nebo pravé tlačítko › Vybrat jiné…) a zobrazí se vše pod kurzorem; dalším kliknutím na stejné místo vyberete další prvek. Dvojklikem prostředním tlačítkem přejdete na výchozí pohled (Předvolby › Navigace).",
|
"Select Other: hold the left button still on the model (or right-click › Select Other…) to list everything under the cursor; click again on the same spot to select the next thing there. Double-click the middle button to go Home (Preferences › Navigation).": "Vybrat jiné: podržte levé tlačítko na modelu (nebo pravé tlačítko › Vybrat jiné…) a zobrazí se vše pod kurzorem; dalším kliknutím na stejné místo vyberete další prvek. Dvojklikem prostředním tlačítkem přejdete na výchozí pohled (Předvolby › Navigace).",
|
||||||
"Select bodies (a face picks its body)": "Vyberte tělesa (plocha vybere své těleso)",
|
"Select bodies (a face picks its body)": "Vyberte tělesa (plocha vybere své těleso)",
|
||||||
"Select bodies or faces instead": "Vyberte místo toho tělesa nebo plochy",
|
"Select bodies or faces instead": "Vyberte místo toho tělesa nebo plochy",
|
||||||
@@ -333,6 +335,7 @@
|
|||||||
"Show Agent Cursor": "Zobrazit kurzor agenta",
|
"Show Agent Cursor": "Zobrazit kurzor agenta",
|
||||||
"Show in folder": "Zobrazit ve složce",
|
"Show in folder": "Zobrazit ve složce",
|
||||||
"Show the pointer an AI agent moves (#35)": "Zobrazit ukazatel, kterým pohybuje AI agent (#35)",
|
"Show the pointer an AI agent moves (#35)": "Zobrazit ukazatel, kterým pohybuje AI agent (#35)",
|
||||||
|
"Show tool at cursor": "Zobrazit nástroj u kurzoru",
|
||||||
"Signed axes": "Osy se znaménkem",
|
"Signed axes": "Osy se znaménkem",
|
||||||
"Size": "Velikost",
|
"Size": "Velikost",
|
||||||
"Sketch constraints": "Vazby náčrtu",
|
"Sketch constraints": "Vazby náčrtu",
|
||||||
@@ -345,9 +348,11 @@
|
|||||||
"SolidCraft closed before these designs were saved. Their last autosave can be opened.": "SolidCraft se zavřel dříve, než se tyto návrhy uložily. Lze otevřít jejich poslední automatické uložení.",
|
"SolidCraft closed before these designs were saved. Their last autosave can be opened.": "SolidCraft se zavřel dříve, než se tyto návrhy uložily. Lze otevřít jejich poslední automatické uložení.",
|
||||||
"Specialise": "Specializovat",
|
"Specialise": "Specializovat",
|
||||||
"Speed": "Rychlost",
|
"Speed": "Rychlost",
|
||||||
|
"Square": "Čtverec",
|
||||||
"Stand it up": "Postavit",
|
"Stand it up": "Postavit",
|
||||||
"Stand it up: a quarter turn about X, as one Move feature you can undo.": "Postavit: otočení o čtvrt otáčky kolem osy X jako jeden prvek Posunutí, který lze vrátit.",
|
"Stand it up: a quarter turn about X, as one Move feature you can undo.": "Postavit: otočení o čtvrt otáčky kolem osy X jako jeden prvek Posunutí, který lze vrátit.",
|
||||||
"Stand this part up?": "Postavit tento díl?",
|
"Stand this part up?": "Postavit tento díl?",
|
||||||
|
"Start angle": "Počáteční úhel",
|
||||||
"Start bulge": "Vypouklost začátku",
|
"Start bulge": "Vypouklost začátku",
|
||||||
"Start continuity": "Návaznost začátku",
|
"Start continuity": "Návaznost začátku",
|
||||||
"Step": "Krok",
|
"Step": "Krok",
|
||||||
@@ -412,6 +417,7 @@
|
|||||||
"angle, height": "úhel, výška",
|
"angle, height": "úhel, výška",
|
||||||
"appearance.dielectric_ior": "Index lomu dielektrika",
|
"appearance.dielectric_ior": "Index lomu dielektrika",
|
||||||
"appearance.metallic": "Kovovost",
|
"appearance.metallic": "Kovovost",
|
||||||
|
"appearance.only_available": "Pouze dostupné vzhledy",
|
||||||
"appearance.pbr_help": "Tento povrch zobrazíte v renderu nebo v produktovém PNG. Bez lomu a průchodu světla.",
|
"appearance.pbr_help": "Tento povrch zobrazíte v renderu nebo v produktovém PNG. Bez lomu a průchodu světla.",
|
||||||
"appearance.pbr_opaque": "Neprůhledné PBR",
|
"appearance.pbr_opaque": "Neprůhledné PBR",
|
||||||
"appearance.roughness": "Drsnost",
|
"appearance.roughness": "Drsnost",
|
||||||
@@ -451,6 +457,7 @@
|
|||||||
"cmd.canvas_delete": "Smazat plátno",
|
"cmd.canvas_delete": "Smazat plátno",
|
||||||
"cmd.canvas_edit": "Upravit plátno",
|
"cmd.canvas_edit": "Upravit plátno",
|
||||||
"cmd.canvas_insert": "Plátno",
|
"cmd.canvas_insert": "Plátno",
|
||||||
|
"cmd.canvas_to_sketch": "Náčrt z plátna",
|
||||||
"cmd.component_activate": "Aktivovat komponentu",
|
"cmd.component_activate": "Aktivovat komponentu",
|
||||||
"cmd.component_break_link": "Zrušit odkaz",
|
"cmd.component_break_link": "Zrušit odkaz",
|
||||||
"cmd.component_capture_position": "Zachytit polohu",
|
"cmd.component_capture_position": "Zachytit polohu",
|
||||||
@@ -528,6 +535,7 @@
|
|||||||
"cmd.file_export": "Exportovat",
|
"cmd.file_export": "Exportovat",
|
||||||
"cmd.file_insert_mesh": "Vložit síť",
|
"cmd.file_insert_mesh": "Vložit síť",
|
||||||
"cmd.file_insert_step": "Vložit STEP",
|
"cmd.file_insert_step": "Vložit STEP",
|
||||||
|
"cmd.file_open_in_easyprint": "Otevřít v EasyPrint",
|
||||||
"cmd.file_save_mesh": "Uložit jako síť",
|
"cmd.file_save_mesh": "Uložit jako síť",
|
||||||
"cmd.file_slicers": "Nainstalované slicery",
|
"cmd.file_slicers": "Nainstalované slicery",
|
||||||
"cmd.frame_member": "Prvek rámu",
|
"cmd.frame_member": "Prvek rámu",
|
||||||
@@ -573,6 +581,7 @@
|
|||||||
"cmd.material_create": "Nový fyzický materiál",
|
"cmd.material_create": "Nový fyzický materiál",
|
||||||
"cmd.material_delete": "Smazat fyzický materiál",
|
"cmd.material_delete": "Smazat fyzický materiál",
|
||||||
"cmd.material_edit": "Upravit fyzický materiál",
|
"cmd.material_edit": "Upravit fyzický materiál",
|
||||||
|
"cmd.material_inspect": "Zkontrolovat fyzický materiál",
|
||||||
"cmd.material_list": "Seznam materiálů",
|
"cmd.material_list": "Seznam materiálů",
|
||||||
"cmd.material_properties_directional": "Směrový modul pružnosti",
|
"cmd.material_properties_directional": "Směrový modul pružnosti",
|
||||||
"cmd.material_properties_validate": "Ověřit data fyzického materiálu",
|
"cmd.material_properties_validate": "Ověřit data fyzického materiálu",
|
||||||
@@ -619,6 +628,8 @@
|
|||||||
"cmd.plastic_rules": "Seznam pravidel pro plasty",
|
"cmd.plastic_rules": "Seznam pravidel pro plasty",
|
||||||
"cmd.plastic_snap_fit": "Zacvakávací spoj",
|
"cmd.plastic_snap_fit": "Zacvakávací spoj",
|
||||||
"cmd.render_backends": "Renderovací jádra",
|
"cmd.render_backends": "Renderovací jádra",
|
||||||
|
"cmd.render_camera_fit": "Zarámovat objekt renderu",
|
||||||
|
"cmd.render_camera_get": "Prohlédnout kameru renderu",
|
||||||
"cmd.render_cancel": "Zrušit render",
|
"cmd.render_cancel": "Zrušit render",
|
||||||
"cmd.render_export": "Exportovat obrázek renderu",
|
"cmd.render_export": "Exportovat obrázek renderu",
|
||||||
"cmd.render_preflight": "Zkontrolovat požadavek na render",
|
"cmd.render_preflight": "Zkontrolovat požadavek na render",
|
||||||
@@ -626,6 +637,7 @@
|
|||||||
"cmd.render_settings_apply": "Použít kameru renderu",
|
"cmd.render_settings_apply": "Použít kameru renderu",
|
||||||
"cmd.render_settings_get": "Nastavení renderu",
|
"cmd.render_settings_get": "Nastavení renderu",
|
||||||
"cmd.render_settings_set": "Uložit nastavení renderu",
|
"cmd.render_settings_set": "Uložit nastavení renderu",
|
||||||
|
"cmd.render_stage_backdrop": "Uložit fyzické pozadí renderu",
|
||||||
"cmd.render_start": "Renderovat obrázek",
|
"cmd.render_start": "Renderovat obrázek",
|
||||||
"cmd.render_status": "Průběh renderu",
|
"cmd.render_status": "Průběh renderu",
|
||||||
"cmd.select_clear": "Zrušit výběr",
|
"cmd.select_clear": "Zrušit výběr",
|
||||||
@@ -964,6 +976,7 @@
|
|||||||
"motion.key_here": "Vložit klíčový snímek sem",
|
"motion.key_here": "Vložit klíčový snímek sem",
|
||||||
"motion.key_here_hint": "Přidat v tomto kroku klíčový snímek s aktuální hodnotou kloubu",
|
"motion.key_here_hint": "Přidat v tomto kroku klíčový snímek s aktuální hodnotou kloubu",
|
||||||
"motion.no_collisions": "Během studie nedochází ke kolizím",
|
"motion.no_collisions": "Během studie nedochází ke kolizím",
|
||||||
|
"motion.plot_quantity": "Množství",
|
||||||
"motion.step_back": "Krok zpět",
|
"motion.step_back": "Krok zpět",
|
||||||
"motion.step_forward": "Krok vpřed",
|
"motion.step_forward": "Krok vpřed",
|
||||||
"motion.to_end": "Na konec",
|
"motion.to_end": "Na konec",
|
||||||
@@ -989,6 +1002,16 @@
|
|||||||
"pattern.direction_1": "Směr 1",
|
"pattern.direction_1": "Směr 1",
|
||||||
"pattern.direction_2": "Směr 2",
|
"pattern.direction_2": "Směr 2",
|
||||||
"pattern.flip_direction": "Převrátit směr",
|
"pattern.flip_direction": "Převrátit směr",
|
||||||
|
"perf.click_for_details": "Klikněte pro podrobnosti: graf časů snímků, histogram a co vykreslila GPU",
|
||||||
|
"perf.draw_calls": "Volání vykreslení",
|
||||||
|
"perf.line_segments": "Úsečky",
|
||||||
|
"perf.low_1": "1% minimum",
|
||||||
|
"perf.renderer": "Vykreslování",
|
||||||
|
"perf.scene_build": "Sestavení scény",
|
||||||
|
"perf.triangles": "Trojúhelníky",
|
||||||
|
"perf.ui_time": "Čas UI",
|
||||||
|
"perf.viewport": "Pohled",
|
||||||
|
"perf.worst": "nejhorší",
|
||||||
"pick a hole to seat it, or OK places it at the origin": "vyberte otvor pro usazení, nebo OK umístí do počátku",
|
"pick a hole to seat it, or OK places it at the origin": "vyberte otvor pro usazení, nebo OK umístí do počátku",
|
||||||
"pick one or two vertices, edges or faces": "vyberte jeden nebo dva vrcholy, hrany či plochy",
|
"pick one or two vertices, edges or faces": "vyberte jeden nebo dva vrcholy, hrany či plochy",
|
||||||
"prefs.cpu": "CPU (softwarově)",
|
"prefs.cpu": "CPU (softwarově)",
|
||||||
@@ -1001,20 +1024,51 @@
|
|||||||
"recovery.min_ago": "před {count} min",
|
"recovery.min_ago": "před {count} min",
|
||||||
"recovery.never_saved": "nikdy neuloženo",
|
"recovery.never_saved": "nikdy neuloženo",
|
||||||
"render.background": "Pozadí scény",
|
"render.background": "Pozadí scény",
|
||||||
|
"render.bloom_enable": "Záře ve výstupu",
|
||||||
|
"render.bloom_help": "Kreativní záře z lineárních jasů se třemi normalizovanými průchody. Poloměr v pixelech výstupu, přičtení před sRGB. Nejde o simulaci čočky, objemu ani zlepšení konvergence. Surové EXR se nemění.",
|
||||||
|
"render.bloom_opaque": "Záře vyžaduje neprůhledný výstup. Průhledné PNG se odmítne, neprovede se skryté sloučení.",
|
||||||
|
"render.bloom_radius": "Poloměr záře",
|
||||||
|
"render.bloom_strength": "Síla záře",
|
||||||
|
"render.bloom_threshold": "Lineární práh jasů",
|
||||||
|
"render.cpu_aa_help": "Prostorové vzorky: více vzorků zlepší hrany a prodlouží vykreslení.",
|
||||||
|
"render.cpu_key_rim": "Hlavní a obrysové",
|
||||||
|
"render.cpu_lighting": "Předvolba osvětlení",
|
||||||
|
"render.cpu_neutral": "Neutrální",
|
||||||
|
"render.cpu_opaque_required": "CPU trasování vyžaduje neprůhledné pozadí. Vypněte průhledné pozadí.",
|
||||||
|
"render.cpu_options_pending": "Panel podporuje vzorky hran, předvolby světel, stíny a expozici. Další volby jsou v API.",
|
||||||
|
"render.cpu_primary_samples": "Vzorky hran na pixel",
|
||||||
|
"render.cpu_shadows": "Vrhat stíny",
|
||||||
|
"render.cpu_summary": "Neprůhledný CPU PNG · světla · stíny · bez skla a textur",
|
||||||
|
"render.cpu_warm_cool": "Teplé a studené",
|
||||||
|
"render.exr_pending": "GPU může uchovat surové lineární EXR. Komprese, vícevrstvé obrazy a pomocné průchody zatím nejsou dostupné.",
|
||||||
"render.fit": "Přizpůsobit produktu",
|
"render.fit": "Přizpůsobit produktu",
|
||||||
|
"render.gpu_depth": "Maximální hloubka cesty",
|
||||||
|
"render.gpu_options_help": "Tyto volby platí pro tuto úlohu. Expozice vychází z uloženého nastavení.",
|
||||||
|
"render.gpu_path_failed": "Trasování cest GPU není dostupné",
|
||||||
|
"render.gpu_path_first_setup": "První příprava na této GPU může trvat několik minut; SolidCraft lze mezitím používat. Při dalších spuštěních se použijí zkompilované shadery, pokud je ovladač uchová.",
|
||||||
|
"render.gpu_path_preparing": "Trasování cest GPU: kompilace shaderů…",
|
||||||
|
"render.gpu_seed": "Náhodné semeno",
|
||||||
|
"render.gpu_unavailable": "Trasování cest GPU není na tomto zařízení připraveno.",
|
||||||
|
"render.image_advanced": "Pokročilé nastavení GPU",
|
||||||
"render.image_cancelled": "Render zrušen",
|
"render.image_cancelled": "Render zrušen",
|
||||||
"render.image_cancelling": "Rušení",
|
"render.image_cancelling": "Rušení",
|
||||||
"render.image_completed": "Obrázek připraven k exportu",
|
"render.image_completed": "Obrázek připraven k exportu",
|
||||||
"render.image_encoding": "Kódování PNG",
|
"render.image_encoding": "Kódování PNG",
|
||||||
"render.image_export": "Exportovat PNG",
|
"render.image_export": "Exportovat hotový obrázek",
|
||||||
|
"render.image_exposure": "Expozice",
|
||||||
"render.image_failed": "Render selhal",
|
"render.image_failed": "Render selhal",
|
||||||
"render.image_height": "Výška",
|
"render.image_height": "Výška",
|
||||||
"render.image_help": "Náhledový obrázek z CPU · PNG · přibližná průhlednost",
|
"render.image_help": "Náhledový obrázek z CPU · PNG · přibližná průhlednost",
|
||||||
|
"render.image_host_missing": "Není dostupný vykreslovací hostitel.",
|
||||||
|
"render.image_method": "Metoda obrazu",
|
||||||
"render.image_overwrite": "Nahradit existující soubor",
|
"render.image_overwrite": "Nahradit existující soubor",
|
||||||
"render.image_preparing": "Příprava obrázku",
|
"render.image_preparing": "Příprava obrázku",
|
||||||
|
"render.image_progressive": "Progresivní render",
|
||||||
"render.image_queued": "Čeká na render",
|
"render.image_queued": "Čeká na render",
|
||||||
"render.image_reduce": "Zkuste menší obrázek nebo jednodušší scénu.",
|
"render.image_reduce": "Zkuste menší obrázek nebo jednodušší scénu.",
|
||||||
"render.image_running": "Renderování obrázku",
|
"render.image_running": "Renderování obrázku",
|
||||||
|
"render.image_samples": "Vzorků na pixel",
|
||||||
|
"render.image_scene_stale": "Před kontrolou nebo spuštěním dokončete modelování nebo obnovte scénu.",
|
||||||
"render.image_stale": "Tento obrázek používá scénu zachycenou před pozdějšími změnami.",
|
"render.image_stale": "Tento obrázek používá scénu zachycenou před pozdějšími změnami.",
|
||||||
"render.image_start": "Spustit render",
|
"render.image_start": "Spustit render",
|
||||||
"render.image_supported": "Požadavek na render je podporován; fronta a paměť se znovu ověří při spuštění.",
|
"render.image_supported": "Požadavek na render je podporován; fronta a paměť se znovu ověří při spuštění.",
|
||||||
@@ -1024,17 +1078,135 @@
|
|||||||
"render.image_unknown": "Stav renderu není k dispozici",
|
"render.image_unknown": "Stav renderu není k dispozici",
|
||||||
"render.image_use_largest": "Použít největší velikost v tomto poměru stran:",
|
"render.image_use_largest": "Použít největší velikost v tomto poměru stran:",
|
||||||
"render.image_width": "Šířka",
|
"render.image_width": "Šířka",
|
||||||
|
"render.material_absorption": "Absorpce R · G · B (na mm)",
|
||||||
|
"render.material_add": "Přidat nebo upravit těleso",
|
||||||
|
"render.material_assignments": "Přiřazení těles",
|
||||||
|
"render.material_binding_enable": "Zahrnout úpravy tohoto tělesa",
|
||||||
|
"render.material_box": "Osově zarovnaný kvádr",
|
||||||
|
"render.material_browse": "Vybrat obrázek…",
|
||||||
|
"render.material_certification": "Uzavřené sklo používá geometrickou vzdálenost. GPU příprava ověřuje topologii, orientaci, překryvy a optická rozhraní; kontrola jen přijímá požadavek.",
|
||||||
|
"render.material_choose_body": "Vybrat těleso scény",
|
||||||
|
"render.material_closed": "Uzavřená objemová síť",
|
||||||
|
"render.material_coat": "Čirý povlak na základním materiálu",
|
||||||
|
"render.material_coat_enable": "Zapnout čirý povlak",
|
||||||
|
"render.material_coat_help": "Ilustrativní dielektrický povlak na stávajícím neprůhledném vzhledu. Nulová váha ponechá základ beze změny.",
|
||||||
|
"render.material_color_map": "Obraz základní barvy (sRGB)",
|
||||||
|
"render.material_custom": "Vlastní ilustrativní optika",
|
||||||
|
"render.material_enable": "Použít tyto úpravy materiálů GPU",
|
||||||
|
"render.material_filter": "Filtrovat tělesa scény…",
|
||||||
|
"render.material_filter_help": "Zobrazuje se nejvýše 128 shod. U velkých scén zpřesněte filtr.",
|
||||||
|
"render.material_glass": "Sklo a optická absorpce",
|
||||||
|
"render.material_glass_enable": "Použít fyzikální sklo na těleso",
|
||||||
|
"render.material_glass_exclusive": "Tento renderer nepodporuje sklo s povlakem nebo mapami na témže tělese.",
|
||||||
|
"render.material_glass_help": "Původní ilustrativní recepty. Vzorky ukazují propustnost, ne render. Absorpce je −ln(lineární propustnosti) / referenční vzdálenost; alfa se nemění.",
|
||||||
|
"render.material_gpu_required": "Aktivní úpravy vyžadují GPU tracing. Před kontrolou nebo spuštěním vyberte GPU nebo úpravy vypněte.",
|
||||||
|
"render.material_ior": "Index lomu (IOR)",
|
||||||
|
"render.material_limits": "Nejvýše 128 nastavení těles, 32 oddělených skel, 64 povlaků a 128 vazeb textur. Shodné mapy sdílejí paměť; limity zařízení a celkové paměti zůstávají aktivní.",
|
||||||
|
"render.material_map_invalid": "Cesty map musí být omezené místní cesty; síla normál musí být konečná mezi 0 a 1.",
|
||||||
|
"render.material_map_required": "Před použitím map vyberte obraz barvy nebo normál.",
|
||||||
|
"render.material_maps": "Rovinné mapy barvy a normál",
|
||||||
|
"render.material_maps_enable": "Zapnout mapy neprůhledného tělesa",
|
||||||
|
"render.material_maps_help": "PNG/JPEG do 1024×1024; celkem 16 MiB kódovaných dat. U a V jsou kolmé vektory opakování ve světových mm (nejvýše 128 opakování). Barva je sRGB, normály OpenGL +Y. Soubory se zachytí při kontrole/spuštění.",
|
||||||
|
"render.material_normal_map": "Obraz normál (OpenGL, +Y)",
|
||||||
|
"render.material_normal_strength": "Síla normál (0–1)",
|
||||||
|
"render.material_origin": "Počátek mapování X · Y · Z (mm)",
|
||||||
|
"render.material_refresh": "Obnovit tělesa scény",
|
||||||
|
"render.material_refresh_needed": "Scéna se změnila. Před přidáním cíle obnovte seznam.",
|
||||||
|
"render.material_remove": "Odstranit přiřazení",
|
||||||
|
"render.material_repeat_u": "Jedno opakování U X · Y · Z (mm)",
|
||||||
|
"render.material_repeat_v": "Jedno opakování V X · Y · Z (mm)",
|
||||||
|
"render.material_revalidate": "Znovu ověřit těleso",
|
||||||
|
"render.material_revalidate_needed": "Přiřazení patří ke starší revizi scény. Před renderem znovu ověřte přesnou identitu tělesa.",
|
||||||
|
"render.material_roughness": "Drsnost povlaku (0,045–1)",
|
||||||
|
"render.material_shadow": "Propouštět přímé stínové paprsky",
|
||||||
|
"render.material_target_missing": "Pořadí a název tělesa již nesouhlasí. Odstraňte přiřazení a znovu výslovně vyberte těleso.",
|
||||||
|
"render.material_thickness": "Tloušťka vrstvy (mm)",
|
||||||
|
"render.material_thin": "Tenká vrstva",
|
||||||
|
"render.material_title": "Materiály GPU obrazu",
|
||||||
|
"render.material_transient": "Dočasné optické úpravy pro tuto kartu. Neukládají se do návrhu, nastavení renderu ani knihovny materiálů.",
|
||||||
|
"render.material_weight": "Váha povlaku (0–1)",
|
||||||
|
"render.method_cpu": "Trasování paprsků CPU",
|
||||||
|
"render.method_gpu": "Trasování cest GPU",
|
||||||
|
"render.method_raster": "CPU rastr",
|
||||||
"render.navigation_help": "Kamera se ovládá stejně jako v návrhu (Předvolby › Navigace). Uložit nastavení zaznamená aktuální kameru.",
|
"render.navigation_help": "Kamera se ovládá stejně jako v návrhu (Předvolby › Navigace). Uložit nastavení zaznamená aktuální kameru.",
|
||||||
"render.opaque_image_summary": "Náhledové PNG · neprůhledné PBR · smíšená průhlednost",
|
"render.opaque_image_summary": "Náhledové PNG · neprůhledné PBR · smíšená průhlednost",
|
||||||
"render.opaque_preview_help": "Neprůhledné PBR a jednoduché barvy; smíšená průhlednost. Lom světla, HDRI a finální render zatím nejsou k dispozici.",
|
"render.opaque_preview_help": "Neprůhledné PBR a jednoduché barvy; smíšená průhlednost. Lom světla, HDRI a finální render zatím nejsou k dispozici.",
|
||||||
|
"render.output_format_status": "PNG je přesný dokončený obraz. Volitelné GPU EXR uchovává lineární FLOAT32 radianci před filtry. Export nikdy nenahrazuje výsledek náhledem nebo jinou úlohou.",
|
||||||
"render.perspective": "Perspektivní kamera",
|
"render.perspective": "Perspektivní kamera",
|
||||||
"render.preview": "Integrovaný náhled",
|
"render.preview": "Integrovaný náhled",
|
||||||
"render.preview_help": "Rastrové stínování a smíšená průhlednost. Lom světla, HDRI a finální render zatím nejsou k dispozici.",
|
"render.preview_help": "Rastrové stínování a smíšená průhlednost. Lom světla, HDRI a finální render zatím nejsou k dispozici.",
|
||||||
|
"render.progressive_image_summary": "Náhledové PNG · neprůhledné PBR · postupné vzorkování",
|
||||||
"render.reload_settings": "Znovu načíst uložené nastavení",
|
"render.reload_settings": "Znovu načíst uložené nastavení",
|
||||||
"render.restore_camera": "Obnovit uloženou kameru",
|
"render.restore_camera": "Obnovit uloženou kameru",
|
||||||
|
"render.result_actual_help": "Jeden pixel obrázku na jeden pixel obrazovky.",
|
||||||
|
"render.result_capture": "Zachycená revize",
|
||||||
|
"render.result_current": "Zachycená revize modelu je aktuální.",
|
||||||
|
"render.result_empty": "Zatím není hotový obrázek. Zkontrolujte nastavení a spusťte vykreslování.",
|
||||||
|
"render.result_fit": "Přizpůsobit obrázek",
|
||||||
|
"render.result_job": "Úloha",
|
||||||
|
"render.result_navigation": "Posun a přiblížení používají nastavení navigace. Mezerník + tažení posouvá.",
|
||||||
|
"render.result_open": "Otevřít hotový obrázek na hlavním plátně.",
|
||||||
|
"render.result_preview": "Živý náhled",
|
||||||
|
"render.result_retained": "Zobrazuje se poslední hotový obrázek; novější vykreslení jej zatím nenahradilo.",
|
||||||
|
"render.result_title": "Výsledek vykreslení",
|
||||||
"render.return_design": "Zpět k návrhu",
|
"render.return_design": "Zpět k návrhu",
|
||||||
|
"render.ribbon_backgrounds": "Pozadí",
|
||||||
|
"render.ribbon_check": "Kontrola",
|
||||||
|
"render.ribbon_check_help": "Ověřit přesný aktuální návrh renderu. Bez skrytého přepnutí vykreslovače, zmenšení nebo nahrazení zdrojů.",
|
||||||
|
"render.ribbon_edit_lights": "Upravit světla",
|
||||||
|
"render.ribbon_environment_help": "HDR osvětlení, pozadí kamery a fyzické plochy jsou samostatné ovládací prvky s potvrzením nahrazení.",
|
||||||
|
"render.ribbon_finish_dialog": "Nejprve dokončete dialog souboru nebo potvrzení.",
|
||||||
|
"render.ribbon_frame": "Zarámovat",
|
||||||
|
"render.ribbon_hdr_library": "Knihovna HDR",
|
||||||
|
"render.ribbon_job_active": "Render již běží; před spuštěním dalšího jej výslovně zrušte.",
|
||||||
|
"render.ribbon_light_rigs": "Sestavy světel",
|
||||||
|
"render.ribbon_lights_help": "Zkontrolovat světelné sestavy nebo upravit podporovaná světla; aktuální nastavení nahradí až výslovné použití.",
|
||||||
|
"render.ribbon_materials": "Materiály",
|
||||||
|
"render.ribbon_materials_help": "Otevřít inspektor vzhledu a původní povrchy. Optické úpravy nemění skrytě technické vlastnosti.",
|
||||||
|
"render.ribbon_no_active_job": "Není aktivní render ke zrušení.",
|
||||||
|
"render.ribbon_no_result": "Před exportem dokončete render.",
|
||||||
|
"render.ribbon_no_saved_camera": "Před obnovením kamery uložte záběr.",
|
||||||
|
"render.ribbon_saved_camera": "Uložená kamera",
|
||||||
|
"render.ribbon_shots": "Záběry",
|
||||||
|
"render.ribbon_studios": "Studia",
|
||||||
|
"render.ribbon_studios_help": "Procházejte dostupná studia a před použitím zkontrolujte nahrazované prvky. Koncepty zůstávají označené.",
|
||||||
|
"render.ribbon_surface_maps": "Mapy povrchu",
|
||||||
"render.save_setup": "Uložit nastavení",
|
"render.save_setup": "Uložit nastavení",
|
||||||
"render.setup_name": "Název nastavení",
|
"render.setup_name": "Název nastavení",
|
||||||
|
"render.studio_add_area": "Přidat plošné světlo",
|
||||||
|
"render.studio_ambient": "Konstantní zář prostředí",
|
||||||
|
"render.studio_aperture": "Poloměr clony",
|
||||||
|
"render.studio_area": "Plošné světlo",
|
||||||
|
"render.studio_area_help": "Nejvýše čtyři jednostranné obdélníky. Kolmé poloviční hrany U a V určují velikost; U × V míří na osvětlenou stranu. Souřadnice jsou světové milimetry.",
|
||||||
|
"render.studio_center": "Střed X, Y, Z (mm)",
|
||||||
|
"render.studio_denoise": "Potlačit šum v hotovém obrazu",
|
||||||
|
"render.studio_denoise_help": "Závěrečný filtr respektuje hrany; může změkčit detaily. Sklo a ostré zrcadlové povrchy se nefiltrují.",
|
||||||
|
"render.studio_direction": "Směr ke slunci (X, Y, Z)",
|
||||||
|
"render.studio_environment": "Prostředí",
|
||||||
|
"render.studio_environment_bounds": "Intenzita prostředí musí být 0–100 a otočení −360° až 360°.",
|
||||||
|
"render.studio_environment_none": "Bez mapy prostředí",
|
||||||
|
"render.studio_focus": "Osová zaostřovací vzdálenost",
|
||||||
|
"render.studio_half_u": "Poloviční hrana U (mm)",
|
||||||
|
"render.studio_half_v": "Poloviční hrana V (mm)",
|
||||||
|
"render.studio_hdr": "Soubor Radiance HDR",
|
||||||
|
"render.studio_hdr_browse": "Vybrat HDR…",
|
||||||
|
"render.studio_hdr_help": "Radiance .hdr, panorama 2:1, nejvýše 2048 × 1024. EXR není dostupné. Předpoklad barev platí jen při neurčených primárních barvách.",
|
||||||
|
"render.studio_hdr_required": "Vyberte místní soubor .hdr.",
|
||||||
|
"render.studio_hdr_srgb": "Neurčené primární barvy chápat jako lineární sRGB",
|
||||||
|
"render.studio_intensity": "Intenzita prostředí",
|
||||||
|
"render.studio_lens": "Hloubka ostrosti",
|
||||||
|
"render.studio_lens_perspective": "Hloubka ostrosti vyžaduje perspektivní kameru.",
|
||||||
|
"render.studio_lighting": "Studiové osvětlení",
|
||||||
|
"render.studio_lighting_enable": "Použít vlastní studiové osvětlení",
|
||||||
|
"render.studio_radiance": "Lineární RGB zář",
|
||||||
|
"render.studio_remove_area": "Odebrat plošné světlo",
|
||||||
|
"render.studio_rotation": "Otočení prostředí",
|
||||||
|
"render.studio_runtime_help": "Optické úpravy těles jsou v Materiálech GPU obrazu. Ovládání studia a materiálů je dočasné a nemění uložené vzhledy.",
|
||||||
|
"render.studio_sky": "Umělecká obloha",
|
||||||
|
"render.studio_sky_help": "Původní přechod oblohy pro osvětlení; nejde o kalibrovaný model atmosféry.",
|
||||||
|
"render.studio_sun": "Slunce",
|
||||||
|
"render.studio_sun_radius": "Úhlový poloměr",
|
||||||
|
"render.studio_tone_map": "Mapování tónů",
|
||||||
"render.unavailable_preview": "Toto nastavení vyžaduje nedostupný profil náhledu.",
|
"render.unavailable_preview": "Toto nastavení vyžaduje nedostupný profil náhledu.",
|
||||||
"render.unsaved": "Neuložené změny náhledu",
|
"render.unsaved": "Neuložené změny náhledu",
|
||||||
"render.use_preview": "Použít integrovaný náhled",
|
"render.use_preview": "Použít integrovaný náhled",
|
||||||
@@ -1064,6 +1236,7 @@
|
|||||||
"search.try": "Zadejte název příkazu, prvek v tomto návrhu nebo parametr. Chcete-li spustit příkaz s hodnotami, zadejte jeho id a objekt JSON: {example}",
|
"search.try": "Zadejte název příkazu, prvek v tomto návrhu nebo parametr. Chcete-li spustit příkaz s hodnotami, zadejte jeho id a objekt JSON: {example}",
|
||||||
"search.valid": "Platné",
|
"search.valid": "Platné",
|
||||||
"settings.display_quality_note": "Jemnější úrovně kreslí zakřivené plochy a hrany hladčeji, ale síťování trvá déle. Mění se jen zobrazení, nikdy návrh ani exporty.",
|
"settings.display_quality_note": "Jemnější úrovně kreslí zakřivené plochy a hrany hladčeji, ale síťování trvá déle. Mění se jen zobrazení, nikdy návrh ani exporty.",
|
||||||
|
"settings.frame_rate_details_note": "Přidá graf časů posledních snímků s vykreslenými trojúhelníky, histogram časů snímků a to, co vykreslila GPU. Kliknutím na snímkovou frekvenci v pohledu je zobrazíte nebo skryjete.",
|
||||||
"settings.frame_rate_note": "Zobrazuje snímky za sekundu v pravém dolním rohu pohledu.",
|
"settings.frame_rate_note": "Zobrazuje snímky za sekundu v pravém dolním rohu pohledu.",
|
||||||
"settings.measure_axis_distances": "Zobrazit vzdálenosti X/Y/Z",
|
"settings.measure_axis_distances": "Zobrazit vzdálenosti X/Y/Z",
|
||||||
"settings.measure_axis_distances_help": "Při otevřeném měření zobrazit kromě celkové vzdálenosti i složky ve směru os.",
|
"settings.measure_axis_distances_help": "Při otevřeném měření zobrazit kromě celkové vzdálenosti i složky ve směru os.",
|
||||||
@@ -1120,6 +1293,10 @@
|
|||||||
"toolbar.customize_note": "Karta {tab}. Zaškrtnutím příkazu přidáte jeho tlačítko na panel nástrojů. Můžete také přetáhnout řádek z rozbalovací nabídky panelu na panel nástrojů, odstranit tlačítko přetažením mimo panel nástrojů nebo použít připínáček na řádku rozbalovací nabídky.",
|
"toolbar.customize_note": "Karta {tab}. Zaškrtnutím příkazu přidáte jeho tlačítko na panel nástrojů. Můžete také přetáhnout řádek z rozbalovací nabídky panelu na panel nástrojů, odstranit tlačítko přetažením mimo panel nástrojů nebo použít připínáček na řádku rozbalovací nabídky.",
|
||||||
"toolbar.image": "OBRÁZEK",
|
"toolbar.image": "OBRÁZEK",
|
||||||
"toolbar.render": "RENDER",
|
"toolbar.render": "RENDER",
|
||||||
|
"toolbar.render_appearance": "VZHLED",
|
||||||
|
"toolbar.render_camera": "KAMERA",
|
||||||
|
"toolbar.render_environment": "PROSTŘEDÍ",
|
||||||
|
"toolbar.render_lighting": "OSVĚTLENÍ",
|
||||||
"toolbar.render_scene": "SCÉNA",
|
"toolbar.render_scene": "SCÉNA",
|
||||||
"trace.points": "Bodů podél cesty: {count}",
|
"trace.points": "Bodů podél cesty: {count}",
|
||||||
"trace.stopped_by_contact": "Končí ve vzorku {sample}: {a} by prošlo skrz {b}",
|
"trace.stopped_by_contact": "Končí ve vzorku {sample}: {a} by prošlo skrz {b}",
|
||||||
@@ -1318,7 +1495,7 @@
|
|||||||
"ui.agent_chat_pop_out": "Otevřít ve vlastním okně, které lze přesunout na jinou obrazovku",
|
"ui.agent_chat_pop_out": "Otevřít ve vlastním okně, které lze přesunout na jinou obrazovku",
|
||||||
"ui.agent_chat_previous_picture": "Předchozí obrázek",
|
"ui.agent_chat_previous_picture": "Předchozí obrázek",
|
||||||
"ui.agent_chat_privacy": "Nic se nikam neodesílá, jen agentovi, kterého spouštíte pod vlastním účtem.",
|
"ui.agent_chat_privacy": "Nic se nikam neodesílá, jen agentovi, kterého spouštíte pod vlastním účtem.",
|
||||||
"ui.agent_chat_privacy_note": "SolidCraft nic nikam neodesílá: agent, kterého spouštíte, komunikuje se svou službou pod vaším účtem. SolidCraft nikdy nevidí ani neukládá klíč či heslo.",
|
"ui.agent_chat_privacy_note": "Chat sám nic nikam neodesílá: agent, kterého spouštíte, komunikuje se svou službou pod vaším účtem. SolidCraft nikdy nevidí ani neukládá klíč či heslo.",
|
||||||
"ui.agent_chat_queue": "Zařadit",
|
"ui.agent_chat_queue": "Zařadit",
|
||||||
"ui.agent_chat_queue_full": "Čeká příliš mnoho zpráv: některou odeberte nebo počkejte na agenta.",
|
"ui.agent_chat_queue_full": "Čeká příliš mnoho zpráv: některou odeberte nebo počkejte na agenta.",
|
||||||
"ui.agent_chat_queued": "Ve frontě",
|
"ui.agent_chat_queued": "Ve frontě",
|
||||||
@@ -1382,6 +1559,7 @@
|
|||||||
"ui.ai_http_busy": "endpoint je zaneprázdněný nebo překročil limit; zkuste to později",
|
"ui.ai_http_busy": "endpoint je zaneprázdněný nebo překročil limit; zkuste to později",
|
||||||
"ui.ai_http_key": "endpoint odmítl klíč: zkontrolujte jej v Předvolby > AI",
|
"ui.ai_http_key": "endpoint odmítl klíč: zkontrolujte jej v Předvolby > AI",
|
||||||
"ui.ai_http_not_found": "takový endpoint nebo model neexistuje: zkontrolujte základní URL a název modelu",
|
"ui.ai_http_not_found": "takový endpoint nebo model neexistuje: zkontrolujte základní URL a název modelu",
|
||||||
|
"ui.ai_http_too_large": "konverzace je pro tento endpoint příliš velká; začněte nový chat",
|
||||||
"ui.ai_key": "API klíč",
|
"ui.ai_key": "API klíč",
|
||||||
"ui.ai_key_hint": "volitelné; uloženo v systémové klíčence",
|
"ui.ai_key_hint": "volitelné; uloženo v systémové klíčence",
|
||||||
"ui.ai_key_needs_https": "Klíč se odesílá pouze přes HTTPS nebo na tento počítač.",
|
"ui.ai_key_needs_https": "Klíč se odesílá pouze přes HTTPS nebo na tento počítač.",
|
||||||
@@ -1409,7 +1587,6 @@
|
|||||||
"ui.ai_permissions": "Oprávnění",
|
"ui.ai_permissions": "Oprávnění",
|
||||||
"ui.ai_preset": "Předvolba",
|
"ui.ai_preset": "Předvolba",
|
||||||
"ui.ai_remove": "Odebrat",
|
"ui.ai_remove": "Odebrat",
|
||||||
"ui.ai_request_limit": "zastaveno po 24 požadavcích na jednu zprávu; pro pokračování pošlete další zprávu",
|
|
||||||
"ui.ai_reset": "Obnovit",
|
"ui.ai_reset": "Obnovit",
|
||||||
"ui.ai_settings": "Nastavení AI…",
|
"ui.ai_settings": "Nastavení AI…",
|
||||||
"ui.ai_show_features": "Zobrazit funkce AI",
|
"ui.ai_show_features": "Zobrazit funkce AI",
|
||||||
@@ -1503,6 +1680,7 @@
|
|||||||
"ui.command_done": "{command} hotovo",
|
"ui.command_done": "{command} hotovo",
|
||||||
"ui.command_palette_hint": "Zadejte příkaz, např. {example} — nebo stiskněte S pro hledání",
|
"ui.command_palette_hint": "Zadejte příkaz, např. {example} — nebo stiskněte S pro hledání",
|
||||||
"ui.concentric": "Soustřednost",
|
"ui.concentric": "Soustřednost",
|
||||||
|
"ui.cone": "Kužel",
|
||||||
"ui.conic_curve": "Kuželosečka",
|
"ui.conic_curve": "Kuželosečka",
|
||||||
"ui.constant": "Konstantní",
|
"ui.constant": "Konstantní",
|
||||||
"ui.constraints_conflict": "Konflikt vazeb",
|
"ui.constraints_conflict": "Konflikt vazeb",
|
||||||
@@ -1561,6 +1739,11 @@
|
|||||||
"ui.draft": "Úkos",
|
"ui.draft": "Úkos",
|
||||||
"ui.drawing": "Výkres",
|
"ui.drawing": "Výkres",
|
||||||
"ui.drill_point": "Špička vrtáku",
|
"ui.drill_point": "Špička vrtáku",
|
||||||
|
"ui.easyprint_consent": "EasyPrint je slicer od Printables v prohlížeči. Aby se v něm model otevřel, SolidCraft jej nahraje na servery Printables. Odkaz vyprší po 30 minutách a musíte být přihlášeni k Printables. Pokračovat?",
|
||||||
|
"ui.easyprint_failed": "Nahrání do EasyPrint se nezdařilo: {error}",
|
||||||
|
"ui.easyprint_opened": "Otevřeno v EasyPrint",
|
||||||
|
"ui.easyprint_row": "EasyPrint (Printables, v prohlížeči)",
|
||||||
|
"ui.easyprint_uploading": "Nahrávám na Printables…",
|
||||||
"ui.edit": "Upravit",
|
"ui.edit": "Upravit",
|
||||||
"ui.editJointLimits": "Upravit limity kloubu",
|
"ui.editJointLimits": "Upravit limity kloubu",
|
||||||
"ui.edit_section_analysis": "Upravit analýzu řezu",
|
"ui.edit_section_analysis": "Upravit analýzu řezu",
|
||||||
@@ -1586,6 +1769,8 @@
|
|||||||
"ui.filter_commands_or_keys": "Filtrovat příkazy nebo klávesy",
|
"ui.filter_commands_or_keys": "Filtrovat příkazy nebo klávesy",
|
||||||
"ui.findInTimeline": "Najít na časové ose",
|
"ui.findInTimeline": "Najít na časové ose",
|
||||||
"ui.findInWindow": "Najít v okně",
|
"ui.findInWindow": "Najít v okně",
|
||||||
|
"ui.fine": "Jemná",
|
||||||
|
"ui.finest": "Nejjemnější",
|
||||||
"ui.finish_sketch": "Dokončit náčrt",
|
"ui.finish_sketch": "Dokončit náčrt",
|
||||||
"ui.fit": "Přizpůsobit",
|
"ui.fit": "Přizpůsobit",
|
||||||
"ui.fix_unfix": "Zafixovat/uvolnit",
|
"ui.fix_unfix": "Zafixovat/uvolnit",
|
||||||
@@ -1593,6 +1778,7 @@
|
|||||||
"ui.flip": "Převrátit",
|
"ui.flip": "Převrátit",
|
||||||
"ui.format": "Formát",
|
"ui.format": "Formát",
|
||||||
"ui.frame_rate": "Snímková frekvence",
|
"ui.frame_rate": "Snímková frekvence",
|
||||||
|
"ui.frame_rate_details": "Podrobnosti snímkové frekvence",
|
||||||
"ui.front": "Zepředu",
|
"ui.front": "Zepředu",
|
||||||
"ui.fully_constrained": "Plně zavazbeno",
|
"ui.fully_constrained": "Plně zavazbeno",
|
||||||
"ui.function": "Funkce",
|
"ui.function": "Funkce",
|
||||||
@@ -1615,6 +1801,7 @@
|
|||||||
"ui.heading_circular_pattern": "KRUHOVÉ POLE",
|
"ui.heading_circular_pattern": "KRUHOVÉ POLE",
|
||||||
"ui.heading_coil": "ŠROUBOVICE",
|
"ui.heading_coil": "ŠROUBOVICE",
|
||||||
"ui.heading_combine": "KOMBINOVAT",
|
"ui.heading_combine": "KOMBINOVAT",
|
||||||
|
"ui.heading_cone": "KUŽEL",
|
||||||
"ui.heading_configure": "KONFIGURACE",
|
"ui.heading_configure": "KONFIGURACE",
|
||||||
"ui.heading_constraints": "VAZBY",
|
"ui.heading_constraints": "VAZBY",
|
||||||
"ui.heading_construct": "KONSTRUKCE",
|
"ui.heading_construct": "KONSTRUKCE",
|
||||||
@@ -1674,6 +1861,7 @@
|
|||||||
"ui.heading_torus": "ANULOID",
|
"ui.heading_torus": "ANULOID",
|
||||||
"ui.heading_utilities": "NÁSTROJE",
|
"ui.heading_utilities": "NÁSTROJE",
|
||||||
"ui.heading_utility": "NÁSTROJE",
|
"ui.heading_utility": "NÁSTROJE",
|
||||||
|
"ui.heading_weldments": "SVAŘENCE",
|
||||||
"ui.help": "Nápověda",
|
"ui.help": "Nápověda",
|
||||||
"ui.hide": "Skrýt",
|
"ui.hide": "Skrýt",
|
||||||
"ui.hideAxes": "Skrýt osy",
|
"ui.hideAxes": "Skrýt osy",
|
||||||
@@ -1681,6 +1869,8 @@
|
|||||||
"ui.hideOrigin": "Skrýt počátek",
|
"ui.hideOrigin": "Skrýt počátek",
|
||||||
"ui.hidePlanes": "Skrýt roviny",
|
"ui.hidePlanes": "Skrýt roviny",
|
||||||
"ui.hideProfile": "Skrýt profil",
|
"ui.hideProfile": "Skrýt profil",
|
||||||
|
"ui.hide_origin_by_default": "Ve výchozím stavu skrýt počátek",
|
||||||
|
"ui.hide_origin_note": "Nové návrhy začínají se skrytou složkou Počátek. Návrh si ponechá vlastní nastavení počátku, jakmile ho zobrazíte nebo skryjete.",
|
||||||
"ui.history_back": "O krok zpět",
|
"ui.history_back": "O krok zpět",
|
||||||
"ui.history_below_browser": "Pod prohlížečem",
|
"ui.history_below_browser": "Pod prohlížečem",
|
||||||
"ui.history_first": "Přejít na začátek",
|
"ui.history_first": "Přejít na začátek",
|
||||||
@@ -1810,6 +2000,7 @@
|
|||||||
"ui.project_face_edges_sketch": "Promítat hrany plochy do nových náčrtů",
|
"ui.project_face_edges_sketch": "Promítat hrany plochy do nových náčrtů",
|
||||||
"ui.properties": "Vlastnosti",
|
"ui.properties": "Vlastnosti",
|
||||||
"ui.pull_direction": "Směr vyjímání",
|
"ui.pull_direction": "Směr vyjímání",
|
||||||
|
"ui.quality": "Kvalita",
|
||||||
"ui.quantity": "Počet",
|
"ui.quantity": "Počet",
|
||||||
"ui.quantity_2": "Počet 2",
|
"ui.quantity_2": "Počet 2",
|
||||||
"ui.quit": "Ukončit",
|
"ui.quit": "Ukončit",
|
||||||
@@ -1848,9 +2039,7 @@
|
|||||||
"ui.right": "Zprava",
|
"ui.right": "Zprava",
|
||||||
"ui.save": "Uložit",
|
"ui.save": "Uložit",
|
||||||
"ui.save_as": "Uložit jako",
|
"ui.save_as": "Uložit jako",
|
||||||
"ui.save_mesh_no_slicer": "Nebyl nalezen žádný slicer: zvolte Vlastní… a vyberte svůj slicer, nebo vypněte Odeslat do sliceru",
|
|
||||||
"ui.save_mesh_pick_bodies": "Vyberte tělesa k uložení",
|
"ui.save_mesh_pick_bodies": "Vyberte tělesa k uložení",
|
||||||
"ui.save_mesh_temp_failed": "Nelze vytvořit {folder}: {error}",
|
|
||||||
"ui.saved_to": "Uloženo {path}",
|
"ui.saved_to": "Uloženo {path}",
|
||||||
"ui.sbox_pin": "Připnout nahoru ve vyhledávání S",
|
"ui.sbox_pin": "Připnout nahoru ve vyhledávání S",
|
||||||
"ui.sbox_unpin": "Odepnout",
|
"ui.sbox_unpin": "Odepnout",
|
||||||
@@ -1865,7 +2054,6 @@
|
|||||||
"ui.selection_shift_add_only": "Shift+klik pouze přidává",
|
"ui.selection_shift_add_only": "Shift+klik pouze přidává",
|
||||||
"ui.selection_shift_add_only_tip": "Zapnuto: Shift přidává položky, Ctrl/Cmd přepíná. Vypnuto (výchozí): Shift i Ctrl/Cmd přepínají.",
|
"ui.selection_shift_add_only_tip": "Zapnuto: Shift přidává položky, Ctrl/Cmd přepíná. Vypnuto (výchozí): Shift i Ctrl/Cmd přepínají.",
|
||||||
"ui.send": "Odeslat",
|
"ui.send": "Odeslat",
|
||||||
"ui.send_to_slicer": "Odeslat do sliceru",
|
|
||||||
"ui.sent_to_slicer": "Odesláno do {slicer}",
|
"ui.sent_to_slicer": "Odesláno do {slicer}",
|
||||||
"ui.sheet_gap": "Mezera",
|
"ui.sheet_gap": "Mezera",
|
||||||
"ui.shell": "Skořepina",
|
"ui.shell": "Skořepina",
|
||||||
@@ -1904,6 +2092,7 @@
|
|||||||
"ui.spline": "Splajn",
|
"ui.spline": "Splajn",
|
||||||
"ui.split_body": "Rozdělit těleso",
|
"ui.split_body": "Rozdělit těleso",
|
||||||
"ui.stand_up_tip": "Když se soubor STEP nebo IGES otevře s osou Z nahoru, nabídnout otočení o čtvrt otáčky kolem X",
|
"ui.stand_up_tip": "Když se soubor STEP nebo IGES otevře s osou Z nahoru, nabídnout otočení o čtvrt otáčky kolem X",
|
||||||
|
"ui.standard": "Standardní",
|
||||||
"ui.start": "Start",
|
"ui.start": "Start",
|
||||||
"ui.start_over": "Začít znovu",
|
"ui.start_over": "Začít znovu",
|
||||||
"ui.start_page": "Úvodní stránka",
|
"ui.start_page": "Úvodní stránka",
|
||||||
@@ -1956,6 +2145,7 @@
|
|||||||
"ui.untitled": "Bez názvu",
|
"ui.untitled": "Bez názvu",
|
||||||
"ui.up_axis_note": "Která osa v pohledech míří nahoru (pohled podél osy, výchozí pohled, pohled kolmo). Návrhy se nemění.",
|
"ui.up_axis_note": "Která osa v pohledech míří nahoru (pohled podél osy, výchozí pohled, pohled kolmo). Návrhy se nemění.",
|
||||||
"ui.updateToCurrentView": "Aktualizovat na aktuální pohled",
|
"ui.updateToCurrentView": "Aktualizovat na aktuální pohled",
|
||||||
|
"ui.upload": "Nahrát",
|
||||||
"ui.view_centre": "Střed pohledu",
|
"ui.view_centre": "Střed pohledu",
|
||||||
"ui.visual_shaded_hidden_edges": "Stínovaný se skrytými hranami",
|
"ui.visual_shaded_hidden_edges": "Stínovaný se skrytými hranami",
|
||||||
"ui.visual_shaded_with_edges": "Stínovaný s hranami",
|
"ui.visual_shaded_with_edges": "Stínovaný s hranami",
|
||||||
|
|||||||