OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-06-30 12:14:08 +03:00
Code

0024268: Wrong triangulation on the boundaries of the cones

Browse Source 
Added check for cone singularity point, modified isoline checks, deleted check along U and V in GeomLib::NormEstim.
Correction in sign in GeomLib::NormEstim.
This commit is contained in:
aml 2013-11-14 11:01:09 +04:00 committed by bugmaster
parent 7893b2faf8
commit 23b894f730
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/GeomLib/GeomLib.cxx
View File

@ -2367,25 +2367,57 @@ Standard_Integer GeomLib::NormEstim(const Handle(Geom_Surface)& S,
Standard_Real Umin, Umax, Vmin, Vmax; Standard_Real Umin, Umax, Vmin, Vmax;
Standard_Real step = 1.0e-5; Standard_Real step = 1.0e-5;
Standard_Real eps = 1.0e-16; Standard_Real eps = 1.0e-16;
Standard_Real sign = 1; Standard_Real sign = -1.0;
S->Bounds(Umin, Umax, Vmin, Vmax); S->Bounds(Umin, Umax, Vmin, Vmax);
// check for cone apex singularity point
if ((UV.Y() > Vmin + step) && (UV.Y() < Vmax - step))
{
gp_Dir aNormal1, aNormal2;
Standard_Real aConeSingularityAngleEps = 1.0e-4;
S->D1(UV.X(), UV.Y() - sign * step, DummyPnt, DU, DV);
if ((DU.XYZ().SquareModulus() > eps) && (DV.XYZ().SquareModulus() > eps)) {
aNormal1 = DU^DV;
S->D1(UV.X(), UV.Y() + sign * step, DummyPnt, DU, DV);
if ((DU.XYZ().SquareModulus() > eps) && (DV.XYZ().SquareModulus() > eps)) {
aNormal2 = DU^DV;
if (aNormal1.IsOpposite(aNormal2, aConeSingularityAngleEps))
return 2;
}
}
}
// Along V // Along V
if(MDU < aTol2 && MDV >= aTol2) { if(MDU < aTol2 && MDV >= aTol2) {
if (UV.Y() + step >= Vmax) if ((Vmax - UV.Y()) > (UV.Y() - Vmin))
sign = -1.0; sign = 1.0;
S->D1(UV.X(), UV.Y() + sign * step, DummyPnt, DU, DV); S->D1(UV.X(), UV.Y() + sign * step, DummyPnt, DU, DV);
gp_Vec Norm = DU^DV; gp_Vec Norm = DU^DV;
if (Norm.SquareMagnitude() < eps) {
Standard_Real sign1 = -1.0;
if ((Umax - UV.X()) > (UV.X() - Umin))
sign1 = 1.0;
S->D1(UV.X() + sign1 * step, UV.Y() + sign * step, DummyPnt, DU, DV);
Norm = DU^DV;
}
if ((Norm.SquareMagnitude() >= eps) && (Norm.Dot(aNormal) < 0.0)) if ((Norm.SquareMagnitude() >= eps) && (Norm.Dot(aNormal) < 0.0))
aNormal.Reverse(); aNormal.Reverse();
} }
// Along U // Along U
if(MDV < aTol2 && MDU >= aTol2) { if(MDV < aTol2 && MDU >= aTol2) {
if (UV.X() + step >= Umax) if ((Umax - UV.X()) > (UV.X() - Umin))
sign = -1.0; sign = 1.0;
S->D1(UV.X() + sign * step, UV.Y(), DummyPnt, DU, DV); S->D1(UV.X() + sign * step, UV.Y(), DummyPnt, DU, DV);
gp_Vec Norm = DU^DV; gp_Vec Norm = DU^DV;
if (Norm.SquareMagnitude() < eps) {
Standard_Real sign1 = -1.0;
if ((Vmax - UV.Y()) > (UV.Y() - Vmin))
sign1 = 1.0;
S->D1(UV.X() + sign * step, UV.Y() + sign1 * step, DummyPnt, DU, DV);
Norm = DU^DV;
}
if ((Norm.SquareMagnitude() >= eps) && (Norm.Dot(aNormal) < 0.0)) if ((Norm.SquareMagnitude() >= eps) && (Norm.Dot(aNormal) < 0.0))
aNormal.Reverse(); aNormal.Reverse();
} }