city_generator2

commit c75b4899b9ef1362833c7e15df682b25e59759ab
parent 36a66126a14105c00e167277c2beb8b2ce83b652
Author: Benjamin Piaud <benjamin.piaud@meso-star.com>
Date:   Thu, 12 Jan 2023 11:41:37 +0100

Modification of the suffix for stl describing a solid to facilitate post processing

Diffstat:
M
src/cg_constructive_mode_0.c
 | 
8
++++----
M
src/cg_constructive_mode_1.c
 | 
26
+++++++++++++-------------

2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/cg_constructive_mode_0.c b/src/cg_constructive_mode_0.c
@@ -73,7 +73,7 @@ build_floor
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_floor"));
+    ERR(str_append(&name, "_S_floor"));
     floorname = str_get(&name);
   }
 
@@ -112,7 +112,7 @@ build_roof
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_roof"));
+    ERR(str_append(&name, "_S_roof"));
     roofname = str_get(&name);
   }
 
@@ -184,7 +184,7 @@ build_wall
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_wall"));
+    ERR(str_append(&name, "_S_wall"));
     wallname = str_get(&name);
   }
 
@@ -228,7 +228,7 @@ build_cavity
   is_init = 1;
   if (prefix) {
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_cavity"));
+    ERR(str_append(&name, "_F_cavity"));
     cavityname = str_get(&name);
   }
 
diff --git a/src/cg_constructive_mode_1.c b/src/cg_constructive_mode_1.c
@@ -56,7 +56,7 @@ build_floor
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_floor"));
+    ERR(str_append(&name, "S_floor"));
     floorname = str_get(&name);
   }
 
@@ -189,7 +189,7 @@ build_int_insulation
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_int_insulation"));
+    ERR(str_append(&name, "_S_int_insulation"));
     insulationname = str_get(&name);
   }
 
@@ -262,7 +262,7 @@ build_roof
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_roof"));
+    ERR(str_append(&name, "_S_roof"));
     roofname = str_get(&name);
   }
 
@@ -318,7 +318,7 @@ build_roof_insulation
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_roof_insulation"));
+    ERR(str_append(&name, "_S_roof_insulation"));
     insulationname = str_get(&name);
   }
 
@@ -373,7 +373,7 @@ build_floor_insulation
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_floor_insulation"));
+    ERR(str_append(&name, "_S_floor_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, "_inter_floor"));
+    ERR(str_append(&name, "_S_inter_floor"));
     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, "_ext_insulation"));
+    ERR(str_append(&name, "_S_ext_insulation"));
     insulationname = str_get(&name);
   }
 
@@ -576,7 +576,7 @@ build_crawlspace
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_crawlspace"));
+    ERR(str_append(&name, "_F_crawlspace"));
     crawlname = 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, "_cavity"));
+    ERR(str_append(&name, "_F_cavity"));
     cavityname = str_get(&name);
   }
 
@@ -697,7 +697,7 @@ build_attic
     str_init(allocator, &name);
     is_init = 1;
     ERR(str_set(&name, prefix));
-    ERR(str_append(&name, "_attic"));
+    ERR(str_append(&name, "_F_attic"));
     atticname = 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, "_glass"));
+    ERR(str_append(&gname, "_S_glass"));
   }
 
   ERR(scad_fuse_geometries(str_cget(&gname), glass_list, 1,
@@ -1306,7 +1306,7 @@ build_cad_cmode_1
   name = str_cget(&building->name);
   ERR(build_floor(name, allocator, pg, data, &data_cad->floor));
 
-  ERR(build_wall(name, "wall", allocator, pg, height, data, &data_cad->wall));
+  ERR(build_wall(name, "S_wall", allocator, pg, height, data, &data_cad->wall));
 
   ERR(build_roof(name, allocator, pg, height, data, &data_cad->roof));
 
@@ -1321,7 +1321,7 @@ build_cad_cmode_1
 
   if (data->foundation_depth > 0) {
     depth = -data->foundation_depth;
-    ERR(build_wall(name, "foundation", allocator, pg, depth, data,
+    ERR(build_wall(name, "S_foundation", allocator, pg, depth, data,
           &data_cad->foundation));
   }