city_generator2

commit be68aa739a64662b1a21dc53a8ee16d455367d09
parent bf1c00320453de66497f03ef6a8dbad963b9c455
Author: Benjamin Piaud <benjamin.piaud@meso-star.com>
Date:   Tue, 17 Jan 2023 15:49:10 +0100

Adaptation to the change of API of the scad_stl_export function

Diffstat:
M
src/cg_construction_mode_0.c
 | 
14
+++++++-------
M
src/cg_construction_mode_1.c
 | 
32
++++++++++++++++----------------
M
src/cg_ground.c
 | 
2
+-

3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/cg_construction_mode_0.c b/src/cg_construction_mode_0.c
@@ -576,27 +576,27 @@ export_stl_cmode_0
   }
 
   /* floor export */
-  ERR(scad_stl_export(data_cad->floor, NULL, binary));
+  ERR(scad_stl_export(data_cad->floor, NULL, 0, binary));
 
   /* roof export */
-  ERR(scad_stl_export(data_cad->roof, NULL, binary));
+  ERR(scad_stl_export(data_cad->roof, NULL, 0, binary));
 
   /* wall export */
-  ERR(scad_stl_export(data_cad->wall, NULL, binary));
+  ERR(scad_stl_export(data_cad->wall, NULL, 0, binary));
 
   /* cavity export */
-  ERR(scad_stl_export(data_cad->cavity, NULL, binary));
+  ERR(scad_stl_export(data_cad->cavity, NULL, 0, binary));
 
   /* connection export */
   for (i = 0; i < data_cad->n_connection; i++) {
-    ERR(scad_stl_export(data_cad->connection[i], NULL, binary));
+    ERR(scad_stl_export(data_cad->connection[i], NULL, 0, binary));
   }
 
   /* boundary export */
-  ERR(scad_stl_export(data_cad->boundary, NULL, binary));
+  ERR(scad_stl_export(data_cad->boundary, NULL, 0, binary));
 
   /* footprint export */
-  ERR(scad_stl_export(data_cad->ground_connection, NULL, binary));
+  ERR(scad_stl_export(data_cad->ground_connection, NULL, 0, binary));
 
 exit:
   return res;
diff --git a/src/cg_construction_mode_1.c b/src/cg_construction_mode_1.c
@@ -1472,76 +1472,76 @@ export_stl_cmode_1
   }
 
   /* floor export */
-  ERR(scad_stl_export(data_cad->floor, NULL, binary));
+  ERR(scad_stl_export(data_cad->floor, NULL, 0, binary));
 
   /* wall export */
-  ERR(scad_stl_export(data_cad->wall, NULL, binary));
+  ERR(scad_stl_export(data_cad->wall, NULL, 0, binary));
 
   /* roof export */
-  ERR(scad_stl_export(data_cad->roof, NULL, binary));
+  ERR(scad_stl_export(data_cad->roof, NULL, 0, binary));
 
   /* foundation export */
   if (data_cad->foundation) {
-    ERR(scad_stl_export(data_cad->foundation, NULL, binary));
+    ERR(scad_stl_export(data_cad->foundation, NULL, 0, binary));
   }
 
   /* glass export */
   if (data_cad->glass) {
-    ERR(scad_stl_export(data_cad->glass, NULL, binary));
+    ERR(scad_stl_export(data_cad->glass, NULL, 0, binary));
   }
 
   /* intermediate floor export*/
   if (data_cad->intermediate_floor) {
-    ERR(scad_stl_export(data_cad->intermediate_floor, NULL, binary));
+    ERR(scad_stl_export(data_cad->intermediate_floor, NULL, 0, binary));
   }
 
   /* internal insulation export*/
   if (data_cad->internal_insulation) {
-    ERR(scad_stl_export(data_cad->internal_insulation, NULL, binary));
+    ERR(scad_stl_export(data_cad->internal_insulation, NULL, 0, binary));
   }
 
   /* external insulation export*/
   if (data_cad->external_insulation) {
-    ERR(scad_stl_export(data_cad->external_insulation, NULL, binary));
+    ERR(scad_stl_export(data_cad->external_insulation, NULL, 0, binary));
   }
 
   /* roof insulation export*/
   if (data_cad->roof_insulation) {
-    ERR(scad_stl_export(data_cad->roof_insulation, NULL, binary));
+    ERR(scad_stl_export(data_cad->roof_insulation, NULL, 0, binary));
   }
 
   /* floor insulation export*/
   if (data_cad->floor_insulation) {
-    ERR(scad_stl_export(data_cad->floor_insulation, NULL, binary));
+    ERR(scad_stl_export(data_cad->floor_insulation, NULL, 0, binary));
   }
 
   /* attic cavity export*/
   if (data_cad->attic_cavity) {
-    ERR(scad_stl_export(data_cad->attic_cavity, NULL, binary));
+    ERR(scad_stl_export(data_cad->attic_cavity, NULL, 0, binary));
   }
 
   /* habitable cavity export*/
-  ERR(scad_stl_export(data_cad->habitable_cavity, NULL, binary));
+  ERR(scad_stl_export(data_cad->habitable_cavity, NULL, 0, binary));
 
   /* crawlspace cavity export*/
   if (data_cad->crawlspace_cavity) {
-    ERR(scad_stl_export(data_cad->crawlspace_cavity, NULL, binary));
+    ERR(scad_stl_export(data_cad->crawlspace_cavity, NULL, 0, binary));
   }
 
   /* boundary export*/
   for(i = 0; i < darray_geometries_size_get(&data_cad->boundary); i++) {
     struct scad_geometry* b = darray_geometries_data_get(&data_cad->boundary)[i];
-    ERR(scad_stl_export(b, NULL, binary));
+    ERR(scad_stl_export(b, NULL, 0, binary));
   }
 
   /* connections export*/
   for(i = 0; i < darray_geometries_size_get(&data_cad->connection); i++) {
     struct scad_geometry* c = darray_geometries_data_get(&data_cad->connection)[i];
-    ERR(scad_stl_export(c, NULL, binary));
+    ERR(scad_stl_export(c, NULL, 0, binary));
   }
 
   /* ground/building connection export*/
-  ERR(scad_stl_export(data_cad->ground_connection, NULL, binary));
+  ERR(scad_stl_export(data_cad->ground_connection, NULL, 1, binary));
 
 exit:
   return res;
diff --git a/src/cg_ground.c b/src/cg_ground.c
@@ -70,7 +70,7 @@ ground_export_stl(const struct ground* ground, const int binary)
 {
   res_T res = RES_OK;
 
-  ERR(scad_stl_export(ground->boundary, "B_ground", binary));
+  ERR(scad_stl_export(ground->boundary, "B_ground", 0, binary));
 
 exit:
   return res;