Skip to content

Commit 3b1a656

Browse files
committed
feat(Attribute): add uuid to attributes changes
1 parent 4c4f52f commit 3b1a656

27 files changed

Lines changed: 254 additions & 76 deletions

include/geode/geosciences/explicit/geometry/geographic_coordinate_system.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ namespace geode
8080
public:
8181
GeographicCoordinateSystem(
8282
AttributeManager& manager, GeographicCoordinateSystemInfo info );
83+
84+
GeographicCoordinateSystem( AttributeManager& manager,
85+
const geode::uuid& uuid,
86+
GeographicCoordinateSystemInfo info );
87+
8388
~GeographicCoordinateSystem();
8489

8590
[[nodiscard]] static GeographicCoordinateSystem< dimension >

include/geode/geosciences/explicit/representation/core/cross_section.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#pragma once
2525

2626
#include <geode/basic/algorithm.hpp>
27+
#include <geode/basic/bitsery_archive.hpp>
2728

2829
#include <geode/model/mixin/core/corner.hpp>
2930
#include <geode/model/mixin/core/corner_collection.hpp>
@@ -147,6 +148,7 @@ namespace geode
147148
using Components = tuple_cat< MeshComponents, CollectionComponents >;
148149

149150
CrossSection() = default;
151+
CrossSection( BITSERY );
150152
CrossSection( CrossSection&& ) noexcept = default;
151153
explicit CrossSection( Section&& section ) noexcept;
152154
CrossSection( const CrossSection& initial_model,

include/geode/geosciences/explicit/representation/core/structural_model.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#pragma once
2525

2626
#include <geode/basic/algorithm.hpp>
27+
#include <geode/basic/bitsery_archive.hpp>
2728

2829
#include <geode/model/mixin/core/block.hpp>
2930
#include <geode/model/mixin/core/block_collection.hpp>
@@ -150,6 +151,7 @@ namespace geode
150151
using Components = tuple_cat< MeshComponents, CollectionComponents >;
151152

152153
StructuralModel() = default;
154+
StructuralModel( BITSERY );
153155
StructuralModel( StructuralModel&& ) noexcept = default;
154156
explicit StructuralModel( BRep&& brep ) noexcept;
155157
StructuralModel( const StructuralModel& initial_model,

include/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ namespace geode
5454

5555
public:
5656
StratigraphicRelationships();
57+
StratigraphicRelationships( BITSERY );
5758
~StratigraphicRelationships();
5859

5960
[[nodiscard]] bool is_above(

include/geode/geosciences/implicit/representation/core/detail/helpers.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,11 @@ namespace geode
7171

7272
[[nodiscard]] ImplicitCrossSection opengeode_geosciences_implicit_api
7373
implicit_section_from_cross_section_scalar_field(
74-
CrossSection&& section,
75-
std::string_view scalar_attribute_name );
74+
CrossSection&& section, const uuid& scalar_attribute_id );
7675

7776
[[nodiscard]] ImplicitStructuralModel opengeode_geosciences_implicit_api
7877
implicit_model_from_structural_model_scalar_field(
79-
StructuralModel&& model,
80-
std::string_view scalar_attribute_name );
78+
StructuralModel&& model, const uuid& scalar_attribute_id );
8179

8280
[[nodiscard]] StratigraphicModel opengeode_geosciences_implicit_api
8381
stratigraphic_model_from_implicit_model_and_coords(

include/geode/geosciences/implicit/representation/core/horizons_stack.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#pragma once
2525

26+
#include <geode/basic/bitsery_archive.hpp>
2627
#include <geode/basic/identifier.hpp>
2728
#include <geode/basic/pimpl.hpp>
2829

@@ -134,6 +135,7 @@ namespace geode
134135
using Components = tuple_cat< MeshComponents, CollectionComponents >;
135136

136137
HorizonsStack();
138+
HorizonsStack( BITSERY );
137139
HorizonsStack( HorizonsStack< dimension >&& horizons_stack ) noexcept;
138140
~HorizonsStack();
139141

include/geode/geosciences/implicit/representation/core/implicit_cross_section.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include <optional>
2727

28+
#include <geode/basic/bitsery_archive.hpp>
2829
#include <geode/basic/pimpl.hpp>
2930

3031
#include <geode/geosciences/explicit/representation/core/cross_section.hpp>
@@ -56,6 +57,7 @@ namespace geode
5657
"geode_implicit_attribute";
5758
using implicit_attribute_type = double;
5859
ImplicitCrossSection();
60+
ImplicitCrossSection( BITSERY );
5961
ImplicitCrossSection( ImplicitCrossSection&& implicit_model ) noexcept;
6062
explicit ImplicitCrossSection( CrossSection&& cross_section ) noexcept;
6163
ImplicitCrossSection( const ImplicitCrossSection& initial_model,

include/geode/geosciences/implicit/representation/core/implicit_structural_model.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include <optional>
2727

28+
#include <geode/basic/bitsery_archive.hpp>
2829
#include <geode/basic/pimpl.hpp>
2930

3031
#include <geode/geosciences/explicit/representation/core/structural_model.hpp>
@@ -63,6 +64,7 @@ namespace geode
6364
"geode_implicit_attribute";
6465
using implicit_attribute_type = double;
6566
ImplicitStructuralModel();
67+
ImplicitStructuralModel( BITSERY );
6668
ImplicitStructuralModel(
6769
ImplicitStructuralModel&& implicit_model ) noexcept;
6870
explicit ImplicitStructuralModel(
@@ -87,6 +89,9 @@ namespace geode
8789
return native_extension_static();
8890
}
8991

92+
[[nodiscard]] uuid block_implicit_function_attribute_id(
93+
const uuid& block_id ) const;
94+
9095
/*!
9196
* Return the implicit value at the given vertex of the given block.
9297
*/

include/geode/geosciences/implicit/representation/core/stratigraphic_model.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#pragma once
2525

26+
#include <geode/basic/bitsery_archive.hpp>
2627
#include <geode/basic/pimpl.hpp>
2728

2829
#include <geode/geosciences/implicit/common.hpp>
@@ -59,6 +60,7 @@ namespace geode
5960
"geode_associated_block_polyhedron_facet";
6061
using stratigraphic_location_type = Point2D;
6162
StratigraphicModel();
63+
StratigraphicModel( BITSERY );
6264
StratigraphicModel( StratigraphicModel&& implicit_model ) noexcept;
6365
explicit StratigraphicModel(
6466
ImplicitStructuralModel&& structural_model ) noexcept;
@@ -142,6 +144,9 @@ namespace geode
142144

143145
[[nodiscard]] BoundingBox3D stratigraphic_bounding_box() const;
144146

147+
[[nodiscard]] uuid block_stratigraphic_location_attribute_id(
148+
const uuid& block_id ) const;
149+
145150
public:
146151
void initialize_stratigraphic_query_trees(
147152
StratigraphicModelBuilderKey );

include/geode/geosciences/implicit/representation/core/stratigraphic_section.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include <optional>
2727

28+
#include <geode/basic/bitsery_archive.hpp>
2829
#include <geode/basic/pimpl.hpp>
2930

3031
#include <geode/geosciences/implicit/common.hpp>
@@ -62,6 +63,7 @@ namespace geode
6263

6364
using stratigraphic_location_type = Point1D;
6465
StratigraphicSection();
66+
StratigraphicSection( BITSERY );
6567
StratigraphicSection(
6668
StratigraphicSection&& stratigraphic_section ) noexcept;
6769
explicit StratigraphicSection(
@@ -145,6 +147,9 @@ namespace geode
145147

146148
[[nodiscard]] BoundingBox2D stratigraphic_bounding_box() const;
147149

150+
[[nodiscard]] uuid surface_stratigraphic_location_attribute_id(
151+
const uuid& surface ) const;
152+
148153
public:
149154
void initialize_stratigraphic_query_trees(
150155
StratigraphicSectionBuilderKey );

0 commit comments

Comments
 (0)