Merge pull request #1099 from Geode-solutions/fix/component-id-in-component

MelchiorSchuh · web-flow · commit 53e62ec0d7f9 · 2025-03-07T10:59:38.000+01:00
fix(Model): move up component_id() in Component class
diff --git a/include/geode/model/mixin/core/block.hpp b/include/geode/model/mixin/core/block.hpp
@@ -72,11 +72,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
         template < typename TypedMesh = Mesh >
         [[nodiscard]] const TypedMesh& mesh() const
         {
diff --git a/include/geode/model/mixin/core/block_collection.hpp b/include/geode/model/mixin/core/block_collection.hpp
@@ -63,11 +63,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
     public:
         BlockCollection( BlockCollectionsKey ) : BlockCollection() {}
 
diff --git a/include/geode/model/mixin/core/component.hpp b/include/geode/model/mixin/core/component.hpp
@@ -52,6 +52,8 @@ namespace geode
 
         [[nodiscard]] virtual ComponentType component_type() const = 0;
 
+        [[nodiscard]] ComponentID component_id() const;
+
     protected:
         Component();
 
diff --git a/include/geode/model/mixin/core/corner.hpp b/include/geode/model/mixin/core/corner.hpp
@@ -72,11 +72,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
         [[nodiscard]] const Mesh& mesh() const;
 
         [[nodiscard]] const MeshImpl& mesh_type() const;
diff --git a/include/geode/model/mixin/core/corner_collection.hpp b/include/geode/model/mixin/core/corner_collection.hpp
@@ -63,11 +63,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
     public:
         CornerCollection( CornerCollectionsKey ) : CornerCollection() {}
 
diff --git a/include/geode/model/mixin/core/line.hpp b/include/geode/model/mixin/core/line.hpp
@@ -71,11 +71,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
         [[nodiscard]] const Mesh& mesh() const;
 
         [[nodiscard]] const MeshImpl& mesh_type() const;
diff --git a/include/geode/model/mixin/core/line_collection.hpp b/include/geode/model/mixin/core/line_collection.hpp
@@ -63,11 +63,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
     public:
         LineCollection( LineCollectionsKey ) : LineCollection() {}
 
diff --git a/include/geode/model/mixin/core/model_boundary.hpp b/include/geode/model/mixin/core/model_boundary.hpp
@@ -63,11 +63,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
     public:
         ModelBoundary( ModelBoundariesKey ) : ModelBoundary() {}
 
diff --git a/include/geode/model/mixin/core/surface.hpp b/include/geode/model/mixin/core/surface.hpp
@@ -71,11 +71,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
         template < typename TypedMesh = Mesh >
         [[nodiscard]] const TypedMesh& mesh() const
         {
diff --git a/include/geode/model/mixin/core/surface_collection.hpp b/include/geode/model/mixin/core/surface_collection.hpp
@@ -63,11 +63,6 @@ namespace geode
             return component_type_static();
         }
 
-        [[nodiscard]] ComponentID component_id() const
-        {
-            return { this->component_type_static(), this->id() };
-        };
-
     public:
         SurfaceCollection( SurfaceCollectionsKey ) : SurfaceCollection() {}
 
diff --git a/src/geode/model/mixin/core/component.cpp b/src/geode/model/mixin/core/component.cpp
@@ -37,19 +37,14 @@ namespace geode
     class Component< dimension >::Impl
     {
     public:
-        std::string_view name() const
+        std::string_view backward_compatible_name() const
         {
-            return name_;
+            return backward_compatible_name_;
         }
 
-        void set_name( std::string_view name )
+        const uuid& backward_compatible_id() const
         {
-            name_ = to_string( name );
-        }
-
-        const uuid& id() const
-        {
-            return id_;
+            return backward_compatible_id_;
         }
 
     private:
@@ -59,14 +54,15 @@ namespace geode
         {
             archive.ext( *this,
                 Growable< Archive, Impl >{ { []( Archive& a, Impl& impl ) {
-                    a.text1b( impl.name_, impl.name_.max_size() );
-                    a.object( impl.id_ );
+                    a.text1b( impl.backward_compatible_name_,
+                        impl.backward_compatible_name_.max_size() );
+                    a.object( impl.backward_compatible_id_ );
                 } } } );
         }
 
     private:
-        std::string name_ = std::string{ "unknown" };
-        uuid id_;
+        std::string backward_compatible_name_ = std::string{ "unknown" };
+        uuid backward_compatible_id_;
     };
 
     template < index_t dimension >
@@ -78,6 +74,12 @@ namespace geode
     template < index_t dimension >
     Component< dimension >::Component( Component&& ) noexcept = default;
 
+    template < index_t dimension >
+    ComponentID Component< dimension >::component_id() const
+    {
+        return { this->component_type(), this->id() };
+    };
+
     template < index_t dimension >
     template < typename Archive >
     void Component< dimension >::serialize( Archive& archive )
@@ -86,8 +88,10 @@ namespace geode
             *this, Growable< Archive, Component >{
                        { []( Archive& a, Component& component ) {
                             a.object( component.impl_ );
-                            component.set_id( component.impl_->id() );
-                            component.set_name( component.impl_->name() );
+                            component.set_id(
+                                component.impl_->backward_compatible_id() );
+                            component.set_name(
+                                component.impl_->backward_compatible_name() );
                             component.impl_.reset();
                         },
                            []( Archive& a, Component& component ) {

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,6 @@ namespace geode`
`72`	`72`	`return component_type_static();`
`73`	`73`	`}`
`74`	`74`
`75`		`- [[nodiscard]] ComponentID component_id() const`
`76`		`- {`
`77`		`- return { this->component_type_static(), this->id() };`
`78`		`- };`
`79`		`-`
`80`	`75`	`template < typename TypedMesh = Mesh >`
`81`	`76`	`[[nodiscard]] const TypedMesh& mesh() const`
`82`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,6 @@ namespace geode`
`71`	`71`	`return component_type_static();`
`72`	`72`	`}`
`73`	`73`
`74`		`- [[nodiscard]] ComponentID component_id() const`
`75`		`- {`
`76`		`- return { this->component_type_static(), this->id() };`
`77`		`- };`
`78`		`-`
`79`	`74`	`template < typename TypedMesh = Mesh >`
`80`	`75`	`[[nodiscard]] const TypedMesh& mesh() const`
`81`	`76`	`{`