Skip to content

Commit 5a1f566

Browse files
Merge pull request #1071 from Geode-solutions/fix/modifiers-inactive-and-1d
Fix/modifiers inactive and 1d
2 parents 2d7e72b + 1a6d21d commit 5a1f566

33 files changed

+176
-58
lines changed

include/geode/basic/mapping.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ namespace geode
126126
class BijectiveMapping : public MappingBase< T1, T2, OneValueStorage >
127127
{
128128
public:
129+
BijectiveMapping() = default;
130+
BijectiveMapping( BijectiveMapping&& other ) = default;
131+
BijectiveMapping& operator=( BijectiveMapping&& other ) = default;
132+
129133
void map( const T1& in, const T2& out )
130134
{
131135
if( this->has_mapping_input( in ) )
@@ -184,6 +188,10 @@ namespace geode
184188
class GenericMapping : public MappingBase< T1, T2, MultipleValueStorage >
185189
{
186190
public:
191+
GenericMapping() = default;
192+
GenericMapping( GenericMapping&& other ) = default;
193+
GenericMapping& operator=( GenericMapping&& other ) = default;
194+
187195
void map( const T1& in, const T2& out )
188196
{
189197
if( this->has_mapping_input( in ) )

include/geode/geometry/aabb.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ namespace geode
4444
class AABBTree
4545
{
4646
OPENGEODE_DISABLE_COPY( AABBTree );
47-
OPENGEODE_TEMPLATE_ASSERT_2D_OR_3D( dimension );
4847

4948
public:
5049
/*!
@@ -237,7 +236,7 @@ namespace geode
237236
private:
238237
IMPLEMENTATION_MEMBER( impl_ );
239238
};
240-
ALIAS_2D_AND_3D( AABBTree );
239+
ALIAS_1D_AND_2D_AND_3D( AABBTree );
241240
} // namespace geode
242241

243242
#include <geode/geometry/detail/aabb_impl.hpp>

include/geode/geometry/basic_objects/infinite_line.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ namespace geode
5454

5555
[[nodiscard]] const Point< dimension >& origin() const;
5656
[[nodiscard]] const Vector< dimension >& direction() const;
57+
template < index_t T = dimension >
58+
[[nodiscard]] typename std::enable_if< T == 2, double >::type
59+
line_constant() const;
5760

5861
private:
5962
Vector< dimension > direction_;

include/geode/mesh/builder/coordinate_reference_system_managers_builder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ namespace geode
7171
private:
7272
CoordinateReferenceSystemManagers< dimension >& crs_managers_;
7373
};
74-
ALIAS_2D_AND_3D( CoordinateReferenceSystemManagersBuilder );
74+
ALIAS_1D_AND_2D_AND_3D( CoordinateReferenceSystemManagersBuilder );
7575
} // namespace geode

include/geode/mesh/builder/edged_curve_builder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ namespace geode
7171
private:
7272
EdgedCurve< dimension >& edged_curve_;
7373
};
74-
ALIAS_2D_AND_3D( EdgedCurveBuilder );
74+
ALIAS_1D_AND_2D_AND_3D( EdgedCurveBuilder );
7575
} // namespace geode

include/geode/mesh/builder/geode/geode_edged_curve_builder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ namespace geode
8383
private:
8484
OpenGeodeEdgedCurve< dimension >& geode_edged_curve_;
8585
};
86-
ALIAS_2D_AND_3D( OpenGeodeEdgedCurveBuilder );
86+
ALIAS_1D_AND_2D_AND_3D( OpenGeodeEdgedCurveBuilder );
8787
} // namespace geode

include/geode/mesh/builder/geode/geode_point_set_builder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ namespace geode
6868
private:
6969
OpenGeodePointSet< dimension >& geode_point_set_;
7070
};
71-
ALIAS_2D_AND_3D( OpenGeodePointSetBuilder );
71+
ALIAS_1D_AND_2D_AND_3D( OpenGeodePointSetBuilder );
7272
} // namespace geode

include/geode/mesh/builder/point_set_builder.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ namespace geode
4545
: public VertexSetBuilder,
4646
public CoordinateReferenceSystemManagersBuilder< dimension >
4747
{
48-
OPENGEODE_TEMPLATE_ASSERT_2D_OR_3D( dimension );
49-
5048
public:
5149
static constexpr auto dim = dimension;
5250

@@ -75,5 +73,5 @@ namespace geode
7573
private:
7674
PointSet< dimension >& point_set_;
7775
};
78-
ALIAS_2D_AND_3D( PointSetBuilder );
76+
ALIAS_1D_AND_2D_AND_3D( PointSetBuilder );
7977
} // namespace geode

include/geode/mesh/core/coordinate_reference_system_managers.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,5 @@ namespace geode
9393
private:
9494
IMPLEMENTATION_MEMBER( impl_ );
9595
};
96-
ALIAS_2D_AND_3D( CoordinateReferenceSystemManagers );
96+
ALIAS_1D_AND_2D_AND_3D( CoordinateReferenceSystemManagers );
9797
} // namespace geode

include/geode/mesh/core/edged_curve.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@ namespace geode
9494
private:
9595
IMPLEMENTATION_MEMBER( impl_ );
9696
};
97-
ALIAS_2D_AND_3D( EdgedCurve );
97+
ALIAS_1D_AND_2D_AND_3D( EdgedCurve );
9898
} // namespace geode

0 commit comments

Comments
 (0)