Skip to content

Commit 00d9658

Browse files
committed
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeode into fix_removing_apex_refine_in_remesh
2 parents e9f6683 + 0cd5c69 commit 00d9658

File tree

12 files changed

+24
-9
lines changed

12 files changed

+24
-9
lines changed

include/geode/geometry/basic_objects/circle.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,8 @@
3030
namespace geode
3131
{
3232
FORWARD_DECLARATION_DIMENSION_CLASS( BoundingBox );
33-
FORWARD_DECLARATION_DIMENSION_CLASS( Point );
3433
ALIAS_3D( BoundingBox );
35-
ALIAS_3D( Point );
3634
class OwnerCircle;
37-
38-
template < index_t dimension >
39-
using RefPoint = std::reference_wrapper< const Point< dimension > >;
40-
ALIAS_2D_AND_3D( RefPoint );
4135
} // namespace geode
4236

4337
namespace geode
@@ -46,6 +40,8 @@ namespace geode
4640
class GenericCircle
4741
{
4842
public:
43+
static constexpr auto dim = 3;
44+
4945
GenericCircle( PlaneType plane, double radius );
5046

5147
GenericCircle( const GenericCircle& other );

include/geode/geometry/basic_objects/cylinder.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ namespace geode
3131
class opengeode_geometry_api Cylinder
3232
{
3333
public:
34+
static constexpr auto dim = 3;
35+
3436
Cylinder( Segment3D axis, double radius );
3537

3638
Cylinder( const Cylinder& other );

include/geode/geometry/basic_objects/ellipse.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ namespace geode
4747
class GenericEllipse
4848
{
4949
public:
50+
static constexpr auto dim = dimension;
51+
5052
GenericEllipse( PointType center, FrameType axis );
5153

5254
GenericEllipse(

include/geode/geometry/basic_objects/infinite_line.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ namespace geode
4343
class GenericLine
4444
{
4545
public:
46+
static constexpr auto dim = dimension;
47+
4648
GenericLine( const Vector< dimension >& direction, PointType origin );
4749
explicit GenericLine( const Segment< dimension >& segment );
4850
GenericLine( const GenericLine< PointType, dimension >& other );

include/geode/geometry/basic_objects/plane.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ namespace geode
4444
class GenericPlane
4545
{
4646
public:
47+
static constexpr auto dim = 3;
48+
4749
GenericPlane( const Vector3D& normal, PointType origin );
4850
explicit GenericPlane( const Triangle3D& triangle );
4951
GenericPlane( const GenericPlane& other );

include/geode/geometry/basic_objects/polygon.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ namespace geode
4747
class GenericPolygon
4848
{
4949
public:
50+
static constexpr auto dim = dimension;
51+
5052
GenericPolygon( std::vector< PointType > vertices ) noexcept;
5153

5254
GenericPolygon(

include/geode/geometry/basic_objects/segment.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ namespace geode
4242
class GenericSegment
4343
{
4444
public:
45+
static constexpr auto dim = dimension;
46+
4547
GenericSegment( PointType point0, PointType point1 ) noexcept;
4648

4749
GenericSegment(

include/geode/geometry/basic_objects/sphere.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ namespace geode
4343
class GenericSphere
4444
{
4545
public:
46+
static constexpr auto dim = dimension;
47+
4648
GenericSphere( PointType origin, double radius );
4749

4850
GenericSphere( const GenericSphere< PointType, dimension >& other );

include/geode/geometry/basic_objects/tetrahedron.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ namespace geode
4646
class GenericTetrahedron
4747
{
4848
public:
49+
static constexpr auto dim = 3;
4950
static constexpr inline std::array< std::array< index_t, 3 >, 4 >
5051
tetrahedron_facet_vertex{ { { { 1, 3, 2 } }, { { 0, 2, 3 } },
5152
{ { 3, 1, 0 } }, { { 0, 1, 2 } } } };

include/geode/geometry/basic_objects/triangle.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ namespace geode
4747
class GenericTriangle
4848
{
4949
public:
50+
static constexpr auto dim = dimension;
51+
5052
GenericTriangle(
5153
PointType point0, PointType point1, PointType point2 ) noexcept;
5254

0 commit comments

Comments
 (0)