From f54716193505281512f3eb052ac5cc0444ef95fb Mon Sep 17 00:00:00 2001
From: Erwin Lau <e.lau@jitx.com>
Date: Tue, 22 Aug 2023 17:12:22 -0700
Subject: [PATCH 1/2] no comments id in ESIR Model3D

---
 utils/parts.stanza | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/utils/parts.stanza b/utils/parts.stanza
index f0913530..26c3175d 100644
--- a/utils/parts.stanza
+++ b/utils/parts.stanza
@@ -900,7 +900,7 @@ public defstruct LandPatternCode :
   pcb-layer-value: PCBLayerValue
   layers: Tuple<PCBLayerCode>
   geometries: Tuple<GeomCode>
-  model3ds: Tuple<Model3D>
+  model3ds: Tuple<Model3DCode>
 
 public-when(TESTING) defn LandPatternCode (json: JObject) -> LandPatternCode :
   LandPatternCode(
@@ -910,7 +910,7 @@ public-when(TESTING) defn LandPatternCode (json: JObject) -> LandPatternCode :
     PCBLayerValue(json["pcb_layer_value"] as JObject),
     map(PCBLayerCode, json["layers"] as Tuple<JObject>),
     map(GeomCode, json["geometries"] as Tuple<JObject>),
-    map(Model3D, json["model3ds"] as Tuple<JObject>)
+    map(Model3DCode, json["model3ds"] as Tuple<JObject>)
   )
 
 ;Represents a via, copper, or pour.
@@ -967,11 +967,18 @@ defn ViaType (s: String) -> ViaType :
     "MicroVia": MicroVia
     "BlindVia": BlindVia
 
-defn Model3D (json: JObject) -> Model3D :
-  Model3D(json["filename"] as String,
-          Vec3D(json["position"] as JObject),
-          Vec3D(json["scale"] as JObject),
-          Vec3D(json["rotation"] as JObject))
+public defstruct Model3DCode :
+  model3d: Model3D
+  model3d-id: String
+
+public defn Model3DCode (json: JObject) -> Model3DCode :
+  Model3DCode(
+    Model3D(json["filename"] as String,
+            Vec3D(json["position"] as JObject),
+            Vec3D(json["scale"] as JObject),
+            Vec3D(json["rotation"] as JObject))
+    json["jitx_model_3d_id"] as String
+  )
 
 defn Vec3D (json: JObject) -> Vec3D :
   Vec3D(json["x"] as Double,
@@ -1003,7 +1010,7 @@ defn to-jitx (lp: LandPatternCode, jitx-pads-by-pcb-pad-name: HashTable<String,
 
     do(to-jitx, layers(lp))
     do(to-jitx, geometries(lp))
-    do(to-jitx, model3ds(lp))
+    do(to-jitx{model3d(_)}, model3ds(lp))
 
   my-landpattern
 

From 56699cd557218a7738bae79467b2071c3f32b6eb Mon Sep 17 00:00:00 2001
From: Erwin Lau <e.lau@jitx.com>
Date: Wed, 23 Aug 2023 12:11:22 -0700
Subject: [PATCH 2/2] use times function

---
 utils/parts.stanza | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/parts.stanza b/utils/parts.stanza
index 26c3175d..f6eec5e9 100644
--- a/utils/parts.stanza
+++ b/utils/parts.stanza
@@ -1010,7 +1010,7 @@ defn to-jitx (lp: LandPatternCode, jitx-pads-by-pcb-pad-name: HashTable<String,
 
     do(to-jitx, layers(lp))
     do(to-jitx, geometries(lp))
-    do(to-jitx{model3d(_)}, model3ds(lp))
+    do(to-jitx * model3d, model3ds(lp))
 
   my-landpattern