city_generator2

commit d800c78a978bdc4eaad8679623a9e28c632bf0fa
parent e92a395ee81111808513182bf02c5721394f3449
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri, 30 Dec 2022 14:53:44 +0100

Adapt to star-cad changes on getting geometries names

Diffstat:
M
src/cg_constructive_mode_1.c
 | 
27
++++++++++-----------------

1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/cg_constructive_mode_1.c b/src/cg_constructive_mode_1.c
@@ -762,7 +762,6 @@ build_windows
   struct scad_geometry* glass = NULL;
   struct scad_geometry** glass_list = NULL;
   size_t list_n = 0;
-  char* name = NULL;
   struct str gname;
   int is_init = 0;
 
@@ -812,36 +811,30 @@ build_windows
   }
 
   /* wall perforation */
-  ERR(scad_geometry_get_name(data_cad->wall, &name));
-  ERR(scad_cut_geometries(
-        NULL, &data_cad->wall, 1, hole_list, sa_size(hole_list), &geom));
+  ERR(scad_cut_geometries(NULL, &data_cad->wall, 1,
+        hole_list, sa_size(hole_list), &geom));
+  ERR(scad_geometry_swap_names(data_cad->wall, geom));
   ERR(scad_geometry_delete(data_cad->wall));
-  /*data_cad->wall = geom;*/
-  ERR(scad_geometry_copy(geom, name, &data_cad->wall));
-  ERR(scad_geometry_delete(geom));
+  data_cad->wall = geom;
   geom = NULL;
 
   /* internal insulation perforation */
   if (data_cad->internal_insulation) {
-    ERR(scad_geometry_get_name(data_cad->internal_insulation, &name));
-    ERR(scad_cut_geometries(
-          NULL, &data_cad->internal_insulation, 1,
+    ERR(scad_cut_geometries(NULL, &data_cad->internal_insulation, 1,
           hole_list, sa_size(hole_list), &geom));
+    ERR(scad_geometry_swap_names(data_cad->internal_insulation, geom));
     ERR(scad_geometry_delete(data_cad->internal_insulation));
-    ERR(scad_geometry_copy(geom, name, &data_cad->internal_insulation));
-    ERR(scad_geometry_delete(geom));
+    data_cad->internal_insulation = geom;
     geom = NULL;
   }
 
   /* external insulation perforation */
   if (data_cad->external_insulation) {
-    ERR(scad_geometry_get_name(data_cad->external_insulation, &name));
-    ERR(scad_cut_geometries(
-          NULL, &data_cad->external_insulation, 1,
+    ERR(scad_cut_geometries(NULL, &data_cad->external_insulation, 1,
           hole_list, sa_size(hole_list), &geom));
+    ERR(scad_geometry_swap_names(data_cad->external_insulation, geom));
     ERR(scad_geometry_delete(data_cad->external_insulation));
-    ERR(scad_geometry_copy(geom, name, &data_cad->external_insulation));
-    ERR(scad_geometry_delete(geom));
+    data_cad->external_insulation = geom;
     geom = NULL;
   }