6ac9c49773
Right now, if you model something like this box with a button: <img width="413" alt="Screenshot 2025-02-06 at 3 08 03 PM" src="https://github.com/user-attachments/assets/04818a70-7cf3-4ee3-b8c5-df5959ac10db" /> Let's say you want to pattern the button, and repeat it a second time. If you try, you'll actually pattern the entire model (box + button). <img width="486" alt="Screenshot 2025-02-06 at 3 08 52 PM" src="https://github.com/user-attachments/assets/09fc28d9-5d80-4ab3-b4dc-b8de2945fcba" /> Why? Because right now, when you sketch on a face (like the button was), both the box and the button share the same ID. All extrusions from a solid will share the same ID, because they all refer to the same composite solid. This is helpful in some ways -- arguably the solid _is_ just one big complex shape now -- but it's not helpful in other ways. What if I want to only pattern the button? Luckily there's an original ID for the button part, which is still stored. So we just need a way to tell the pattern stdlib functions whether to use the target's main ID or its original ID. This PR adds a new optional bool, `useOriginal`, to patterns. It's false by default, to keep backwards-compatibility (make sure that old KCL code doesn't change). This PR is based on https://github.com/KittyCAD/modeling-app/pull/3914. It's based on work Serena and I are doing to fix a bug (engine does not allow patterning a 3D solid which was sketched on a face of another solid). @gserena01 our test program is now: ``` w = 400 case = startSketchOn('XY') |> startProfileAt([-w, -w], %) |> line(endAbsolute = [-w, w]) |> line(endAbsolute = [w, -w]) |> line(endAbsolute = [-w, -w]) |> close() |> extrude(length = 200) bump1 = startSketchOn(case, 'end') |> circle({ center = [-50, -50], radius = 40 }, %) |> extrude(length = 20) // We pass in "bump1" here since we want to pattern just this object on the face. useOriginal = true target = bump1 transform = { axis = [1, 0, 0], instances = 3, distance = -100 } patternLinear3d(transform, target, useOriginal) ``` If you change the `useOriginal = true` to `false` you can see the difference.
531 lines
13 KiB
Plaintext
531 lines
13 KiB
Plaintext
---
|
|
source: kcl/src/simulation_tests.rs
|
|
description: Program memory after executing riddle_small.kcl
|
|
snapshot_kind: text
|
|
---
|
|
{
|
|
"environments": [
|
|
{
|
|
"bindings": {
|
|
"ANSWER": {
|
|
"type": "Number",
|
|
"value": 41803.0,
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
9,
|
|
14,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"HALF_TURN": {
|
|
"type": "Number",
|
|
"value": 180.0,
|
|
"__meta": []
|
|
},
|
|
"QUARTER_TURN": {
|
|
"type": "Number",
|
|
"value": 90.0,
|
|
"__meta": []
|
|
},
|
|
"THREE_QUARTER_TURN": {
|
|
"type": "Number",
|
|
"value": 270.0,
|
|
"__meta": []
|
|
},
|
|
"ZERO": {
|
|
"type": "Number",
|
|
"value": 0.0,
|
|
"__meta": []
|
|
},
|
|
"ox": {
|
|
"type": "Number",
|
|
"value": -26.0,
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
96,
|
|
98,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
9,
|
|
14,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
73,
|
|
79,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
49,
|
|
54,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
58,
|
|
64,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
110,
|
|
112,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"oy": {
|
|
"type": "Number",
|
|
"value": 34.0,
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
119,
|
|
121,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
9,
|
|
14,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
85,
|
|
90,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
49,
|
|
54,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
58,
|
|
64,
|
|
0
|
|
]
|
|
},
|
|
{
|
|
"sourceRange": [
|
|
133,
|
|
135,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"r": {
|
|
"type": "Solid",
|
|
"value": {
|
|
"type": "Solid",
|
|
"id": "[uuid]",
|
|
"artifactId": "[uuid]",
|
|
"value": [
|
|
{
|
|
"faceId": "[uuid]",
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
199,
|
|
217,
|
|
0
|
|
],
|
|
"tag": null,
|
|
"type": "extrudePlane"
|
|
},
|
|
{
|
|
"faceId": "[uuid]",
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
223,
|
|
242,
|
|
0
|
|
],
|
|
"tag": null,
|
|
"type": "extrudePlane"
|
|
},
|
|
{
|
|
"faceId": "[uuid]",
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
248,
|
|
267,
|
|
0
|
|
],
|
|
"tag": null,
|
|
"type": "extrudePlane"
|
|
},
|
|
{
|
|
"faceId": "[uuid]",
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
273,
|
|
281,
|
|
0
|
|
],
|
|
"tag": null,
|
|
"type": "extrudePlane"
|
|
}
|
|
],
|
|
"sketch": {
|
|
"type": "Sketch",
|
|
"id": "[uuid]",
|
|
"paths": [
|
|
{
|
|
"__geoMeta": {
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
199,
|
|
217,
|
|
0
|
|
]
|
|
},
|
|
"from": [
|
|
-26.0,
|
|
34.0
|
|
],
|
|
"tag": null,
|
|
"to": [
|
|
-25.0,
|
|
34.0
|
|
],
|
|
"type": "ToPoint"
|
|
},
|
|
{
|
|
"__geoMeta": {
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
223,
|
|
242,
|
|
0
|
|
]
|
|
},
|
|
"from": [
|
|
-25.0,
|
|
34.0
|
|
],
|
|
"tag": null,
|
|
"to": [
|
|
-25.0,
|
|
33.0
|
|
],
|
|
"type": "ToPoint"
|
|
},
|
|
{
|
|
"__geoMeta": {
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
248,
|
|
267,
|
|
0
|
|
]
|
|
},
|
|
"from": [
|
|
-25.0,
|
|
33.0
|
|
],
|
|
"tag": null,
|
|
"to": [
|
|
-26.0,
|
|
33.0
|
|
],
|
|
"type": "ToPoint"
|
|
},
|
|
{
|
|
"__geoMeta": {
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
273,
|
|
281,
|
|
0
|
|
]
|
|
},
|
|
"from": [
|
|
-26.0,
|
|
33.0
|
|
],
|
|
"tag": null,
|
|
"to": [
|
|
-26.0,
|
|
34.0
|
|
],
|
|
"type": "ToPoint"
|
|
}
|
|
],
|
|
"on": {
|
|
"type": "plane",
|
|
"id": "[uuid]",
|
|
"artifactId": "[uuid]",
|
|
"value": "XZ",
|
|
"origin": {
|
|
"x": 0.0,
|
|
"y": 0.0,
|
|
"z": 0.0
|
|
},
|
|
"xAxis": {
|
|
"x": 1.0,
|
|
"y": 0.0,
|
|
"z": 0.0
|
|
},
|
|
"yAxis": {
|
|
"x": 0.0,
|
|
"y": 0.0,
|
|
"z": 1.0
|
|
},
|
|
"zAxis": {
|
|
"x": 0.0,
|
|
"y": -1.0,
|
|
"z": 0.0
|
|
},
|
|
"units": {
|
|
"type": "Mm"
|
|
},
|
|
"__meta": []
|
|
},
|
|
"start": {
|
|
"from": [
|
|
-26.0,
|
|
34.0
|
|
],
|
|
"to": [
|
|
-26.0,
|
|
34.0
|
|
],
|
|
"tag": null,
|
|
"__geoMeta": {
|
|
"id": "[uuid]",
|
|
"sourceRange": [
|
|
166,
|
|
193,
|
|
0
|
|
]
|
|
}
|
|
},
|
|
"artifactId": "[uuid]",
|
|
"originalId": "[uuid]",
|
|
"units": {
|
|
"type": "Mm"
|
|
},
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
166,
|
|
193,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"height": 1.0,
|
|
"startCapId": "[uuid]",
|
|
"endCapId": "[uuid]",
|
|
"units": {
|
|
"type": "Mm"
|
|
},
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
166,
|
|
193,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"t": {
|
|
"type": "Function",
|
|
"expression": {
|
|
"body": {
|
|
"body": [
|
|
{
|
|
"argument": {
|
|
"end": 64,
|
|
"left": {
|
|
"end": 54,
|
|
"left": {
|
|
"end": 46,
|
|
"left": {
|
|
"end": 42,
|
|
"name": "ANSWER",
|
|
"start": 36,
|
|
"type": "Identifier",
|
|
"type": "Identifier"
|
|
},
|
|
"operator": "*",
|
|
"right": {
|
|
"end": 46,
|
|
"name": "s",
|
|
"start": 45,
|
|
"type": "Identifier",
|
|
"type": "Identifier"
|
|
},
|
|
"start": 36,
|
|
"type": "BinaryExpression",
|
|
"type": "BinaryExpression"
|
|
},
|
|
"operator": "+",
|
|
"right": {
|
|
"end": 54,
|
|
"raw": "12345",
|
|
"start": 49,
|
|
"type": "Literal",
|
|
"type": "Literal",
|
|
"value": {
|
|
"value": 12345.0,
|
|
"suffix": "None"
|
|
}
|
|
},
|
|
"start": 36,
|
|
"type": "BinaryExpression",
|
|
"type": "BinaryExpression"
|
|
},
|
|
"operator": "%",
|
|
"right": {
|
|
"end": 64,
|
|
"raw": "214748",
|
|
"start": 58,
|
|
"type": "Literal",
|
|
"type": "Literal",
|
|
"value": {
|
|
"value": 214748.0,
|
|
"suffix": "None"
|
|
}
|
|
},
|
|
"start": 36,
|
|
"type": "BinaryExpression",
|
|
"type": "BinaryExpression"
|
|
},
|
|
"end": 64,
|
|
"start": 28,
|
|
"type": "ReturnStatement",
|
|
"type": "ReturnStatement"
|
|
}
|
|
],
|
|
"end": 66,
|
|
"start": 24
|
|
},
|
|
"end": 66,
|
|
"params": [
|
|
{
|
|
"type": "Parameter",
|
|
"identifier": {
|
|
"end": 22,
|
|
"name": "s",
|
|
"start": 21,
|
|
"type": "Identifier"
|
|
}
|
|
}
|
|
],
|
|
"start": 20,
|
|
"type": "FunctionExpression"
|
|
},
|
|
"memory": {
|
|
"environments": [
|
|
{
|
|
"bindings": {
|
|
"ANSWER": {
|
|
"type": "Number",
|
|
"value": 41803.0,
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
9,
|
|
14,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"HALF_TURN": {
|
|
"type": "Number",
|
|
"value": 180.0,
|
|
"__meta": []
|
|
},
|
|
"QUARTER_TURN": {
|
|
"type": "Number",
|
|
"value": 90.0,
|
|
"__meta": []
|
|
},
|
|
"THREE_QUARTER_TURN": {
|
|
"type": "Number",
|
|
"value": 270.0,
|
|
"__meta": []
|
|
},
|
|
"ZERO": {
|
|
"type": "Number",
|
|
"value": 0.0,
|
|
"__meta": []
|
|
}
|
|
},
|
|
"parent": null
|
|
}
|
|
],
|
|
"currentEnv": 0,
|
|
"return": null
|
|
},
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
20,
|
|
66,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"xs": {
|
|
"type": "Number",
|
|
"value": 205804.0,
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
73,
|
|
79,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"ys": {
|
|
"type": "Number",
|
|
"value": 71816.0,
|
|
"__meta": [
|
|
{
|
|
"sourceRange": [
|
|
85,
|
|
90,
|
|
0
|
|
]
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"parent": null
|
|
}
|
|
],
|
|
"currentEnv": 0,
|
|
"return": null
|
|
}
|