kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: fix clang-tidy warnings in BoundBox.h

Browse Source
This commit is contained in:
wmayer
2023-08-26 18:22:45 +02:00
committed by wwmayer
parent 9dd4779252
commit b4739d3ca4
3 changed files with 516 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Mesh/App/Core/TrimByPlane.cpp
View File

@@ -51,7 +51,7 @@ void MeshTrimByPlane::CheckFacets(const MeshFacetGrid& rclGrid, const Base::Vect
// save all elements in checkElements
clGridIter.GetElements(checkElements);
}
else if (clBBox3d.CalcPoint(0).DistanceToPlane(base, normal) > 0.0f) {
else if (clBBox3d.CalcPoint(Base::BoundBox3f::TLB).DistanceToPlane(base, normal) > 0.0f) {
// save all elements in removeFacets
clGridIter.GetElements(removeFacets);
}

35
src/Mod/Mesh/App/Mesh.cpp
View File

@@ -165,7 +165,7 @@ Base::BoundBox3d MeshObject::getBoundBox()const
Base::BoundBox3d Bnd2;
if (Bnd.IsValid()) {
for (int i =0 ;i<=7;i++)
Bnd2.Add(transformPointToOutside(Bnd.CalcPoint(i)));
Bnd2.Add(transformPointToOutside(Bnd.CalcPoint(Base::BoundBox3f::CORNER(i))));
}
return Bnd2;
@@ -1882,28 +1882,29 @@ MeshObject* MeshObject::createCube(float length, float width, float height, floa
MeshObject* MeshObject::createCube(const Base::BoundBox3d& bbox)
{
using Corner = Base::BoundBox3d::CORNER;
std::vector<MeshCore::MeshGeomFacet> facets;
auto createFacet = [&bbox](int i, int j, int k) {
auto createFacet = [&bbox](Corner p1, Corner p2, Corner p3) {
MeshCore::MeshGeomFacet facet;
facet._aclPoints[0] = Base::convertTo<Base::Vector3f>(bbox.CalcPoint(i));
facet._aclPoints[1] = Base::convertTo<Base::Vector3f>(bbox.CalcPoint(j));
facet._aclPoints[2] = Base::convertTo<Base::Vector3f>(bbox.CalcPoint(k));
facet._aclPoints[0] = Base::convertTo<Base::Vector3f>(bbox.CalcPoint(p1));
facet._aclPoints[1] = Base::convertTo<Base::Vector3f>(bbox.CalcPoint(p2));
facet._aclPoints[2] = Base::convertTo<Base::Vector3f>(bbox.CalcPoint(p3));
facet.CalcNormal();
return facet;
};
facets.push_back(createFacet(0, 1, 2));
facets.push_back(createFacet(0, 2, 3));
facets.push_back(createFacet(0, 5, 1));
facets.push_back(createFacet(0, 4, 5));
facets.push_back(createFacet(0, 3, 7));
facets.push_back(createFacet(0, 7, 4));
facets.push_back(createFacet(4, 6, 5));
facets.push_back(createFacet(4, 7, 6));
facets.push_back(createFacet(1, 6, 2));
facets.push_back(createFacet(1, 5, 6));
facets.push_back(createFacet(2, 7, 3));
facets.push_back(createFacet(2, 6, 7));
facets.push_back(createFacet(Corner::TLB, Corner::TLF, Corner::TRF));
facets.push_back(createFacet(Corner::TLB, Corner::TRF, Corner::TRB));
facets.push_back(createFacet(Corner::TLB, Corner::BLF, Corner::TLF));
facets.push_back(createFacet(Corner::TLB, Corner::BLB, Corner::BLF));
facets.push_back(createFacet(Corner::TLB, Corner::TRB, Corner::BRB));
facets.push_back(createFacet(Corner::TLB, Corner::BRB, Corner::BLB));
facets.push_back(createFacet(Corner::BLB, Corner::BRF, Corner::BLF));
facets.push_back(createFacet(Corner::BLB, Corner::BRB, Corner::BRF));
facets.push_back(createFacet(Corner::TLF, Corner::BRF, Corner::TRF));
facets.push_back(createFacet(Corner::TLF, Corner::BLF, Corner::BRF));
facets.push_back(createFacet(Corner::TRF, Corner::BRB, Corner::TRB));
facets.push_back(createFacet(Corner::TRF, Corner::BRF, Corner::BRB));
Base::EmptySequencer seq;
std::unique_ptr<MeshObject> mesh(new MeshObject);