Merge pull request #1166 from Geode-solutions/fix/model-copy-active

MelchiorSchuh · web-flow · commit cc3c5493aff9 · 2025-07-21T14:32:32.000+02:00
fix(ModelBuilder): copy component active status
diff --git a/include/geode/model/representation/builder/detail/copy.hpp b/include/geode/model/representation/builder/detail/copy.hpp
@@ -63,17 +63,18 @@ namespace geode
                     ModelFrom::dim == BuilderTo::dim
                         ? builder_to.add_corner( id, corner.mesh().impl_name() )
                         : builder_to.add_corner( id );
-                    builder_to.set_corner_name( id, corner.name() );
                 }
                 else
                 {
                     const auto& id =
                         ModelFrom::dim == BuilderTo::dim
                             ? builder_to.add_corner( corner.mesh().impl_name() )
                             : builder_to.add_corner();
-                    builder_to.set_corner_name( id, corner.name() );
                     mapping.map( corner.id(), id );
                 }
+                const auto& id = mapping.in2out( corner.id() );
+                builder_to.set_corner_name( id, corner.name() );
+                builder_to.set_corner_active( id, corner.is_active() );
             }
         }
 
@@ -89,17 +90,18 @@ namespace geode
                     ModelFrom::dim == BuilderTo::dim
                         ? builder_to.add_line( id, line.mesh().impl_name() )
                         : builder_to.add_line( id );
-                    builder_to.set_line_name( id, line.name() );
                 }
                 else
                 {
                     const auto& id =
                         ModelFrom::dim == BuilderTo::dim
                             ? builder_to.add_line( line.mesh().impl_name() )
                             : builder_to.add_line();
-                    builder_to.set_line_name( id, line.name() );
                     mapping.map( line.id(), id );
                 }
+                const auto& id = mapping.in2out( line.id() );
+                builder_to.set_line_name( id, line.name() );
+                builder_to.set_line_active( id, line.is_active() );
             }
         }
 
@@ -116,17 +118,18 @@ namespace geode
                         ? builder_to.add_surface(
                               id, surface.mesh().impl_name() )
                         : builder_to.add_surface( id );
-                    builder_to.set_surface_name( id, surface.name() );
                 }
                 else
                 {
                     const auto& id = ModelFrom::dim == BuilderTo::dim
                                          ? builder_to.add_surface(
                                                surface.mesh().impl_name() )
                                          : builder_to.add_surface();
-                    builder_to.set_surface_name( id, surface.name() );
                     mapping.map( surface.id(), id );
                 }
+                const auto& id = mapping.in2out( surface.id() );
+                builder_to.set_surface_name( id, surface.name() );
+                builder_to.set_surface_active( id, surface.is_active() );
             }
         }
 
@@ -142,17 +145,18 @@ namespace geode
                     ModelFrom::dim == BuilderTo::dim
                         ? builder_to.add_block( id, block.mesh().impl_name() )
                         : builder_to.add_block( id );
-                    builder_to.set_block_name( id, block.name() );
                 }
                 else
                 {
                     const auto& id =
                         ModelFrom::dim == BuilderTo::dim
                             ? builder_to.add_block( block.mesh().impl_name() )
                             : builder_to.add_block();
-                    builder_to.set_block_name( id, block.name() );
                     mapping.map( block.id(), id );
                 }
+                const auto& id = mapping.in2out( block.id() );
+                builder_to.set_block_name( id, block.name() );
+                builder_to.set_block_active( id, block.is_active() );
             }
         }
 
@@ -166,16 +170,16 @@ namespace geode
                 {
                     const auto& id = mapping.in2out( model_boundary.id() );
                     builder_to.add_model_boundary( id );
-                    builder_to.set_model_boundary_name(
-                        id, model_boundary.name() );
                 }
                 else
                 {
                     const auto& id = builder_to.add_model_boundary();
-                    builder_to.set_model_boundary_name(
-                        id, model_boundary.name() );
                     mapping.map( model_boundary.id(), id );
                 }
+                const auto& id = mapping.in2out( model_boundary.id() );
+                builder_to.set_model_boundary_name( id, model_boundary.name() );
+                builder_to.set_model_boundary_active(
+                    id, model_boundary.is_active() );
             }
         }
 
@@ -189,16 +193,17 @@ namespace geode
                 {
                     const auto& id = mapping.in2out( corner_collection.id() );
                     builder_to.add_corner_collection( id );
-                    builder_to.set_corner_collection_name(
-                        id, corner_collection.name() );
                 }
                 else
                 {
                     const auto& id = builder_to.add_corner_collection();
-                    builder_to.set_corner_collection_name(
-                        id, corner_collection.name() );
                     mapping.map( corner_collection.id(), id );
                 }
+                const auto& id = mapping.in2out( corner_collection.id() );
+                builder_to.set_corner_collection_name(
+                    id, corner_collection.name() );
+                builder_to.set_corner_collection_active(
+                    id, corner_collection.is_active() );
             }
         }
 
@@ -212,16 +217,17 @@ namespace geode
                 {
                     const auto& id = mapping.in2out( line_collection.id() );
                     builder_to.add_line_collection( id );
-                    builder_to.set_line_collection_name(
-                        id, line_collection.name() );
                 }
                 else
                 {
                     const auto& id = builder_to.add_line_collection();
-                    builder_to.set_line_collection_name(
-                        id, line_collection.name() );
                     mapping.map( line_collection.id(), id );
                 }
+                const auto& id = mapping.in2out( line_collection.id() );
+                builder_to.set_line_collection_name(
+                    id, line_collection.name() );
+                builder_to.set_line_collection_active(
+                    id, line_collection.is_active() );
             }
         }
 
@@ -235,16 +241,17 @@ namespace geode
                 {
                     const auto& id = mapping.in2out( surface_collection.id() );
                     builder_to.add_surface_collection( id );
-                    builder_to.set_surface_collection_name(
-                        id, surface_collection.name() );
                 }
                 else
                 {
                     const auto& id = builder_to.add_surface_collection();
-                    builder_to.set_surface_collection_name(
-                        id, surface_collection.name() );
                     mapping.map( surface_collection.id(), id );
                 }
+                const auto& id = mapping.in2out( surface_collection.id() );
+                builder_to.set_surface_collection_name(
+                    id, surface_collection.name() );
+                builder_to.set_surface_collection_active(
+                    id, surface_collection.is_active() );
             }
         }
 
@@ -258,16 +265,17 @@ namespace geode
                 {
                     const auto& id = mapping.in2out( block_collection.id() );
                     builder_to.add_block_collection( id );
-                    builder_to.set_block_collection_name(
-                        id, block_collection.name() );
                 }
                 else
                 {
                     const auto& id = builder_to.add_block_collection();
-                    builder_to.set_block_collection_name(
-                        id, block_collection.name() );
                     mapping.map( block_collection.id(), id );
                 }
+                const auto& id = mapping.in2out( block_collection.id() );
+                builder_to.set_block_collection_name(
+                    id, block_collection.name() );
+                builder_to.set_block_collection_active(
+                    id, block_collection.is_active() );
             }
         }
 
diff --git a/src/geode/model/mixin/core/component.cpp b/src/geode/model/mixin/core/component.cpp
@@ -119,7 +119,6 @@ namespace geode
                                 component.impl_->backward_compatible_id() );
                             component.set_name(
                                 component.impl_->backward_compatible_name() );
-                            component.impl_.reset();
                         },
                            []( Archive& local_archive, Component& component ) {
                                local_archive.ext( component,

Original file line number	Diff line number	Diff line change
`@@ -63,17 +63,18 @@ namespace geode`
`63`	`63`	`ModelFrom::dim == BuilderTo::dim`
`64`	`64`	`? builder_to.add_corner( id, corner.mesh().impl_name() )`
`65`	`65`	`: builder_to.add_corner( id );`
`66`		`- builder_to.set_corner_name( id, corner.name() );`
`67`	`66`	`}`
`68`	`67`	`else`
`69`	`68`	`{`
`70`	`69`	`const auto& id =`
`71`	`70`	`ModelFrom::dim == BuilderTo::dim`
`72`	`71`	`? builder_to.add_corner( corner.mesh().impl_name() )`
`73`	`72`	`: builder_to.add_corner();`
`74`		`- builder_to.set_corner_name( id, corner.name() );`
`75`	`73`	`mapping.map( corner.id(), id );`
`76`	`74`	`}`
	`75`	`+ const auto& id = mapping.in2out( corner.id() );`
	`76`	`+ builder_to.set_corner_name( id, corner.name() );`
	`77`	`+ builder_to.set_corner_active( id, corner.is_active() );`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
`@@ -89,17 +90,18 @@ namespace geode`
`89`	`90`	`ModelFrom::dim == BuilderTo::dim`
`90`	`91`	`? builder_to.add_line( id, line.mesh().impl_name() )`
`91`	`92`	`: builder_to.add_line( id );`
`92`		`- builder_to.set_line_name( id, line.name() );`
`93`	`93`	`}`
`94`	`94`	`else`
`95`	`95`	`{`
`96`	`96`	`const auto& id =`
`97`	`97`	`ModelFrom::dim == BuilderTo::dim`
`98`	`98`	`? builder_to.add_line( line.mesh().impl_name() )`
`99`	`99`	`: builder_to.add_line();`
`100`		`- builder_to.set_line_name( id, line.name() );`
`101`	`100`	`mapping.map( line.id(), id );`
`102`	`101`	`}`
	`102`	`+ const auto& id = mapping.in2out( line.id() );`
	`103`	`+ builder_to.set_line_name( id, line.name() );`
	`104`	`+ builder_to.set_line_active( id, line.is_active() );`
`103`	`105`	`}`
`104`	`106`	`}`
`105`	`107`
`@@ -116,17 +118,18 @@ namespace geode`
`116`	`118`	`? builder_to.add_surface(`
`117`	`119`	`id, surface.mesh().impl_name() )`
`118`	`120`	`: builder_to.add_surface( id );`
`119`		`- builder_to.set_surface_name( id, surface.name() );`
`120`	`121`	`}`
`121`	`122`	`else`
`122`	`123`	`{`
`123`	`124`	`const auto& id = ModelFrom::dim == BuilderTo::dim`
`124`	`125`	`? builder_to.add_surface(`
`125`	`126`	`surface.mesh().impl_name() )`
`126`	`127`	`: builder_to.add_surface();`
`127`		`- builder_to.set_surface_name( id, surface.name() );`
`128`	`128`	`mapping.map( surface.id(), id );`
`129`	`129`	`}`
	`130`	`+ const auto& id = mapping.in2out( surface.id() );`
	`131`	`+ builder_to.set_surface_name( id, surface.name() );`
	`132`	`+ builder_to.set_surface_active( id, surface.is_active() );`
`130`	`133`	`}`
`131`	`134`	`}`
`132`	`135`
`@@ -142,17 +145,18 @@ namespace geode`
`142`	`145`	`ModelFrom::dim == BuilderTo::dim`
`143`	`146`	`? builder_to.add_block( id, block.mesh().impl_name() )`
`144`	`147`	`: builder_to.add_block( id );`
`145`		`- builder_to.set_block_name( id, block.name() );`
`146`	`148`	`}`
`147`	`149`	`else`
`148`	`150`	`{`
`149`	`151`	`const auto& id =`
`150`	`152`	`ModelFrom::dim == BuilderTo::dim`
`151`	`153`	`? builder_to.add_block( block.mesh().impl_name() )`
`152`	`154`	`: builder_to.add_block();`
`153`		`- builder_to.set_block_name( id, block.name() );`
`154`	`155`	`mapping.map( block.id(), id );`
`155`	`156`	`}`
	`157`	`+ const auto& id = mapping.in2out( block.id() );`
	`158`	`+ builder_to.set_block_name( id, block.name() );`
	`159`	`+ builder_to.set_block_active( id, block.is_active() );`
`156`	`160`	`}`
`157`	`161`	`}`
`158`	`162`
`@@ -166,16 +170,16 @@ namespace geode`
`166`	`170`	`{`
`167`	`171`	`const auto& id = mapping.in2out( model_boundary.id() );`
`168`	`172`	`builder_to.add_model_boundary( id );`
`169`		`- builder_to.set_model_boundary_name(`
`170`		`- id, model_boundary.name() );`
`171`	`173`	`}`
`172`	`174`	`else`
`173`	`175`	`{`
`174`	`176`	`const auto& id = builder_to.add_model_boundary();`
`175`		`- builder_to.set_model_boundary_name(`
`176`		`- id, model_boundary.name() );`
`177`	`177`	`mapping.map( model_boundary.id(), id );`
`178`	`178`	`}`
	`179`	`+ const auto& id = mapping.in2out( model_boundary.id() );`
	`180`	`+ builder_to.set_model_boundary_name( id, model_boundary.name() );`
	`181`	`+ builder_to.set_model_boundary_active(`
	`182`	`+ id, model_boundary.is_active() );`
`179`	`183`	`}`
`180`	`184`	`}`
`181`	`185`
`@@ -189,16 +193,17 @@ namespace geode`
`189`	`193`	`{`
`190`	`194`	`const auto& id = mapping.in2out( corner_collection.id() );`
`191`	`195`	`builder_to.add_corner_collection( id );`
`192`		`- builder_to.set_corner_collection_name(`
`193`		`- id, corner_collection.name() );`
`194`	`196`	`}`
`195`	`197`	`else`
`196`	`198`	`{`
`197`	`199`	`const auto& id = builder_to.add_corner_collection();`
`198`		`- builder_to.set_corner_collection_name(`
`199`		`- id, corner_collection.name() );`
`200`	`200`	`mapping.map( corner_collection.id(), id );`
`201`	`201`	`}`
	`202`	`+ const auto& id = mapping.in2out( corner_collection.id() );`
	`203`	`+ builder_to.set_corner_collection_name(`
	`204`	`+ id, corner_collection.name() );`
	`205`	`+ builder_to.set_corner_collection_active(`
	`206`	`+ id, corner_collection.is_active() );`
`202`	`207`	`}`
`203`	`208`	`}`
`204`	`209`
`@@ -212,16 +217,17 @@ namespace geode`
`212`	`217`	`{`
`213`	`218`	`const auto& id = mapping.in2out( line_collection.id() );`
`214`	`219`	`builder_to.add_line_collection( id );`
`215`		`- builder_to.set_line_collection_name(`
`216`		`- id, line_collection.name() );`
`217`	`220`	`}`
`218`	`221`	`else`
`219`	`222`	`{`
`220`	`223`	`const auto& id = builder_to.add_line_collection();`
`221`		`- builder_to.set_line_collection_name(`
`222`		`- id, line_collection.name() );`
`223`	`224`	`mapping.map( line_collection.id(), id );`
`224`	`225`	`}`
	`226`	`+ const auto& id = mapping.in2out( line_collection.id() );`
	`227`	`+ builder_to.set_line_collection_name(`
	`228`	`+ id, line_collection.name() );`
	`229`	`+ builder_to.set_line_collection_active(`
	`230`	`+ id, line_collection.is_active() );`
`225`	`231`	`}`
`226`	`232`	`}`
`227`	`233`
`@@ -235,16 +241,17 @@ namespace geode`
`235`	`241`	`{`
`236`	`242`	`const auto& id = mapping.in2out( surface_collection.id() );`
`237`	`243`	`builder_to.add_surface_collection( id );`
`238`		`- builder_to.set_surface_collection_name(`
`239`		`- id, surface_collection.name() );`
`240`	`244`	`}`
`241`	`245`	`else`
`242`	`246`	`{`
`243`	`247`	`const auto& id = builder_to.add_surface_collection();`
`244`		`- builder_to.set_surface_collection_name(`
`245`		`- id, surface_collection.name() );`
`246`	`248`	`mapping.map( surface_collection.id(), id );`
`247`	`249`	`}`
	`250`	`+ const auto& id = mapping.in2out( surface_collection.id() );`
	`251`	`+ builder_to.set_surface_collection_name(`
	`252`	`+ id, surface_collection.name() );`
	`253`	`+ builder_to.set_surface_collection_active(`
	`254`	`+ id, surface_collection.is_active() );`
`248`	`255`	`}`
`249`	`256`	`}`
`250`	`257`
`@@ -258,16 +265,17 @@ namespace geode`
`258`	`265`	`{`
`259`	`266`	`const auto& id = mapping.in2out( block_collection.id() );`
`260`	`267`	`builder_to.add_block_collection( id );`
`261`		`- builder_to.set_block_collection_name(`
`262`		`- id, block_collection.name() );`
`263`	`268`	`}`
`264`	`269`	`else`
`265`	`270`	`{`
`266`	`271`	`const auto& id = builder_to.add_block_collection();`
`267`		`- builder_to.set_block_collection_name(`
`268`		`- id, block_collection.name() );`
`269`	`272`	`mapping.map( block_collection.id(), id );`
`270`	`273`	`}`
	`274`	`+ const auto& id = mapping.in2out( block_collection.id() );`
	`275`	`+ builder_to.set_block_collection_name(`
	`276`	`+ id, block_collection.name() );`
	`277`	`+ builder_to.set_block_collection_active(`
	`278`	`+ id, block_collection.is_active() );`
`271`	`279`	`}`
`272`	`280`	`}`
`273`	`281`