#include <TColgp_SequenceOfPnt.hxx>
#include <TColgp_SequenceOfPnt2d.hxx>
+#include <ElCLib.hxx>
+
#define myInfinite 1.e15 // the same as was in Adaptor3d_TopolTool
static void Recadre(GeomAbs_SurfaceType typeS1,
//purpose :
//=======================================================================
-void IntPatch_RstInt::PutVertexOnLine (Handle(IntPatch_Line)& L,
- const Handle(Adaptor3d_HSurface)& Surf,
- const Handle(Adaptor3d_TopolTool)& Domain,
- const Handle(Adaptor3d_HSurface)& OtherSurf,
- const Standard_Boolean OnFirst,
- const Standard_Real Tol,
- const Standard_Boolean hasBeenAdded)
+void IntPatch_RstInt::PutVertexOnLine (const Handle(IntPatch_Line)& L,
+ const Handle(Adaptor3d_HSurface)& Surf,
+ const Handle(Adaptor3d_TopolTool)& Domain,
+ const Handle(Adaptor3d_HSurface)& OtherSurf,
+ const Standard_Boolean OnFirst,
+ const Standard_Real Tol)
{
// Domain est le domaine de restriction de la surface Surf.
}
Bnd_Box2d BPLin = PLin.Bounding();
-
- if(SurfaceIsPeriodic) {
- Standard_Real xmin,ymin,xmax,ymax,g;
- BPLin.Get(xmin,ymin,xmax,ymax);
- g = BPLin.GetGap();
- BPLin.SetVoid();
- BPLin.Update(xmin-M_PI-M_PI,ymin,
- xmax+M_PI+M_PI,ymax);
- BPLin.SetGap(g);
- }
- if(SurfaceIsBiPeriodic) {
- Standard_Real xmin,ymin,xmax,ymax,g;
- BPLin.Get(xmin,ymin,xmax,ymax);
- g = BPLin.GetGap();
- BPLin.SetVoid();
- BPLin.Update(xmin,ymin-M_PI-M_PI,
- xmax,ymax+M_PI+M_PI);
- BPLin.SetGap(g);
- }
+ Standard_Real OffsetV = 0.0;
+ Standard_Real OffsetU = 0.0;
switch(arc->GetType())
{
- case GeomAbs_Line: NbEchant=10; break;
+ case GeomAbs_Line:
+ {
+ NbEchant=10;
+
+ Standard_Real aXmin, aYmin, aXmax, aYmax;
+ BPLin.Get(aXmin, aYmin, aXmax, aYmax);
+ gp_Lin2d aLin = arc->Curve2d().Line();
+ const gp_Pnt2d& aLoc = aLin.Location();
+ const gp_Dir2d& aDir = aLin.Direction();
+
+ //Here, we consider rectangular axis-aligned domain only.
+ const Standard_Boolean isAlongU = (Abs(aDir.X()) > Abs(aDir.Y()));
+
+ if(SurfaceIsPeriodic && !isAlongU)
+ {
+ //Shift along U-direction
+ const Standard_Real aNewLocation =
+ ElCLib::InPeriod(aLoc.X(), aXmin, aXmin + M_PI + M_PI);
+ OffsetU = aNewLocation - aLoc.X();
+ }
+ else if(SurfaceIsBiPeriodic && isAlongU)
+ {
+ //Shift along V-direction
+ const Standard_Real aNewLocation =
+ ElCLib::InPeriod(aLoc.Y(), aYmin, aYmin + M_PI + M_PI);
+ OffsetV = aNewLocation - aLoc.Y();
+ }
+ }
+ break;
case GeomAbs_BezierCurve:
{
NbEchant = (3 + arc->NbPoles());
}
}
+ if(SurfaceIsPeriodic) {
+ Standard_Real xmin,ymin,xmax,ymax,g;
+ BPLin.Get(xmin,ymin,xmax,ymax);
+ g = BPLin.GetGap();
+ BPLin.SetVoid();
+ BPLin.Update(xmin-M_PI-M_PI,ymin,
+ xmax+M_PI+M_PI,ymax);
+ BPLin.SetGap(g);
+ }
+ if(SurfaceIsBiPeriodic) {
+ Standard_Real xmin,ymin,xmax,ymax,g;
+ BPLin.Get(xmin,ymin,xmax,ymax);
+ g = BPLin.GetGap();
+ BPLin.SetVoid();
+ BPLin.Update(xmin,ymin-M_PI-M_PI,
+ xmax,ymax+M_PI+M_PI);
+ BPLin.SetGap(g);
+ }
+
IntPatch_PolyArc Brise(arc,NbEchant,PFirst,PLast,BPLin);
Standard_Integer IndiceOffsetBiPeriodic = 0;
- Standard_Integer IndiceOffsetPeriodic = 0;
- Standard_Real OffsetV = 0.0;
- Standard_Real OffsetU = 0.0;
-
+ Standard_Integer IndiceOffsetPeriodic = 0;
+ const Standard_Real aRefOU = OffsetU,
+ aRefOV = OffsetV;
+
do {
if(IndiceOffsetBiPeriodic == 1)
- OffsetV = -M_PI-M_PI;
+ OffsetV = aRefOV - M_PI - M_PI;
else if(IndiceOffsetBiPeriodic == 2)
- OffsetV = M_PI+M_PI;
-
+ OffsetV = aRefOV + M_PI + M_PI;
+
do {
- if(IndiceOffsetPeriodic == 1)
- OffsetU = -M_PI-M_PI;
- else if(IndiceOffsetPeriodic == 2)
- OffsetU = M_PI+M_PI;
-
- Brise.SetOffset(OffsetU,OffsetV);
+ if(IndiceOffsetPeriodic == 1)
+ OffsetU = aRefOU - M_PI - M_PI;
+ else if(IndiceOffsetPeriodic == 2)
+ OffsetU = aRefOU + M_PI + M_PI;
+
+ Brise.SetOffset(OffsetU,OffsetV);
static int debug_polygon2d =0;
if(debug_polygon2d) {
}
Standard_Boolean refined = Standard_False;
- if (refine[ip]) {
- //------------------------------------------------------------------------
- //-- On a trouve un point 2d approche Ua,Va intersection de la ligne
- //-- de cheminement et de la restriction.
- //--
- //-- On injecte ce point ds les intersections Courbe-Surface
- //--
- IntPatch_CSFunction thefunc(OtherSurf,arc,Surf);
- // MSV: extend UV bounds to not miss solution near the boundary
- Standard_Real margCoef = 0.004;
- IntPatch_CurvIntSurf IntCS(U,V,W,thefunc,edgeTol,margCoef);
- if (IntCS.IsDone()) {
- if (!IntCS.IsEmpty()) {
- ptsommet = IntCS.Point();
- IntCS.ParameterOnSurface(U2,V2);
- paramarc = IntCS.ParameterOnCurve();
- refined = Standard_True;
- }
- }
- }
+ if (refine[ip])
+ {
+ //------------------------------------------------------------------------
+ //-- On a trouve un point 2d approche Ua,Va intersection de la ligne
+ //-- de cheminement et de la restriction.
+ //--
+ //-- On injecte ce point ds les intersections Courbe-Surface
+ //--
+ IntPatch_CSFunction thefunc(OtherSurf,arc,Surf);
+ // MSV: extend UV bounds to not miss solution near the boundary
+ Standard_Real margCoef = 0.004;
+ IntPatch_CurvIntSurf IntCS(U,V,W,thefunc,edgeTol,margCoef);
+ if (IntCS.IsDone())
+ {
+ if (!IntCS.IsEmpty())
+ {
+ ptsommet = IntCS.Point();
+ IntCS.ParameterOnSurface(U2,V2);
+ gp_Pnt anOldPnt, aNewPnt;
+ OtherSurf->D0(U,V, anOldPnt);
+ OtherSurf->D0(U2,V2, aNewPnt);
+ if (anOldPnt.SquareDistance(aNewPnt) < Precision::Confusion()
+ * Precision::Confusion())
+ {
+ U2 = U;
+ V2 = V;
+ }
+ paramarc = IntCS.ParameterOnCurve();
+ refined = Standard_True;
+ }
+ }
+ }
else {
U2 = U; V2 = V;
paramarc = W;
*/
wlin->SetPeriod(pu1,pv1,pu2,pv2);
- wlin->ComputeVertexParameters(Tol, hasBeenAdded);
+ wlin->ComputeVertexParameters(Tol);
}
else {
rlin->ComputeVertexParameters(Tol);
projects / occt.git / blobdiff