0026917: 3D Offset algorithm produces incorrect result

Extension on the 3D Offset algorithm (Mode="Complete", Join Type = "Intersection")
for colliding cases to add support for new configurations of the shapes.
In the previous approach the result of the offset operation was build from
the offset faces using MakerVolume algorithm, without checking of the validity of these faces.
The new extension is based on this approach, but now the offset faces are being checked
on invalidity and rebuild in case of any. This allows (in case of successful rebuilding) to avoid creation
of the unforeseen parts such as dangling parts, spikes, inverted faces in the result of offset operation.
The main criteria for the validity of the faces is the coincidence of the normal
direction of the offset face with the normal direction of the original face.
Check for removal of invalid faces has been removed as obsolete.

BRepOffset_Inter2D: Avoid excess trimming of the edges due to coincidence with other edges.
BRepOffset_Inter3D: Careful treatment of the intersection of the faces connected only through vertices.

Eliminating the compiler warning.

Small corrections of test cases for issue CR26917

src/BOPAlgo/BOPAlgo_Builder_4.cxx

@@ -176,7 +176,11 @@ void BOPAlgo_Builder::PrepareHistory()
   aItM.Initialize(aMS);
   for (; aItM.More(); aItM.Next()) {
     const TopoDS_Shape& aSx=aItM.Key();
-    aType=aSx.ShapeType();
+    aType = aSx.ShapeType();
+    if (!(aType == TopAbs_VERTEX || aType == TopAbs_EDGE || 
+          aType == TopAbs_FACE   || aType == TopAbs_SOLID)) {
+      continue;
+    }
     //
     // 4.1 .myImagesResult
     bHasImage=myImages.IsBound(aSx); 

src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx

@@ -228,7 +228,6 @@ void BOPAlgo_PaveFiller::PerformFF()
       //
       bToIntersect = CheckPlanes(nF1, nF2);
       if (!bToIntersect) {
-        myDS->AddInterf(nF1, nF2);
         BOPDS_InterfFF& aFF=aFFs.Append1();
         aFF.SetIndices(nF1, nF2);
         aFF.Init(0, 0);

src/BOPTools/BOPTools_AlgoTools_2.cxx

@@ -150,8 +150,12 @@ void BOPTools_AlgoTools::MakeSplitEdge(const TopoDS_Edge&   aE,
   E.EmptyCopy();
   //
   BRep_Builder BB;
-  BB.Add  (E, aV1);
+  if (!aV1.IsNull()) {
-  BB.Add  (E, aV2);
+    BB.Add  (E, aV1);
+  }
+  if (!aV2.IsNull()) {
+    BB.Add  (E, aV2);
+  }
   BB.Range(E, aP1, aP2);
   BB.UpdateEdge(E, aTol);
   aNewEdge=E;

src/BRepOffset/BRepOffset_Inter2d.cxx

@@ -115,84 +115,115 @@ static TopoDS_Vertex CommonVertex(TopoDS_Edge& E1,
 
 //=======================================================================
 //function : Store
-//purpose  : The vertices are added despite of the coincidence with
+//purpose  : Store the vertices <theLV> into AsDes for the edge <theEdge>.
+//           The vertices are added despite of the coincidence with
 //           already added vertices. When all vertices for all edges
 //           are added the coinciding chains of vertices should be fused
 //           using FuseVertices() method.
 //=======================================================================
-static void  Store (const TopoDS_Edge&     E1,
+static void Store(const TopoDS_Edge& theEdge,
-                    const TopoDS_Edge&     E2,
+                  const TopTools_ListOfShape& theLV,
-                    const TopTools_ListOfShape&  LV1,
+                  const Standard_Real theTol,
-                    const TopTools_ListOfShape&  LV2,
+                  const Standard_Boolean IsToUpdate,
-                    Handle(BRepAlgo_AsDes) AsDes,
+                  Handle(BRepAlgo_AsDes) theAsDes2d,
-                    Standard_Real          Tol,
+                  TopTools_IndexedDataMapOfShapeListOfShape& theDMVV)
-                    TopTools_IndexedDataMapOfShapeListOfShape& aDMVV)
 {
-  BRep_Builder aBB;
+  const TopTools_ListOfShape& aLVEx = theAsDes2d->Descendant(theEdge);
-  for (Standard_Integer i = 0; i < 2; ++i) {
+  if (!IsToUpdate && aLVEx.IsEmpty()) {
-    const TopoDS_Edge& aE = !i ? E1 : E2;
+    if (theLV.Extent()) theAsDes2d->Add(theEdge, theLV);
-    const TopTools_ListOfShape& aLV = !i ? LV1 : LV2;
+    return;
-    const TopTools_ListOfShape& aLVEx = AsDes->Descendant(aE);
+  }
-    if (aLVEx.IsEmpty()) {
+  //
-      if (aLV.Extent()) AsDes->Add(aE, aLV);
+  GeomAPI_ProjectPointOnCurve aProjPC;
+  if (IsToUpdate) {
+    Standard_Real aT1, aT2;
+    const Handle(Geom_Curve)& aC = BRep_Tool::Curve(theEdge, aT1, aT2);
+    aProjPC.Init(aC, aT1, aT2);
+  }
+  //
+  TopTools_MapOfShape aMV;
+  TopTools_ListIteratorOfListOfShape aIt(theLV);
+  for (; aIt.More(); aIt.Next()) {
+    const TopoDS_Vertex& aV = TopoDS::Vertex(aIt.Value());
+    if (!aMV.Add(aV)) {
       continue;
     }
     //
-    TopTools_MapOfShape aMV;
+    const gp_Pnt& aP = BRep_Tool::Pnt(aV);
-    TopTools_ListIteratorOfListOfShape aIt(aLV);
+    //
-    for (; aIt.More(); aIt.Next()) {
+    TopTools_ListOfShape aLVC;
-      const TopoDS_Vertex& aV = TopoDS::Vertex(aIt.Value());
+    TopTools_ListIteratorOfListOfShape aItEx(aLVEx);
-      if (!aMV.Add(aV)) {
+    for (; aItEx.More(); aItEx.Next()) {
-        continue;
+      const TopoDS_Vertex& aVEx = TopoDS::Vertex(aItEx.Value());
+      if (aV.IsSame(aVEx)) {
+        break;
       }
-      gp_Pnt aP = BRep_Tool::Pnt(aV);
+      const gp_Pnt& aPEx = BRep_Tool::Pnt(aVEx);
-      //
+      if (aP.IsEqual(aPEx, theTol)) {
-      TopTools_ListOfShape aLVC;
+        aLVC.Append(aVEx);
-      TopTools_ListIteratorOfListOfShape aItEx(aLVEx);
-      for (; aItEx.More(); aItEx.Next()) {
-        const TopoDS_Vertex& aVEx = TopoDS::Vertex(aItEx.Value());
-        if (aV.IsSame(aVEx)) {
-          break;
-        }
-        gp_Pnt aPEx = BRep_Tool::Pnt(aVEx);
-        //
-        if (aP.IsEqual(aPEx, Tol)) {
-          aLVC.Append(aVEx);
-        }
       }
-      //
-      if (aItEx.More()) {
-        continue;
-      }
-      //
-      if (aLVC.Extent()) {
-        TopTools_ListOfShape aLVN;
-        aLVN.Append(aV);
-        //
-        TopTools_ListIteratorOfListOfShape aItLV(aLVC);
-        for (; aItLV.More(); aItLV.Next()) {
-          const TopoDS_Shape& aVC = aItLV.Value();
-          TopTools_ListOfShape* pLV = aDMVV.ChangeSeek(aVC);
-          if (!pLV) {
-            aDMVV.Add(aVC, aLVN);
-          }
-          else {
-            pLV->Append(aV);
-          }
-        }
-        //
-        TopTools_ListOfShape* pLV = aDMVV.ChangeSeek(aV);
-        if (!pLV) {
-          aDMVV.Add(aV, aLVC);
-        }
-        else {
-          pLV->Append(aLVC);
-        }
-      }
-      //
-      aBB.UpdateVertex(aV, Tol);
-      AsDes->Add(aE, aV);
     }
+    //
+    if (aItEx.More()) {
+      continue;
+    }
+    //
+    if (IsToUpdate) {
+      // get parameter of the vertex on the edge
+      aProjPC.Perform(aP);
+      if (!aProjPC.NbPoints()) {
+        continue;
+      }
+      //
+      if (aProjPC.LowerDistance() > theTol) {
+        continue;
+      }
+      //
+      Standard_Real aT = aProjPC.LowerDistanceParameter();
+      TopoDS_Shape aLocalShape = aV.Oriented(TopAbs_INTERNAL);
+      BRep_Builder().UpdateVertex(TopoDS::Vertex(aLocalShape), aT, theEdge, theTol);
+    }
+    else {
+      BRep_Builder().UpdateVertex(aV, theTol);
+    }
+    //
+    if (aLVC.Extent()) {
+      TopTools_ListIteratorOfListOfShape aItLV(aLVC);
+      for (; aItLV.More(); aItLV.Next()) {
+        const TopoDS_Shape& aVC = aItLV.Value();
+        TopTools_ListOfShape* pLV = theDMVV.ChangeSeek(aVC);
+        if (!pLV) {
+          pLV = &theDMVV(theDMVV.Add(aVC, TopTools_ListOfShape()));
+        }
+        pLV->Append(aV);
+      }
+      //
+      TopTools_ListOfShape* pLV = theDMVV.ChangeSeek(aV);
+      if (!pLV) {
+        pLV = &theDMVV(theDMVV.Add(aV, TopTools_ListOfShape()));
+      }
+      pLV->Append(aLVC);
+    }
+    theAsDes2d->Add(theEdge, aV);
+  }
+}
+
+//=======================================================================
+//function : Store
+//purpose  : Store the intersection vertices between two edges into AsDes
+//=======================================================================
+static void  Store (const TopoDS_Edge& theE1,
+                    const TopoDS_Edge& theE2,
+                    const TopTools_ListOfShape& theLV1,
+                    const TopTools_ListOfShape& theLV2,
+                    const Standard_Real theTol,
+                    Handle(BRepAlgo_AsDes) theAsDes2d,
+                    TopTools_IndexedDataMapOfShapeListOfShape& theDMVV)
+{
+  for (Standard_Integer i = 0; i < 2; ++i) {
+    const TopoDS_Edge& aE = !i ? theE1 : theE2;
+    const TopTools_ListOfShape& aLV = !i ? theLV1 : theLV2;
+    Store(aE, aLV, theTol, Standard_False, theAsDes2d, theDMVV);
   }
 }
 
@@ -453,7 +484,7 @@ static void EdgeInter(const TopoDS_Face&              F,
     //---------------------------------
     Standard_Real TolStore = BRep_Tool::Tolerance(E1) + BRep_Tool::Tolerance(E2);
     TolStore = Max(TolStore, 10.*Tol);
-    Store (E1,E2,LV1,LV2,AsDes,TolStore, aDMVV);
+    Store (E1,E2,LV1,LV2,TolStore,AsDes, aDMVV);
   }
 }
 //=======================================================================
@@ -469,7 +500,8 @@ static void RefEdgeInter(const TopoDS_Face&              F,
                          Standard_Real                   Tol,
                          Standard_Boolean                WithOri,
                          gp_Pnt&                         Pref,
-                         TopTools_IndexedDataMapOfShapeListOfShape& aDMVV)
+                         TopTools_IndexedDataMapOfShapeListOfShape& aDMVV,
+                         Standard_Boolean&               theCoincide)
 {
 #ifdef DRAW
   if (Inter2dAffichInt2d) {
@@ -480,7 +512,9 @@ static void RefEdgeInter(const TopoDS_Face&              F,
     DBRep::Set(name,E2);
   }
 #endif
-
+  //
+  theCoincide = Standard_False;
+  //
   if (E1.IsSame(E2))
     return;
 
@@ -531,6 +565,14 @@ static void RefEdgeInter(const TopoDS_Face&              F,
   Geom2dAdaptor_Curve GAC1(pcurve1, f[1], l[1]);
   Geom2dAdaptor_Curve GAC2(pcurve2, f[2], l[2]);
   Geom2dInt_GInter Inter2d( GAC1, GAC2, TolDub, TolDub );
+  //
+  if (!Inter2d.IsDone() || !Inter2d.NbPoints()) {
+    theCoincide = (Inter2d.NbSegments() &&
+                  (GAC1.GetType() == GeomAbs_Line) &&
+                  (GAC2.GetType() == GeomAbs_Line));
+    return;
+  }
+  //
   for (i = 1; i <= Inter2d.NbPoints(); i++)
     {
       gp_Pnt P3d;
@@ -723,7 +765,7 @@ static void RefEdgeInter(const TopoDS_Face&              F,
 ////-----------------------------------------------------
     Standard_Real TolStore = BRep_Tool::Tolerance(E1) + BRep_Tool::Tolerance(E2);
     TolStore = Max(TolStore, 10.*Tol);
-    Store (E1,E2,LV1,LV2,AsDes,TolStore, aDMVV);
+    Store (E1,E2,LV1,LV2,TolStore,AsDes, aDMVV);
   }
 }
 
@@ -848,7 +890,7 @@ static Standard_Boolean ExtendPCurve(const Handle(Geom2d_Curve)& aPCurve,
 
 //  Modified by skv - Fri Dec 26 17:00:55 2003 OCC4455 Begin
 //static void ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge& NE) 
-static void ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge& NE, const Standard_Real theOffset)
+void BRepOffset_Inter2d::ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge& NE, const Standard_Real theOffset)
 {
   //BRepLib::BuildCurve3d(E);
 
@@ -1380,20 +1422,16 @@ void BRepOffset_Inter2d::Compute (const Handle(BRepAlgo_AsDes)&     AsDes,
 //function : ConnexIntByInt
 //purpose  : 
 //=======================================================================
-
-//  Modified by skv - Fri Dec 26 16:53:16 2003 OCC4455 Begin
-//  Add another parameter: offset value.
 void BRepOffset_Inter2d::ConnexIntByInt
-(const TopoDS_Face&            FI,
+ (const TopoDS_Face&            FI,
- BRepOffset_Offset&            OFI,
+  BRepOffset_Offset&            OFI,
- TopTools_DataMapOfShapeShape& MES,
+  TopTools_DataMapOfShapeShape& MES,
- const TopTools_DataMapOfShapeShape& Build,
+  const TopTools_DataMapOfShapeShape& Build,
- const Handle(BRepAlgo_AsDes)& AsDes,
+  const Handle(BRepAlgo_AsDes)& AsDes2d,
- const Handle(BRepAlgo_AsDes)& AsDes2d,
+  const Standard_Real           Offset,
- const Standard_Real           Offset,
+  const Standard_Real           Tol,
- const Standard_Real           Tol,
+  TopTools_IndexedMapOfShape&   FacesWithVerts,
- TopTools_IndexedDataMapOfShapeListOfShape& theDMVV)
+  TopTools_IndexedDataMapOfShapeListOfShape& theDMVV)
-//  Modified by skv - Fri Dec 26 16:53:18 2003 OCC4455 End
 {  
 
   TopTools_DataMapOfShapeListOfShape MVE;
@@ -1417,12 +1455,8 @@ void BRepOffset_Inter2d::ConnexIntByInt
         const TopoDS_Edge& EI = TopoDS::Edge(itL.Value());
         TopoDS_Shape aLocalShape = OFI.Generated(EI);
         const TopoDS_Edge& OE = TopoDS::Edge(aLocalShape);
-//        const TopoDS_Edge& OE = TopoDS::Edge(OFI.Generated(EI));
         if (!MES.IsBound(OE) && !Build.IsBound(EI)) {
-//  Modified by skv - Fri Dec 26 16:59:52 2003 OCC4455 Begin
-//          ExtentEdge(OE,NE);
           ExtentEdge(OE,NE, Offset);
-//  Modified by skv - Fri Dec 26 16:59:54 2003 OCC4455 End
           MES.Bind  (OE,NE);
         }
       }
@@ -1432,14 +1466,6 @@ void BRepOffset_Inter2d::ConnexIntByInt
   TopoDS_Face           FIO = TopoDS::Face(OFI.Face());
   if (MES.IsBound(FIO)) FIO = TopoDS::Face(MES(FIO));
   //
-  TopTools_MapOfShape aME;
-  const TopTools_ListOfShape& aLE = AsDes->Descendant(FIO);
-  TopTools_ListIteratorOfListOfShape aItLE(aLE);
-  for (; aItLE.More(); aItLE.Next()) {
-    const TopoDS_Shape& aE = aItLE.Value();
-    aME.Add(aE);
-  }
-  //
   BRepAdaptor_Surface BAsurf(FIO);
   
   TopExp_Explorer exp(FI.Oriented(TopAbs_FORWARD),TopAbs_WIRE);
@@ -1454,8 +1480,6 @@ void BRepOffset_Inter2d::ConnexIntByInt
     wexp.Init(TopoDS::Wire(aLocalWire),TopoDS::Face(aLocalFace));
     if (!wexp.More())
       continue; // Protection from case when explorer does not contain edges.
-//    wexp.Init(TopoDS::Wire(W .Oriented(TopAbs_FORWARD)),
-//              TopoDS::Face(FI.Oriented(TopAbs_FORWARD)));
     CurE = FirstE  = wexp.Current(); 
     while (!end) {
       wexp.Next();
@@ -1467,17 +1491,13 @@ void BRepOffset_Inter2d::ConnexIntByInt
       }
       if (CurE.IsSame(NextE)) continue;
 
-      //IFV------------
       TopoDS_Vertex Vref = CommonVertex(CurE, NextE); 
       gp_Pnt Pref = BRep_Tool::Pnt(Vref);
-      //IFV------------
 
       TopoDS_Shape aLocalShape = OFI.Generated(CurE);
       TopoDS_Edge CEO = TopoDS::Edge(aLocalShape);
       aLocalShape = OFI.Generated(NextE);
       TopoDS_Edge NEO = TopoDS::Edge(aLocalShape);
-//      TopoDS_Edge CEO = TopoDS::Edge(OFI.Generated(CurE));
-//      TopoDS_Edge NEO = TopoDS::Edge(OFI.Generated(NextE));
       //------------------------------------------
       // Inter processing of images of CurE NextE.
       //------------------------------------------
@@ -1490,7 +1510,7 @@ void BRepOffset_Inter2d::ConnexIntByInt
         NE2 = Build(NextE);
       }
       else if (Build.IsBound(CurE) && MES.IsBound(NEO)) {
-         NE1 = Build(CurE);
+        NE1 = Build(CurE);
         NE2 = MES  (NEO);
       }
       else if (Build.IsBound(NextE) && MES.IsBound(CEO)) {
@@ -1504,43 +1524,31 @@ void BRepOffset_Inter2d::ConnexIntByInt
         //------------------------------------
         // NE1,NE2 can be a compound of Edges.
         //------------------------------------
-        TopExp_Explorer Exp1,Exp2;
+        Standard_Boolean bCoincide;
-        for (Exp1.Init(NE1,TopAbs_EDGE) ; Exp1.More(); Exp1.Next()) {
+        TopExp_Explorer Exp1, Exp2;
-          for (Exp2.Init(NE2,TopAbs_EDGE) ; Exp2.More(); Exp2.Next()) {
+        for (Exp1.Init(NE1, TopAbs_EDGE); Exp1.More(); Exp1.Next()) {
-            RefEdgeInter(FIO,BAsurf,TopoDS::Edge(Exp1.Current()),TopoDS::Edge(Exp2.Current()),
+          const TopoDS_Edge& aE1 = TopoDS::Edge(Exp1.Current());
-                      AsDes2d,Tol,Standard_True/*Standard_False*/, Pref, theDMVV);
+          for (Exp2.Init(NE2, TopAbs_EDGE); Exp2.More(); Exp2.Next()) {
+            const TopoDS_Edge& aE2 = TopoDS::Edge(Exp2.Current());
+            RefEdgeInter(FIO, BAsurf, aE1, aE2, AsDes2d,
+                         Tol, Standard_True, Pref, theDMVV, bCoincide);
           }
         }
         //
+        // check if some of the offset edges have been
+        // generated out of the common vertex
         if (Build.IsBound(Vref)) {
-          TopoDS_Shape NE3 = Build(Vref);
+          FacesWithVerts.Add(FI);
-          //
-          for (Exp2.Init(NE3,TopAbs_EDGE) ; Exp2.More(); Exp2.Next()) {
-            const TopoDS_Edge& aE3 = *(TopoDS_Edge*)&Exp2.Current();
-            if (!aME.Contains(aE3)) {
-              continue;
-            }
-            //
-            for (Exp1.Init(NE1,TopAbs_EDGE) ; Exp1.More(); Exp1.Next()) {
-              RefEdgeInter(FIO,BAsurf,TopoDS::Edge(Exp1.Current()),aE3,
-                           AsDes2d,Tol,Standard_True/*Standard_False*/, Pref, theDMVV);
-            }
-            //
-            for (Exp1.Init(NE2,TopAbs_EDGE) ; Exp1.More(); Exp1.Next()) {
-              RefEdgeInter(FIO,BAsurf,TopoDS::Edge(Exp1.Current()),aE3,
-                           AsDes2d,Tol,Standard_True/*Standard_False*/, Pref, theDMVV);
-            }
-          }
         }
       }
       else {
         if (MES.IsBound(CEO)) {
-          TopoDS_Vertex  V = CommonVertex(CEO,NEO); 
+          TopoDS_Vertex  V = CommonVertex(CEO,NEO);
           UpdateVertex  (V,CEO,TopoDS::Edge(MES(CEO)),Tol);
           AsDes2d->Add     (MES(CEO),V);
         }
         else if (MES.IsBound(NEO)) {
-          TopoDS_Vertex V = CommonVertex(CEO,NEO); 
+          TopoDS_Vertex V = CommonVertex(CEO,NEO);
           UpdateVertex (V,NEO,TopoDS::Edge(MES(NEO)),Tol);
           AsDes2d->Add    (MES(NEO),V);
         }
@@ -1550,6 +1558,143 @@ void BRepOffset_Inter2d::ConnexIntByInt
   }
 }
 
+//=======================================================================
+//function : ConnexIntByIntInVert
+//purpose  : Intersection of the edges generated out of vertices
+//=======================================================================
+void BRepOffset_Inter2d::ConnexIntByIntInVert
+ (const TopoDS_Face&            FI,
+  BRepOffset_Offset&            OFI,
+  TopTools_DataMapOfShapeShape& MES,
+  const TopTools_DataMapOfShapeShape& Build,
+  const Handle(BRepAlgo_AsDes)& AsDes,
+  const Handle(BRepAlgo_AsDes)& AsDes2d,
+  const Standard_Real           Tol,
+  TopTools_IndexedDataMapOfShapeListOfShape& theDMVV)
+{
+  TopoDS_Face           FIO = TopoDS::Face(OFI.Face());
+  if (MES.IsBound(FIO)) FIO = TopoDS::Face(MES(FIO));
+  //
+  TopTools_MapOfShape aME;
+  const TopTools_ListOfShape& aLE = AsDes->Descendant(FIO);
+  TopTools_ListIteratorOfListOfShape aItLE(aLE);
+  for (; aItLE.More(); aItLE.Next()) {
+    const TopoDS_Shape& aE = aItLE.Value();
+    aME.Add(aE);
+  }
+  //
+  BRepAdaptor_Surface BAsurf(FIO);
+  //
+  TopExp_Explorer exp(FI.Oriented(TopAbs_FORWARD),TopAbs_WIRE);
+  for (; exp.More(); exp.Next()) {
+    const TopoDS_Wire&     W = TopoDS::Wire(exp.Current());
+    //
+    BRepTools_WireExplorer wexp;
+    Standard_Boolean       end = Standard_False ;
+    TopoDS_Edge            FirstE,CurE,NextE;
+    //
+    TopoDS_Shape aLocalWire = W .Oriented(TopAbs_FORWARD);
+    TopoDS_Shape aLocalFace = FI.Oriented(TopAbs_FORWARD);
+    wexp.Init(TopoDS::Wire(aLocalWire),TopoDS::Face(aLocalFace));
+    if (!wexp.More())
+      continue; // Protection from case when explorer does not contain edges.
+    //
+    CurE = FirstE  = wexp.Current(); 
+    while (!end) {
+      wexp.Next();
+      if (wexp.More()) {
+        NextE = wexp.Current();
+      } 
+      else {
+        NextE = FirstE; end = Standard_True;
+      }
+      if (CurE.IsSame(NextE)) continue;
+      //
+      TopoDS_Vertex Vref = CommonVertex(CurE, NextE); 
+      gp_Pnt Pref = BRep_Tool::Pnt(Vref);
+      if (!Build.IsBound(Vref)) {
+        CurE = NextE;
+        continue;
+      }
+      //
+      TopoDS_Shape aLocalShape = OFI.Generated(CurE);
+      TopoDS_Edge CEO = TopoDS::Edge(aLocalShape);
+      aLocalShape = OFI.Generated(NextE);
+      TopoDS_Edge NEO = TopoDS::Edge(aLocalShape);
+      //
+      TopoDS_Shape         NE1,NE2;
+      
+      if (Build.IsBound(CurE) && Build.IsBound(NextE)) {
+        NE1 = Build(CurE );
+        NE2 = Build(NextE);
+      }
+      else if (Build.IsBound(CurE) && MES.IsBound(NEO)) {
+        NE1 = Build(CurE);
+        NE2 = MES  (NEO);
+      }
+      else if (Build.IsBound(NextE) && MES.IsBound(CEO)) {
+        NE1 = Build(NextE);
+        NE2 = MES(CEO);
+      }
+      else {
+        CurE = NextE;
+        continue;
+      }
+      //
+      TopExp_Explorer Exp1, Exp2;
+      Standard_Boolean bCoincide;
+      // intersect edges generated from vertex with the edges of the face
+      TopoDS_Shape NE3 = Build(Vref);
+      //
+      for (Exp2.Init(NE3, TopAbs_EDGE); Exp2.More(); Exp2.Next()) {
+        const TopoDS_Edge& aE3 = *(TopoDS_Edge*)&Exp2.Current();
+        if (!aME.Contains(aE3)) {
+          continue;
+        }
+        //
+        // intersection with first edge
+        for (Exp1.Init(NE1, TopAbs_EDGE); Exp1.More(); Exp1.Next()) {
+          const TopoDS_Edge& aE1 = TopoDS::Edge(Exp1.Current());
+          RefEdgeInter(FIO, BAsurf, aE1, aE3, AsDes2d,
+            Tol, Standard_True, Pref, theDMVV, bCoincide);
+          if (bCoincide) {
+            // in case of coincidence trim the edge E3 the same way as E1
+            Store(aE3, AsDes2d->Descendant(aE1), Tol, Standard_True, AsDes2d, theDMVV);
+          }
+        }
+        //
+        // intersection with second edge
+        for (Exp1.Init(NE2, TopAbs_EDGE); Exp1.More(); Exp1.Next()) {
+          const TopoDS_Edge& aE2 = TopoDS::Edge(Exp1.Current());
+          RefEdgeInter(FIO, BAsurf, aE2, aE3, AsDes2d,
+            Tol, Standard_True, Pref, theDMVV, bCoincide);
+          if (bCoincide) {
+            // in case of coincidence trim the edge E3 the same way as E2
+            Store(aE3, AsDes2d->Descendant(aE2), Tol, Standard_True, AsDes2d, theDMVV);
+          }
+        }
+        //
+        // intersection of the edges generated from vertex
+        // among themselves
+        for (Exp1.Init(NE3, TopAbs_EDGE); Exp1.More(); Exp1.Next()) {
+          if (aE3.IsSame(Exp1.Current())) {
+            break;
+          }
+        }
+        //
+        for (Exp1.Next(); Exp1.More(); Exp1.Next()) {
+          const TopoDS_Edge& aE3Next = TopoDS::Edge(Exp1.Current());
+          if (aME.Contains(aE3Next)) {
+            RefEdgeInter(FIO, BAsurf, aE3Next, aE3, AsDes2d,
+              Tol, Standard_True, Pref, theDMVV, bCoincide);
+          }
+        }
+      }
+      CurE = NextE;
+    }
+  }
+}
+
 //=======================================================================
 //function : MakeChain
 //purpose  : 

src/BRepOffset/BRepOffset_Inter2d.hxx

@@ -51,27 +51,45 @@ public:
                                        const Standard_Real Tol,
                                        TopTools_IndexedDataMapOfShapeListOfShape& theDMVV);
 
-  //! Computes the intersection between the offset edges
+  //! Computes the intersection between the offset edges of the <FI>.
-  //! stored in AsDes as descendatnds on <F>. All intersection
+  //! All intersection vertices will be stored in AsDes2d.
-  //! vertices will be stored in AsDes2d. When all faces of the
+  //! When all faces of the shape are treated the intersection vertices
-  //! shape are treated the intersection vertices have to be fused
+  //! have to be fused using the FuseVertices method.
-  //! using the FuseVertices method.
   //! theDMVV contains the vertices that should be fused.
-  Standard_EXPORT static void ConnexIntByInt (const TopoDS_Face& FI, 
+  Standard_EXPORT static void ConnexIntByInt (const TopoDS_Face& FI,
-                                              BRepOffset_Offset& OFI, 
+                                              BRepOffset_Offset& OFI,
-                                              TopTools_DataMapOfShapeShape& MES, 
+                                              TopTools_DataMapOfShapeShape& MES,
-                                              const TopTools_DataMapOfShapeShape& Build, 
+                                              const TopTools_DataMapOfShapeShape& Build,
-                                              const Handle(BRepAlgo_AsDes)& AsDes, 
+                                              const Handle(BRepAlgo_AsDes)& AsDes2d,
-                                              const Handle(BRepAlgo_AsDes)& AsDes2d, 
+                                              const Standard_Real Offset,
-                                              const Standard_Real Offset, 
                                               const Standard_Real Tol,
+                                              TopTools_IndexedMapOfShape& FacesWithVerts,
                                               TopTools_IndexedDataMapOfShapeListOfShape& theDMVV);
 
+  //! Computes the intersection between the offset edges generated
+  //! from vertices and stored into AsDes as descendants of the <FI>.
+  //! All intersection vertices will be stored in AsDes2d.
+  //! When all faces of the shape are treated the intersection vertices
+  //! have to be fused using the FuseVertices method.
+  //! theDMVV contains the vertices that should be fused.
+  Standard_EXPORT static void ConnexIntByIntInVert (const TopoDS_Face& FI,
+                                                    BRepOffset_Offset& OFI,
+                                                    TopTools_DataMapOfShapeShape& MES,
+                                                    const TopTools_DataMapOfShapeShape& Build,
+                                                    const Handle(BRepAlgo_AsDes)& AsDes,
+                                                    const Handle(BRepAlgo_AsDes)& AsDes2d,
+                                                    const Standard_Real Tol,
+                                                    TopTools_IndexedDataMapOfShapeListOfShape& theDMVV);
+
   //! Fuses the chains of vertices in the theDMVV
   //! and updates AsDes by replacing the old vertices
   //! with the new ones.
   Standard_EXPORT static void FuseVertices(const TopTools_IndexedDataMapOfShapeListOfShape& theDMVV,
                                            const Handle(BRepAlgo_AsDes)& theAsDes);
+  //! extents the edge
+  Standard_EXPORT static void ExtentEdge(const TopoDS_Edge& E,
+                                         TopoDS_Edge& NE,
+                                         const Standard_Real theOffset);
 
 protected:
 

src/BRepOffset/BRepOffset_Inter3d.cxx

@@ -45,6 +45,8 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
+//
+#include <BOPTools_AlgoTools.hxx>
 
 //=======================================================================
 //function : BRepOffset_Inter3d
@@ -444,51 +446,24 @@ void BRepOffset_Inter3d::ConnexIntByInt
     TopExp::MapShapesAndAncestors(SI, TopAbs_VERTEX, TopAbs_FACE, aMVF);
   }
   //
-  aNb = VEmap.Extent();
+  TopTools_DataMapOfShapeListOfShape aDMVLF1, aDMVLF2;
-  for (i = 1; i <= aNb; ++i) {
+  TopTools_IndexedDataMapOfShapeListOfShape aDMIntE, aDMIntFF;
-    const TopoDS_Shape& aS = VEmap(i);
+  //
-    //
+  if (bIsPlanar) {
-    TopoDS_Edge E;
+    aNb = VEmap.Extent();
-    TopTools_ListOfShape aLF1, aLF2;
+    for (i = 1; i <= aNb; ++i) {
-    //
+      const TopoDS_Shape& aS = VEmap(i);
-    bEdge = (aS.ShapeType() == TopAbs_EDGE);
+      if (aS.ShapeType() != TopAbs_VERTEX) {
-    if (bEdge) {
-      // faces connected by the edge
-      E = *(TopoDS_Edge*)&aS;
-      //
-      const BRepOffset_ListOfInterval& L = Analyse.Type(E);
-      if (L.IsEmpty()) {
         continue;
       }
       //
-      BRepOffset_Type    OT   = L.First().Type();
-      if (OT != BRepOffset_Convex && OT != BRepOffset_Concave) {
-        continue;
-      }
-      //
-      if (OT == BRepOffset_Concave) CurSide = TopAbs_IN;
-      else                          CurSide = TopAbs_OUT;
-      //-----------------------------------------------------------
-      // edge is of the proper type, return adjacent faces.
-      //-----------------------------------------------------------
-      const TopTools_ListOfShape& Anc = Analyse.Ancestors(E);
-      if (Anc.Extent() != 2) {
-        continue;
-      }
-      //
-      F1  = TopoDS::Face(Anc.First());
-      F2  = TopoDS::Face(Anc.Last ());
-      //
-      aLF1.Append(F1);
-      aLF2.Append(F2);
-    }
-    else {
       // faces connected by the vertex
       const TopTools_ListOfShape& aLF = aMVF.FindFromKey(aS);
       if (aLF.Extent() < 2) {
         continue;
       }
       //
+      TopTools_ListOfShape aLF1, aLF2;
       Standard_Boolean bVertexOnly = Standard_False;
       TopTools_MapOfShape aMFence;
       //
@@ -534,6 +509,57 @@ void BRepOffset_Inter3d::ConnexIntByInt
         continue;
       }
       //
+      aDMVLF1.Bind(aS, aLF1);
+      aDMVLF2.Bind(aS, aLF2);
+    }
+  }
+  //
+  aNb = VEmap.Extent();
+  for (i = 1; i <= aNb; ++i) {
+    const TopoDS_Shape& aS = VEmap(i);
+    //
+    TopoDS_Edge E;
+    TopTools_ListOfShape aLF1, aLF2;
+    //
+    bEdge = (aS.ShapeType() == TopAbs_EDGE);
+    if (bEdge) {
+      // faces connected by the edge
+      E = *(TopoDS_Edge*)&aS;
+      //
+      const BRepOffset_ListOfInterval& L = Analyse.Type(E);
+      if (L.IsEmpty()) {
+        continue;
+      }
+      //
+      BRepOffset_Type    OT   = L.First().Type();
+      if (OT != BRepOffset_Convex && OT != BRepOffset_Concave) {
+        continue;
+      }
+      //
+      if (OT == BRepOffset_Concave) CurSide = TopAbs_IN;
+      else                          CurSide = TopAbs_OUT;
+      //-----------------------------------------------------------
+      // edge is of the proper type, return adjacent faces.
+      //-----------------------------------------------------------
+      const TopTools_ListOfShape& Anc = Analyse.Ancestors(E);
+      if (Anc.Extent() != 2) {
+        continue;
+      }
+      //
+      F1  = TopoDS::Face(Anc.First());
+      F2  = TopoDS::Face(Anc.Last ());
+      //
+      aLF1.Append(F1);
+      aLF2.Append(F2);
+    }
+    else {
+      if (!aDMVLF1.IsBound(aS)) {
+        continue;
+      }
+      //
+      aLF1 = aDMVLF1.Find(aS);
+      aLF2 = aDMVLF2.Find(aS);
+      //
       CurSide = mySide;
     }
     //
@@ -595,6 +621,24 @@ void BRepOffset_Inter3d::ConnexIntByInt
           for (; it.More(); it.Next()) {
             const TopoDS_Shape& aNE = it.Value();
             B.Add(C, aNE);
+            if (bEdge) {
+              TopoDS_Vertex aVO1, aVO2;
+              TopExp::Vertices(TopoDS::Edge(aS), aVO1, aVO2);
+              if (!aDMVLF1.IsBound(aVO1) && !aDMVLF1.IsBound(aVO2)) {
+                TopTools_ListOfShape *pListS = aDMIntE.ChangeSeek(aNE);
+                if (!pListS) {
+                  pListS = &aDMIntE.ChangeFromIndex(aDMIntE.Add(aNE, TopTools_ListOfShape()));
+                }
+                pListS->Append(aS);
+                //
+                if (!aDMIntFF.Contains(aNE)) {
+                  TopTools_ListOfShape aLFF;
+                  aLFF.Append(NF1);
+                  aLFF.Append(NF2);
+                  aDMIntFF.Add(aNE, aLFF);
+                }
+              }
+            }
           }
           //
           Build.Bind(aS,C);
@@ -620,14 +664,33 @@ void BRepOffset_Inter3d::ConnexIntByInt
             }
           }
           //
+          TopTools_ListOfShape aLENew;
           for (it.Initialize(aLInt1) ; it.More(); it.Next()) {
             const TopoDS_Shape &anE1 = it.Value();
             //
             for (it1.Initialize(aLInt2) ; it1.More(); it1.Next()) {
               const TopoDS_Shape &anE2 = it1.Value();
-              
+              if (anE1.IsSame(anE2)) {
-              if (anE1.IsSame(anE2))
                 B.Add(C, anE1);
+                if (bEdge) {
+                  TopoDS_Vertex aVO1, aVO2;
+                  TopExp::Vertices(TopoDS::Edge(aS), aVO1, aVO2);
+                  if (!aDMVLF1.IsBound(aVO1) && !aDMVLF1.IsBound(aVO2)) {
+                    TopTools_ListOfShape *pListS = aDMIntE.ChangeSeek(anE1);
+                    if (!pListS) {
+                      pListS = &aDMIntE.ChangeFromIndex(aDMIntE.Add(anE1, TopTools_ListOfShape()));
+                    }
+                    pListS->Append(aS);
+                    //
+                    if (!aDMIntFF.Contains(anE1)) {
+                      TopTools_ListOfShape aLFF;
+                      aLFF.Append(NF1);
+                      aLFF.Append(NF2);
+                      aDMIntFF.Add(anE1, aLFF);
+                    }
+                  }
+                }
+              }
             }
           }
           Build.Bind(aS,C);
@@ -639,6 +702,70 @@ void BRepOffset_Inter3d::ConnexIntByInt
     }
     //  Modified by skv - Fri Dec 26 12:20:14 2003 OCC4455 End
   }
+  //
+  aNb = aDMIntE.Extent();
+  for (i = 1; i <= aNb; ++i) {
+    const TopTools_ListOfShape& aLE = aDMIntE(i);
+    if (aLE.Extent() == 1) {
+      continue;
+    }
+    //
+    // make connexity blocks of edges
+    TopoDS_Compound aCE;
+    B.MakeCompound(aCE);
+    //
+    TopTools_ListIteratorOfListOfShape aItLE(aLE);
+    for (; aItLE.More(); aItLE.Next()) {
+      const TopoDS_Shape& aE = aItLE.Value();
+      B.Add(aCE, aE);
+    }
+    //
+    TopTools_ListOfShape aLCBE;
+    BOPTools_AlgoTools::MakeConnexityBlocks(aCE, TopAbs_VERTEX, TopAbs_EDGE, aLCBE);
+    if (aLCBE.Extent() == 1) {
+      continue;
+    }
+    //
+    const TopoDS_Edge& aE = TopoDS::Edge(aDMIntE.FindKey(i));
+    const TopTools_ListOfShape& aLFF = aDMIntFF.FindFromKey(aE);
+    const TopoDS_Shape& aF1 = aLFF.First();
+    const TopoDS_Shape& aF2 = aLFF.Last();
+    //
+    aItLE.Initialize(aLCBE);
+    for (aItLE.Next(); aItLE.More(); aItLE.Next()) {
+      // make new edge with different tedge instance
+      TopoDS_Edge aNewEdge;
+      TopoDS_Vertex aV1, aV2;
+      Standard_Real aT1, aT2;
+      //
+      TopExp::Vertices(aE, aV1, aV2);
+      BRep_Tool::Range(aE, aT1, aT2);
+      //
+      BOPTools_AlgoTools::MakeSplitEdge(aE, aV1, aT1, aV2, aT2, aNewEdge);
+      //
+      myAsDes->Add(aF1, aNewEdge);
+      myAsDes->Add(aF2, aNewEdge);
+      //
+      const TopoDS_Shape& aCB = aItLE.Value();
+      TopoDS_Iterator aItCB(aCB);
+      for (; aItCB.More(); aItCB.Next()) {
+        const TopoDS_Shape& aS = aItCB.Value();
+        TopoDS_Shape& aCI = Build.ChangeFind(aS);
+        //
+        TopoDS_Compound aNewCI;
+        B.MakeCompound(aNewCI);
+        TopExp_Explorer aExp(aCI, TopAbs_EDGE);
+        for (; aExp.More(); aExp.Next()) {
+          const TopoDS_Shape& aSx = aExp.Current();
+          if (!aSx.IsSame(aE)) {
+            B.Add(aNewCI, aSx);
+          }
+        }
+        B.Add(aNewCI, aNewEdge);
+        aCI = aNewCI;
+      }
+    }
+  }
 }
 
 //=======================================================================

src/BRepOffset/BRepOffset_MakeOffset.hxx

@@ -53,27 +53,25 @@ public:
   
   Standard_EXPORT BRepOffset_MakeOffset();
   
-  Standard_EXPORT BRepOffset_MakeOffset(const TopoDS_Shape& S, 
+  Standard_EXPORT BRepOffset_MakeOffset(const TopoDS_Shape& S,
-                                        const Standard_Real Offset, 
+                                        const Standard_Real Offset,
-                                        const Standard_Real Tol, 
+                                        const Standard_Real Tol,
-                                        const BRepOffset_Mode Mode = BRepOffset_Skin, 
+                                        const BRepOffset_Mode Mode = BRepOffset_Skin,
-                                        const Standard_Boolean Intersection = Standard_False, 
+                                        const Standard_Boolean Intersection = Standard_False,
-                                        const Standard_Boolean SelfInter = Standard_False, 
+                                        const Standard_Boolean SelfInter = Standard_False,
-                                        const GeomAbs_JoinType Join = GeomAbs_Arc, 
+                                        const GeomAbs_JoinType Join = GeomAbs_Arc,
                                         const Standard_Boolean Thickening = Standard_False,
-                                        const Standard_Boolean RemoveIntEdges = Standard_False,
+                                        const Standard_Boolean RemoveIntEdges = Standard_False);
-                                        const Standard_Boolean RemoveInvalidFaces = Standard_False);
   
-  Standard_EXPORT void Initialize (const TopoDS_Shape& S, 
+  Standard_EXPORT void Initialize (const TopoDS_Shape& S,
-                                   const Standard_Real Offset, 
+                                   const Standard_Real Offset,
-                                   const Standard_Real Tol, 
+                                   const Standard_Real Tol,
-                                   const BRepOffset_Mode Mode = BRepOffset_Skin, 
+                                   const BRepOffset_Mode Mode = BRepOffset_Skin,
-                                   const Standard_Boolean Intersection = Standard_False, 
+                                   const Standard_Boolean Intersection = Standard_False,
-                                   const Standard_Boolean SelfInter = Standard_False, 
+                                   const Standard_Boolean SelfInter = Standard_False,
-                                   const GeomAbs_JoinType Join = GeomAbs_Arc, 
+                                   const GeomAbs_JoinType Join = GeomAbs_Arc,
                                    const Standard_Boolean Thickening = Standard_False,
-                                   const Standard_Boolean RemoveIntEdges = Standard_False,
+                                   const Standard_Boolean RemoveIntEdges = Standard_False);
-                                   const Standard_Boolean RemoveInvalidFaces = Standard_False);
   
   Standard_EXPORT void Clear();
   
@@ -129,20 +127,13 @@ protected:
 
 private:
 
-  
   Standard_EXPORT void BuildOffsetByArc();
   
   Standard_EXPORT void BuildOffsetByInter();
 
-  //! Building splits of the offset faces by the section curves 
+  //! Make Offset faces
-  //! between the neighboring faces. 
+  Standard_EXPORT void MakeOffsetFaces(BRepOffset_DataMapOfShapeOffset& theMapSF);
-  Standard_EXPORT void BuildSplitsOfFaces(const TopTools_ListOfShape& theLF,
+
-                                          const Handle(BRepAlgo_AsDes)& theAsDes,
-                                          TopTools_IndexedDataMapOfShapeListOfShape& theOrigins,
-                                          BRepAlgo_Image& theImage,
-                                          TopTools_ListOfShape& theLFailed,
-                                          const Standard_Boolean bLimited);
-  
   Standard_EXPORT void SelfInter (TopTools_MapOfShape& Modif);
   
   Standard_EXPORT void Intersection3D (BRepOffset_Inter3d& Inter);
@@ -177,7 +168,30 @@ private:
   //! Removes INTERNAL edges from the result
   Standard_EXPORT void RemoveInternalEdges();
 
+  //! Intersects edges
+  Standard_EXPORT void IntersectEdges (const TopoDS_Shape& theShape,
+                                       BRepOffset_DataMapOfShapeOffset& theMapSF,
+                                       TopTools_DataMapOfShapeShape& theMES,
+                                       TopTools_DataMapOfShapeShape& theBuild,
+                                       Handle(BRepAlgo_AsDes)& theAsDes,
+                                       Handle(BRepAlgo_AsDes)& theAsDes2d);
 
+  //! Building of the splits of the offset faces for mode Complete
+  //! and joint type Intersection. This method is an advanced alternative
+  //! for BRepOffset_MakeLoops::Build method.
+  //! Currently the Complete intersection mode is limited to work only on planar cases.
+  Standard_EXPORT void BuildSplitsOfExtendedFaces(const TopTools_ListOfShape& theLF,
+                                                  Handle(BRepAlgo_AsDes)& theAsDes,
+                                                  TopTools_DataMapOfShapeListOfShape& theEdgesOrigins,
+                                                  TopTools_DataMapOfShapeShape& theFacesOrigins,
+                                                  TopTools_DataMapOfShapeShape& theETrimEInf,
+                                                  BRepAlgo_Image& theImage);
+
+  //! Building of the splits of the already trimmed offset faces for mode Complete
+  //! and joint type Intersection.
+  Standard_EXPORT void BuildSplitsOfTrimmedFaces(const TopTools_ListOfShape& theLF,
+                                                 Handle(BRepAlgo_AsDes)& theAsDes,
+                                                 BRepAlgo_Image& theImage);
 
   Standard_Real myOffset;
   Standard_Real myTol;
@@ -188,7 +202,6 @@ private:
   GeomAbs_JoinType myJoin;
   Standard_Boolean myThickening;
   Standard_Boolean myRemoveIntEdges;
-  Standard_Boolean myRemoveInvalidFaces;
   TopTools_DataMapOfShapeReal myFaceOffset;
   TopTools_IndexedMapOfShape myFaces;
   BRepOffset_Analyse myAnalyse;

src/BRepOffset/FILES

@@ -21,6 +21,7 @@ BRepOffset_ListOfInterval.hxx
 BRepOffset_MakeLoops.cxx
 BRepOffset_MakeLoops.hxx
 BRepOffset_MakeOffset.cxx
+BRepOffset_MakeOffset_1.cxx
 BRepOffset_MakeOffset.hxx
 BRepOffset_Mode.hxx
 BRepOffset_Offset.cxx

src/BRepTest/BRepTest_FeatureCommands.cxx

@@ -1003,13 +1003,12 @@ static Standard_Real         TheTolerance = Precision::Confusion();
 static Standard_Boolean      TheInter     = Standard_False;
 static GeomAbs_JoinType      TheJoin      = GeomAbs_Arc;
 static Standard_Boolean      RemoveIntEdges = Standard_False;
-static Standard_Boolean      RemoveInvalidFaces = Standard_False;
 
 Standard_Integer offsetparameter(Draw_Interpretor& di,
                                  Standard_Integer n, const char** a)
 {
   if ( n == 1 ) { 
-    di << " offsetparameter Tol Inter(c/p) JoinType(a/i/t) [RemoveInternalEdges(r/k) RemoveInvalidFaces(r/k)]\n";
+    di << " offsetparameter Tol Inter(c/p) JoinType(a/i/t) [RemoveInternalEdges(r/k)]\n";
     di << " Current Values\n";
     di << "   --> Tolerance : " << TheTolerance << "\n";
     di << "   --> TheInter  : ";
@@ -1034,14 +1033,6 @@ Standard_Integer offsetparameter(Draw_Interpretor& di,
     else {
       di << "Keep";
     }
-    //
-    di << "\n   --> Invalid Faces : ";
-    if (RemoveInvalidFaces) {
-      di << "Remove";
-    }
-    else {
-      di << "Keep";
-    }
     di << "\n";
     //
     return 0;
@@ -1057,7 +1048,6 @@ Standard_Integer offsetparameter(Draw_Interpretor& di,
   else if ( !strcmp(a[3],"t")) TheJoin = GeomAbs_Tangent;
   //
   RemoveIntEdges = (n >= 5) ? !strcmp(a[4], "r") : Standard_False;
-  RemoveInvalidFaces = (n == 6) ? !strcmp(a[5], "r") : Standard_False;
   //
   return 0;
 }
@@ -1079,7 +1069,7 @@ Standard_Integer offsetload(Draw_Interpretor& ,
 //  Standard_Boolean Inter = Standard_True;
   
   TheOffset.Initialize(S,Of,TheTolerance,BRepOffset_Skin,TheInter,0,TheJoin,
-                       Standard_False, RemoveIntEdges, RemoveInvalidFaces);
+                       Standard_False, RemoveIntEdges);
   //------------------------------------------
   // recuperation et chargement des bouchons.
   //----------------------------------------
@@ -2327,7 +2317,7 @@ void BRepTest::FeatureCommands (Draw_Interpretor& theCommands)
 		  __FILE__,offsetshape,g);
 
   theCommands.Add("offsetparameter",
-		  "offsetparameter Tol Inter(c/p) JoinType(a/i/t) [RemoveInternalEdges(r/k) RemoveInvalidFaces(r/k)]",
+		  "offsetparameter Tol Inter(c/p) JoinType(a/i/t) [RemoveInternalEdges(r/k)]",
 		  __FILE__,offsetparameter);
 
   theCommands.Add("offsetload",

tests/bugs/modalg_6/bug27540_1

@@ -24,7 +24,7 @@ foreach f $faces {
 offsetperform result1
 checkprops result1 -s 3.26459e+006
 checkprops result1 -v 1.067e+008
-checknbshapes result1 -vertex 28 -edge 44 -wire 20 -face 19 -shell 1 -solid 1
+checknbshapes result1 -vertex 28 -edge 42 -wire 18 -face 17 -shell 1 -solid 1
 
 
 # second shape
@@ -42,7 +42,7 @@ foreach f $faces {
 offsetperform result2
 checkprops result2 -s 3.26459e+006
 checkprops result2 -v 1.067e+008
-checknbshapes result2 -vertex 28 -edge 44 -wire 20 -face 19 -shell 1 -solid 1
+checknbshapes result2 -vertex 28 -edge 42 -wire 18 -face 17 -shell 1 -solid 1
 
 
 # compare the results

tests/bugs/modalg_6/bug27540_2

@@ -24,7 +24,7 @@ foreach f $faces {
 offsetperform result1
 checkprops result1 -s 3.76166e+006
 checkprops result1 -v 1.74521e+008
-checknbshapes result1 -vertex 36 -edge 56 -wire 24 -face 23 -shell 1 -solid 1
+checknbshapes result1 -vertex 36 -edge 54 -wire 22 -face 21 -shell 1 -solid 1
 
 
 # second shape
@@ -42,7 +42,7 @@ foreach f $faces {
 offsetperform result2
 checkprops result2 -s 3.76166e+006
 checkprops result2 -v 1.74521e+008
-checknbshapes result2 -vertex 36 -edge 56 -wire 24 -face 23 -shell 1 -solid 1
+checknbshapes result2 -vertex 36 -edge 54 -wire 22 -face 21 -shell 1 -solid 1
 
 
 # compare the results

tests/bugs/modalg_6/bug27540_3

@@ -24,7 +24,7 @@ foreach f $faces {
 offsetperform result1
 checkprops result1 -s 464088
 checkprops result1 -v 1.29909e+007
-checknbshapes result1 -vertex 48 -edge 74 -wire 32 -face 30 -shell 1 -solid 1
+checknbshapes result1 -vertex 48 -edge 72 -wire 30 -face 28 -shell 1 -solid 1
 
 
 # second shape
@@ -42,7 +42,7 @@ foreach f $faces {
 offsetperform result2
 checkprops result2 -s 464088
 checkprops result2 -v 1.29909e+007
-checknbshapes result2 -vertex 48 -edge 74 -wire 32 -face 30 -shell 1 -solid 1
+checknbshapes result2 -vertex 48 -edge 72 -wire 30 -face 28 -shell 1 -solid 1
 
 
 # compare the results

tests/offset/end

@@ -111,7 +111,11 @@ if { [isdraw result] && $mist == 0} {
         }
     }
     if { $m > 0 } {
-       checkview -display result -2d -path ${imagedir}/${test_image}.png
+      if {[info exists result_unif]} {
+        checkview -display result_unif -2d -path ${imagedir}/${test_image}.png
+      } else {
+        checkview -display result -2d -path ${imagedir}/${test_image}.png
+      }
     }
 } else {
     puts "Error : The offset cannot be built."

tests/offset/shape_type_i_c/A1

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 0.1 {} $calcul $type
 
 checkprops result -v 925.196
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/A2

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 0.3 {} $calcul $type
 
 checkprops result -v 1068.58
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/A3

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 0.6 {} $calcul $type
 
 checkprops result -v 1296.86
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/A4

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 0.9 {} $calcul $type
 
 checkprops result -v 1543.91
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/A5

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 1.2 {} $calcul $type
 
 checkprops result -v 1817.34
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/A6

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 1.5 {} $calcul $type
 
 checkprops result -v 2119
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/A7

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 1.8 {} $calcul $type
 
 checkprops result -v 2450.18
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/A8

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 2.1 {} $calcul $type
 
 checkprops result -v 2812.17
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/A9

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_box_cut_4boxes.brep] s
 OFFSETSHAPE 2.4 {} $calcul $type
 
 checkprops result -v 3206.27
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/B1

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 3 {} $calcul $type
 
-checkprops result -v 2.00176e+007
+checkprops result -v 2.00176e+007 -s 644597
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 24 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/B2

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 6 {} $calcul $type
 
-checkprops result -v 2.19865e+007
+checkprops result -v 2.19865e+007 -s 668050
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 24 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/B3

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 10 {} $calcul $type
 
-checkprops result -v 2.47223e+007
+checkprops result -v 2.47223e+007 -s 699984
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 24 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/B4

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 18 {} $calcul $type
 
-checkprops result -v 3.05847e+007
+checkprops result -v 3.05847e+007 -s 766128
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 24 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/B5

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 21 {} $calcul $type
 
-checkprops result -v 3.29213e+007
+checkprops result -v 3.29213e+007 -s 791474
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 22 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/B6

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 25 {} $calcul $type
 
-checkprops result -v 3.61487e+007
+checkprops result -v 3.61487e+007 -s 823028
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 20 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/B7

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 26 {} $calcul $type
 
-checkprops result -v 3.6976e+007
+checkprops result -v 3.6976e+007 -s 831726
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 20 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/B8

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 36 {} $calcul $type
 
-checkprops result -v 4.58112e+007
+checkprops result -v 4.58112e+007 -s 936544
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 14 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/B9

@@ -2,4 +2,9 @@ restore [locate_data_file bug25926_input_slanted.brep] s
 
 OFFSETSHAPE 44 {} $calcul $type
 
-checkprops result -v 5.36522e+007
+checkprops result -v 5.36522e+007 -s 1.02422e+006
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 14 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/C1

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 3 {} $calcul $type
 
 checkprops result -v 5.53893e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/C2

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 6 {} $calcul $type
 
 checkprops result -v 5.70329e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/C3

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 5.92261e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/C4

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 13 {} $calcul $type
 
 checkprops result -v 6.08723e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/C5

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 18 {} $calcul $type
 
 checkprops result -v 6.36191e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/C6

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 30 {} $calcul $type
 
 checkprops result -v 7.02144e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/C7

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 40 {} $calcul $type
 
 checkprops result -v 7.58284e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/C8

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 50 {} $calcul $type
 
 checkprops result -v 8.16e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/C9

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_input_shape.brep] s
 OFFSETSHAPE 60 {} $calcul $type
 
 checkprops result -v 8.75772e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D1

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_offset_shape_tc80_2_smaller.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 3.03855e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D2

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_offset_shape_tc80_2_smaller.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 3.38527e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D3

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_offset_shape_tc80_2_smaller.brep] s
 OFFSETSHAPE 15 {} $calcul $type
 
 checkprops result -v 3.68177e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D4

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_offset_shape_tc80_3_smaller.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 3.13188e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D5

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_offset_shape_tc80_3_smaller.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 3.44873e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D6

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_offset_shape_tc80_3_smaller.brep] s
 OFFSETSHAPE 15 {} $calcul $type
 
 checkprops result -v 3.72139e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D7

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_shape_input_tc80.2.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 1.01936e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D8

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_shape_input_tc80.2.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 1.14248e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/D9

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_shape_input_tc80.2.brep] s
 OFFSETSHAPE 15 {} $calcul $type
 
 checkprops result -v 1.25498e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E1

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_shape_input_tc80.3.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 1.05054e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E2

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_shape_input_tc80.3.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 1.16522e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E3

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_offset_shape_input_tc80.3.brep] s
 OFFSETSHAPE 15 {} $calcul $type
 
 checkprops result -v 1.27083e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E4

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_shape_fails.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 2.1234e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E5

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_shape_fails.brep] s
 OFFSETSHAPE 30 {} $calcul $type
 
 checkprops result -v 4.0384e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E6

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_input_shape_fails.brep] s
 OFFSETSHAPE 60 {} $calcul $type
 
 checkprops result -v 7.15e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E7

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_trapezoid_1.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 244837
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E8

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_spike_shape.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 4.30309e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/E9

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_spike_shape.brep] s
 OFFSETSHAPE 15 {} $calcul $type
 
 checkprops result -v 4.79673e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F1

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_undercut_1.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 2.7823e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F2

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_undercut_1.brep] s
 OFFSETSHAPE 15 {} $calcul $type
 
 checkprops result -v 3.89013e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F3

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_undercut_1.brep] s
 OFFSETSHAPE 25 {} $calcul $type
 
 checkprops result -v 5.10815e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F4

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_undercut_1.brep] s
 OFFSETSHAPE 30 {} $calcul $type
 
 checkprops result -v 5.7548e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F5

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_undercut_1.brep] s
 OFFSETSHAPE 40 {} $calcul $type
 
 checkprops result -v 7.1364e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F6

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_unit_cell_grid.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 2.46039e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F7

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_unit_cell_grid.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 2.8855e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F8

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_unit_cell_grid.brep] s
 OFFSETSHAPE 25 {} $calcul $type
 
 checkprops result -v 4.21733e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/F9

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_unit_cell_grid.brep] s
 OFFSETSHAPE 30 {} $calcul $type
 
 checkprops result -v 4.67244e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G1

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 2.5576e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G2

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys.brep] s
 OFFSETSHAPE 20 {} $calcul $type
 
 checkprops result -v 3.2592e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G3

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys.brep] s
 OFFSETSHAPE 25 {} $calcul $type
 
 checkprops result -v 3.6439e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G4

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys.brep] s
 OFFSETSHAPE 50 {} $calcul $type
 
 checkprops result -v 5.9724e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G5

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 2.11792e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G6

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
 OFFSETSHAPE 20 {} $calcul $type
 
 checkprops result -v 2.51328e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G7

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
 OFFSETSHAPE 30 {} $calcul $type
 
 checkprops result -v 2.93724e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G8

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
 OFFSETSHAPE 50 {} $calcul $type
 
 checkprops result -v 3.89556e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/G9

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
 OFFSETSHAPE 60 {} $calcul $type
 
 checkprops result -v 4.33344e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H1

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_example_1_side_10_top_10.brep] s
 OFFSETSHAPE 10 {} $calcul $type
 
 checkprops result -v 9.6408e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H2

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_example_1_side_10_top_10.brep] s
 OFFSETSHAPE 15 {} $calcul $type
 
 checkprops result -v 1.07272e+008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H3

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_example_2_side_26_top_0.brep] s
 OFFSETSHAPE 26 {} $calcul $type
 
 checkprops result -v 3.14983e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H4

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_example_3_side_30_top_0.brep] s
 OFFSETSHAPE 35 {} $calcul $type
 
 checkprops result -v 8.08679e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H5

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_example_3_side_30_top_0.brep] s
 OFFSETSHAPE 45 {} $calcul $type
 
 checkprops result -v 9.51489e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H6

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_example_4_side_30_top_10.brep] s
 OFFSETSHAPE 35 {} $calcul $type
 
 checkprops result -v 4.8893e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H7

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_example_4_side_30_top_10.brep] s
 OFFSETSHAPE 45 {} $calcul $type
 
 checkprops result -v 5.89638e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H8

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_b5.brep] s
 OFFSETSHAPE 2 {} $calcul $type
 
 checkprops result -v 4580.57
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/H9

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_b5.brep] s
 OFFSETSHAPE 11 {} $calcul $type
 
 checkprops result -v 43008
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I1

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_b1x.brep] s
 OFFSETSHAPE 2 {} $calcul $type
 
 checkprops result -v 1756.4
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I2

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_b1x.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 6000
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I3

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_b1.brep] s
 OFFSETSHAPE 1 {} $calcul $type
 
 checkprops result -v 5328
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I4

@@ -5,3 +5,5 @@ prism s f 0 5 0
 OFFSETSHAPE 0.6 {} $calcul $type
 
 checkprops result -v 216.363
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I5

@@ -5,3 +5,5 @@ prism s f 0 5 0
 OFFSETSHAPE 1.2 {} $calcul $type
 
 checkprops result -v 394.982
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I6

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_parasite_solid.brep] s
 OFFSETSHAPE 1 {} $calcul $type
 
 checkprops result -v 1450.99
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I7

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_parasite_solid_s.brep] s
 OFFSETSHAPE 1 {} $calcul $type
 
 checkprops result -v 1304.43
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I8

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_parasite_solid_s2.brep] s
 OFFSETSHAPE 1 {} $calcul $type
 
 checkprops result -v 1217.22
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/I9

@@ -3,3 +3,5 @@ restore [locate_data_file bug25926_parasite_solid_s2.brep] s
 OFFSETSHAPE 5 {} $calcul $type
 
 checkprops result -v 10761.4
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/J1

@@ -0,0 +1,17 @@
+restore [locate_data_file bug25926_input_slanted.brep] s
+
+set distance 1
+offsetparameter 1.e-7 $calcul $type
+offsetload s $distance
+explode s f
+# s_15 s_22
+offsetonface s_15 6
+offsetonface s_22 6
+offsetperform result
+
+checkprops result -v 1.87868e+007 -s 627294
+
+unifysamedom result_unif result
+checknbshapes result_unif -face 24 -shell 1
+
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png

tests/offset/shape_type_i_c/J2

@@ -14,3 +14,5 @@ offsetonface s_14 0
 offsetperform result
 
 checkprops result -v 2.07856e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/J3

@@ -14,3 +14,5 @@ offsetonface s_14 0
 offsetperform result
 
 checkprops result -v 3.0278e+007
+
+checknbshapes result -shell 1

tests/offset/shape_type_i_c/J4

@@ -14,3 +14,5 @@ offsetonface s_14 0
 offsetperform result
 
 checkprops result -v 3.2025e+007
+
+checknbshapes result -shell 1