city_generator2

commit 5a9995edc2d7ef3f37ac1fc5c0efbd26cee3364b
parent 3c529a538e70f2c7d3463e2edab69e2eeb1e6bb1
Author: Benjamin Piaud <benjamin.piaud@meso-star.com>
Date:   Thu,  6 Oct 2022 12:15:07 +0200

Rename slab by floor

Diffstat:
M
src/cg_building.c
 | 
54
+++++++++++++++++++++++++++---------------------------
M
src/cg_building.h
 | 
4
++--
M
src/cg_city.c
 | 
6
+++---

3 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/cg_building.c b/src/cg_building.c
@@ -24,7 +24,7 @@
 #define ERR(Expr) if((res = (Expr)) != RES_OK) goto error; else (void)0
 
 static res_T
-build_slab_footprint
+build_floor_footprint
  (const struct pg_polygon* pg,
  struct scad_geometry** footprint)
 {
@@ -45,40 +45,40 @@ error:
 }
 
 static res_T
-build_slab
+build_floor
 (const char* prefix,
  const struct pg_polygon* pg,
  struct building* b,
- struct scad_geometry** slab)
+ struct scad_geometry** floor)
 {
   res_T res = RES_OK;
   double e;
   struct data_model0* data;
   struct scad_geometry* footprint; 
   double d[3] = {0, 0, 0};
-  char* slabname = NULL;
+  char* floorname = NULL;
   struct str name;
   int is_init = 0;
  
   data = (struct data_model0*)b->data;
-  e = data->slab;
+  e = data->floor;
 
   str_init(NULL, &name);
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_slab"));
-    slabname = str_get(&name);
+    ERR(str_append(&name, "_floor"));
+    floorname = str_get(&name);
   }
   
-  ERR(build_slab_footprint(pg, &footprint));
+  ERR(build_floor_footprint(pg, &footprint));
 
   d[2] = e;
   ERR(scad_geometry_extrude
       (footprint,
-       slabname, 
+       floorname, 
        d,
-       slab));
+       floor));
 
 exit:
   scad_geometry_delete(footprint);
@@ -92,7 +92,7 @@ static res_T
 build_roof
   (const char* prefix,
    const struct building* b,
-   const struct scad_geometry* slab,
+   const struct scad_geometry* floor,
    struct scad_geometry** roof)
 {
   res_T res = RES_OK;
@@ -116,9 +116,9 @@ build_roof
   height = b->height;
   data = (struct data_model0*)b->data;
   /*data_cad = (struct data_cad_model0*)b->data_cad;*/
-  e = data->slab;
+  e = data->floor;
 
-  ERR(scad_geometry_copy(slab, roofname, roof));
+  ERR(scad_geometry_copy(floor, roofname, roof));
   d[2] = height - e ;
   ERR(scad_geometry_translate(*roof, d));
 
@@ -234,7 +234,7 @@ build_cavity
  
   height = b->height;
   data = (struct data_model0*)b->data;
-  e = data->slab;
+  e = data->floor;
 
   str_init(NULL, &name);
   is_init = 1;
@@ -279,19 +279,19 @@ build_connection
   cad->connection = malloc(3 * sizeof(struct scad_geometry*));
   cad->n_connection = 3;
 
-  /* cavity/slab connection */
+  /* cavity/floor connection */
   str_init(NULL, &name);
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_C_cavity_slab"));
+    ERR(str_append(&name, "_C_cavity_floor"));
     cname = str_get(&name);
   }
 
   ERR(scad_geometries_common_boundaries 
       (cname,
        &cad->cavity, 1,
-       &cad->slab, 1,
+       &cad->floor, 1,
        &cad->connection[0]));
          
   /* cavity/wall connection */
@@ -371,7 +371,7 @@ build_boundary
   int is_init = 0;
 
   list = malloc(4 * sizeof(struct scad_geometry*));
-  list[0] = cad->slab;
+  list[0] = cad->floor;
   list[1] = cad->wall;
   list[2] = cad->roof;
   list[3] = cad->cavity;
@@ -431,7 +431,7 @@ build_cad_model0(struct building* building)
     goto error;
   } 
 
-  if (height <= 0 || data->wall <= 0 || data->slab <= 0) {
+  if (height <= 0 || data->wall <= 0 || data->floor <= 0) {
     res = RES_BAD_ARG;
     goto error;
   } 
@@ -449,11 +449,11 @@ build_cad_model0(struct building* building)
   e_wall = data->wall;
   ERR(pg_offset(&pg, e_wall, &pg_int, &pg_ext));
 
-  /* build slab with pg_int */
-  ERR(build_slab(str_cget(&prefix), &pg_int, building, &data_cad->slab));
+  /* build floor with pg_int */
+  ERR(build_floor(str_cget(&prefix), &pg_int, building, &data_cad->floor));
 
-  /* roof is a translated copy of slab */
-  ERR(build_roof(str_cget(&prefix), building, data_cad->slab, &data_cad->roof));
+  /* roof is a translated copy of floor */
+  ERR(build_roof(str_cget(&prefix), building, data_cad->floor, &data_cad->roof));
 
   /* build wall with pg and pg_int */
   ERR(build_wall(str_cget(&prefix), &pg, &pg_int, building, &data_cad->wall));
@@ -471,7 +471,7 @@ build_cad_model0(struct building* building)
   /* build boundary */
   ERR(build_boundary(str_cget(&prefix), building->data_cad));
 
-  /* build connection cavity/slab */
+  /* build connection cavity/floor */
   ERR(build_connection(str_cget(&prefix), building->data_cad));
  
 
@@ -500,7 +500,7 @@ build_footprint_model0
   ERR(pg_offset(&pg, e_wall, &pg_int, &pg_ext));
   
   ERR(build_wall_footprint(&pg, &pg_int, &geom[0]));
-  ERR(build_slab_footprint(&pg, &geom[1]));
+  ERR(build_floor_footprint(&pg, &geom[1]));
 
   ERR(scad_fragment_geometries
       (NULL,
@@ -526,8 +526,8 @@ export_stl_model0
   struct data_cad_model0* data_cad = (struct data_cad_model0 *)building->data_cad;
   size_t i;
 
-  /* slab export */
-  ERR(scad_stl_export(data_cad->slab, NULL, 0));  
+  /* floor export */
+  ERR(scad_stl_export(data_cad->floor, NULL, 0));  
 
   /* roof export */
   ERR(scad_stl_export(data_cad->roof, NULL, 0));  
diff --git a/src/cg_building.h b/src/cg_building.h
@@ -55,13 +55,13 @@ struct building {
 /* specific data for model 0 */
 struct data_model0 { 
   double wall; /* wall thickness */
-  double slab; /* slab thickness */
+  double floor; /* floor thickness */
 };
 
 struct data_cad_model0 { 
   struct scad_geometry* wall; 
   struct scad_geometry* roof; 
-  struct scad_geometry* slab; 
+  struct scad_geometry* floor; 
   struct scad_geometry* cavity; 
   struct scad_geometry* ground; 
   struct scad_geometry* boundary; 
diff --git a/src/cg_city.c b/src/cg_city.c
@@ -48,7 +48,7 @@ parse:
       b.model = MODEL0;
       b.data = malloc(sizeof(struct data_model0));
       data0.wall = 0.2;
-      data0.slab = 0.3;
+      data0.floor = 0.3;
       *(struct data_model0*)(b.data) = data0;
       b.build_cad = &build_cad_model0;
       b.export_stl = &export_stl_model0;
@@ -104,7 +104,7 @@ city_cad_build(struct logger* logger, struct city* city)
   res_T res = RES_OK;
   size_t i,n;
 
-  ERR(scad_initialize(logger, NULL, 3));
+  ERR(scad_initialize(logger, NULL, 0));
 
   /* iterate on building */
   n = city->n;
@@ -129,7 +129,7 @@ city_ground_build(struct logger* logger, struct city* city)
   res_T res = RES_OK;
   size_t i,n;
 
-  ERR(scad_initialize(logger, NULL, 3));
+  ERR(scad_initialize(logger, NULL, 0));
   /* iterate on building */
   n = city->n;
   city->ground.n = n;