Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-18 22:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpaqueCoordinate rule of 3

Browse Source
This commit is contained in:
Thomas Krijnen
2023-12-19 12:40:16 +01:00
parent 89fd887d9a
commit 9fddb564b1
2 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/ConversionResult.h
+25 -1
View File
@@ -152,8 +152,15 @@ namespace IfcGeom {
template <size_t N> template <size_t N>
struct IFC_GEOM_API OpaqueCoordinate { struct IFC_GEOM_API OpaqueCoordinate {
private:
std::array<OpaqueNumber*, N> values; std::array<OpaqueNumber*, N> values;
static void copy_(std::array<OpaqueNumber*, N>& dest, const std::array<OpaqueNumber*, N>& src) {
for (size_t i = 0; i < N; ++i) {
dest[i] = (src[i] != nullptr) ? src[i]->clone() : nullptr;
}
}
public:
template <typename... Args> template <typename... Args>
OpaqueCoordinate(Args... args) { OpaqueCoordinate(Args... args) {
static_assert(sizeof...(args) == N, "Incorrect number of arguments provided"); static_assert(sizeof...(args) == N, "Incorrect number of arguments provided");
@@ -166,7 +173,24 @@ namespace IfcGeom {
} }
} }
OpaqueNumber* get(size_t i) { OpaqueCoordinate(const OpaqueCoordinate& other) {
copy_(values, other.values);
}
OpaqueCoordinate& operator=(const OpaqueCoordinate& other) {
if (this != &other) {
copy_(values, other.values);
}
return *this;
}
~OpaqueCoordinate() {
for (auto it = values.begin(); it != values.end(); ++it) {
delete *it;
}
}
OpaqueNumber* get(size_t i) const {
if (i >= N) { if (i >= N) {
return nullptr; return nullptr;
} }
src/ifcgeom/kernels/cgal/CgalConversionResult.cpp
+16 -16
View File
@@ -708,16 +708,16 @@ void ifcopenshell::geometry::CgalShapeHalfSpaceDecomposition::map(OpaqueCoordina
plane_map<Kernel_> mp; plane_map<Kernel_> mp;
mp.insert({ mp.insert({
CGAL::Plane_3<Kernel_>( CGAL::Plane_3<Kernel_>(
static_cast<NumberEpeck*>(from.values[0])->value(), static_cast<NumberEpeck*>(from.get(0))->value(),
static_cast<NumberEpeck*>(from.values[1])->value(), static_cast<NumberEpeck*>(from.get(1))->value(),
static_cast<NumberEpeck*>(from.values[2])->value(), static_cast<NumberEpeck*>(from.get(2))->value(),
static_cast<NumberEpeck*>(from.values[3])->value() static_cast<NumberEpeck*>(from.get(3))->value()
), ),
CGAL::Plane_3<Kernel_>( CGAL::Plane_3<Kernel_>(
static_cast<NumberEpeck*>(to.values[0])->value(), static_cast<NumberEpeck*>(to.get(0))->value(),
static_cast<NumberEpeck*>(to.values[1])->value(), static_cast<NumberEpeck*>(to.get(1))->value(),
static_cast<NumberEpeck*>(to.values[2])->value(), static_cast<NumberEpeck*>(to.get(2))->value(),
static_cast<NumberEpeck*>(to.values[3])->value() static_cast<NumberEpeck*>(to.get(3))->value()
) )
}); });
auto nw = shape_->map(mp); auto nw = shape_->map(mp);
@@ -736,16 +736,16 @@ void ifcopenshell::geometry::CgalShapeHalfSpaceDecomposition::map(const std::vec
auto& to = *jt; auto& to = *jt;
mp.insert({ mp.insert({
CGAL::Plane_3<Kernel_>( CGAL::Plane_3<Kernel_>(
static_cast<NumberEpeck*>(from.values[0])->value(), static_cast<NumberEpeck*>(from.get(0))->value(),
static_cast<NumberEpeck*>(from.values[1])->value(), static_cast<NumberEpeck*>(from.get(1))->value(),
static_cast<NumberEpeck*>(from.values[2])->value(), static_cast<NumberEpeck*>(from.get(2))->value(),
static_cast<NumberEpeck*>(from.values[3])->value() static_cast<NumberEpeck*>(from.get(3))->value()
), ),
CGAL::Plane_3<Kernel_>( CGAL::Plane_3<Kernel_>(
static_cast<NumberEpeck*>(to.values[0])->value(), static_cast<NumberEpeck*>(to.get(0))->value(),
static_cast<NumberEpeck*>(to.values[1])->value(), static_cast<NumberEpeck*>(to.get(1))->value(),
static_cast<NumberEpeck*>(to.values[2])->value(), static_cast<NumberEpeck*>(to.get(2))->value(),
static_cast<NumberEpeck*>(to.values[3])->value() static_cast<NumberEpeck*>(to.get(3))->value()
) )
}); });
} }