mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-05 18:16:23 +03:00
0026783: Coding rules - eliminate GCC warning -Wunused-but-set-parameter
TestTopOpeDraw_Displayer::GetTol(), GetPar() - pass assigned parameters by reference. TopOpeBRep_vprdeg.cxx, TopOpeBRep_FacesFiller::ProcessVPondgE() - remove commented code, comment inactive code.
This commit is contained in:
rkv
abv
parent
5d88fd549c
commit
3d18f1e038
@ -51,11 +51,11 @@ class TestTopOpeDraw_Displayer {
|
|||||||
void Discret(const Standard_Integer n) { mySdiscret = n; }
|
void Discret(const Standard_Integer n) { mySdiscret = n; }
|
||||||
void DiscretDef(const Standard_Boolean b) { mySdiscretdef = b; }
|
void DiscretDef(const Standard_Boolean b) { mySdiscretdef = b; }
|
||||||
void SetTol(const Standard_Real Tol) { myTol = Tol;}
|
void SetTol(const Standard_Real Tol) { myTol = Tol;}
|
||||||
void GetTol(Standard_Real Tol) { Tol = myTol;}
|
void GetTol(Standard_Real& Tol) { Tol = myTol;}
|
||||||
Standard_Boolean TolIs(void) {return myTolIs;}
|
Standard_Boolean TolIs(void) {return myTolIs;}
|
||||||
void TolIs(Standard_Boolean TolIs) { myTolIs = TolIs;}
|
void TolIs(Standard_Boolean TolIs) { myTolIs = TolIs;}
|
||||||
void SetPar(const Standard_Real Par) { myPar = Par; myParIs = Standard_True;}
|
void SetPar(const Standard_Real Par) { myPar = Par; myParIs = Standard_True;}
|
||||||
void GetPar(Standard_Real Par) { Par = myPar;}
|
void GetPar(Standard_Real& Par) { Par = myPar;}
|
||||||
Standard_Boolean ParIs(void) {return myParIs;}
|
Standard_Boolean ParIs(void) {return myParIs;}
|
||||||
void SetColor(const Draw_Color Col) { myCol = Col; myColIs = Standard_True;}
|
void SetColor(const Draw_Color Col) { myCol = Col; myColIs = Standard_True;}
|
||||||
void SetNameColor(const Draw_Color Col) { myNameColor = Col; myNameColorIs = Standard_True;}
|
void SetNameColor(const Draw_Color Col) { myNameColor = Col; myNameColorIs = Standard_True;}
|
||||||
|
|||||||
@ -115,680 +115,6 @@ Standard_EXPORT void FUN_VPIndex
|
|||||||
Standard_Boolean& CPIfound, Handle(TopOpeBRepDS_Interference)& ICPI, // out
|
Standard_Boolean& CPIfound, Handle(TopOpeBRepDS_Interference)& ICPI, // out
|
||||||
const Standard_Integer mkVP);
|
const Standard_Integer mkVP);
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
// ******************* methods for the compute **********************
|
|
||||||
// ****************** of interferences on degenerated edge **********
|
|
||||||
|
|
||||||
// UVonEofF(par) = 2d point of parameter par on edge E in F's 2d representation.
|
|
||||||
// UVonF(E) = E's pcurve on F
|
|
||||||
// UVonF(V) = V's UV on F's 2d representation.
|
|
||||||
|
|
||||||
#define UNDEF (0)
|
|
||||||
#define FIRST (1)
|
|
||||||
#define LAST (2)
|
|
||||||
|
|
||||||
static void FUN_GetVectors(const TopoDS_Face& Fe, const TopoDS_Face& Fi,
|
|
||||||
const TopoDS_Edge& Ec,
|
|
||||||
const gp_Pnt2d& p2di, const gp_Pnt2d& p2de,
|
|
||||||
const TopoDS_Vertex& ve,
|
|
||||||
gp_Vec& ngFe, gp_Vec& ngFi,
|
|
||||||
gp_Vec& a, gp_Vec& x)
|
|
||||||
{
|
|
||||||
// geometric normals to Fe and Fi : ngFe,ngFi
|
|
||||||
ngFi = FUN_tool_nggeomF(p2di, Fi);
|
|
||||||
ngFe = FUN_tool_nggeomF(p2de, Fe);
|
|
||||||
// tgEc
|
|
||||||
gp_Vec tgEc;
|
|
||||||
// Standard_Integer orivine = FUN_tool_orientVinE(ve,Ec);
|
|
||||||
// Standard_Real parOnEc = BRep_Tool::Parameter(ve,Ec);
|
|
||||||
// tgEc = FUN_tool_tggeomE(parOnEc,Ec);
|
|
||||||
// a = tgEc; if (orivine == LAST) a.Reverse();
|
|
||||||
Standard_Integer ovine; Standard_Boolean ok = TopOpeBRepTool_TOOL::TgINSIDE(ve,Ec,a,ovine);
|
|
||||||
|
|
||||||
x = ngFe^ngFi;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void FUN_getEofFwithV(const TopoDS_Vertex& v, const TopoDS_Face& Fi, TopTools_ListOfShape& los)
|
|
||||||
{
|
|
||||||
// get <los>, the edges of <Fi> binding vertex <V>
|
|
||||||
los.Clear(); Standard_Integer ned = 0;
|
|
||||||
|
|
||||||
TopExp_Explorer exe(Fi, TopAbs_EDGE);
|
|
||||||
for (; exe.More(); exe.Next()) {
|
|
||||||
const TopoDS_Shape& edge = exe.Current();
|
|
||||||
TopExp_Explorer exv(edge, TopAbs_VERTEX);
|
|
||||||
for (; exv.More(); exv.Next()) {
|
|
||||||
if (exv.Current().IsSame(v)) {
|
|
||||||
los.Append(edge);
|
|
||||||
ned++; break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ned == 2) return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static Standard_Real FUN_getpar(const gp_Dir& a, const gp_Dir& x, const gp_Dir& y,
|
|
||||||
const Standard_Boolean& complement)
|
|
||||||
{
|
|
||||||
// Computes the parameter on degenerated edge (on circle) :
|
|
||||||
// <Fe> on spherical surface
|
|
||||||
// <Fi> the incident face
|
|
||||||
// watching our system in a XY space normal to ngFe :
|
|
||||||
// <a> : tangent with tgEc, going OUT the sphere, while
|
|
||||||
// following the geometry of <Ec>
|
|
||||||
// <x> : normal to ngFi, oriented INSIDE Fi
|
|
||||||
// <y> : normal to <x>, oriented OUTSIDE the matter delimited
|
|
||||||
// by the oriented face <Fi>.
|
|
||||||
// <par> is the oriented angle (<a>,<x>), computed in the
|
|
||||||
// anti-trigonometric sense (defined by RONd (<x>,<y>,<z>).
|
|
||||||
|
|
||||||
// If <complement>, nrotation has a direction opposite to z,
|
|
||||||
// parameter on sphere = 2PI - parameter computed.
|
|
||||||
|
|
||||||
Standard_Real x1 = a.Dot(x);
|
|
||||||
Standard_Real x2 = a.Dot(y);
|
|
||||||
Standard_Real par;
|
|
||||||
Standard_Real tol = Precision::Angular();
|
|
||||||
Standard_Boolean x1null = (Abs(x1) <= tol);
|
|
||||||
Standard_Boolean x2null = (Abs(x2) <= tol);
|
|
||||||
|
|
||||||
if (x1null) par = (x2 > 0.) ? 3.*M_PI*.5 : M_PI*.5;
|
|
||||||
else if (x2null) par = (x1 > 0.) ? 2.*M_PI : M_PI;
|
|
||||||
else {
|
|
||||||
Standard_Real ac = ACos(Abs(x1));
|
|
||||||
Standard_Boolean x1pos = (x1 > tol);
|
|
||||||
Standard_Boolean x2pos = (x2 > tol);
|
|
||||||
if (x1pos && x2pos) par = 2.*M_PI-ac;
|
|
||||||
if (x1pos && !x2pos) par = ac;
|
|
||||||
if (!x1pos && x2pos) par = M_PI+ac;
|
|
||||||
if (!x1pos && !x2pos) par = M_PI-ac;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (complement) par = 2.*M_PI - par;
|
|
||||||
return par;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void FUN_getloEi(const gp_Pnt2d& p2d, const TopoDS_Shape& F, TopTools_ListOfShape& loE)
|
|
||||||
{
|
|
||||||
loE.Clear(); Standard_Integer nsol = 0;
|
|
||||||
// looking for restrictions of <F> / <p2d> is ON these restrictions.
|
|
||||||
// if <onlyoneE>, looks get the first restriction solution,
|
|
||||||
// else looks among all the restrictions for edges solutions
|
|
||||||
Standard_Real tol = Precision::Parametric(Precision::Confusion());
|
|
||||||
TopExp_Explorer ex(F, TopAbs_EDGE);
|
|
||||||
for (; ex.More(); ex.Next()){
|
|
||||||
const TopoDS_Edge& E = TopoDS::Edge(ex.Current());
|
|
||||||
if ( E.Orientation() == TopAbs_INTERNAL ) continue;
|
|
||||||
if ( BRep_Tool::IsClosed(E,TopoDS::Face(F)) ) continue;
|
|
||||||
|
|
||||||
Standard_Real par,dist;
|
|
||||||
Standard_Boolean ok = TopOpeBRepTool_TOOL::ParE2d(p2d,E,TopoDS::Face(F), par,dist);
|
|
||||||
if (!ok) continue;
|
|
||||||
Standard_Real tolp = TopOpeBRepTool_TOOL::TolP(E,TopoDS::Face(F));
|
|
||||||
if (dist < tolp) {loE.Append(E); nsol++;}
|
|
||||||
if (nsol == 2) return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static Standard_Boolean FUN_paronE(const gp_Pnt2d& p2d, const TopoDS_Shape& E, const TopoDS_Shape& F,
|
|
||||||
Standard_Real& paronE)
|
|
||||||
{
|
|
||||||
// <p2d> on UVon<F>(<E>)
|
|
||||||
// Purpose : finding out paronE / UVon<E>(paronE) = <p2d>
|
|
||||||
Standard_Real par,dist;
|
|
||||||
Standard_Boolean ok = TopOpeBRepTool_TOOL::ParE2d(p2d,TopoDS::Edge(E),TopoDS::Face(F), par,dist);
|
|
||||||
if (!ok) return Standard_False;
|
|
||||||
Standard_Real tolp = TopOpeBRepTool_TOOL::TolP(TopoDS::Edge(E),TopoDS::Face(F));
|
|
||||||
if (dist < tolp) {paronE = par; return Standard_True;}
|
|
||||||
else return Standard_False;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Standard_Boolean FUN_nullx(const gp_Vec& x)
|
|
||||||
{
|
|
||||||
Standard_Real tola = Precision::Confusion();
|
|
||||||
Standard_Real mag = x.Magnitude();
|
|
||||||
Standard_Boolean isnull = (mag < tola);
|
|
||||||
return isnull;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Standard_Boolean FUN_OOEi(const gp_Pnt2d& p2di, const TopoDS_Face& Fi,
|
|
||||||
TopoDS_Edge& OOEi, Standard_Real& paronOOEi)
|
|
||||||
{
|
|
||||||
// ngFe // ngFi : <Fi> is tangent to the sphere on its
|
|
||||||
// degenerated edge.
|
|
||||||
// vertex is on <Ec> (sphere's closing edge) and <OOEi> (on <Fi>).
|
|
||||||
// <p2di> = UVon<Fi>(<ve>)
|
|
||||||
Standard_Boolean isplane = FUN_tool_plane(Fi); if (isplane) return Standard_False;
|
|
||||||
|
|
||||||
// --------------------------------------------------
|
|
||||||
// SUPPLYING INTPATCH :
|
|
||||||
// The geometry of <ve> is on 2 edges <Ec> and <OOEi>
|
|
||||||
// and <OOEi> is not found touched.
|
|
||||||
// --------------------------------------------------
|
|
||||||
// <loEi> is the list of edges of <Fi> not INTERNAL
|
|
||||||
// and non-closing.
|
|
||||||
TopTools_ListOfShape loEi; FUN_getloEi(p2di,Fi,loEi);
|
|
||||||
if (loEi.Extent() != 1) return Standard_False;
|
|
||||||
|
|
||||||
OOEi = TopoDS::Edge(loEi.First());
|
|
||||||
Standard_Boolean done = FUN_paronE(p2di,OOEi,Fi,paronOOEi);
|
|
||||||
return done;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void FUN_transitiononedge
|
|
||||||
(const TopAbs_State& staB, const TopAbs_State& staA, TopOpeBRepDS_Transition& T)
|
|
||||||
{
|
|
||||||
T = TopOpeBRepDS_Transition(staB,staA,TopAbs_EDGE,TopAbs_EDGE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static Standard_Boolean FUN_IEcOOEi
|
|
||||||
(const TopoDS_Vertex& ve, const Standard_Real& paronOOEi, const TopoDS_Edge& OOEi, const TopoDS_Edge& Ec,
|
|
||||||
TopOpeBRepDS_Transition& TOOEi)
|
|
||||||
{
|
|
||||||
FUN_transitiononedge(TopAbs_UNKNOWN,TopAbs_UNKNOWN,TOOEi);
|
|
||||||
// ------------------------------------------------------------
|
|
||||||
// SUPPLYING INTPATCH :
|
|
||||||
// when tg<OOEi> and tg<Ec> are tangent,
|
|
||||||
// the interference <OOEi> with <Ec> at vertex <v> is not found
|
|
||||||
// => we have to compute the transition <T> :
|
|
||||||
// following <OOEi>'s geometry, we cross <Ec> at vertex <ve>
|
|
||||||
// and describe the transition <T>.
|
|
||||||
// ------------------------------------------------------------
|
|
||||||
gp_Vec dirOOEi = FUN_tool_tggeomE(paronOOEi,OOEi);
|
|
||||||
|
|
||||||
Standard_Real paronEc;
|
|
||||||
Standard_Boolean ok = FUN_tool_parVonE(ve,Ec,paronEc); if (!ok) return Standard_False;
|
|
||||||
gp_Vec dirEc = FUN_tool_tggeomE(paronEc,Ec);
|
|
||||||
|
|
||||||
Standard_Real prod = dirOOEi.Dot(dirEc);
|
|
||||||
Standard_Real tola = Precision::Angular();
|
|
||||||
Standard_Boolean dEctgdOOEi = (Abs(1-Abs(prod)) < tola);
|
|
||||||
if (!dEctgdOOEi) return Standard_False;
|
|
||||||
|
|
||||||
// get <dparonOOEi>,
|
|
||||||
// compute <paronOOEi> = point of <OOEi> at param=paronOOEi+dparonOOEi
|
|
||||||
Standard_Real f,l; Handle(Geom_Curve) C = BRep_Tool::Curve(OOEi,f,l);
|
|
||||||
Standard_Real dparonOOEi = (l-f)*0.05; // NYI : find a better value
|
|
||||||
Standard_Real tol = Precision::Parametric( Precision::Confusion());
|
|
||||||
Standard_Boolean islast = (Abs(paronOOEi-l) < tol);
|
|
||||||
Standard_Boolean isfirst = (Abs(paronOOEi-f) < tol);
|
|
||||||
if (islast || isfirst) return Standard_False;
|
|
||||||
Standard_Real param = paronOOEi+dparonOOEi;
|
|
||||||
gp_Pnt ptonOOEi = C->Value(param);
|
|
||||||
|
|
||||||
// classify <paronOOEi> IN <Ec>
|
|
||||||
TopAbs_State sta = FUN_tool_staPinE(ptonOOEi,Ec);
|
|
||||||
if (sta == TopAbs_IN) FUN_transitiononedge(TopAbs_OUT,TopAbs_IN,TOOEi);
|
|
||||||
if (sta == TopAbs_OUT) FUN_transitiononedge(TopAbs_IN,TopAbs_OUT,TOOEi);
|
|
||||||
return Standard_True;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define s_NOTdgE (0) // do NOT compute any transition
|
|
||||||
#define s_TdgE (1) // compute transition on dgE
|
|
||||||
#define s_TOOEi (2) // compute transition on OOEi
|
|
||||||
|
|
||||||
// case VP is ON the boundary of <Fi> (on edge <Ei>)
|
|
||||||
static Standard_Integer FUN_parondgEONFi
|
|
||||||
(const TopOpeBRep_VPointInter& VP,
|
|
||||||
const Standard_Boolean visvon12,
|
|
||||||
const TopoDS_Vertex& ve,
|
|
||||||
const TopoDS_Vertex& vi, // dummy if !visvon12
|
|
||||||
const Standard_Integer is, // rank of <Fe>
|
|
||||||
const TopoDS_Face& Fe, // contains Ed, Ec
|
|
||||||
const TopoDS_Face& Fi, // face of shape is, contains Ei
|
|
||||||
const TopoDS_Edge& Ed, // degenerated edge
|
|
||||||
const TopoDS_Edge& Ei, // incident edge
|
|
||||||
const TopoDS_Edge& Ec, // couture edge
|
|
||||||
Standard_Real& paronEd,TopOpeBRepDS_Transition& T, // !s_NOTdgE
|
|
||||||
TopoDS_Edge& OOEi, Standard_Real& paronOOEi, TopOpeBRepDS_Transition& TOOEi) // s_TOOEi
|
|
||||||
{
|
|
||||||
// <Fe>, <Ed>, <ve> are of rank <is>, <Ed> is on face <Fe>
|
|
||||||
// <Fi>, <Ei>, <vi> are of rank <ioo>, <Ei> is on face <Fi>
|
|
||||||
Standard_Integer ioo = (is == 1) ? 2 : 1;
|
|
||||||
Standard_Integer sind = VP.ShapeIndex();
|
|
||||||
|
|
||||||
// p2di and p2de :
|
|
||||||
gp_Pnt2d p2de = VP.SurfaceParameters(is);
|
|
||||||
|
|
||||||
gp_Pnt2d p2di = VP.SurfaceParameters(ioo);
|
|
||||||
Standard_Real parOnEi;
|
|
||||||
Standard_Boolean ok = VP.ParonE(Ei,parOnEi);
|
|
||||||
if (!ok) {
|
|
||||||
TopoDS_Vertex voo;
|
|
||||||
if (visvon12) voo = vi;
|
|
||||||
else voo = ve; // is of rank <is> or <ioo>!
|
|
||||||
ok = FUN_tool_parVonE(voo,Ei,parOnEi);
|
|
||||||
}
|
|
||||||
if (!ok) return s_NOTdgE;
|
|
||||||
|
|
||||||
// Getting caracteristic vectors describing our system (a,x,y).
|
|
||||||
// The system is in the plane normal to ngFe :
|
|
||||||
// * <a> is the direction of the tangent vector tgEc, going OUT
|
|
||||||
// the sphere while following <Ec>
|
|
||||||
// * <x> is normal to ngFi.
|
|
||||||
// <x> is oriented INSIDE <Fi> (the matter limited by <Fi>'s boundaries)
|
|
||||||
// * (<x>,<y>,<z>) describe a RONd such that
|
|
||||||
// the geometry of the degenerated edge <Ed> follows (<x>,<y>,<z>),
|
|
||||||
// <y> is oriented OUTSIDE the matter limited by the oriented face <Fi>.
|
|
||||||
// (<Fi> is a plane : <z> is parallel to ngFe)
|
|
||||||
|
|
||||||
gp_Vec ngFe,ngFi,x,a;
|
|
||||||
FUN_GetVectors(Fe,Fi,Ec,p2di,p2de,ve,ngFe,ngFi,a,x);
|
|
||||||
|
|
||||||
// xpu : 24-10-97
|
|
||||||
Standard_Boolean nullx = FUN_nullx(x);
|
|
||||||
if (nullx) {
|
|
||||||
Standard_Boolean mTOOEi = Standard_False;
|
|
||||||
Standard_Boolean getOOEi = FUN_OOEi(p2di,Fi,OOEi,paronOOEi);
|
|
||||||
if (getOOEi && !OOEi.IsSame(Ei)) mTOOEi = FUN_IEcOOEi(ve,paronOOEi,OOEi,Ec,TOOEi);
|
|
||||||
|
|
||||||
if (!mTOOEi) return s_NOTdgE;
|
|
||||||
else return s_TOOEi;
|
|
||||||
}
|
|
||||||
// xpu : 24-10-97
|
|
||||||
|
|
||||||
gp_Vec xx = FUN_tool_getgeomxx(Fi,Ei,parOnEi,ngFi);
|
|
||||||
TopAbs_Orientation oriEi; ok = FUN_tool_orientEinFFORWARD(Ei,Fi,oriEi);
|
|
||||||
if (!ok) return s_NOTdgE; // NYI : Raise Error
|
|
||||||
if (oriEi == TopAbs_REVERSED) xx.Reverse();
|
|
||||||
|
|
||||||
if (x.Dot(xx) < 0.) x.Reverse();
|
|
||||||
|
|
||||||
// when the edge <Ei> is tangent to <Fe> at vertex <v>,
|
|
||||||
// the degenerated edge is not splitted.
|
|
||||||
Standard_Boolean EitangenttoFe = FUN_tool_EitangenttoFe(ngFe,Ei,parOnEi);
|
|
||||||
if (EitangenttoFe) return s_NOTdgE;
|
|
||||||
|
|
||||||
gp_Vec y;
|
|
||||||
if (Fi.Orientation() == TopAbs_FORWARD) y = ngFi;
|
|
||||||
else y = ngFi.Reversed();
|
|
||||||
gp_Vec z(x^y);
|
|
||||||
|
|
||||||
#ifdef OCCT_DEBUG
|
|
||||||
Standard_Boolean trc = Standard_False;
|
|
||||||
if (trc) {
|
|
||||||
gp_Pnt p = BRep_Tool::Pnt(ve);
|
|
||||||
#ifdef DRAW
|
|
||||||
TCollection_AsciiString aax("x"); FUN_brep_draw(aax,p,x);
|
|
||||||
TCollection_AsciiString aay("y"); FUN_brep_draw(aay,p,y);
|
|
||||||
TCollection_AsciiString aang("ngFi"); FUN_brep_draw(aang,p,ngFi);
|
|
||||||
TCollection_AsciiString aaa("a"); FUN_brep_draw(aaa,p,a);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// nrotation = axis describing the sphere's parametrization
|
|
||||||
Standard_Integer orivine = FUN_tool_orientVinE(ve,Ec);
|
|
||||||
gp_Vec nrotation;
|
|
||||||
if (orivine == LAST) nrotation = ngFe;
|
|
||||||
else nrotation = ngFe.Reversed();
|
|
||||||
Standard_Boolean complement = (z.Dot(nrotation) < 0.);
|
|
||||||
paronEd = FUN_getpar(gp_Dir(a),gp_Dir(x),gp_Dir(y),complement);
|
|
||||||
|
|
||||||
// T :
|
|
||||||
// in referential (x,y), following trigonometric sense, while
|
|
||||||
// crossing axis x (describing Fi), the transition is IN/OUT
|
|
||||||
// (y = ntFi).
|
|
||||||
// if parametrization follows the trigonometric sense: transition IN/OUT
|
|
||||||
// else, it is OUT/IN.
|
|
||||||
|
|
||||||
Standard_Boolean inout = !complement;
|
|
||||||
if (inout) T.Set(TopAbs_IN,TopAbs_OUT);
|
|
||||||
else T.Set(TopAbs_OUT,TopAbs_IN);
|
|
||||||
return s_TdgE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Standard_Boolean FUN_0or2PI(Standard_Real& paronEd, const Standard_Boolean& inout)
|
|
||||||
{
|
|
||||||
Standard_Real tol = Precision::Parametric(Precision::Confusion());
|
|
||||||
Standard_Boolean extre = (Abs(paronEd) < tol);
|
|
||||||
extre = extre && (Abs(2.*M_PI-paronEd) < tol);
|
|
||||||
if (!extre) return Standard_False;
|
|
||||||
paronEd = (inout) ? 2.*M_PI : 0.;
|
|
||||||
return Standard_True;
|
|
||||||
}
|
|
||||||
|
|
||||||
// case VP is IN <Fi>
|
|
||||||
static Standard_Integer FUN_parondgEINFi(const TopOpeBRep_VPointInter& VP,
|
|
||||||
const TopoDS_Face& Fe,
|
|
||||||
const TopoDS_Face& Fi,
|
|
||||||
const TopoDS_Edge& Ed,
|
|
||||||
const TopoDS_Edge& Ec,
|
|
||||||
Standard_Real& par1OnEd,
|
|
||||||
Standard_Real& par2OnEd,
|
|
||||||
TopOpeBRepDS_Transition& T1,
|
|
||||||
TopOpeBRepDS_Transition& T2, // !s_NOTdgE
|
|
||||||
TopoDS_Edge& OOEi, Standard_Real& paronOOEi, TopOpeBRepDS_Transition& TOOEi) // s_TdgEandTOOEi
|
|
||||||
{
|
|
||||||
Standard_Integer is = VP.ShapeIndex();
|
|
||||||
Standard_Integer ioo = (is == 1) ? 2 : 1;
|
|
||||||
Standard_Boolean iis1 = (is == 1) ? Standard_True : Standard_False;
|
|
||||||
|
|
||||||
// VP is on the restriction of shape <i>
|
|
||||||
// and IN the face <Fi>.
|
|
||||||
Standard_Boolean isVon1 = VP.IsVertexOnS1();
|
|
||||||
Standard_Boolean isVon2 = VP.IsVertexOnS2();
|
|
||||||
if (iis1 && !isVon1) return s_NOTdgE;
|
|
||||||
if (!iis1 && !isVon2) return s_NOTdgE;
|
|
||||||
TopoDS_Vertex v;
|
|
||||||
if (iis1) v = TopoDS::Vertex(VP.VertexOnS1());
|
|
||||||
else v = TopoDS::Vertex(VP.VertexOnS2());
|
|
||||||
|
|
||||||
// p2di and p2de
|
|
||||||
gp_Pnt2d p2de = VP.SurfaceParameters(is);
|
|
||||||
gp_Pnt2d p2di = VP.SurfaceParameters(ioo);
|
|
||||||
|
|
||||||
gp_Vec ngFe,ngFi,x,a;
|
|
||||||
FUN_GetVectors(Fe,Fi,Ec,p2di,p2de,v,ngFe,ngFi,a,x);
|
|
||||||
|
|
||||||
// xpu : 24-10-97
|
|
||||||
Standard_Boolean nullx = FUN_nullx(x);
|
|
||||||
if (nullx) {
|
|
||||||
Standard_Boolean mTOOEi = Standard_False;
|
|
||||||
Standard_Boolean getOOEi = FUN_OOEi(p2di,Fi,OOEi,paronOOEi);
|
|
||||||
if (getOOEi) mTOOEi = FUN_IEcOOEi(v,paronOOEi,OOEi,Ec,TOOEi);
|
|
||||||
|
|
||||||
if (!mTOOEi) return s_NOTdgE;
|
|
||||||
else return s_TOOEi;
|
|
||||||
}
|
|
||||||
// xpu : 24-10-97
|
|
||||||
|
|
||||||
gp_Vec y;
|
|
||||||
if (Fi.Orientation() == TopAbs_FORWARD) y = ngFi;
|
|
||||||
else y = ngFi.Reversed();
|
|
||||||
gp_Vec z(x^y);
|
|
||||||
|
|
||||||
#ifdef OCCT_DEBUG
|
|
||||||
Standard_Boolean trc = Standard_False;
|
|
||||||
if (trc) {
|
|
||||||
gp_Pnt p = BRep_Tool::Pnt(v);
|
|
||||||
#ifdef DRAW
|
|
||||||
TCollection_AsciiString aax("x"); FUN_brep_draw(aax,p,x);
|
|
||||||
TCollection_AsciiString aay("y"); FUN_brep_draw(aay,p,y);
|
|
||||||
TCollection_AsciiString aang("ngFi"); FUN_brep_draw(aang,p,ngFi);
|
|
||||||
TCollection_AsciiString aaa("a"); FUN_brep_draw(aaa,p,a);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// parameters on <Ed>
|
|
||||||
Standard_Integer orivine = FUN_tool_orientVinE(v,Ec);
|
|
||||||
gp_Vec nrotation;
|
|
||||||
if (orivine == LAST) nrotation = ngFe;
|
|
||||||
else nrotation = ngFe.Reversed();
|
|
||||||
Standard_Boolean complement = (z.Dot(nrotation) < 0.);
|
|
||||||
|
|
||||||
Standard_Boolean T1inout = !complement;
|
|
||||||
if (T1inout) T1.Set(TopAbs_IN,TopAbs_OUT);
|
|
||||||
else T1.Set(TopAbs_OUT,TopAbs_IN);
|
|
||||||
T2 = T1.Complement();
|
|
||||||
|
|
||||||
Standard_Real par = FUN_getpar(a,x,y,complement);
|
|
||||||
par1OnEd = par;
|
|
||||||
par2OnEd = (par > M_PI) ? par-M_PI : par+M_PI;
|
|
||||||
|
|
||||||
// kpart Ec on Fi :
|
|
||||||
Standard_Boolean changedpar1 = FUN_0or2PI(par1OnEd,T1inout);
|
|
||||||
Standard_Boolean changedpar2 = FUN_0or2PI(par2OnEd,!T1inout);
|
|
||||||
|
|
||||||
return s_TdgE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Standard_Boolean FUN_PInDegenEd(const Standard_Real& paronEd, const TopoDS_Edge& Ec)
|
|
||||||
{
|
|
||||||
TopoDS_Vertex vf,vl;
|
|
||||||
TopExp::Vertices(Ec,vf,vl);
|
|
||||||
Standard_Real pf = BRep_Tool::Parameter(vf,Ec);
|
|
||||||
Standard_Real pl = BRep_Tool::Parameter(vl,Ec);
|
|
||||||
Standard_Real tol = Precision::Parametric(Precision::Confusion());
|
|
||||||
|
|
||||||
Standard_Boolean kept = (paronEd < pl-tol) || (paronEd > pl+tol);
|
|
||||||
kept = kept || (paronEd < pf-tol) || (paronEd > pf+tol);
|
|
||||||
return kept;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Standard_Integer FUN_putInterfonDegenEd
|
|
||||||
(const TopOpeBRep_VPointInter& VP,
|
|
||||||
const TopoDS_Face& F1,
|
|
||||||
const TopoDS_Face& F2,
|
|
||||||
TopTools_DataMapOfShapeListOfShape& DataforDegenEd, // const but for copy &
|
|
||||||
const Handle(TopOpeBRepDS_HDataStructure) HDS,
|
|
||||||
Standard_Integer& is,
|
|
||||||
Standard_Integer& makeinterf, // 1,2,3 : compute interf1, or2 or the 2 interfs
|
|
||||||
TopOpeBRepDS_Transition& Trans1, Standard_Real& param1,
|
|
||||||
TopOpeBRepDS_Transition& Trans2, Standard_Real& param2,
|
|
||||||
TopoDS_Edge& OOEi, Standard_Real& paronOOEi, TopOpeBRepDS_Transition& TOOEi)
|
|
||||||
{
|
|
||||||
// IMPORTANT : NYI : xpu :
|
|
||||||
// -----------------------
|
|
||||||
// The following process is valid when ngFe is normal to ngFi.
|
|
||||||
// It may be unsufficient elsewhere.
|
|
||||||
|
|
||||||
// (kpart : sphere/box, with one sphere's degenerated edge lying on one boxe's
|
|
||||||
// face, IN or ON the face)
|
|
||||||
// 1_ if on2edges :
|
|
||||||
// Ed append EVI of transition(FACE Fi) on G=(VERTEX,V), S=(EDGE,Ei) par = paronEd.
|
|
||||||
// 2_ else :
|
|
||||||
// Ed append EVI of transition(FACE Fi) on G=(VERTEX,V), S=(FACE,Fi) par = paronEd1
|
|
||||||
// Ed append EVI of transition(FACE Fi) on G=(VERTEX,V), S=(FACE,Fi) par = paronEd2
|
|
||||||
// with Ed the degenerated edge, Ei of Fi interfers with Ed at vertex V.
|
|
||||||
|
|
||||||
#ifdef OCCT_DEBUG
|
|
||||||
Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF();
|
|
||||||
Standard_Boolean traceDEGEN = TopOpeBRepDS_GettraceDEGEN();
|
|
||||||
Standard_Boolean trace = traceDSF || traceDEGEN;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
TopOpeBRepDS_DataStructure& DS = HDS->ChangeDS();
|
|
||||||
Standard_Boolean isvon1 = VP.IsVertexOnS1();
|
|
||||||
Standard_Boolean isvon2 = VP.IsVertexOnS2();
|
|
||||||
Standard_Boolean isvon12 = isvon1 && isvon2;
|
|
||||||
if (!isvon1 && !isvon2) return s_NOTdgE;
|
|
||||||
Standard_Boolean ison1 = VP.IsOnDomS1();
|
|
||||||
Standard_Boolean ison2 = VP.IsOnDomS2();
|
|
||||||
|
|
||||||
TopoDS_Vertex v1, v2;
|
|
||||||
if (isvon1) v1 = TopoDS::Vertex(VP.VertexOnS1());
|
|
||||||
if (isvon2) v2 = TopoDS::Vertex(VP.VertexOnS2());
|
|
||||||
|
|
||||||
#ifdef DRAW
|
|
||||||
Standard_Boolean trcd = Standard_False;
|
|
||||||
if (trcd && isvon1) {TCollection_AsciiString aa("v1"); FUN_brep_draw(aa,v1);}
|
|
||||||
if (trcd && isvon2) {TCollection_AsciiString aa("v2"); FUN_brep_draw(aa,v2);}
|
|
||||||
if (trcd) FUN_DrawMap(DataforDegenEd);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// VP is lying on at least one vertex vi
|
|
||||||
// !!! : even if isvon1 && isvon2, v1 and v2 are NOT SAME !
|
|
||||||
Standard_Boolean visvon12 = isvon1 ? HDS->HasSameDomain(v1) : HDS->HasSameDomain(v2);
|
|
||||||
if (visvon12 && !isvon12) {
|
|
||||||
TopoDS_Shape oov;
|
|
||||||
if(isvon1) {
|
|
||||||
Standard_Boolean ok = FUN_ds_getoov(v1,HDS,oov);
|
|
||||||
if (!ok) return s_NOTdgE;
|
|
||||||
v2 = TopoDS::Vertex(oov);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Standard_Boolean ok = FUN_ds_getoov(v2,HDS,oov);
|
|
||||||
if (!ok) return s_NOTdgE;
|
|
||||||
v1 = TopoDS::Vertex(oov);
|
|
||||||
}
|
|
||||||
// now, if visvon12, v1 and v2 are defined
|
|
||||||
}
|
|
||||||
|
|
||||||
TopoDS_Vertex v;
|
|
||||||
Standard_Boolean hasdegened;
|
|
||||||
if (isvon1) v = v1;
|
|
||||||
else v = v2;
|
|
||||||
hasdegened = DataforDegenEd.IsBound(v);
|
|
||||||
if (!hasdegened && visvon12) {
|
|
||||||
// DataforDegenEd can either bind v1 or v2.
|
|
||||||
if (isvon1) hasdegened = DataforDegenEd.IsBound(v2);
|
|
||||||
else hasdegened = DataforDegenEd.IsBound(v1);
|
|
||||||
if (hasdegened) {
|
|
||||||
if (isvon1) v = v2;
|
|
||||||
else v = v1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!hasdegened) return s_NOTdgE;
|
|
||||||
|
|
||||||
Standard_Boolean on2edges = (VP.ShapeIndex() == 3);
|
|
||||||
on2edges = on2edges || visvon12;
|
|
||||||
|
|
||||||
TopTools_ListIteratorOfListOfShape itoflos(DataforDegenEd.Find(v));
|
|
||||||
if (!itoflos.More()) return s_NOTdgE;
|
|
||||||
TopoDS_Edge Ec = TopoDS::Edge(itoflos.Value());
|
|
||||||
itoflos.Next(); if (!itoflos.More()) return s_NOTdgE;
|
|
||||||
TopoDS_Edge Ed = TopoDS::Edge(itoflos.Value());
|
|
||||||
|
|
||||||
// -----------------------------------------
|
|
||||||
// Fe, Ec, Ed and v are on shape <is>,
|
|
||||||
// Fi, Ei are on shape <ioo> = (is == 1) ? 2 :1
|
|
||||||
// -----------------------------------------
|
|
||||||
TopoDS_Edge e1,e2;
|
|
||||||
Standard_Boolean e1isEd = Standard_False, e2isEd = Standard_False;
|
|
||||||
if (ison1) { e1 = TopoDS::Edge(VP.ArcOnS1()); e1isEd = BRep_Tool::Degenerated(e1); }
|
|
||||||
if (ison2) { e2 = TopoDS::Edge(VP.ArcOnS2()); e2isEd = BRep_Tool::Degenerated(e2); }
|
|
||||||
|
|
||||||
if (!e1isEd && !e2isEd) return s_NOTdgE; // computes transitions only ONCE
|
|
||||||
is = (e1isEd) ? 1 : 2;
|
|
||||||
Standard_Integer ioo = (is == 1) ? 2 : 1;
|
|
||||||
TopoDS_Face Fe;
|
|
||||||
if (is == 1) Fe = F1;
|
|
||||||
else Fe = F2;
|
|
||||||
TopoDS_Face Fi;
|
|
||||||
if (ioo == 1) Fi = F1;
|
|
||||||
else Fi = F2;
|
|
||||||
Standard_Integer iv = 0;
|
|
||||||
|
|
||||||
#ifdef OCCT_DEBUG
|
|
||||||
if (FUN_debnull(Fe)) cout<<"Fe is null"<<endl;
|
|
||||||
if (FUN_debnull(Fi)) cout<<"Fi is null"<<endl;
|
|
||||||
if (FUN_debnull(Ec)) cout<<"Ec is null"<<endl;
|
|
||||||
if (FUN_debnull(Ed)) cout<<"Ed is null"<<endl;
|
|
||||||
if (trace) {
|
|
||||||
TopAbs_Orientation Edori = Ed.Orientation();
|
|
||||||
}
|
|
||||||
Standard_Boolean trace3d = Standard_False;
|
|
||||||
#ifdef DRAW
|
|
||||||
if (trace3d) {TCollection_AsciiString afe("Fe");TCollection_AsciiString afi("Fi");TCollection_AsciiString aec("Ec");
|
|
||||||
FUN_brep_draw(afe,Fe); FUN_brep_draw(afi,Fi); FUN_brep_draw(aec,Ec);}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Standard_Integer makeI = s_NOTdgE;
|
|
||||||
// case 1 :
|
|
||||||
// -------
|
|
||||||
if (on2edges) {
|
|
||||||
|
|
||||||
TopTools_ListOfShape loEi;
|
|
||||||
TopoDS_Vertex vi,ve; // vertex on shape ioo sharing same domain with v
|
|
||||||
// dummy if !visvon12
|
|
||||||
if (visvon12) {
|
|
||||||
// if isvon12, we have two choices for <Ei>,
|
|
||||||
// we choose the one for which FUN_parondgEONFi returns True.
|
|
||||||
// (recall that prequesitory : ngFi is normal to ngFe)
|
|
||||||
if (is == 1) ve = v1;
|
|
||||||
else ve = v2;
|
|
||||||
if (ioo == 1) vi = v1;
|
|
||||||
else vi = v2;
|
|
||||||
FUN_getEofFwithV(vi,Fi,loEi);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (is == 2) loEi.Append (e1);
|
|
||||||
else loEi.Append (e2);
|
|
||||||
}
|
|
||||||
|
|
||||||
Standard_Real paronEd;
|
|
||||||
TopOpeBRepDS_Transition T;
|
|
||||||
TopTools_ListIteratorOfListOfShape itloei(loEi);
|
|
||||||
|
|
||||||
TopoDS_Edge tmpOOEi; Standard_Real tmpparonOOEi; TopOpeBRepDS_Transition tmpTOOEi;
|
|
||||||
for (;itloei.More(); itloei.Next()) {
|
|
||||||
|
|
||||||
#ifdef OCCT_DEBUG
|
|
||||||
if (FUN_debnull(itloei.Value())) cout<<"Ei is null"<<endl;
|
|
||||||
#ifdef DRAW
|
|
||||||
if (trace3d) {TCollection_AsciiString aa("ecur");FUN_brep_draw(aa,itloei.Value());}
|
|
||||||
#endif
|
|
||||||
TopAbs_ShapeEnum typ = itloei.Value().ShapeType();
|
|
||||||
if (typ != TopAbs_EDGE) cout<<"shape not edge"<<endl;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
TopoDS_Edge Ei = TopoDS::Edge(itloei.Value());
|
|
||||||
if (visvon12) v = ve;
|
|
||||||
makeI = FUN_parondgEONFi (VP,visvon12,v,vi,
|
|
||||||
is,Fe,Fi,Ed,Ei,Ec,paronEd,T,
|
|
||||||
tmpOOEi,tmpparonOOEi,tmpTOOEi);
|
|
||||||
if (makeI == s_NOTdgE) continue;
|
|
||||||
if (makeI == s_TOOEi) {
|
|
||||||
tmpOOEi = OOEi; tmpparonOOEi = paronOOEi; tmpTOOEi = TOOEi;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
Standard_Boolean keepI = FUN_PInDegenEd(paronEd,Ed);
|
|
||||||
if (keepI) {
|
|
||||||
makeinterf = 1;
|
|
||||||
param1 = paronEd;
|
|
||||||
Trans1.Set(T.Before(), T.After());
|
|
||||||
}
|
|
||||||
} // itloei
|
|
||||||
|
|
||||||
}
|
|
||||||
// case 2 :
|
|
||||||
// -------
|
|
||||||
else {
|
|
||||||
Standard_Real paronEd1, paronEd2;
|
|
||||||
TopOpeBRepDS_Transition T1, T2;
|
|
||||||
|
|
||||||
makeI = FUN_parondgEINFi (VP,Fe,Fi,Ed,Ec,paronEd1,paronEd2,T1,T2,
|
|
||||||
OOEi,paronOOEi,TOOEi);
|
|
||||||
if (makeI == s_NOTdgE) return makeI;
|
|
||||||
if (makeI == s_TOOEi) return makeI;
|
|
||||||
|
|
||||||
Standard_Boolean keepI1 = FUN_PInDegenEd(paronEd1,Ed);
|
|
||||||
Standard_Boolean keepI2 = FUN_PInDegenEd(paronEd2,Ed);
|
|
||||||
|
|
||||||
if (keepI1) {
|
|
||||||
makeinterf = 1;
|
|
||||||
param1 = paronEd1;
|
|
||||||
Trans1.Set(T1.Before(), T1.After());
|
|
||||||
}
|
|
||||||
if (keepI2) {
|
|
||||||
makeinterf = (makeinterf == 1) ? 3 : 2;
|
|
||||||
param2 = paronEd2;
|
|
||||||
Trans2.Set(T2.Before(), T2.After());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return makeI;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static Standard_Boolean FUN_getEc
|
|
||||||
(const TopOpeBRep_VPointInter& VP,
|
|
||||||
TopTools_DataMapOfShapeListOfShape& DataforDegenEd,
|
|
||||||
const Handle(TopOpeBRepDS_HDataStructure)& HDS, TopoDS_Shape& Ec)
|
|
||||||
{
|
|
||||||
TopoDS_Vertex v;
|
|
||||||
Standard_Boolean isvon1 = VP.IsVertexOnS1();
|
|
||||||
Standard_Boolean isvon2 = VP.IsVertexOnS2();
|
|
||||||
if (!isvon1 && !isvon2) return Standard_False;
|
|
||||||
if (isvon1) v = TopoDS::Vertex(VP.VertexOnS1());
|
|
||||||
if (isvon2) v = TopoDS::Vertex(VP.VertexOnS2());
|
|
||||||
Standard_Boolean inmap = DataforDegenEd.IsBound(v);
|
|
||||||
if (!inmap) {
|
|
||||||
if (HDS->HasSameDomain(v))
|
|
||||||
{Standard_Boolean ok = FUN_ds_getoov(v,HDS,v); if (!ok) return Standard_False;}
|
|
||||||
inmap = DataforDegenEd.IsBound(v);
|
|
||||||
if (!inmap) return s_NOTdgE;
|
|
||||||
}
|
|
||||||
const TopTools_ListOfShape& los = DataforDegenEd.Find(v);
|
|
||||||
if (los.Extent() < 2) return Standard_False;
|
|
||||||
Ec = los.First();
|
|
||||||
return Standard_True;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
Standard_EXPORT void FUN_FillVof12
|
Standard_EXPORT void FUN_FillVof12
|
||||||
(const TopOpeBRep_LineInter& L,
|
(const TopOpeBRep_LineInter& L,
|
||||||
TopOpeBRepDS_PDataStructure pDS)
|
TopOpeBRepDS_PDataStructure pDS)
|
||||||
@ -967,7 +293,7 @@ static Standard_Integer FUN_putInterfonDegenEd
|
|||||||
Standard_Integer& , // 1,2,3 : compute interf1, or2 or the 2 interfs
|
Standard_Integer& , // 1,2,3 : compute interf1, or2 or the 2 interfs
|
||||||
TopOpeBRepDS_Transition& Trans1, Standard_Real& param1,
|
TopOpeBRepDS_Transition& Trans1, Standard_Real& param1,
|
||||||
TopOpeBRepDS_Transition& Trans2, Standard_Real& param2,
|
TopOpeBRepDS_Transition& Trans2, Standard_Real& param2,
|
||||||
TopoDS_Edge& OOEi, Standard_Real& paronOOEi, Standard_Boolean hasOOEi,
|
TopoDS_Edge& OOEi, Standard_Real& paronOOEi, Standard_Boolean& hasOOEi,
|
||||||
Standard_Boolean& isT2d)
|
Standard_Boolean& isT2d)
|
||||||
{
|
{
|
||||||
OOEi.Nullify();
|
OOEi.Nullify();
|
||||||
@ -1193,8 +519,8 @@ Standard_Boolean TopOpeBRep_FacesFiller::ProcessVPondgE
|
|||||||
Standard_Integer iEd =
|
Standard_Integer iEd =
|
||||||
#endif
|
#endif
|
||||||
myDS->AddShape(dgEd,rankdg);
|
myDS->AddShape(dgEd,rankdg);
|
||||||
Standard_Integer iOOEi = 0;
|
// Standard_Integer iOOEi = 0;
|
||||||
if (hasOOEi) iOOEi = myDS->AddShape(OOEi,rankFi);
|
// if (hasOOEi) iOOEi = myDS->AddShape(OOEi,rankFi);
|
||||||
|
|
||||||
#ifdef OCCT_DEBUG
|
#ifdef OCCT_DEBUG
|
||||||
Standard_Boolean trace = traceDSF || traceDEGEN;
|
Standard_Boolean trace = traceDSF || traceDEGEN;
|
||||||
@ -1206,11 +532,13 @@ Standard_Boolean TopOpeBRep_FacesFiller::ProcessVPondgE
|
|||||||
T1ondg.Index(iFi);
|
T1ondg.Index(iFi);
|
||||||
Standard_Boolean isvertex1 = (rkv == 1);
|
Standard_Boolean isvertex1 = (rkv == 1);
|
||||||
|
|
||||||
|
/*
|
||||||
if (hasOOEi) {
|
if (hasOOEi) {
|
||||||
Handle(TopOpeBRepDS_Interference) EVI1i = ::MakeEPVInterference(T1ondg,iOOEi,PVIndex,par1ondg,
|
Handle(TopOpeBRepDS_Interference) EVI1i = ::MakeEPVInterference(T1ondg,iOOEi,PVIndex,par1ondg,
|
||||||
TopOpeBRepDS_VERTEX,TopOpeBRepDS_EDGE,isvertex1);
|
TopOpeBRepDS_VERTEX,TopOpeBRepDS_EDGE,isvertex1);
|
||||||
myHDS->StoreInterference(EVI1i,dgEd);
|
myHDS->StoreInterference(EVI1i,dgEd);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
if (!isT2d) {
|
if (!isT2d) {
|
||||||
Handle(TopOpeBRepDS_Interference) EVI1 = ::MakeEPVInterference(T1ondg,iFi,PVIndex,par1ondg,
|
Handle(TopOpeBRepDS_Interference) EVI1 = ::MakeEPVInterference(T1ondg,iFi,PVIndex,par1ondg,
|
||||||
TopOpeBRepDS_VERTEX,TopOpeBRepDS_FACE,isvertex1);
|
TopOpeBRepDS_VERTEX,TopOpeBRepDS_FACE,isvertex1);
|
||||||
@ -1221,11 +549,13 @@ Standard_Boolean TopOpeBRep_FacesFiller::ProcessVPondgE
|
|||||||
T2ondg.Index(iFi);
|
T2ondg.Index(iFi);
|
||||||
Standard_Boolean isvertex2 = (rkv == 2);
|
Standard_Boolean isvertex2 = (rkv == 2);
|
||||||
|
|
||||||
|
/*
|
||||||
if (hasOOEi) {
|
if (hasOOEi) {
|
||||||
Handle(TopOpeBRepDS_Interference) EVI2i = ::MakeEPVInterference(T2ondg,iOOEi,PVIndex,par2ondg,
|
Handle(TopOpeBRepDS_Interference) EVI2i = ::MakeEPVInterference(T2ondg,iOOEi,PVIndex,par2ondg,
|
||||||
TopOpeBRepDS_VERTEX,TopOpeBRepDS_EDGE,isvertex2);
|
TopOpeBRepDS_VERTEX,TopOpeBRepDS_EDGE,isvertex2);
|
||||||
myHDS->StoreInterference(EVI2i,dgEd);
|
myHDS->StoreInterference(EVI2i,dgEd);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
if (!isT2d) {
|
if (!isT2d) {
|
||||||
Handle(TopOpeBRepDS_Interference) EVI2 = ::MakeEPVInterference(T2ondg,iFi,PVIndex,par2ondg,
|
Handle(TopOpeBRepDS_Interference) EVI2 = ::MakeEPVInterference(T2ondg,iFi,PVIndex,par2ondg,
|
||||||
TopOpeBRepDS_VERTEX,TopOpeBRepDS_FACE,isvertex2);
|
TopOpeBRepDS_VERTEX,TopOpeBRepDS_FACE,isvertex2);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user