wip

Author: BenPinet

include/geode/basic/bitsery_archive.hpp

@@ -48,6 +48,11 @@ namespace geode
     using Deserializer =
         bitsery::Deserializer< bitsery::InputStreamAdapter, TContext >;
 
+    enum struct BITSERY
+    {
+        constructor
+    };
+
     /*!
      * Register all the information needed by Bitsery to serialize the objects
      * in the basic library.
@@ -87,8 +92,10 @@ namespace geode
         template < template < typename > class Attribute, typename T >
         void import_old_attribute( AttributeManager &manager,
             std::string_view old_attribute_name,
-            geode::uuid new_attribute_id )
+            geode::uuid new_attribute_id,
+            index_t attribute_size )
         {
+            DEBUG( "import_old_attribute" );
             const auto ids =
                 manager.attribute_ids_with_name( old_attribute_name ).value();
             DEBUG( ids.size() );
@@ -106,14 +113,14 @@ namespace geode
                 manager.read_attribute< T >( old_attribute_id );
             auto new_attribute =
                 manager.find_attribute< Attribute, T >( new_attribute_id );
-            manager.resize( old_attribute->nb_items() );
-            for( const auto index : geode::Range{ old_attribute->nb_items() } )
+            manager.resize( attribute_size );
+            for( const auto index : geode::Range{ attribute_size } )
             {
-                SDEBUG( old_attribute->value( index ) );
                 new_attribute->set_value(
                     index, old_attribute->value( index ) );
             }
             manager.delete_attribute( old_attribute_id );
+            DEBUG( "import_old_attribute done" );
         }
     } // namespace detail
 } // namespace geode

include/geode/basic/growable.hpp

@@ -28,6 +28,7 @@
 #include <bitsery/bitsery.h>
 #include <bitsery/ext/compact_value.h>
 
+#include <geode/basic/logger.hpp>
 #include <geode/basic/types.hpp>
 
 namespace geode

include/geode/basic/uuid.hpp

@@ -68,6 +68,7 @@ namespace geode
         {
             serializer.ext( *this, Growable< Archive, uuid >{
                                        { []( Archive &archive, uuid &id ) {
+                                            DEBUG( "uuid::serialize" );
                                             uint64_t ab;
                                             uint64_t cd;
                                             archive.value8b( ab );
@@ -88,6 +89,7 @@ namespace geode
                                             id.bytes_[13] = ( cd >> 16 ) & 0xFF;
                                             id.bytes_[14] = ( cd >> 8 ) & 0xFF;
                                             id.bytes_[15] = ( cd >> 0 ) & 0xFF;
+                                            DEBUG( "uuid::serialize end" );
                                         },
                                            []( Archive &archive, uuid &id ) {
                                                archive.container1b( id.bytes_ );

include/geode/mesh/core/attribute_coordinate_reference_system.hpp

@@ -43,7 +43,7 @@ namespace geode
 
     public:
         explicit AttributeCoordinateReferenceSystem(
-            AttributeManager& manager );
+            AttributeManager& manager, const geode::uuid& uuid );
         AttributeCoordinateReferenceSystem(
             AttributeManager& manager, std::string_view attribute_name );
         ~AttributeCoordinateReferenceSystem();

include/geode/mesh/core/detail/facet_storage.hpp

@@ -57,6 +57,8 @@ namespace geode
             }
 
         protected:
+            FacetStorage( BITSERY ) {}
+
             FacetStorage()
             {
                 const auto counter_attribute_id =
@@ -70,7 +72,7 @@ namespace geode
                 const auto vertices_attribute_id =
                     facet_attribute_manager_
                         .create_attribute< VariableAttribute, VertexContainer >(
-                            "vertices", VertexContainer{},
+                            "facet_vertices", VertexContainer{},
                             { false, false, false } );
                 SDEBUG( vertices_attribute_id );
                 vertices_ =

include/geode/mesh/core/geode/geode_edged_curve.hpp

@@ -23,6 +23,7 @@
 
 #pragma once
 
+#include <geode/basic/bitsery_archive.hpp>
 #include <geode/basic/passkey.hpp>
 #include <geode/basic/pimpl.hpp>
 
@@ -49,6 +50,7 @@ namespace geode
         static constexpr auto dim = dimension;
 
         OpenGeodeEdgedCurve();
+        OpenGeodeEdgedCurve( BITSERY );
         OpenGeodeEdgedCurve( OpenGeodeEdgedCurve&& other ) noexcept;
         OpenGeodeEdgedCurve& operator=( OpenGeodeEdgedCurve&& other ) noexcept;
         ~OpenGeodeEdgedCurve();
@@ -82,10 +84,6 @@ namespace geode
         }
 
     public:
-        void set_vertex( index_t vertex_id,
-            Point< dimension > point,
-            OGEdgedCurveKey /*key*/ );
-
         void set_edge_vertex( const EdgeVertex& edge_vertex,
             index_t vertex_id,
             OGEdgedCurveKey /*key*/ );

include/geode/mesh/core/geode/geode_graph.hpp

@@ -23,6 +23,7 @@
 
 #pragma once
 
+#include <geode/basic/bitsery_archive.hpp>
 #include <geode/basic/passkey.hpp>
 #include <geode/basic/pimpl.hpp>
 
@@ -44,6 +45,7 @@ namespace geode
         using Builder = OpenGeodeGraphBuilder;
 
         OpenGeodeGraph();
+        OpenGeodeGraph( BITSERY );
         OpenGeodeGraph( OpenGeodeGraph&& other ) noexcept;
         OpenGeodeGraph& operator=( OpenGeodeGraph&& other ) noexcept;
         ~OpenGeodeGraph();

include/geode/mesh/core/geode/geode_hybrid_solid.hpp

@@ -25,6 +25,7 @@
 
 #include <array>
 
+#include <geode/basic/bitsery_archive.hpp>
 #include <geode/basic/passkey.hpp>
 #include <geode/basic/pimpl.hpp>
 
@@ -51,6 +52,7 @@ namespace geode
         static constexpr auto dim = dimension;
 
         OpenGeodeHybridSolid();
+        OpenGeodeHybridSolid( BITSERY );
         OpenGeodeHybridSolid( OpenGeodeHybridSolid&& other ) noexcept;
         OpenGeodeHybridSolid& operator=(
             OpenGeodeHybridSolid&& other ) noexcept;
@@ -85,10 +87,6 @@ namespace geode
         }
 
     public:
-        void set_vertex( index_t vertex_id,
-            Point< dimension > point,
-            OGHybridSolidKey /*key*/ );
-
         void set_polyhedron_vertex( const PolyhedronVertex& polyhedron_vertex,
             index_t vertex_id,
             OGHybridSolidKey /*key*/ );

include/geode/mesh/core/geode/geode_point_set.hpp

@@ -25,6 +25,7 @@
 
 #include <iostream>
 
+#include <geode/basic/bitsery_archive.hpp>
 #include <geode/basic/passkey.hpp>
 #include <geode/basic/pimpl.hpp>
 
@@ -50,6 +51,7 @@ namespace geode
         static constexpr auto dim = dimension;
 
         OpenGeodePointSet();
+        OpenGeodePointSet( BITSERY );
         OpenGeodePointSet( OpenGeodePointSet&& other ) noexcept;
         OpenGeodePointSet& operator=( OpenGeodePointSet&& other ) noexcept;
         ~OpenGeodePointSet();

include/geode/mesh/core/geode/geode_polygonal_surface.hpp

@@ -23,6 +23,7 @@
 
 #pragma once
 
+#include <geode/basic/bitsery_archive.hpp>
 #include <geode/basic/passkey.hpp>
 #include <geode/basic/pimpl.hpp>
 
@@ -49,6 +50,7 @@ namespace geode
         static constexpr auto dim = dimension;
 
         OpenGeodePolygonalSurface();
+        OpenGeodePolygonalSurface( BITSERY );
         OpenGeodePolygonalSurface( OpenGeodePolygonalSurface&& other ) noexcept;
         OpenGeodePolygonalSurface& operator=(
             OpenGeodePolygonalSurface&& other ) noexcept;
@@ -83,10 +85,6 @@ namespace geode
         }
 
     public:
-        void set_vertex( index_t vertex_id,
-            Point< dimension > point,
-            OGPolygonalSurfaceKey /*key*/ );
-
         void set_polygon_vertex( const PolygonVertex& polygon_vertex,
             index_t vertex_id,
             OGPolygonalSurfaceKey /*key*/ );