From 5d3ddec35d664e854643202d31afcac013d61275 Mon Sep 17 00:00:00 2001
From: akaftasev <akaftasev@opencascade.com>
Date: Thu, 6 Jun 2024 14:45:35 +0100
Subject: [PATCH] 0033639: Modeling Algorithms - Boolean torus cut cone failed

Avoid adding an apex of cone as singular pole, which is lying on torus surface
---
 src/IntPatch/IntPatch_SpecialPoints.cxx | 10 ++++++++++
 tests/bugs/modalg_8/bug33639_1          | 15 +++++++++++++++
 tests/bugs/modalg_8/bug33639_2          | 16 ++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 tests/bugs/modalg_8/bug33639_1
 create mode 100644 tests/bugs/modalg_8/bug33639_2

diff --git a/src/IntPatch/IntPatch_SpecialPoints.cxx b/src/IntPatch/IntPatch_SpecialPoints.cxx
index d2fb94add0..af531197f1 100644
--- a/src/IntPatch/IntPatch_SpecialPoints.cxx
+++ b/src/IntPatch/IntPatch_SpecialPoints.cxx
@@ -827,6 +827,16 @@ Standard_Boolean IntPatch_SpecialPoints::
     return Standard_False;
   }
 
+  if (theQSurf->GetType() == GeomAbs_Cone && thePSurf->GetType() == GeomAbs_Torus)
+  {
+    const gp_Pnt anApex = theQSurf->Cone().Apex();
+    Standard_Real aSqDist = anApex.SquareDistance(aPQuad);
+    if (aSqDist < aTol * aTol)
+    {
+      return Standard_False;
+    }
+  }
+
   //Pole is an intersection point
   //(lies in the quadric and the parametric surface)
 
diff --git a/tests/bugs/modalg_8/bug33639_1 b/tests/bugs/modalg_8/bug33639_1
new file mode 100644
index 0000000000..a9c31ef648
--- /dev/null
+++ b/tests/bugs/modalg_8/bug33639_1
@@ -0,0 +1,15 @@
+puts "================================"
+puts "	0033639: Modeling Algorithms - Boolean torus cut cone incorrect"
+puts "================================"
+puts ""
+
+ptorus t 750 250 360
+pcone c 200 0 2000
+
+trotate c 0 0 0 1 0 0 90
+ttranslate c 0 1000 0
+
+bcut result t c
+
+checknbshapes result -vertex 8 -edge 13 -wire 5 -face 3
+checkview -display result -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/bugs/modalg_8/bug33639_2 b/tests/bugs/modalg_8/bug33639_2
new file mode 100644
index 0000000000..03d8643517
--- /dev/null
+++ b/tests/bugs/modalg_8/bug33639_2
@@ -0,0 +1,16 @@
+puts "================================"
+puts "	0033639: Modeling Algorithms - Boolean torus cut cone incorrect"
+puts "================================"
+puts ""
+
+ptorus t 750 250 360
+pcone c 500 0 2000
+
+trotate c 0 0 0 1 0 0 90
+ttranslate c 0 1000 0
+trotate c 0 -1000 0 1 0 0 45
+
+bcut result t c
+
+checknbshapes result -vertex 4 -edge 7 -wire 3 -face 2
+checkview -display result -2d -path ${imagedir}/${test_image}.png