city_generator2

commit 7b8c4185bcde6e63531e814145ead833e1a600fb
parent 3a5ba799710c3b7da936dcf2f20d74759bdafa6f
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 25 Jan 2023 18:04:06 +0100

Improve consistency in output files naming

Diffstat:
M
src/cg_construction_mode_0.c
 | 
18
+++++++++---------
M
src/cg_construction_mode_1.c
 | 
40
++++++++++++++++++++--------------------
M
src/cg_ground.c
 | 
9
+++------

3 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/src/cg_construction_mode_0.c b/src/cg_construction_mode_0.c
@@ -206,7 +206,7 @@ build_wall
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_S_wall"));
+    ERR(str_append(&name, "_S_walls"));
     wallname = str_get(&name);
   }
 
@@ -250,7 +250,7 @@ build_cavity
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_F_cavity"));
+    ERR(str_append(&name, "_F_internal"));
     cavityname = str_get(&name);
   }
 
@@ -293,7 +293,7 @@ build_connection
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_C_cavity_floor"));
+    ERR(str_append(&name, "_C_floor"));
     cname = str_get(&name);
   }
 
@@ -303,7 +303,7 @@ build_connection
   /* cavity/wall connection */
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_C_cavity_wall"));
+    ERR(str_append(&name, "_C_walls"));
     cname = str_get(&name);
   }
 
@@ -313,7 +313,7 @@ build_connection
   /* cavity/roof connection */
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_C_cavity_roof"));
+    ERR(str_append(&name, "_C_roof"));
     cname = str_get(&name);
   }
 
@@ -360,17 +360,17 @@ build_boundary
   data_cad->boundary = MEM_ALLOC(allocator, 2 * sizeof(struct scad_geometry*));
 
   ERR(str_set(&name, prefix));
-  ERR(str_append(&name, "_boundary_wall"));
+  ERR(str_append(&name, "_B_walls"));
   boundaryname = str_get(&name);
   ERR(scad_geometries_common_boundaries(boundaryname, list, count,
         &data_cad->wall, 1, &data_cad->boundary[0]));
 
   ERR(str_set(&name, prefix));
-  ERR(str_append(&name, "_boundary_roof"));
+  ERR(str_append(&name, "_B_roof"));
   boundaryname = str_get(&name);
   ERR(scad_geometries_common_boundaries(boundaryname, list, count,
         &data_cad->roof, 1, &data_cad->boundary[1]));
- 
+
 exit:
   MEM_RM(allocator, list);
   if (is_init) str_release(&name);
@@ -399,7 +399,7 @@ building_ground_connection
     str_init(NULL, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_C_building_ground"));
+    ERR(str_append(&name, "_C_ground"));
     cname = str_get(&name);
   }
 
diff --git a/src/cg_construction_mode_1.c b/src/cg_construction_mode_1.c
@@ -189,7 +189,7 @@ build_int_insulation
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_S_int_insulation"));
+    ERR(str_append(&name, "_S_internal_insulation"));
     insulationname = str_get(&name);
   }
 
@@ -437,7 +437,7 @@ build_inter_floor
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_S_inter_floor"));
+    ERR(str_append(&name, "_S_intermediate_floors"));
     floorname = str_get(&name);
   }
 
@@ -510,7 +510,7 @@ build_ext_insulation
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_S_ext_insulation"));
+    ERR(str_append(&name, "_S_external_insulation"));
     insulationname = str_get(&name);
   }
 
@@ -635,7 +635,7 @@ build_habitable
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_F_cavity"));
+    ERR(str_append(&name, "_F_levels"));
     cavityname = str_get(&name);
   }
 
@@ -838,7 +838,7 @@ build_windows
     str_init(allocator, &gname);
     is_init = 1;
     ERR(str_set(&gname, prefix));
-    ERR(str_append(&gname, "_S_glass"));
+    ERR(str_append(&gname, "_S_glazing"));
   }
 
   ERR(scad_fuse_geometries(str_cget(&gname), glass_list, 1,
@@ -936,14 +936,14 @@ build_boundary
   ERR(darray_geometries_reserve(boundary, 5+darray_geometries_size_get(boundary)));
 
   ERR(str_set(&name, prefix));
-  ERR(str_append(&name, "_boundary_wall"));
+  ERR(str_append(&name, "_B_walls"));
   boundaryname = str_get(&name);
   ERR(scad_geometries_common_boundaries(boundaryname, list, count,
         &data_cad->wall, 1, &bound));
   ERR(darray_geometries_push_back(boundary, &bound));
 
   ERR(str_set(&name, prefix));
-  ERR(str_append(&name, "_boundary_roof"));
+  ERR(str_append(&name, "_B_roof"));
   boundaryname = str_get(&name);
   ERR(scad_geometries_common_boundaries(boundaryname, list, count,
         &data_cad->roof, 1, &bound));
@@ -951,7 +951,7 @@ build_boundary
 
   if (data_cad->glass) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_boundary_glass"));
+    ERR(str_append(&name, "_B_glazing"));
     boundaryname = str_get(&name);
     ERR(scad_geometries_common_boundaries(boundaryname, list, count,
           &data_cad->glass, 1, &bound));
@@ -960,7 +960,7 @@ build_boundary
 
   if (data_cad->external_insulation) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_boundary_ext_insulation"));
+    ERR(str_append(&name, "_B_external_insulation"));
     boundaryname = str_get(&name);
     ERR(scad_geometries_common_boundaries(boundaryname, list, count,
           &data_cad->external_insulation, 1, &bound));
@@ -970,7 +970,7 @@ build_boundary
   if (data_cad->internal_insulation) {
     size_t bcount = 0;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_boundary_int_insulation"));
+    ERR(str_append(&name, "_B_internal_insulation"));
     boundaryname = str_get(&name);
     ERR(scad_geometries_common_boundaries(boundaryname, list, count,
           &data_cad->internal_insulation, 1, &bound));
@@ -1026,32 +1026,32 @@ build_connection
   /* -------------------------------------------------------------------------*/
 
   /* with floor */
-  CREATE_CONNECT(habitable_cavity,floor,"_C_cavity_floor");
+  CREATE_CONNECT(habitable_cavity,floor,"_C_floor");
 
   /* with wall */
-  CREATE_CONNECT(habitable_cavity,wall,"_C_cavity_wall");
+  CREATE_CONNECT(habitable_cavity,wall,"_C_walls");
 
   /* with glass */
   if (data_cad->glass) {
-    CREATE_CONNECT(habitable_cavity,glass,"_C_cavity_glass");
+    CREATE_CONNECT(habitable_cavity,glass,"_C_glazing");
   }
 
   /* with internal insulation */
   if (data_cad->internal_insulation) {
-    CREATE_CONNECT(habitable_cavity,internal_insulation,"_C_cavity_internal_insulation");
+    CREATE_CONNECT(habitable_cavity,internal_insulation,"_C_internal_insulation");
   }
 
   /* with roof insulation */
   if (data_cad->roof_insulation) {
-    CREATE_CONNECT(habitable_cavity,roof_insulation,"_C_cavity_roof_insulation");
+    CREATE_CONNECT(habitable_cavity,roof_insulation,"_C_roof_insulation");
   } else {
     /* with roof */
-    CREATE_CONNECT(habitable_cavity,roof,"_C_cavity_roof");
+    CREATE_CONNECT(habitable_cavity,roof,"_C_roof");
   }
 
   /* with intermediate floor */
   if (data_cad->intermediate_floor) {
-    CREATE_CONNECT(habitable_cavity,intermediate_floor,"_C_cavity_intermediate_floor");
+    CREATE_CONNECT(habitable_cavity,intermediate_floor,"_C_intermediate_floors");
   }
 
   /* -------------------------------------------------------------------------*/
@@ -1086,7 +1086,7 @@ build_connection
     CREATE_CONNECT(attic_cavity, roof_insulation,"_C_attic_insulation");
 
     /* with wall */
-    CREATE_CONNECT(attic_cavity, wall,"_C_attic_wall");
+    CREATE_CONNECT(attic_cavity, wall,"_C_attic_walls");
   }
 
 #undef CREATE_CONNECT
@@ -1200,7 +1200,7 @@ building_ground_connection
   str_init(allocator, &name);
   is_init = 1;
   ERR(str_set(&name, prefix));
-  ERR(str_append(&name, "_C_building_ground"));
+  ERR(str_append(&name, "_C_ground"));
   cname = str_get(&name);
 
   /* Ensure enough room for all geometries without error nor mem move */
@@ -1339,7 +1339,7 @@ build_cad_cmode_1
   name = str_cget(&building->name);
   ERR(build_floor(name, allocator, pg, data, &data_cad->floor));
 
-  ERR(build_wall(name, "S_wall", allocator, pg, height, data, &data_cad->wall));
+  ERR(build_wall(name, "S_walls", allocator, pg, height, data, &data_cad->wall));
 
   ERR(build_roof(name, allocator, pg, height, data, &data_cad->roof));
 
diff --git a/src/cg_ground.c b/src/cg_ground.c
@@ -34,10 +34,7 @@ ground_build_cad
   double extent[3];
   struct scad_geometry* bound = NULL;
 
-  if (!city || !ground) {
-    res = RES_BAD_ARG;
-    goto error;
-  }
+  ASSERT(city && ground);
 
   origin[0] = city->ground_extent[0];
   origin[1] = city->ground_extent[2];
@@ -70,8 +67,8 @@ ground_export_stl(const struct ground* ground, const int binary)
 {
   res_T res = RES_OK;
 
-  ERR(scad_stl_export(ground->boundary, "B_ground", 0, binary));
-  ERR(scad_stl_export_split(ground->boundary, "B_ground", binary));
+  ERR(scad_stl_export(ground->boundary, "ground_B", 0, binary));
+  ERR(scad_stl_export_split(ground->boundary, "ground_B", binary));
 
 exit:
   return res;