lili/OCCT
1
0
Fork 0
mirror of https://github.com/Open-Cascade-SAS/OCCT.git synced 2026-05-10 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modeling - Optimize BndLib and add GTests (#856)

Browse Source 
- Fix negative modulo in torus bounding box computation
- Fix hyperbola extrema loop early break condition
- Fix OpenMin/OpenMax direction sign for infinite bounds
- Remove dead code in cone bounding computation
- Replace sqrt/log with more efficient computations in hyperbola bounds
- General code cleanup and modernization
This commit is contained in:
Pasukhin Dmitry
2025-11-27 09:22:44 +00:00
committed by GitHub
parent 1663c65625
commit c04f5e0b4c
7 changed files with 1733 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

545
src/ModelingData/TKGeomBase/BndLib/BndLib.cxx
View File

@@ -42,6 +42,12 @@ static Standard_Integer ComputeBox(const gp_Hypr& aHypr,
namespace
{
//! Cosine of M_PI/8 (22.5 degrees) - used for 8-point polygon approximation.
constexpr Standard_Real THE_COS_PI8 = 0.92387953251128674;
//! Cosine (and sine) of M_PI/4 (45 degrees) - used for diagonal points.
constexpr Standard_Real THE_COS_PI4 = 0.70710678118654746;
//! Compute method
template <class PointType, class BndBoxType>
void Compute(const Standard_Real theP1,
@@ -74,19 +80,11 @@ void Compute(const Standard_Real theP1,
}
else
{
// Normalize aTeta1 to [0, 2*PI) range
aTeta1 = std::fmod(aTeta1, 2. * M_PI);
if (aTeta1 < 0.)
{
do
{
aTeta1 += 2. * M_PI;
} while (aTeta1 < 0.);
}
else if (aTeta1 > 2. * M_PI)
{
do
{
aTeta1 -= 2. * M_PI;
} while (aTeta1 > 2. * M_PI);
}
aTeta2 = aTeta1 + aDelta;
}
@@ -104,149 +102,76 @@ void Compute(const Standard_Real theP1,
if (aDelta > M_PI / 8.)
{
// Main radiuses to take into account only 8 points (/cos(Pi/8.))
aRam = theRa / 0.92387953251128674;
aRbm = theRb / 0.92387953251128674;
aRam = theRa / THE_COS_PI8;
aRbm = theRb / THE_COS_PI8;
}
else
{
// Main radiuses to take into account the arrow
Standard_Real aTc = cos(aDelta / 2);
Standard_Real aTc = std::cos(aDelta / 2);
aRam = theRa / aTc;
aRbm = theRb / aTc;
}
theB.Add(PointType(theO.Coord() + aRam * aCn1 * theXd.Coord() + aRbm * aSn1 * theYd.Coord()));
theB.Add(PointType(theO.Coord() + aRam * aCn2 * theXd.Coord() + aRbm * aSn2 * theYd.Coord()));
// cos or sin M_PI/4.
#define PI4 0.70710678118654746
// X and Y multipliers for 8 polygon points at 45-degree intervals (0, 45, 90, ..., 315 degrees).
// Point i corresponds to angle i * 45 degrees.
constexpr Standard_Real aXMult[8] =
{1., THE_COS_PI4, 0., -THE_COS_PI4, -1., -THE_COS_PI4, 0., THE_COS_PI4};
constexpr Standard_Real aYMult[8] =
{0., THE_COS_PI4, 1., THE_COS_PI4, 0., -THE_COS_PI4, -1., -THE_COS_PI4};
// 8 points of the polygon
#define addPoint0 theB.Add(PointType(theO.Coord() + aRam * theXd.Coord()))
#define addPoint1 \
theB.Add(PointType(theO.Coord() + aRam * PI4 * theXd.Coord() + aRbm * PI4 * theYd.Coord()))
#define addPoint2 theB.Add(PointType(theO.Coord() + aRbm * theYd.Coord()))
#define addPoint3 \
theB.Add(PointType(theO.Coord() - aRam * PI4 * theXd.Coord() + aRbm * PI4 * theYd.Coord()))
#define addPoint4 theB.Add(PointType(theO.Coord() - aRam * theXd.Coord()))
#define addPoint5 \
theB.Add(PointType(theO.Coord() - aRam * PI4 * theXd.Coord() - aRbm * PI4 * theYd.Coord()))
#define addPoint6 theB.Add(PointType(theO.Coord() - aRbm * theYd.Coord()))
#define addPoint7 \
theB.Add(PointType(theO.Coord() + aRam * PI4 * theXd.Coord() - aRbm * PI4 * theYd.Coord()))
// Lambda to add polygon point by index (0-7).
const auto addPoint = [&](Standard_Integer theIdx) {
theB.Add(PointType(theO.Coord() + aRam * aXMult[theIdx] * theXd.Coord()
+ aRbm * aYMult[theIdx] * theYd.Coord()));
};
Standard_Integer aDeb = (Standard_Integer)(aTeta1 / (M_PI / 4.));
Standard_Integer aFin = (Standard_Integer)(aTeta2 / (M_PI / 4.));
Standard_Integer aDeb = static_cast<Standard_Integer>(aTeta1 / (M_PI / 4.));
Standard_Integer aFin = static_cast<Standard_Integer>(aTeta2 / (M_PI / 4.));
aDeb++;
if (aDeb > aFin)
return;
switch (aDeb)
{
case 1: {
addPoint1;
if (aFin <= 1)
break;
}
Standard_FALLTHROUGH
case 2: {
addPoint2;
if (aFin <= 2)
break;
}
Standard_FALLTHROUGH
case 3: {
addPoint3;
if (aFin <= 3)
break;
}
Standard_FALLTHROUGH
case 4: {
addPoint4;
if (aFin <= 4)
break;
}
Standard_FALLTHROUGH
case 5: {
addPoint5;
if (aFin <= 5)
break;
}
Standard_FALLTHROUGH
case 6: {
addPoint6;
if (aFin <= 6)
break;
}
Standard_FALLTHROUGH
case 7: {
addPoint7;
if (aFin <= 7)
break;
}
Standard_FALLTHROUGH
case 8: {
addPoint0;
if (aFin <= 8)
break;
}
Standard_FALLTHROUGH
case 9: {
addPoint1;
if (aFin <= 9)
break;
}
Standard_FALLTHROUGH
case 10: {
addPoint2;
if (aFin <= 10)
break;
}
Standard_FALLTHROUGH
case 11: {
addPoint3;
if (aFin <= 11)
break;
}
Standard_FALLTHROUGH
case 12: {
addPoint4;
if (aFin <= 12)
break;
}
Standard_FALLTHROUGH
case 13: {
addPoint5;
if (aFin <= 13)
break;
}
Standard_FALLTHROUGH
case 14: {
addPoint6;
if (aFin <= 14)
break;
}
Standard_FALLTHROUGH
case 15: {
addPoint7;
if (aFin <= 15)
break;
return;
}
// Add polygon points from aDeb to aFin, wrapping around using modulo 8.
for (Standard_Integer i = aDeb; i <= aFin; ++i)
{
addPoint(i % 8);
}
}
} // end namespace
static void OpenMin(const gp_Dir& V, Bnd_Box& B)
{
gp_Dir OX(gp_Dir::D::X);
gp_Dir OY(gp_Dir::D::Y);
gp_Dir OZ(gp_Dir::D::Z);
if (V.IsParallel(OX, Precision::Angular()))
// OpenMin opens the box in the direction of decreasing parameter.
// For a line P(t) = Origin + t*V, as t -> -Inf:
// - If V.X() > 0, x-coordinate -> -Inf, so open Xmin
// - If V.X() < 0, x-coordinate -> +Inf, so open Xmax
if (V.IsParallel(gp::DX(), Precision::Angular()))
{
if (V.X() > 0.)
B.OpenXmin();
else if (V.IsParallel(OY, Precision::Angular()))
else
B.OpenXmax();
}
else if (V.IsParallel(gp::DY(), Precision::Angular()))
{
if (V.Y() > 0.)
B.OpenYmin();
else if (V.IsParallel(OZ, Precision::Angular()))
else
B.OpenYmax();
}
else if (V.IsParallel(gp::DZ(), Precision::Angular()))
{
if (V.Z() > 0.)
B.OpenZmin();
else
B.OpenZmax();
}
else
{
B.OpenXmin();
@@ -257,15 +182,31 @@ static void OpenMin(const gp_Dir& V, Bnd_Box& B)
static void OpenMax(const gp_Dir& V, Bnd_Box& B)
{
gp_Dir OX(gp_Dir::D::X);
gp_Dir OY(gp_Dir::D::Y);
gp_Dir OZ(gp_Dir::D::Z);
if (V.IsParallel(OX, Precision::Angular()))
// OpenMax opens the box in the direction of increasing parameter.
// For a line P(t) = Origin + t*V, as t -> +Inf:
// - If V.X() > 0, x-coordinate -> +Inf, so open Xmax
// - If V.X() < 0, x-coordinate -> -Inf, so open Xmin
if (V.IsParallel(gp::DX(), Precision::Angular()))
{
if (V.X() > 0.)
B.OpenXmax();
else if (V.IsParallel(OY, Precision::Angular()))
else
B.OpenXmin();
}
else if (V.IsParallel(gp::DY(), Precision::Angular()))
{
if (V.Y() > 0.)
B.OpenYmax();
else if (V.IsParallel(OZ, Precision::Angular()))
else
B.OpenYmin();
}
else if (V.IsParallel(gp::DZ(), Precision::Angular()))
{
if (V.Z() > 0.)
B.OpenZmax();
else
B.OpenZmin();
}
else
{
B.OpenXmax();
@@ -276,20 +217,17 @@ static void OpenMax(const gp_Dir& V, Bnd_Box& B)
static void OpenMinMax(const gp_Dir& V, Bnd_Box& B)
{
gp_Dir OX(gp_Dir::D::X);
gp_Dir OY(gp_Dir::D::Y);
gp_Dir OZ(gp_Dir::D::Z);
if (V.IsParallel(OX, Precision::Angular()))
if (V.IsParallel(gp::DX(), Precision::Angular()))
{
B.OpenXmax();
B.OpenXmin();
}
else if (V.IsParallel(OY, Precision::Angular()))
else if (V.IsParallel(gp::DY(), Precision::Angular()))
{
B.OpenYmax();
B.OpenYmin();
}
else if (V.IsParallel(OZ, Precision::Angular()))
else if (V.IsParallel(gp::DZ(), Precision::Angular()))
{
B.OpenZmax();
B.OpenZmin();
@@ -307,12 +245,24 @@ static void OpenMinMax(const gp_Dir& V, Bnd_Box& B)
static void OpenMin(const gp_Dir2d& V, Bnd_Box2d& B)
{
gp_Dir2d OX(gp_Dir2d::D::X);
gp_Dir2d OY(gp_Dir2d::D::Y);
if (V.IsParallel(OX, Precision::Angular()))
// OpenMin opens the box in the direction of decreasing parameter.
// For a line P(t) = Origin + t*V, as t -> -Inf:
// - If V.X() > 0, x-coordinate -> -Inf, so open Xmin
// - If V.X() < 0, x-coordinate -> +Inf, so open Xmax
if (V.IsParallel(gp::DX2d(), Precision::Angular()))
{
if (V.X() > 0.)
B.OpenXmin();
else if (V.IsParallel(OY, Precision::Angular()))
else
B.OpenXmax();
}
else if (V.IsParallel(gp::DY2d(), Precision::Angular()))
{
if (V.Y() > 0.)
B.OpenYmin();
else
B.OpenYmax();
}
else
{
B.OpenXmin();
@@ -322,12 +272,24 @@ static void OpenMin(const gp_Dir2d& V, Bnd_Box2d& B)
static void OpenMax(const gp_Dir2d& V, Bnd_Box2d& B)
{
gp_Dir2d OX(gp_Dir2d::D::X);
gp_Dir2d OY(gp_Dir2d::D::Y);
if (V.IsParallel(OX, Precision::Angular()))
// OpenMax opens the box in the direction of increasing parameter.
// For a line P(t) = Origin + t*V, as t -> +Inf:
// - If V.X() > 0, x-coordinate -> +Inf, so open Xmax
// - If V.X() < 0, x-coordinate -> -Inf, so open Xmin
if (V.IsParallel(gp::DX2d(), Precision::Angular()))
{
if (V.X() > 0.)
B.OpenXmax();
else if (V.IsParallel(OY, Precision::Angular()))
else
B.OpenXmin();
}
else if (V.IsParallel(gp::DY2d(), Precision::Angular()))
{
if (V.Y() > 0.)
B.OpenYmax();
else
B.OpenYmin();
}
else
{
B.OpenXmax();
@@ -337,14 +299,12 @@ static void OpenMax(const gp_Dir2d& V, Bnd_Box2d& B)
static void OpenMinMax(const gp_Dir2d& V, Bnd_Box2d& B)
{
gp_Dir2d OX(gp_Dir2d::D::X);
gp_Dir2d OY(gp_Dir2d::D::Y);
if (V.IsParallel(OX, Precision::Angular()))
if (V.IsParallel(gp::DX2d(), Precision::Angular()))
{
B.OpenXmax();
B.OpenXmin();
}
else if (V.IsParallel(OY, Precision::Angular()))
else if (V.IsParallel(gp::DY2d(), Precision::Angular()))
{
B.OpenYmax();
B.OpenYmin();
@@ -1162,6 +1122,9 @@ void BndLib::Add(const gp_Cylinder& S,
const Standard_Real Tol,
Bnd_Box& B)
{
// Cache axis direction for infinite cases.
const gp_Dir& aDir = S.Axis().Direction();
if (Precision::IsNegativeInfinite(VMin))
{
if (Precision::IsNegativeInfinite(VMax))
@@ -1170,19 +1133,19 @@ void BndLib::Add(const gp_Cylinder& S,
}
else if (Precision::IsPositiveInfinite(VMax))
{
OpenMinMax(S.Axis().Direction(), B);
OpenMinMax(aDir, B);
}
else
{
ComputeCyl(S, UMin, UMax, 0., VMax, B);
OpenMin(S.Axis().Direction(), B);
OpenMin(aDir, B);
}
}
else if (Precision::IsPositiveInfinite(VMin))
{
if (Precision::IsNegativeInfinite(VMax))
{
OpenMinMax(S.Axis().Direction(), B);
OpenMinMax(aDir, B);
}
else if (Precision::IsPositiveInfinite(VMax))
{
@@ -1191,7 +1154,7 @@ void BndLib::Add(const gp_Cylinder& S,
else
{
ComputeCyl(S, UMin, UMax, 0., VMax, B);
OpenMax(S.Axis().Direction(), B);
OpenMax(aDir, B);
}
}
else
@@ -1199,12 +1162,12 @@ void BndLib::Add(const gp_Cylinder& S,
if (Precision::IsNegativeInfinite(VMax))
{
ComputeCyl(S, UMin, UMax, VMin, 0., B);
OpenMin(S.Axis().Direction(), B);
OpenMin(aDir, B);
}
else if (Precision::IsPositiveInfinite(VMax))
{
ComputeCyl(S, UMin, UMax, VMin, 0., B);
OpenMax(S.Axis().Direction(), B);
OpenMax(aDir, B);
}
else
{
@@ -1264,8 +1227,9 @@ void BndLib::Add(const gp_Cone& S,
const Standard_Real Tol,
Bnd_Box& B)
{
// Cache axis direction for infinite cases.
const gp_Dir& aD = S.Axis().Direction();
Standard_Real A = S.SemiAngle();
if (Precision::IsNegativeInfinite(VMin))
{
if (Precision::IsNegativeInfinite(VMax))
@@ -1274,22 +1238,19 @@ void BndLib::Add(const gp_Cone& S,
}
else if (Precision::IsPositiveInfinite(VMax))
{
gp_Dir D(std::cos(A) * S.Axis().Direction());
OpenMinMax(D, B);
OpenMinMax(aD, B);
}
else
{
ComputeCone(S, UMin, UMax, 0., VMax, B);
gp_Dir D(std::cos(A) * S.Axis().Direction());
OpenMin(D, B);
OpenMin(aD, B);
}
}
else if (Precision::IsPositiveInfinite(VMin))
{
if (Precision::IsNegativeInfinite(VMax))
{
gp_Dir D(std::cos(A) * S.Axis().Direction());
OpenMinMax(D, B);
OpenMinMax(aD, B);
}
else if (Precision::IsPositiveInfinite(VMax))
{
@@ -1298,8 +1259,7 @@ void BndLib::Add(const gp_Cone& S,
else
{
ComputeCone(S, UMin, UMax, 0., VMax, B);
gp_Dir D(std::cos(A) * S.Axis().Direction());
OpenMax(D, B);
OpenMax(aD, B);
}
}
else
@@ -1307,14 +1267,12 @@ void BndLib::Add(const gp_Cone& S,
if (Precision::IsNegativeInfinite(VMax))
{
ComputeCone(S, UMin, UMax, VMin, 0., B);
gp_Dir D(std::cos(A) * S.Axis().Direction());
OpenMin(D, B);
OpenMin(aD, B);
}
else if (Precision::IsPositiveInfinite(VMax))
{
ComputeCone(S, UMin, UMax, VMin, 0., B);
gp_Dir D(std::cos(A) * S.Axis().Direction());
OpenMax(D, B);
OpenMax(aD, B);
}
else
{
@@ -1570,18 +1528,18 @@ void BndLib::Add(const gp_Torus& S,
Standard_Integer Fi2;
if (VMax < VMin)
{
Fi1 = (Standard_Integer)(VMax / (M_PI / 4.));
Fi2 = (Standard_Integer)(VMin / (M_PI / 4.));
Fi1 = static_cast<Standard_Integer>(VMax / (M_PI / 4.));
Fi2 = static_cast<Standard_Integer>(VMin / (M_PI / 4.));
}
else
{
Fi1 = (Standard_Integer)(VMin / (M_PI / 4.));
Fi2 = (Standard_Integer)(VMax / (M_PI / 4.));
Fi1 = static_cast<Standard_Integer>(VMin / (M_PI / 4.));
Fi2 = static_cast<Standard_Integer>(VMax / (M_PI / 4.));
}
Fi2++;
Standard_Real Ra = S.MajorRadius();
Standard_Real Ri = S.MinorRadius();
const Standard_Real Ra = S.MajorRadius();
const Standard_Real Ri = S.MinorRadius();
if (Fi2 < Fi1)
return;
@@ -1593,181 +1551,61 @@ void BndLib::Add(const gp_Torus& S,
return;
}
#define SC 0.71
#define addP0 \
(Compute(UMin, \
UMax, \
Ra + Ri, \
Ra + Ri, \
gp_Pnt(S.XAxis().Direction().XYZ()), \
gp_Pnt(S.YAxis().Direction().XYZ()), \
S.Location(), \
B))
#define addP1 \
(Compute(UMin, \
UMax, \
Ra + Ri * SC, \
Ra + Ri * SC, \
gp_Pnt(S.XAxis().Direction().XYZ()), \
gp_Pnt(S.YAxis().Direction().XYZ()), \
gp_Pnt(S.Location().XYZ() + (Ri * SC) * S.Axis().Direction().XYZ()), \
B))
#define addP2 \
(Compute(UMin, \
UMax, \
Ra, \
Ra, \
gp_Pnt(S.XAxis().Direction().XYZ()), \
gp_Pnt(S.YAxis().Direction().XYZ()), \
gp_Pnt(S.Location().XYZ() + Ri * S.Axis().Direction().XYZ()), \
B))
#define addP3 \
(Compute(UMin, \
UMax, \
Ra - Ri * SC, \
Ra - Ri * SC, \
gp_Pnt(S.XAxis().Direction().XYZ()), \
gp_Pnt(S.YAxis().Direction().XYZ()), \
gp_Pnt(S.Location().XYZ() + (Ri * SC) * S.Axis().Direction().XYZ()), \
B))
#define addP4 \
(Compute(UMin, \
UMax, \
Ra - Ri, \
Ra - Ri, \
gp_Pnt(S.XAxis().Direction().XYZ()), \
gp_Pnt(S.YAxis().Direction().XYZ()), \
S.Location(), \
B))
#define addP5 \
(Compute(UMin, \
UMax, \
Ra - Ri * SC, \
Ra - Ri * SC, \
gp_Pnt(S.XAxis().Direction().XYZ()), \
gp_Pnt(S.YAxis().Direction().XYZ()), \
gp_Pnt(S.Location().XYZ() - (Ri * SC) * S.Axis().Direction().XYZ()), \
B))
#define addP6 \
(Compute(UMin, \
UMax, \
Ra, \
Ra, \
gp_Pnt(S.XAxis().Direction().XYZ()), \
gp_Pnt(S.YAxis().Direction().XYZ()), \
gp_Pnt(S.Location().XYZ() - Ri * S.Axis().Direction().XYZ()), \
B))
#define addP7 \
(Compute(UMin, \
UMax, \
Ra + Ri * SC, \
Ra + Ri * SC, \
gp_Pnt(S.XAxis().Direction().XYZ()), \
gp_Pnt(S.YAxis().Direction().XYZ()), \
gp_Pnt(S.Location().XYZ() - (Ri * SC) * S.Axis().Direction().XYZ()), \
B))
// Cache direction vectors.
const gp_XYZ aZDir = S.Axis().Direction().XYZ();
const gp_XYZ aLocXYZ = S.Location().XYZ();
const gp_Pnt aXd(S.XAxis().Direction().XYZ());
const gp_Pnt aYd(S.YAxis().Direction().XYZ());
switch (Fi1)
// Multipliers for torus cross-section points at 45-degree intervals.
// radiusMult[i]: multiplier for Ri in radius calculation (Ra + Ri * radiusMult[i])
// zMult[i]: multiplier for Ri in Z offset calculation (Ri * zMult[i])
// THE_COS_PI4 = cos(45 deg) = sin(45 deg) = 0.707...
constexpr Standard_Real aRadiusMult[8] =
{1., THE_COS_PI4, 0., -THE_COS_PI4, -1., -THE_COS_PI4, 0., THE_COS_PI4};
constexpr Standard_Real aZMult[8] =
{0., THE_COS_PI4, 1., THE_COS_PI4, 0., -THE_COS_PI4, -1., -THE_COS_PI4};
// Lambda to add torus cross-section point by index (0-7).
const auto addTorusPoint = [&](Standard_Integer theIdx) {
const Standard_Real aRadius = Ra + Ri * aRadiusMult[theIdx];
const gp_Pnt aCenter(aLocXYZ + (Ri * aZMult[theIdx]) * aZDir);
Compute(UMin, UMax, aRadius, aRadius, aXd, aYd, aCenter, B);
};
// Add points from Fi1 to Fi2, handling wrap-around for indices.
// Use ((i % 8) + 8) % 8 to handle negative indices correctly
// (C++ modulo can return negative values for negative dividends).
for (Standard_Integer i = Fi1; i <= Fi2; ++i)
{
case 0: {
addP0;
if (Fi2 <= 0)
break;
}
Standard_FALLTHROUGH
case 1: {
addP1;
if (Fi2 <= 1)
break;
}
Standard_FALLTHROUGH
case 2: {
addP2;
if (Fi2 <= 2)
break;
}
Standard_FALLTHROUGH
case 3: {
addP3;
if (Fi2 <= 3)
break;
}
Standard_FALLTHROUGH
case 4: {
addP4;
if (Fi2 <= 4)
break;
}
Standard_FALLTHROUGH
case 5: {
addP5;
if (Fi2 <= 5)
break;
}
Standard_FALLTHROUGH
case 6: {
addP6;
if (Fi2 <= 6)
break;
}
Standard_FALLTHROUGH
case 7: {
addP7;
if (Fi2 <= 7)
break;
}
Standard_FALLTHROUGH
case 8:
default: {
addP0;
switch (Fi2)
{
case 15:
addP7;
Standard_FALLTHROUGH
case 14:
addP6;
Standard_FALLTHROUGH
case 13:
addP5;
Standard_FALLTHROUGH
case 12:
addP4;
Standard_FALLTHROUGH
case 11:
addP3;
Standard_FALLTHROUGH
case 10:
addP2;
Standard_FALLTHROUGH
case 9:
addP1;
Standard_FALLTHROUGH
case 8:
break;
}
}
addTorusPoint(((i % 8) + 8) % 8);
}
B.Enlarge(Tol);
}
void BndLib::Add(const gp_Torus& S, const Standard_Real Tol, Bnd_Box& B)
{
Standard_Real RMa = S.MajorRadius();
Standard_Real Rmi = S.MinorRadius();
gp_XYZ O = S.Location().XYZ();
gp_XYZ Xd = S.XAxis().Direction().XYZ();
gp_XYZ Yd = S.YAxis().Direction().XYZ();
gp_XYZ Zd = S.Axis().Direction().XYZ();
B.Add(gp_Pnt(O - (RMa + Rmi) * Xd - (RMa + Rmi) * Yd + Rmi * Zd));
B.Add(gp_Pnt(O - (RMa + Rmi) * Xd - (RMa + Rmi) * Yd - Rmi * Zd));
B.Add(gp_Pnt(O + (RMa + Rmi) * Xd - (RMa + Rmi) * Yd + Rmi * Zd));
B.Add(gp_Pnt(O + (RMa + Rmi) * Xd - (RMa + Rmi) * Yd - Rmi * Zd));
B.Add(gp_Pnt(O - (RMa + Rmi) * Xd + (RMa + Rmi) * Yd + Rmi * Zd));
B.Add(gp_Pnt(O - (RMa + Rmi) * Xd + (RMa + Rmi) * Yd - Rmi * Zd));
B.Add(gp_Pnt(O + (RMa + Rmi) * Xd + (RMa + Rmi) * Yd + Rmi * Zd));
B.Add(gp_Pnt(O + (RMa + Rmi) * Xd + (RMa + Rmi) * Yd - Rmi * Zd));
const Standard_Real aRMa = S.MajorRadius();
const Standard_Real aRmi = S.MinorRadius();
const Standard_Real aR = aRMa + aRmi;
const gp_XYZ aO = S.Location().XYZ();
const gp_XYZ aXd = S.XAxis().Direction().XYZ();
const gp_XYZ aYd = S.YAxis().Direction().XYZ();
const gp_XYZ aZd = S.Axis().Direction().XYZ();
// Precompute scaled direction vectors.
const gp_XYZ aRXd = aR * aXd;
const gp_XYZ aRYd = aR * aYd;
const gp_XYZ aRiZd = aRmi * aZd;
// Add 8 corner points of torus bounding box.
B.Add(gp_Pnt(aO - aRXd - aRYd + aRiZd));
B.Add(gp_Pnt(aO - aRXd - aRYd - aRiZd));
B.Add(gp_Pnt(aO + aRXd - aRYd + aRiZd));
B.Add(gp_Pnt(aO + aRXd - aRYd - aRiZd));
B.Add(gp_Pnt(aO - aRXd + aRYd + aRiZd));
B.Add(gp_Pnt(aO - aRXd + aRYd - aRiZd));
B.Add(gp_Pnt(aO + aRXd + aRYd + aRiZd));
B.Add(gp_Pnt(aO + aRXd + aRYd - aRiZd));
B.Enlarge(Tol);
}
@@ -1804,7 +1642,8 @@ Standard_Integer ComputeBox(const gp_Hypr& aHypr,
aRmaj = aHypr.MajorRadius();
aRmin = aHypr.MinorRadius();
//
aT3 = 0;
// Find extrema for each coordinate (X, Y, Z) independently.
// Each coordinate can have its extremum at a different parameter value.
for (i = 1; i <= 3; ++i)
{
aA = aRmin * aYDir.Coord(i);
@@ -1813,8 +1652,8 @@ Standard_Integer ComputeBox(const gp_Hypr& aHypr,
aABP = aA + aB;
aBAM = aB - aA;
//
aABP = fabs(aABP);
aBAM = fabs(aBAM);
aABP = std::abs(aABP);
aBAM = std::abs(aBAM);
//
if (aABP < aEps || aBAM < aEps)
{
@@ -1822,23 +1661,17 @@ Standard_Integer ComputeBox(const gp_Hypr& aHypr,
}
//
aCf = aBAM / aABP;
aT3 = log(sqrt(aCf));
aT3 = 0.5 * std::log(aCf);
//
if (aT3 < aT1 || aT3 > aT2)
{
continue;
}
iErr = 0;
break;
}
//
if (iErr)
{
return iErr;
}
//
// Add extremum point for this coordinate.
aP3 = ElCLib::Value(aT3, aHypr);
aBox.Add(aP3);
iErr = 0;
}
//
return iErr;
}

44
src/ModelingData/TKGeomBase/BndLib/BndLib_Add2dCurve.cxx
View File

@@ -143,7 +143,7 @@ public:
Standard_Integer NbVariables() const { return 1; }
private:
Curv2dMaxMinCoordMVar& operator=(const Curv2dMaxMinCoordMVar& theOther);
Curv2dMaxMinCoordMVar& operator=(const Curv2dMaxMinCoordMVar&) = delete;
Standard_Boolean CheckInputData(Standard_Real theParam)
{
@@ -190,7 +190,7 @@ public:
}
private:
Curv2dMaxMinCoord& operator=(const Curv2dMaxMinCoord& theOther);
Curv2dMaxMinCoord& operator=(const Curv2dMaxMinCoord&) = delete;
Standard_Boolean CheckInputData(Standard_Real theParam)
{
@@ -418,7 +418,8 @@ void BndLib_Box2dCurve::PerformBezier()
aTb[1] = aT2;
}
//
if (!(aT1 == aTb[0] && aT2 == aTb[1]))
constexpr Standard_Real anEps = Precision::PConfusion();
if (std::abs(aT1 - aTb[0]) > anEps || std::abs(aT2 - aTb[1]) > anEps)
{
aG = aCBz->Copy();
//
@@ -477,7 +478,7 @@ void BndLib_Box2dCurve::PerformBSpline()
//
constexpr Standard_Real eps = Precision::PConfusion();
if (fabs(aT1 - aTb[0]) > eps || fabs(aT2 - aTb[1]) > eps)
if (std::abs(aT1 - aTb[0]) > eps || std::abs(aT2 - aTb[1]) > eps)
{
aG = aCBS->Copy();
//
@@ -738,7 +739,7 @@ void BndLib_Box2dCurve::D0(const Standard_Real aU, gp_Pnt2d& aP2D)
//
aA = aV1.Y();
aB = -aV1.X();
aR = sqrt(aA * aA + aB * aB);
aR = std::sqrt(aA * aA + aB * aB);
if (aR <= aRes)
{
myErrorStatus = 13;
@@ -948,18 +949,18 @@ void BndLib_Box2dCurve::Compute(const Handle(Geom2d_Conic)& aConic2D,
}
//
// aType==GeomAbs_Circle || aType==GeomAbs_Ellipse
aEps = 1.e-14;
aEps = Precision::Angular();
aTwoPI = 2. * M_PI;
dT = aT2 - aT1;
//
Standard_Real aT1z = AdjustToPeriod(aT1, aTwoPI);
if (fabs(aT1z) < aEps)
if (std::abs(aT1z) < aEps)
{
aT1z = 0.;
}
//
Standard_Real aT2z = aT1z + dT;
if (fabs(aT2z - aTwoPI) < aEps)
if (std::abs(aT2z - aTwoPI) < aEps)
{
aT2z = aTwoPI;
}
@@ -1033,12 +1034,12 @@ Standard_Integer BndLib_Box2dCurve::Compute(const Handle(Geom2d_Conic)& aConic2D
aLy = (!i) ? 1. : 0.;
aBx = aLx * aA21 - aLy * aA11;
aBy = aLx * aA22 - aLy * aA12;
aB = sqrt(aBx * aBx + aBy * aBy);
aB = std::sqrt(aBx * aBx + aBy * aBy);
//
aCosFi = aBx / aB;
aSinFi = aBy / aB;
//
aFi = acos(aCosFi);
aFi = std::acos(aCosFi);
if (aSinFi < 0.)
{
aFi = aTwoPI - aFi;
@@ -1060,7 +1061,7 @@ Standard_Integer BndLib_Box2dCurve::Compute(const Handle(Geom2d_Conic)& aConic2D
Standard_Real aA1, aA2;
Handle(Geom2d_Parabola) aPR2D;
//
aEps = 1.e-12;
aEps = Precision::Angular();
//
aPR2D = Handle(Geom2d_Parabola)::DownCast(aConic2D);
aFc = aPR2D->Focal();
@@ -1072,7 +1073,7 @@ Standard_Integer BndLib_Box2dCurve::Compute(const Handle(Geom2d_Conic)& aConic2D
aLy = (!i) ? 1. : 0.;
//
aA2 = aLx * aSinBt - aLy * aCosBt;
if (fabs(aA2) < aEps)
if (std::abs(aA2) < aEps)
{
continue;
}
@@ -1092,7 +1093,7 @@ Standard_Integer BndLib_Box2dCurve::Compute(const Handle(Geom2d_Conic)& aConic2D
Standard_Real aEps, aB1, aB2, aB12, aB22, aZ, aD;
Handle(Geom2d_Hyperbola) aHP2D;
//
aEps = 1.e-12;
aEps = Precision::Angular();
//
aHP2D = Handle(Geom2d_Hyperbola)::DownCast(aConic2D);
aR1 = aHP2D->MajorRadius();
@@ -1107,12 +1108,12 @@ Standard_Integer BndLib_Box2dCurve::Compute(const Handle(Geom2d_Conic)& aConic2D
aB1 = aR1 * (aLx * aSinBt - aLy * aCosBt);
aB2 = aR2 * (aLx * aSinGm - aLy * aCosGm);
//
if (fabs(aB1) < aEps)
if (std::abs(aB1) < aEps)
{
continue;
}
//
if (fabs(aB2) < aEps)
if (std::abs(aB2) < aEps)
{
pT[j] = 0.;
++j;
@@ -1126,14 +1127,14 @@ Standard_Integer BndLib_Box2dCurve::Compute(const Handle(Geom2d_Conic)& aConic2D
continue;
}
//
aD = sqrt(aB12 - aB22);
aD = std::sqrt(aB12 - aB22);
//-------------
for (k = -1; k < 2; k += 2)
{
aZ = (aB1 + k * aD) / aB2;
if (fabs(aZ) < 1.)
if (std::abs(aZ) < 1.)
{
pT[j] = -log((1. + aZ) / (1. - aZ));
pT[j] = -std::log((1. + aZ) / (1. - aZ));
++j;
}
}
@@ -1155,12 +1156,12 @@ Standard_Real BndLib_Box2dCurve::AdjustToPeriod(const Standard_Real aT, const St
aTRet = aT;
if (aT < 0.)
{
k = 1 + (Standard_Integer)(-aT / aPeriod);
k = 1 + static_cast<Standard_Integer>(-aT / aPeriod);
aTRet = aT + k * aPeriod;
}
else if (aT > aPeriod)
{
k = (Standard_Integer)(aT / aPeriod);
k = static_cast<Standard_Integer>(aT / aPeriod);
aTRet = aT - k * aPeriod;
}
if (aTRet == aPeriod)
@@ -1197,8 +1198,7 @@ void BndLib_Add2dCurve::Add(const Adaptor2d_Curve2d& aC,
const Standard_Real aTol,
Bnd_Box2d& aBox2D)
{
Adaptor2d_Curve2d* pC = (Adaptor2d_Curve2d*)&aC;
Geom2dAdaptor_Curve* pA = dynamic_cast<Geom2dAdaptor_Curve*>(pC);
const Geom2dAdaptor_Curve* pA = dynamic_cast<const Geom2dAdaptor_Curve*>(&aC);
if (!pA)
{
Standard_Real U, DU;

53
src/ModelingData/TKGeomBase/BndLib/BndLib_Add3dCurve.cxx
View File

@@ -48,53 +48,46 @@ static void reduceSplineBox(const Adaptor3d_Curve& theCurve,
const Bnd_Box& theOrigBox,
Bnd_Box& theReducedBox)
{
// Guaranteed bounding box based on poles of bspline.
// Guaranteed bounding box based on poles of bspline/bezier.
Bnd_Box aPolesBox;
Standard_Real aPolesXMin, aPolesYMin, aPolesZMin, aPolesXMax, aPolesYMax, aPolesZMax;
if (theCurve.GetType() == GeomAbs_BSplineCurve)
{
Handle(Geom_BSplineCurve) aC = theCurve.BSpline();
const TColgp_Array1OfPnt& aPoles = aC->Poles();
for (Standard_Integer anIdx = aPoles.Lower(); anIdx <= aPoles.Upper(); ++anIdx)
{
aPolesBox.Add(aPoles.Value(anIdx));
}
}
if (theCurve.GetType() == GeomAbs_BezierCurve)
else if (theCurve.GetType() == GeomAbs_BezierCurve)
{
Handle(Geom_BezierCurve) aC = theCurve.Bezier();
const TColgp_Array1OfPnt& aPoles = aC->Poles();
for (Standard_Integer anIdx = aPoles.Lower(); anIdx <= aPoles.Upper(); ++anIdx)
{
aPolesBox.Add(aPoles.Value(anIdx));
}
}
aPolesBox.Get(aPolesXMin, aPolesYMin, aPolesZMin, aPolesXMax, aPolesYMax, aPolesZMax);
// Get original box limits using C++17 structured bindings.
const auto [aXMin, aXMax, aYMin, aYMax, aZMin, aZMax] = theOrigBox.Get();
Standard_Real x, y, z, X, Y, Z;
theOrigBox.Get(x, y, z, X, Y, Z);
// Left bound.
if (aPolesXMin > x)
x = aPolesXMin;
if (aPolesYMin > y)
y = aPolesYMin;
if (aPolesZMin > z)
z = aPolesZMin;
// Right bound.
if (aPolesXMax < X)
X = aPolesXMax;
if (aPolesYMax < Y)
Y = aPolesYMax;
if (aPolesZMax < Z)
Z = aPolesZMax;
theReducedBox.Update(x, y, z, X, Y, Z);
// If poles box is valid, intersect with original box.
if (!aPolesBox.IsVoid())
{
const auto [aPXMin, aPXMax, aPYMin, aPYMax, aPZMin, aPZMax] = aPolesBox.Get();
theReducedBox.Update(std::max(aXMin, aPXMin),
std::max(aYMin, aPYMin),
std::max(aZMin, aPZMin),
std::min(aXMax, aPXMax),
std::min(aYMax, aPYMax),
std::min(aZMax, aPZMax));
}
else
{
theReducedBox.Update(aXMin, aYMin, aZMin, aXMax, aYMax, aZMax);
}
}
//=================================================================================================
@@ -152,7 +145,7 @@ void BndLib_Add3dCurve::Add(const Adaptor3d_Curve& C,
const Standard_Real Tol,
Bnd_Box& B)
{
static Standard_Real weakness = 1.5; // OCC566(apo)
constexpr Standard_Real weakness = 1.5; // OCC566(apo)
Standard_Real tol = 0.0;
switch (C.GetType())
{
@@ -271,7 +264,7 @@ void BndLib_Add3dCurve::Add(const Adaptor3d_Curve& C,
}
default: {
Bnd_Box B1;
static Standard_Integer N = 33;
constexpr Standard_Integer N = 33;
tol = FillBox(B1, C, U1, U2, N);
B1.Enlarge(weakness * tol);
Standard_Real x, y, z, X, Y, Z;
@@ -464,7 +457,7 @@ public:
Standard_Integer NbVariables() const { return 1; }
private:
CurvMaxMinCoordMVar& operator=(const CurvMaxMinCoordMVar& theOther);
CurvMaxMinCoordMVar& operator=(const CurvMaxMinCoordMVar&) = delete;
Standard_Boolean CheckInputData(Standard_Real theParam)
{
@@ -511,7 +504,7 @@ public:
}
private:
CurvMaxMinCoord& operator=(const CurvMaxMinCoord& theOther);
CurvMaxMinCoord& operator=(const CurvMaxMinCoord&) = delete;
Standard_Boolean CheckInputData(Standard_Real theParam)
{

6
src/ModelingData/TKGeomBase/BndLib/BndLib_AddSurface.cxx
View File

@@ -447,10 +447,10 @@ void BndLib_AddSurface::Add(const Adaptor3d_Surface& S,
gp_Pnt P;
for (Standard_Integer i = 1; i <= Nu; i++)
{
Standard_Real U = UMin + ((UMax - UMin) * (i - 1) / (Nu - 1));
const Standard_Real U = UMin + ((UMax - UMin) * (i - 1) / (Nu - 1));
for (Standard_Integer j = 1; j <= Nv; j++)
{
Standard_Real V = VMin + ((VMax - VMin) * (j - 1) / (Nv - 1));
const Standard_Real V = VMin + ((VMax - VMin) * (j - 1) / (Nv - 1));
S.D0(U, V, P);
B.Add(P);
}
@@ -769,7 +769,7 @@ public:
Standard_Integer NbVariables() const { return 2; }
private:
SurfMaxMinCoord& operator=(const SurfMaxMinCoord& theOther);
SurfMaxMinCoord& operator=(const SurfMaxMinCoord&) = delete;
Standard_Boolean CheckInputData(const math_Vector& theParams)
{

1478
src/ModelingData/TKGeomBase/GTests/BndLib_Test.cxx Normal file
View File

File diff suppressed because it is too large Load Diff

1
src/ModelingData/TKGeomBase/GTests/FILES.cmake
View File

@@ -2,6 +2,7 @@
set(OCCT_TKGeomBase_GTests_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}")
set(OCCT_TKGeomBase_GTests_FILES
BndLib_Test.cxx
Extrema_ExtPC_Test.cxx
IntAna_IntQuadQuad_Test.cxx
)

2
tests/bugs/step/bug32239
View File

@@ -18,7 +18,7 @@ checkshape b_1
set xmin0 -62.992562093513783
set ymin0 -51.45371311501097
set zmin0 -33.223762093513777
set xmax0 43.263112093513783
set xmax0 43.257600511674156
set ymax0 33.211062093513789
set zmax0 37.744962093513792
set bb [bounding b_1]