Skip to content

Commit f71a519

Browse files
MelchiorSchuhMelchiorSchuh
authored
Merge pull request #1124 from Geode-solutions/fix/result-exception
Fix/result exception
2 parents 3c7b078 + 51f8eaf commit f71a519

File tree

8 files changed

+189
-5
lines changed

8 files changed

+189
-5
lines changed

‎include/geode/basic/assert.hpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@ namespace geode
9898
using OpenGeodeException::OpenGeodeException;
9999
};
100100

101+
class OpenGeodeResultException : public OpenGeodeException
102+
{
103+
public:
104+
using OpenGeodeException::OpenGeodeException;
105+
};
106+
101107
void opengeode_basic_api geode_assertion_failed( std::string_view condition,
102108
std::string_view message,
103109
std::string_view file,
@@ -144,5 +150,12 @@ namespace geode
144150
__VA_ARGS__ \
145151
}
146152

153+
#define OPENGEODE_RESULT_EXCEPTION( condition, ... ) \
154+
if( ABSL_PREDICT_FALSE( !( condition ) ) ) \
155+
throw geode::OpenGeodeResultException \
156+
{ \
157+
__VA_ARGS__ \
158+
}
159+
147160
#define OPENGEODE_RESEARCH( condition, ... ) \
148161
OPENGEODE_EXCEPTION( condition, __VA_ARGS__ )

‎include/geode/model/helpers/detail/surface_mesh_validity_fix.hpp‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright (c) 2019 - 2025 Geode-solutions
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
* SOFTWARE.
21+
*
22+
*/
23+
24+
#pragma once
25+
26+
#include <geode/model/common.hpp>
27+
28+
namespace geode
29+
{
30+
FORWARD_DECLARATION_DIMENSION_CLASS( Surface );
31+
} // namespace geode
32+
33+
namespace geode
34+
{
35+
namespace detail
36+
{
37+
template < typename Model >
38+
void repair_non_manifold_vertices(
39+
Model& model, const Surface< Model::dim >& surface );
40+
} // namespace detail
41+
} // namespace geode

‎include/geode/model/representation/io/geode/geode_section_input.hpp‎

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

2424
#pragma once
2525

26+
#include <async++.h>
27+
2628
#include <geode/model/representation/builder/detail/filter.hpp>
2729
#include <geode/model/representation/builder/detail/register.hpp>
2830
#include <geode/model/representation/builder/section_builder.hpp>

‎src/geode/basic/assert.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ namespace geode
5151
Logger::critical( "OpenGeodeDataException: ", exception.what(),
5252
"\n", exception.stack_trace() );
5353
}
54+
catch( const OpenGeodeResultException& exception )
55+
{
56+
Logger::critical( "OpenGeodeResultException: ", exception.what(),
57+
"\n", exception.stack_trace() );
58+
}
5459
catch( const OpenGeodeException& exception )
5560
{
5661
Logger::critical( "OpenGeodeException: ", exception.what(), "\n",

‎src/geode/geometry/basic_objects/segment.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,9 @@ namespace geode
5555
GenericSegment< PointType, dimension >::direction() const
5656
{
5757
Vector< dimension > direction{ vertices_[0], vertices_[1] };
58-
if( direction.length() < GLOBAL_EPSILON )
59-
{
60-
DEBUG( direction.length() );
61-
}
6258
OPENGEODE_EXCEPTION( direction.length() > GLOBAL_EPSILON,
63-
"[Segment::direction] Segment length too small" );
59+
"[Segment::direction] Segment length too small (",
60+
direction.length(), ")" );
6461
return direction;
6562
}
6663
template < typename PointType, index_t dimension >

‎src/geode/model/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ add_geode_library(
4444
"helpers/detail/mappings_merger.cpp"
4545
"helpers/detail/split_along_surface_mesh_borders.cpp"
4646
"helpers/detail/split_along_block_mesh_borders.cpp"
47+
"helpers/detail/surface_mesh_validity_fix.cpp"
4748
"mixin/builder/blocks_builder.cpp"
4849
"mixin/builder/block_collections_builder.cpp"
4950
"mixin/builder/component_registry_builder.cpp"
@@ -172,6 +173,7 @@ add_geode_library(
172173
"helpers/detail/mappings_merger.hpp"
173174
"helpers/detail/split_along_surface_mesh_borders.hpp"
174175
"helpers/detail/split_along_block_mesh_borders.hpp"
176+
"helpers/detail/surface_mesh_validity_fix.hpp"
175177
"mixin/core/detail/components_storage.hpp"
176178
"mixin/core/detail/count_relationships.hpp"
177179
"mixin/core/detail/mesh_storage.hpp"

‎src/geode/model/helpers/detail/surface_mesh_validity_fix.cpp‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/*
2+
* Copyright (c) 2019 - 2025 Geode-solutions
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
* SOFTWARE.
21+
*
22+
*/
23+
24+
#include <geode/model/helpers/detail/surface_mesh_validity_fix.hpp>
25+
26+
#include <absl/container/flat_hash_map.h>
27+
28+
#include <geode/basic/uuid.hpp>
29+
30+
#include <geode/geometry/point.hpp>
31+
32+
#include <geode/mesh/core/surface_mesh.hpp>
33+
34+
#include <geode/model/mixin/core/surface.hpp>
35+
#include <geode/model/representation/core/brep.hpp>
36+
#include <geode/model/representation/core/section.hpp>
37+
38+
namespace geode
39+
{
40+
namespace detail
41+
{
42+
template < typename Model >
43+
void repair_non_manifold_vertices(
44+
Model& model, const Surface< Model::dim >& surface )
45+
{
46+
const auto& mesh = surface.mesh();
47+
typename Model::Builder model_builder{ model };
48+
auto mesh_builder =
49+
model_builder.surface_mesh_builder( surface.id() );
50+
absl::FixedArray< PolygonsAroundVertex > polygons_around_vertices(
51+
mesh.nb_vertices() );
52+
for( const auto p : Range{ mesh.nb_polygons() } )
53+
{
54+
for( const auto v : LRange{ mesh.nb_polygon_vertices( p ) } )
55+
{
56+
polygons_around_vertices[mesh.polygon_vertex( { p, v } )]
57+
.emplace_back( p, v );
58+
}
59+
}
60+
absl::flat_hash_map< index_t, std::vector< index_t > > mappings;
61+
for( const auto v : Range{ mesh.nb_vertices() } )
62+
{
63+
auto polygons_around = mesh.polygons_around_vertex( v );
64+
const auto& polygon_vertices = polygons_around_vertices[v];
65+
auto nb_polygons_around = polygons_around.size();
66+
if( nb_polygons_around == polygon_vertices.size() )
67+
{
68+
continue;
69+
}
70+
std::vector< index_t > new_values;
71+
PolygonsAroundVertex total_polygons;
72+
while( nb_polygons_around != polygon_vertices.size() )
73+
{
74+
for( auto&& polygon : polygons_around )
75+
{
76+
total_polygons.emplace_back( std::move( polygon ) );
77+
}
78+
const auto new_vertex_id =
79+
mesh_builder->create_point( mesh.point( v ) );
80+
mesh_builder->replace_vertex( v, new_vertex_id );
81+
for( const auto& polygon_vertex : polygon_vertices )
82+
{
83+
if( absl::c_find( total_polygons, polygon_vertex )
84+
== total_polygons.end() )
85+
{
86+
mesh_builder->associate_polygon_vertex_to_vertex(
87+
polygon_vertex, v );
88+
break;
89+
}
90+
}
91+
new_values.push_back( new_vertex_id );
92+
polygons_around = mesh.polygons_around_vertex( v );
93+
nb_polygons_around += polygons_around.size();
94+
}
95+
mappings.try_emplace( v, std::move( new_values ) );
96+
}
97+
for( const auto& [old_vertex, new_vertices] : mappings )
98+
{
99+
const auto unique_vertex = model.unique_vertex(
100+
{ surface.component_id(), old_vertex } );
101+
for( const auto new_vertex : new_vertices )
102+
{
103+
model_builder.set_unique_vertex(
104+
{ surface.component_id(), new_vertex }, unique_vertex );
105+
}
106+
}
107+
}
108+
109+
template void opengeode_model_api
110+
repair_non_manifold_vertices< Section >(
111+
Section&, const Surface2D& );
112+
template void opengeode_model_api repair_non_manifold_vertices< BRep >(
113+
BRep&, const Surface3D& );
114+
} // namespace detail
115+
} // namespace geode

‎tests/basic/test-assert.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,15 @@ void test_exception()
185185
{
186186
geode::geode_lippincott();
187187
}
188+
189+
try
190+
{
191+
throw geode::OpenGeodeResultException{ "Bad ", "result" };
192+
}
193+
catch( ... )
194+
{
195+
geode::geode_lippincott();
196+
}
188197
}
189198

190199
void test()

0 commit comments

Comments
 (0)