Skip to content

fix(Convert): add attribute on mesh storing input model unique vertices #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 28, 2022
Merged

fix(Convert): add attribute on mesh storing input model unique vertices #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de2aae1
fix(Convert): add attribute on mesh storing input model unique vertices
panquez Sep 27, 2022
d94ef14
fix test
panquez Sep 28, 2022
aa78d8d
clean
panquez Sep 28, 2022
1a73126
fix test python
panquez Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bindings/python/tests/model/test-py-convert-to-mesh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def run_test_section():
if curve.nb_edges() != 0:
raise ValueError("[Test] Section - Wrong number of curve edges")

if surface.nb_vertices() != 1:
if surface.nb_vertices() != 4:
raise ValueError("[Test] Section - Wrong number of surface vertices")
if surface.nb_polygons() != 1:
raise ValueError("[Test] Section - Wrong number of surface polygons")
Expand Down
3 changes: 3 additions & 0 deletions include/geode/model/helpers/convert_to_mesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ namespace geode
static constexpr auto uuid_from_conversion_attribute_name =
"uuid_from_conversion";
using uuid_from_conversion_attribute_type = uuid;
static constexpr auto unique_vertex_from_conversion_attribute_name =
"unique_vertex_from_conversion";
using unique_vertex_from_conversion_attribute_type = index_t;

std::unique_ptr< EdgedCurve2D > opengeode_model_api
convert_section_into_curve( const Section& section );
Expand Down
112 changes: 87 additions & 25 deletions src/geode/model/helpers/convert_to_mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@ namespace
class FromModel
{
public:
FromModel( const Model& model ) : model_( model ) {}
FromModel( const Model& model ) : model_( model )
{
OPENGEODE_EXCEPTION( model.nb_unique_vertices() > 0,
"[Convert Model to Mesh(es)] Given model should have unique "
"vertices" );
}

const Model& model() const
{
Expand All @@ -71,6 +76,9 @@ namespace

geode::index_t create_vertex( geode::index_t vertex_id )
{
OPENGEODE_EXCEPTION( vertex_id != geode::NO_ID,
"[Convert Model to Mesh(es)] At least one Component Mesh "
"Vertex is not link to a unique vertex" );
const geode::index_t new_id = vertices_.size();
vertices_.emplace( vertex_id, new_id );
return new_id;
Expand All @@ -88,6 +96,12 @@ namespace
return points;
}

const absl::flat_hash_map< geode::index_t, geode::index_t >&
vertices() const
{
return vertices_;
}

private:
const Model& model_;
absl::flat_hash_map< geode::index_t, geode::index_t > vertices_;
Expand Down Expand Up @@ -135,6 +149,10 @@ namespace
const auto polyhedra = build_polyhedra( block );
set_polyhedra_adjacency( block, polyhedra );
}
for( const auto& v2uv : model_.vertices() )
{
attribute_unique_vertex_->set_value( v2uv.first, v2uv.second );
}
}

std::unique_ptr< SolidType > get_result()
Expand All @@ -147,12 +165,21 @@ namespace
: model_( model ),
mesh_{ SolidType::create() },
builder_{ geode::SolidMeshBuilder3D::create( *mesh_ ) },
attribute_{ mesh_->polyhedron_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::uuid_from_conversion_attribute_type >(
geode::uuid_from_conversion_attribute_name,
{} ) }
attribute_uuid_{
mesh_->polyhedron_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::uuid_from_conversion_attribute_type >(
geode::uuid_from_conversion_attribute_name, {} )
},
attribute_unique_vertex_{
mesh_->vertex_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::unique_vertex_from_conversion_attribute_type >(
geode::unique_vertex_from_conversion_attribute_name,
geode::NO_ID )
}
{
}

Expand Down Expand Up @@ -219,7 +246,7 @@ namespace
}
polyhedra[p] = builder_->create_polyhedron(
polyhedron_vertices, polyhedron_facet_vertices );
attribute_->set_value( polyhedra[p], block.id() );
attribute_uuid_->set_value( polyhedra[p], block.id() );
}
return polyhedra;
}
Expand All @@ -230,7 +257,10 @@ namespace
std::unique_ptr< geode::SolidMeshBuilder3D > builder_;
std::shared_ptr< geode::VariableAttribute<
geode::uuid_from_conversion_attribute_type > >
attribute_;
attribute_uuid_;
std::shared_ptr< geode::VariableAttribute<
geode::unique_vertex_from_conversion_attribute_type > >
attribute_unique_vertex_;
};

template < typename SurfaceType, typename Model, geode::index_t dimension >
Expand All @@ -242,12 +272,21 @@ namespace
mesh_{ SurfaceType::create() },
builder_{ geode::SurfaceMeshBuilder< dimension >::create(
*mesh_ ) },
attribute_{ mesh_->polygon_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::uuid_from_conversion_attribute_type >(
geode::uuid_from_conversion_attribute_name,
{} ) }
attribute_uuid_{
mesh_->polygon_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::uuid_from_conversion_attribute_type >(
geode::uuid_from_conversion_attribute_name, {} )
},
attribute_unique_vertex_{
mesh_->vertex_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::unique_vertex_from_conversion_attribute_type >(
geode::unique_vertex_from_conversion_attribute_name,
geode::NO_ID )
}
{
}

Expand All @@ -268,6 +307,10 @@ namespace
const auto polygons = build_polygons( surface );
set_polygons_adjacency( surface, polygons );
}
for( const auto& v2uv : model_.vertices() )
{
attribute_unique_vertex_->set_value( v2uv.first, v2uv.second );
}
}

std::unique_ptr< SurfaceType > get_result()
Expand Down Expand Up @@ -320,7 +363,7 @@ namespace
}
}
polygons[p] = builder_->create_polygon( polygon );
attribute_->set_value( polygons[p], surface.id() );
attribute_uuid_->set_value( polygons[p], surface.id() );
}
return polygons;
}
Expand All @@ -331,7 +374,10 @@ namespace
std::unique_ptr< geode::SurfaceMeshBuilder< dimension > > builder_;
std::shared_ptr< geode::VariableAttribute<
geode::uuid_from_conversion_attribute_type > >
attribute_;
attribute_uuid_;
std::shared_ptr< geode::VariableAttribute<
geode::unique_vertex_from_conversion_attribute_type > >
attribute_unique_vertex_;
};

template < typename SurfaceType >
Expand All @@ -349,12 +395,21 @@ namespace
mesh_{ geode::EdgedCurve< dimension >::create() },
builder_{ geode::EdgedCurveBuilder< dimension >::create(
*mesh_ ) },
attribute_{ mesh_->edge_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::uuid_from_conversion_attribute_type >(
geode::uuid_from_conversion_attribute_name,
{} ) }
attribute_uuid_{
mesh_->edge_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::uuid_from_conversion_attribute_type >(
geode::uuid_from_conversion_attribute_name, {} )
},
attribute_unique_vertex_{
mesh_->vertex_attribute_manager()
.template find_or_create_attribute<
geode::VariableAttribute,
geode::unique_vertex_from_conversion_attribute_type >(
geode::unique_vertex_from_conversion_attribute_name,
geode::NO_ID )
}
{
}

Expand All @@ -364,6 +419,10 @@ namespace
{
build_edges( line );
}
for( const auto& v2uv : model_.vertices() )
{
attribute_unique_vertex_->set_value( v2uv.first, v2uv.second );
}
}

std::unique_ptr< geode::EdgedCurve< dimension > > get_result()
Expand Down Expand Up @@ -395,7 +454,7 @@ namespace
}
const auto edge =
builder_->create_edge( vertices[0], vertices[1] );
attribute_->set_value( edge, line.id() );
attribute_uuid_->set_value( edge, line.id() );
}
}

Expand All @@ -405,7 +464,10 @@ namespace
std::unique_ptr< geode::EdgedCurveBuilder< dimension > > builder_;
std::shared_ptr< geode::VariableAttribute<
geode::uuid_from_conversion_attribute_type > >
attribute_;
attribute_uuid_;
std::shared_ptr< geode::VariableAttribute<
geode::unique_vertex_from_conversion_attribute_type > >
attribute_unique_vertex_;
};

using CurveFromBRep = CurveFromModel< geode::BRep, 3 >;
Expand Down
Binary file modified tests/data/quad.og_sctn
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions tests/model/test-convert-to-mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

void run_test_brep()
{
auto model =
const auto model =
geode::load_brep( absl::StrCat( geode::data_path, "layers.og_brep" ) );

const auto output =
Expand All @@ -66,7 +66,7 @@ void run_test_brep()

void run_test_section()
{
auto model =
const auto model =
geode::load_section( absl::StrCat( geode::data_path, "quad.og_sctn" ) );

const auto output = geode::convert_section_into_curve_and_surface( model );
Expand All @@ -77,7 +77,7 @@ void run_test_section()
"[Test] Section - Wrong number of curve edges" );

const auto& surface = std::get< 1 >( output );
OPENGEODE_EXCEPTION( surface->nb_vertices() == 1,
OPENGEODE_EXCEPTION( surface->nb_vertices() == 4,
"[Test] Section - Wrong number of surface vertices" );
OPENGEODE_EXCEPTION( surface->nb_polygons() == 1,
"[Test] Section - Wrong number of surface polygons" );
Expand Down