OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code Packages Releases Activity

0032607: Modeling Algorithms - BOPAlgo_BOP returns incomplete result

Browse Source 
IntPatch/IntPatch_ImpPrmIntersection.cxx - decreasing step for some conditions
This commit is contained in:
ifv 2021-10-12 09:09:24 +03:00
parent 9f5ad42aae
commit 50269d8437
1 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/IntPatch/IntPatch_ImpPrmIntersection.cxx
View File

@ -78,6 +78,9 @@ static
const Standard_Real theToler3D, const Standard_Real theToler3D,
const Standard_Real theToler2D, const Standard_Real theToler2D,
const Standard_Real thePeriod); const Standard_Real thePeriod);
static
Standard_Real GetLocalStep(const Handle(Adaptor3d_HSurface)& theSurf,
const Standard_Real theStep);
//======================================================================= //=======================================================================
//function : IsSeamOrPole //function : IsSeamOrPole
@ -451,6 +454,82 @@ void Recadre(const Standard_Boolean ,
} }
pt.SetParameters(U1,V1,U2,V2); pt.SetParameters(U1,V1,U2,V2);
} }
//=======================================================================
//function : GetLocalStep
//purpose :
//=======================================================================
Standard_Real GetLocalStep(const Handle(Adaptor3d_HSurface)& theSurf,
const Standard_Real theStep)
{
Standard_Real aLocalStep = theStep;
if (theSurf->UContinuity() > GeomAbs_C0 && theSurf->VContinuity() > GeomAbs_C0)
{
GeomAbs_SurfaceType aSType = theSurf->GetType();
if (aSType == GeomAbs_BezierSurface || aSType == GeomAbs_BSplineSurface)
{
Standard_Real aMinRes = Precision::Infinite();
Standard_Integer aMaxDeg = 0;
const Standard_Real aLimRes = 1.e-10;
aMinRes = Min(theSurf->UResolution(Precision::Confusion()),
theSurf->VResolution(Precision::Confusion()));
aMaxDeg = Max(theSurf->UDegree(), theSurf->VDegree());
if (aMinRes < aLimRes && aMaxDeg > 3)
{
aLocalStep = 0.0001;
}
}
}
if (theSurf->UContinuity() == GeomAbs_C0)
{
Standard_Integer aNbInt = theSurf->NbUIntervals(GeomAbs_C1);
if (aNbInt > 1)
{
TColStd_Array1OfReal anInts(1, aNbInt + 1);
theSurf->UIntervals(anInts, GeomAbs_C1);
Standard_Integer i;
Standard_Real aMinInt = Precision::Infinite();
for (i = 1; i <= aNbInt; ++i)
{
aMinInt = Min(aMinInt, anInts(i + 1) - anInts(i));
}
aMinInt /= theSurf->LastUParameter() - theSurf->FirstUParameter();
if (aMinInt < 0.002)
{
aLocalStep = 0.0001;
}
}
}
if (theSurf->VContinuity() == GeomAbs_C0)
{
Standard_Integer aNbInt = theSurf->NbVIntervals(GeomAbs_C1);
if (aNbInt > 1)
{
TColStd_Array1OfReal anInts(1, aNbInt + 1);
theSurf->VIntervals(anInts, GeomAbs_C1);
Standard_Integer i;
Standard_Real aMinInt = Precision::Infinite();
for (i = 1; i <= aNbInt; ++i)
{
aMinInt = Min(aMinInt, anInts(i + 1) - anInts(i));
}
aMinInt /= theSurf->LastVParameter() - theSurf->FirstVParameter();
if (aMinInt < 0.002)
{
aLocalStep = 0.0001;
}
}
}
aLocalStep = Min(theStep, aLocalStep);
return aLocalStep;
}
//======================================================================= //=======================================================================
//function : Perform //function : Perform
@ -556,7 +635,16 @@ void IntPatch_ImpPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& Sur
} }
break; break;
} }
// //
Standard_Real aLocalPas = Pas;
if (reversed)
aLocalPas = GetLocalStep(Surf1, Pas);
else
aLocalPas = GetLocalStep(Surf2, Pas);
//
Func.SetImplicitSurface(Quad); Func.SetImplicitSurface(Quad);
Func.Set(IntSurf_QuadricTool::Tolerance(Quad)); Func.Set(IntSurf_QuadricTool::Tolerance(Quad));
AFunc.SetQuadric(Quad); AFunc.SetQuadric(Quad);
@ -658,7 +746,7 @@ void IntPatch_ImpPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& Sur
NbPointDep=seqpdep.Length(); NbPointDep=seqpdep.Length();
// //
if (NbPointDep || NbPointIns) { if (NbPointDep || NbPointIns) {
IntPatch_TheIWalking iwalk(TolTang,Fleche,Pas); IntPatch_TheIWalking iwalk(TolTang,Fleche, aLocalPas);
if (!reversed) { if (!reversed) {
iwalk.Perform(seqpdep,seqpins,Func,Surf2); iwalk.Perform(seqpdep,seqpins,Func,Surf2);
} }