EgtGeomKernel :

Modifiche a CalcPocketing
- rimozione variabili statiche
- aggiunti casi ottimizzati Spiral
- estensione superfici sui lati aperti.

AdjustLoops.cpp

@@ -317,6 +317,8 @@ AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst, bool bNeedSameProp)
          pCrvCo->RemoveSmallDefects( 2 * LIN_TOL_MIN, ANG_TOL_STD_DEG, true) ;
         // unisco eventuali tratti allineati
          pCrvCo->MergeCurves( LIN_TOL_MIN, ANG_TOL_STD_DEG, true, bNeedSameProp) ;
+        // richiudo i loop per sicurezza
+         pCrvCo->Close() ;
       }
    }
 

ArcPntDirTgCurve.cpp

@@ -16,9 +16,9 @@
 #include "CurveBezier.h"
 #include "CurveComposite.h"
 #include "CreateCurveAux.h"
-#include "DistPointLine.h"
 #include "GeoConst.h"
 #include "/EgtDev/Include/EGkArcPntDirTgCurve.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EGkArcSpecial.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

CAvToolSurfTm.cpp

@@ -14,8 +14,8 @@
 #include "stdafx.h"
 #include "CAvToolTriangle.h"
 #include "CAvToolSurfTm.h"
-#include "DistPointLine.h"
 #include "DllMain.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGnStringUtils.h"
 #include <thread>
 #include <future>
@@ -120,7 +120,7 @@ CAvToolSurfTm::TestPosition( const Point3d& ptT, const Vector3d& vtDir, const Ve
 
 //----------------------------------------------------------------------------
 bool
-CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dLinTol)
+CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dLinTol, double dProgCoeff)
 {
   // Se utensile non definito, errore
    if ( m_Tool.GetType() == Tool::UNDEF)
@@ -146,8 +146,9 @@ CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d&
    bool bOk = true ;
   // Se un solo thread o pochi punti
    if ( nThreadMax <= 1  ||  m_nTotPnt < 500) {
-      bOk = TestSubPath( -1, lPntM, vtDir, dLinTol) ;
-      ProcessEvents( 100, 0) ;
+      m_nCurrPnt = 0 ;
+      bOk = TestSubPath( -1, lPntM, vtDir, dLinTol, dProgCoeff) ;
+      ProcessEvents( int( 100 * dProgCoeff), 0) ;
    }
   // altrimenti
    else {
@@ -167,7 +168,7 @@ CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d&
       m_bBreak = false ;
       future<bool> vRes[MAX_PARTS] ;
       for ( int i = 0 ; i < nPartCnt ; ++ i)
-         vRes[i] = async( launch::async, &CAvToolSurfTm::TestSubPath, this, i, ref( vlPntM[i]), cref( vtDir), dLinTol) ;
+         vRes[i] = async( launch::async, &CAvToolSurfTm::TestSubPath, this, i, ref( vlPntM[i]), cref( vtDir), dLinTol, dProgCoeff) ;
      // attendo i risultati
       int nFin = 0 ;
       int nNextPE = 0 ;
@@ -179,7 +180,7 @@ CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d&
             }
          }
          if ( m_nCurrPnt > nNextPE) {
-            int nRes = ProcessEvents( int( m_nCurrPnt * 100. / m_nTotPnt), 10) ;
+            int nRes = ProcessEvents( int( m_nCurrPnt * 100. / m_nTotPnt * dProgCoeff), 10) ;
             nNextPE += STEP_PE ;
             if ( nRes == 1)
                m_bBreak = true ;
@@ -191,7 +192,7 @@ CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d&
             lPntM.pop_back() ;
          lPntM.splice( lPntM.end(), vlPntM[i]) ;
       }
-      ProcessEvents( 100, 0) ;
+      ProcessEvents( int( 100 * dProgCoeff), 0) ;
    }
   // pulisco HashGrid 2d
    m_HGrids.Clear() ;
@@ -200,7 +201,7 @@ CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d&
 
 //----------------------------------------------------------------------------
 bool
-CAvToolSurfTm::TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol)
+CAvToolSurfTm::TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol, double dProgCoeff)
 {
   // Se lista vuota, non devo fare alcunché
    if ( lPntM.empty())
@@ -229,7 +230,7 @@ CAvToolSurfTm::TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, dou
       if ( nId == -1) {
         // gestione eventi (ogni STEP_PE punti)
          if (( m_nCurrPnt % STEP_PE) == 0) {
-            int nRes = ProcessEvents( int( m_nCurrPnt * 100. / m_nTotPnt), 0) ;
+            int nRes = ProcessEvents( int( m_nCurrPnt * 100. / m_nTotPnt * dProgCoeff), 0) ;
             if ( nRes == 1)
                return false ;
          }

CAvToolSurfTm.h

@@ -37,13 +37,13 @@ class CAvToolSurfTm : public ICAvToolSurfTm
       const ICurveComposite& GetToolOutline( bool bApprox = false) const override
                   { return ( bApprox ? m_Tool.GetApproxOutline() : m_Tool.GetOutline()) ;}
       bool TestPosition( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, double& dTotDist) override ;
-      bool TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dLinTol) override ;
+      bool TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dLinTol, double dProgCoeff = 1) override ;
 
    public :
       CAvToolSurfTm( void) ;
 
    private :
-      bool   TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol) ;
+      bool   TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol, double dProgCoeff) ;
       double MyTestPosition( Point3d& ptT, const Vector3d& vtDir) ;
       double MyTestPositionHG( Point3d& ptT, const Vector3d& vtDir) ;
       bool   MyTestMidPointHG( PNTULIST& lPntM, const PNTULIST::iterator& itPntMPrev, const PNTULIST::iterator& itPntMCurr,

CAvToolTriangle.cpp

@@ -17,8 +17,8 @@
 #include "CAvToolTriangle.h"
 #include "IntersLineSurfStd.h"
 #include "IntersLineTria.h"
-#include "DistPointLine.h"
 #include "CDeUtility.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkIntervals.h"
 #include "/EgtDev/Include/ENkPolynomialRoots.h"
 #include "/EgtDev/Include/EgtNumUtils.h"

CDeCylTria.cpp

@@ -13,9 +13,9 @@
 
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
-#include "DistPointLine.h"
 #include "CDeCylTria.h"
 #include "CDeConvexTorusTria.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkPolygon3d.h"
 
 using namespace std ;

CDeUtility.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "CDeUtility.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/ENkPolynomialRoots.h"
 
 using namespace std ;

CircleCenTgCurve.cpp

@@ -16,8 +16,8 @@
 #include "CurveBezier.h"
 #include "CurveComposite.h"
 #include "CreateCurveAux.h"
-#include "DistPointLine.h"
 #include "GeoConst.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkCircleCenTgCurve.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

CurveBezier.cpp

@@ -19,7 +19,6 @@
 #include "BiArcs.h"
 #include "GeoConst.h"
 #include "PolygonPlane.h"
-#include "DistPointLine.h"
 #include "GeoObjFactory.h"
 #include "NgeWriter.h"
 #include "NgeReader.h"
@@ -29,6 +28,7 @@
 #include "Voronoi.h"
 #include "IntersLineLine.h"
 #include "/EgtDev/Include/EGkCurveArc.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EGkUiUnits.h"
 #include "/EgtDev/Include/ENkPolynomial.h"

CurveByApprox.cpp

@@ -16,8 +16,8 @@
 #include "CurveComposite.h"
 #include "CalcDerivate.h"
 #include "BiArcs.h"
-#include "DistPointLine.h"
 #include "RemoveCurveDefects.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkCurveByApprox.h"
 #include "/EgtDev/Include/EGkPolyLine.h"
 #include "/EgtDev/Include/EGkPolyArc.h"

CurveComposite.cpp

@@ -14,7 +14,6 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "CurveComposite.h"
-#include "DistPointLine.h"
 #include "DistPointCrvComposite.h"
 #include "CurveLine.h"
 #include "CurveArc.h"
@@ -27,6 +26,7 @@
 #include "NgeWriter.h"
 #include "NgeReader.h"
 #include "Voronoi.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkCurveByApprox.h"
 #include "/EgtDev/Include/EGkArcSpecial.h"
 #include "/EgtDev/Include/EGkSfrCreate.h"
@@ -291,9 +291,15 @@ CurveComposite::Close( void)
       return true ;
   // se molto vicini li modifico
    if ( AreSamePointEpsilon( ptStart, ptEnd, 10 * EPS_SMALL)) {
+     // se un solo arco
+      if ( m_CrvSmplS.size() == 1  &&  m_CrvSmplS.front()->GetType() == CRV_ARC) {
+         CurveArc* pArc = GetBasicCurveArc( m_CrvSmplS.front()) ;
+         return pArc->ChangeAngCenter( pArc->GetAngCenter() > 0 ? ANG_FULL : -ANG_FULL) ;
+      }
+     // caso generale
       Point3d ptMid = Media( ptStart, ptEnd) ;
-      if ( ! ModifyStart( ptMid)  ||
-           ! ModifyEnd( ptMid))
+      if ( ! m_CrvSmplS.front()->ModifyStart( ptMid)  ||
+           ! m_CrvSmplS.back()->ModifyEnd( ptMid))
          return false ;
    }   
   // altrimenti aggiungo la linea di chiusura
@@ -879,8 +885,10 @@ CurveComposite::TestClosure( void)
    // se distanza superiore al limite ridotto forzo i punti a coincidere
    if ( ! AreSamePointEpsilon( ptStart, ptEnd, EPS_CONNECT)) {
      // se un solo arco
-      if ( m_CrvSmplS.size() == 1  &&  m_CrvSmplS.front()->GetType() == CRV_ARC)
-         return GetBasicCurveArc( m_CrvSmplS.front())->ChangeAngCenter( ANG_FULL) ;
+      if ( m_CrvSmplS.size() == 1  &&  m_CrvSmplS.front()->GetType() == CRV_ARC) {
+         CurveArc* pArc = GetBasicCurveArc( m_CrvSmplS.front()) ;
+         return pArc->ChangeAngCenter( pArc->GetAngCenter() > 0 ? ANG_FULL : -ANG_FULL) ;
+      }
      // caso generale
       Point3d ptM = Media( ptStart, ptEnd) ;
       return ( m_CrvSmplS.front()->ModifyStart( ptM)  &&
@@ -3225,61 +3233,64 @@ MergeTwoCurves( ICurve* pCrvP, ICurve* pCrvC, double& dCurrLinTol, double dCosAn
      // verifico di non superare l'angolo giro al centro
       if ( abs( pArcP->GetAngCenter() + pArcC->GetAngCenter()) > ANG_FULL + EPS_ANG_SMALL)
          return 0 ;
-     // se archi piatti
-      if ( pArcP->IsPlane()  &&  pArcC->IsPlane()) {
-        // se calcolo nuovo arco ok, procedo con l'unione
-         Point3d ptP1 ;
-         pArcP->GetStartPoint( ptP1) ;
-         Point3d ptP2 ;
-         pArcP->GetEndPoint( ptP2) ;
-         Point3d ptP3 ;
-         pArcC->GetEndPoint( ptP3) ;
-         // verifico se circonferenza completa
-         bool bCirc = ( AreSamePointApprox( ptP1, ptP3)) ;
-         if ( bCirc)
-            pArcC->GetMidPoint( ptP3) ;
-         CurveArc NewArc ;
-         if ( NewArc.Set3P( ptP1, ptP2, ptP3, bCirc)) {
-           // verifico normale al piano dell'arco
-            if ( NewArc.GetNormVersor() * pArcC->GetNormVersor() < 0)
-               NewArc.InvertN() ;
-           // se curve originali con la stessa proprietà, la riporto
-            if ( nTpr0P == nTpr0C)
-               NewArc.SetTempProp( nTpr0C, 0) ;
-            if ( nTpr1P == nTpr1C)
-               NewArc.SetTempProp( nTpr1C, 1) ;
-           // aggiorno l'arco corrente e torno flag modifica
-            *pArcC = NewArc ;
-            return -1 ;
-         }
-         else
+     // verifico se archi piatti
+      bool bPlaneArcs = pArcP->IsPlane()  &&  pArcC->IsPlane() ;
+     // se archi non piatti verifico coincidenza pendenza sulla normale
+      if ( ! bPlaneArcs) {        
+         double dN = pArcP->GetNormVersor() * pArcC->GetNormVersor() ;
+         if ( abs(( pArcC->GetDeltaN() * pArcP->GetAngCenter() - dN * pArcP->GetDeltaN() * pArcC->GetAngCenter()) /
+            ( pArcP->GetAngCenter() + pArcC->GetAngCenter())) > dCurrLinTol)
             return 0 ;
       }
-     // verifico coincidenza pendenza sulla normale
-      double dN = pArcP->GetNormVersor() * pArcC->GetNormVersor() ;
-      if ( abs(( pArcC->GetDeltaN() * pArcP->GetAngCenter() - dN * pArcP->GetDeltaN() * pArcC->GetAngCenter()) /
-                ( pArcP->GetAngCenter() + pArcC->GetAngCenter())) < dCurrLinTol) {
-        // se calcolo nuovo arco ok, procedo con l'unione
-         Point3d ptP1 ;
-         pArcP->GetStartPoint( ptP1) ;
-         Vector3d vtDir1 ;
-         pArcP->GetStartDir( vtDir1) ;
-         Point3d ptP3 ;
-         pArcC->GetEndPoint( ptP3) ;
-         CurveArc NewArc ;
-         if ( NewArc.Set2PVN( ptP1, ptP3, vtDir1, pArcC->GetNormVersor())) {
-           // se curve originali con la stessa proprietà, la riporto
-            if ( nTpr0P == nTpr0C)
-               NewArc.SetTempProp( nTpr0C, 0) ;
-            if ( nTpr1P == nTpr1C)
-               NewArc.SetTempProp( nTpr1C, 1) ;
-           // aggiorno l'arco corrente e torno flag modifica
-            *pArcC = NewArc ;
-            return -1 ;
-         }
-         else
-            return 0 ;
+
+     // se calcolo nuovo arco ok, procedo con l'unione
+      Point3d ptP1 ;
+      pArcP->GetStartPoint( ptP1) ;
+      Point3d ptP2 ;
+      pArcP->GetEndPoint( ptP2) ;
+      Point3d ptP3 ;
+      pArcC->GetEndPoint( ptP3) ;
+
+     // se archi non piani costruisco arco sul piano definito dalla normale e dal punto di partenza del primo arco
+      Frame3d frRef ;
+      if ( ! frRef.Set( ptP1, pArcP->GetNormVersor()))
+         return 0 ;
+      if ( ! bPlaneArcs) {
+         ptP1.Scale( frRef, 1, 1, 0) ;
+         ptP2.Scale( frRef, 1, 1, 0) ;
+         ptP3.Scale( frRef, 1, 1, 0) ;      
       }
+
+     // verifico se circonferenza completa
+      bool bCirc = ( AreSamePointApprox( ptP1, ptP3)) ;
+      if ( bCirc) {
+         pArcC->GetMidPoint( ptP3) ;
+         if ( ! bPlaneArcs)
+            ptP3.Scale( frRef, 1, 1, 0) ;
+      }
+         
+      CurveArc NewArc ;
+      if ( NewArc.Set3P( ptP1, ptP2, ptP3, bCirc)) {
+        // verifico normale al piano dell'arco
+         if ( NewArc.GetNormVersor() * pArcC->GetNormVersor() < 0)
+            NewArc.InvertN() ;
+        // se archi non piani ripristino il deltaN
+         if ( ! bPlaneArcs) {
+            double dDeltaN1 = pArcP->GetDeltaN() ;
+            double dDeltaN2 = pArcC->GetDeltaN() ;
+            NewArc.ChangeDeltaN( dDeltaN1 + dDeltaN2) ;
+         }
+        // se curve originali con la stessa proprietà, la riporto
+         if ( nTpr0P == nTpr0C)
+            NewArc.SetTempProp( nTpr0C, 0) ;
+         if ( nTpr1P == nTpr1C)
+            NewArc.SetTempProp( nTpr1C, 1) ;
+        // aggiorno l'arco corrente e torno flag modifica
+         *pArcC = NewArc ;
+         return -1 ;
+      }
+      else
+         return 0 ;
    }
 
   // nessuna fusione

CurveLine.cpp

@@ -14,11 +14,11 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "CurveLine.h"
-#include "DistPointLine.h"
 #include "GeoObjFactory.h"
 #include "NgeWriter.h"
 #include "NgeReader.h"
 #include "Voronoi.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EgtNumUtils.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

DistPointCrvAux.cpp

@@ -14,9 +14,9 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "DllMain.h"
-#include "DistPointCrvAux.h"
-#include "DistPointLine.h"
 #include "GeoConst.h"
+#include "DistPointCrvAux.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 
 
 //----------------------------------------------------------------------------

DistPointCurve.cpp

@@ -13,10 +13,10 @@
 
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
-#include "DistPointLine.h"
 #include "DistPointArc.h"
 #include "DistPointCrvBezier.h"
 #include "DistPointCrvComposite.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 
 

DistPointLine.cpp

@@ -1,19 +1,19 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2013-2013
+//  EgalTech 2013-2024
 //----------------------------------------------------------------------------
-// File : DistPointLine.cpp       Data : 17.12.13          Versione : 1.4l1
+// File : DistPointLine.cpp       Data : 20.05.24          Versione : 2.6e5
 // Contenuto : Implementazione della classe distanza punto da linea/segmento.
 //
 //
 //
 // Modifiche : 17.12.13 DS Creazione modulo.
-//
+//             20.05.24 DS Reso pubblico in Include.
 //
 //----------------------------------------------------------------------------
 
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 
 
 //----------------------------------------------------------------------------

DistPointLine.h

@@ -1,58 +0,0 @@
-//----------------------------------------------------------------------------
-//  EgalTech 2013-2014
-//----------------------------------------------------------------------------
-// File : DistPointLine.h      Data : 02.01.14          Versione : 1.5a1
-// Contenuto : Dichiarazione della classe distanza punto da linea/segmento.
-//
-//
-//
-// Modifiche : 30.12.12 DS Creazione modulo.
-//
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#include "/EgtDev/Include/EGkPoint3d.h"
-#include "/EgtDev/Include/EGkCurveLine.h"
-
-
-//-----------------------------------------------------------------------------
-class DistPointLine
-{
-   friend class DistPointCurve ;
-
-   public :
-      DistPointLine( const Point3d& ptP,
-                     const ICurveLine& crvLine, bool bIsSegment = true) ;
-      DistPointLine( const Point3d& ptP,
-                     const Point3d& ptIni, const Point3d& ptFin, bool bIsSegment = true) ;
-      DistPointLine( const Point3d& ptP,
-                     const Point3d& ptIni, const Vector3d& vtDir, double dLen, bool bIsSegment = true) ;
-
-   public :
-      bool GetSqDist( double& dSqDist) const ;
-      bool GetDist( double& dDist) const ;
-      bool IsEpsilon( double dTol) const
-              { double dSqDist ; return ( GetSqDist( dSqDist) && ( dSqDist < SQ_EPS_ZERO || dSqDist < dTol * dTol)) ; }
-      bool IsSmall( void) const
-              { return IsEpsilon( EPS_SMALL) ; }
-      bool IsZero( void) const
-              { return IsEpsilon( EPS_ZERO) ; }
-      int  GetNbrMinDist( void) const
-              { return (( m_dSqDist < 0) ? 0 : 1) ; }
-      bool GetMinDistPoint( Point3d& ptMinDist) const ;
-      bool GetParamAtMinDistPoint( double& dParam) const ;
-
-   private :
-      DistPointLine( void) ;
-      void Calculate( const Point3d& ptP,
-                      const Point3d& ptIni, const Vector3d& vtDir, double dLen, bool bIsSegment) ;
-
-   private :
-      double  m_dSqDist ;
-      mutable double  m_dDist ;
-      double  m_dParam ;
-      Point3d m_ptMinDist ;
-} ;
-

DistPointSurfTm.cpp

@@ -15,6 +15,7 @@
 #include "SurfTriMesh.h"
 #include "/EgtDev/Include/EGkDistPointTria.h"
 #include "/EgtDev/Include/EGkDistPointSurfTm.h"
+#include "/EgtDev/Include/EGkIntersLineTria.h"
 
 using namespace std ;
 
@@ -93,6 +94,8 @@ DistPointSurfTm::Calculate( const Point3d& ptP, const ISurfTriMesh& tmSurf)
 {
   // Inizializzo distanza non calcolata
    m_dDist = - 1. ;
+  // Controllo se la superficie è chiusa
+   m_bIsSurfClosed = tmSurf.IsClosed() ;
 
   // Lavoro con l'oggetto superficie trimesh di base
    const SurfTriMesh* pStm = GetBasicSurfTriMesh( &tmSurf) ;
@@ -121,6 +124,9 @@ DistPointSurfTm::Calculate( const Point3d& ptP, const ISurfTriMesh& tmSurf)
   // Finché non si verifica la condizione di terminazione ingrandisco il box.
    pStm->ResetTempInts() ;
    bool bContinue = true ;
+
+  // creazione del vettore dei triangoli più vicini a ptP
+   vector<pair<int, Triangle3d>> vTria ; // <indice triangolo, Triangolo>
    while ( bContinue) {
      // Calcolo il box differenza con il precedente per non esplorare parti già considerate
       BOXVECTOR vBox ;
@@ -134,8 +140,8 @@ DistPointSurfTm::Calculate( const Point3d& ptP, const ISurfTriMesh& tmSurf)
             continue ;
         // ricerca sui triangoli nel box
          bCollide = true ;
-         INTVECTOR vnIds ; 
-         if ( pStm->GetAllTriaOverlapBox( b3Int, vnIds)) { 
+         INTVECTOR vnIds ;
+         if ( pStm->GetAllTriaOverlapBox( b3Int, vnIds)) {
            // Ciclo sui triangoli del sotto-box corrente
             for ( auto nT : vnIds) {
                int nTriaTemp ;
@@ -144,18 +150,24 @@ DistPointSurfTm::Calculate( const Point3d& ptP, const ISurfTriMesh& tmSurf)
                   pStm->SetTempInt( nT, 1) ;
                   DistPointTriangle distPT( ptP, trCurTria) ;
                   double dCurSqDist ;
-                 // Se la distanza del triangolo č valida e minore di quella attuale aggiorno 
-                  if ( distPT.GetSqDist( dCurSqDist)  &&  dCurSqDist < dMinSqDist) {
-                     dMinSqDist = dCurSqDist ;
-                     nMinDistTriaIndex = nT ;
-                     distPT.GetMinDistPoint( ptMinDistPoint) ;
+                 // Se la distanza del triangolo è valida e minore di quella attuale aggiorno
+                  if ( distPT.GetSqDist( dCurSqDist)) {
+                     if ( abs( dCurSqDist - dMinSqDist) < EPS_SMALL) // se distanze uguali...
+                        vTria.emplace_back( make_pair( nT, trCurTria)) ; // aggiungo il triangolo
+                     else if ( dCurSqDist < dMinSqDist) { // se minore...
+                        vTria.clear() ; // pulisco il vettore
+                        dMinSqDist = dCurSqDist ;
+                        nMinDistTriaIndex = nT ;
+                        distPT.GetMinDistPoint( ptMinDistPoint) ;
+                        vTria.emplace_back( make_pair( nT, trCurTria)) ; // aggiungo il triangolo
+                     }
                   }
                }
             }
          }
       }
      // Se si verifica la condizione di terminazione arresto il ciclo altrimenti aggiorno i box 
-      if ( ! bCollide  ||  dMinSqDist < EPS_SMALL * EPS_SMALL)
+      if ( ! bCollide  ||  dMinSqDist < SQ_EPS_SMALL)
          bContinue = false ;
       else {
         boxPPrev = boxP ;
@@ -163,15 +175,70 @@ DistPointSurfTm::Calculate( const Point3d& ptP, const ISurfTriMesh& tmSurf)
       }
    }
 
-   if ( nMinDistTriaIndex != SVT_NULL) {
-      m_dDist = sqrt( max( dMinSqDist, 0.)) ;
+  // se non ho trovato nessun triangolo, esco
+   if ( nMinDistTriaIndex == SVT_NULL)
+      return ;
+
+  // salvo la distanza minima
+   m_dDist = sqrt( max( dMinSqDist, 0.)) ;
+  // salvo il punto a distanza minima
+   m_ptMinDistPoint = ptMinDistPoint ;
+  // se il punto è sulla TriMesh...
+   if ( m_dDist < EPS_SMALL) {
       m_nMinDistTriaIndex = nMinDistTriaIndex ;
-      m_ptMinDistPoint = ptMinDistPoint ;
-      Triangle3d trMinDistTria ;
-      pStm->GetTriangle( m_nMinDistTriaIndex, trMinDistTria) ;
-      trMinDistTria.Validate() ;
-      m_bIsInside = ( ( ptP - m_ptMinDistPoint) * trMinDistTria.GetN() < - EPS_SMALL)  &&  pStm->IsClosed() ;
+      m_bIsInside = false ;
+      return ;
    }
+  // se ho un solo triangolo, allora deduco le informazioni da lui
+   else if ( int( vTria.size()) == 1) {
+      m_nMinDistTriaIndex = vTria.back().first ;
+      m_bIsInside = ( ( ptP - m_ptMinDistPoint) * vTria.back().second.GetN() < - EPS_SMALL) ;
+      return ;
+   }
+  
+  // controllo se tutti i triangoli a minima distanza forniscono la stessa informazione
+  // ( il punto potrebbe essere esterno a tutti, interno a tutti o indefinito )
+   bool bInside = false ;
+   bool bOutside = false ;
+   for ( int i = 0 ; i < int( vTria.size()) ; ++ i) { // scorro i triangoli a minima distanza
+      if ( ( ptP - vTria[i].second.GetP( 0)) * vTria[i].second.GetN() < - EPS_SMALL)
+         bInside = true ;
+      else
+         bOutside = true ;
+   }
+
+  // inizializzo le variabili membro
+   m_nMinDistTriaIndex = nMinDistTriaIndex ;
+   m_bIsInside = false ;
+
+  // se le informazioni non sono coerenti, allora :
+  // 1) calcolo i centroidi dei triangoli in questione
+  // 2) ottengo il punto medio di questi centroidi
+  // 3) controllo quale triangolo interseca il segmento che parte da ptP e arriva a tale punto
+  // 4) userò questo triangolo per classificare ptP
+   if ( bOutside == bInside) {
+     // calcolo il baricentro complessivo
+      Point3d ptBar_tot ;
+      for ( auto& Tria : vTria)
+         ptBar_tot += Tria.second.GetCentroid() ;
+      ptBar_tot /= int( vTria.size()) ;
+     // per ogni triangolo, cerco quello che interseca il segmento
+      for ( auto& Tria : vTria) {
+         Point3d ptInters1, ptInters2 ;
+         int nType = IntersLineTria( ptP, ptBar_tot, Tria.second, ptInters1, ptInters2) ;
+         if ( nType == ILTT_IN) { // se intersezione ho finito
+            DistPointTriangle( ptP, Tria.second).GetMinDistPoint( m_ptMinDistPoint) ;
+            m_bIsInside = ( ( ptP - m_ptMinDistPoint) * Tria.second.GetN() < - EPS_SMALL) ;
+            m_nMinDistTriaIndex = Tria.first ;
+            break ;
+         }
+      }
+   }
+   else // se informazioni coerenti
+      m_bIsInside = bInside ;
+
+   return ;
+
 }
 
 //----------------------------------------------------------------------------

DistPointTria.cpp

@@ -14,7 +14,7 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "ProjPlane.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistPointTria.h"
 
 

EgtGeomKernel.vcxproj

@@ -329,6 +329,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClInclude Include="..\Include\EGkCDeConvexTorusClosedSurfTm.h" />
     <ClInclude Include="..\Include\EGkCDeRectPrismoidClosedSurfTm.h" />
     <ClInclude Include="..\Include\EGkDistLineLine.h" />
+    <ClInclude Include="..\Include\EGkDistPointLine.h" />
     <ClInclude Include="..\Include\EGkIntersCurveSurfTm.h" />
     <ClInclude Include="..\Include\EGkIntersLineBox.h" />
     <ClInclude Include="..\Include\EGkIntersLineVolZmap.h" />
@@ -600,7 +601,6 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
     <ClInclude Include="DistPointCrvAux.h" />
     <ClInclude Include="DistPointCrvBezier.h" />
     <ClInclude Include="DistPointCrvComposite.h" />
-    <ClInclude Include="DistPointLine.h" />
     <ClInclude Include="DllMain.h" />
     <ClInclude Include="earcut.hpp" />
     <ClInclude Include="ExtDimension.h" />

EgtGeomKernel.vcxproj.filters

@@ -593,9 +593,6 @@
     <ClInclude Include="DistPointArc.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="DistPointLine.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="DistPointCrvBezier.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
@@ -1214,6 +1211,9 @@
     <ClInclude Include="..\Include\EGkDistLineLine.h">
       <Filter>File di intestazione\Include</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\EGkDistPointLine.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="EgtGeomKernel.rc">

IntersLineSurfBez.cpp

@@ -13,12 +13,12 @@
 
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
+#include "CurveLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkIntersLineTria.h"
 #include "/EgtDev/Include/EGkIntersLineSurfTm.h"
 #include "/EgtDev/Include/EGkIntersLineSurfBez.h"
 #include "/EgtDev/Include/EGkSurfBezier.h"
-#include "DistPointLine.h"
-#include "CurveLine.h"
 
 using namespace std ;
 

IntersLineSurfTm.cpp

@@ -52,6 +52,8 @@ OrderInfoIntersLineSurfTm( ILSIVECTOR& vInfo)
             []( const IntLinStmInfo& a, const IntLinStmInfo& b)
                {  double dUa = ( ( a.nILTT == ILTT_SEGM  ||  a.nILTT == ILTT_SEGM_ON_EDGE) ? ( a.dU + a.dU2) / 2 : a.dU) ;
                   double dUb = ( ( b.nILTT == ILTT_SEGM  ||  b.nILTT == ILTT_SEGM_ON_EDGE) ? ( b.dU + b.dU2) / 2 : b.dU) ;
+                  if ( abs( dUa - dUb) < EPS_SMALL)
+                     return ( a.dCosDN < b.dCosDN) ;
                   return ( dUa < dUb) ; }) ;
 }
 

IntersLineTria.cpp

@@ -17,7 +17,7 @@
 #include "CurveLine.h"
 #include "IntersLineLine.h"
 #include "IntersLineTria.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistLineLine.h"
 #include "/EgtDev/Include/EGkIntersLinePlane.h"
 #include "/EgtDev/Include/EGkFrame3d.h"

IntersPlaneSurfTm.cpp

@@ -15,7 +15,7 @@
 #include "stdafx.h"
 #include "ProjPlane.h"
 #include "CurveLine.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkIntersPlaneSurfTm.h"
 #include "/EgtDev/Include/EGkIntersPlaneTria.h"
 #include "/EgtDev/Include/EGkIntersLineSurfTm.h"

IntersSurfTmSurfTm.cpp

@@ -13,9 +13,9 @@
 
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
-#include "DistPointLine.h"
 #include "IntersLineTria.h"
 #include "DllMain.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkIntersSurfTmSurfTm.h"
 #include "/EgtDev/Include/EGkIntersTriaTria.h"
 #include "/EgtDev/Include/EGkPointGrid3d.h"

LineTgCurvePerpCurve.cpp

@@ -14,7 +14,7 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "CreateCurveAux.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkLineTgCurvePerpCurve.h"
 #include "/EgtDev/Include/EGkLinePntTgCurve.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

LineTgTwoCurves.cpp

@@ -14,7 +14,7 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "CreateCurveAux.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkLineTgTwoCurves.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
 

PolyArc.cpp

@@ -13,9 +13,9 @@
 
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
-#include "DistPointLine.h"
 #include "GeoConst.h"
 #include "CurveArc.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkPolyArc.h"
 #include "/EgtDev/Include/EGkFrame3d.h"
 #include <algorithm>

PolyLine.cpp

@@ -14,13 +14,13 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "CurveLine.h"
-#include "DistPointLine.h"
 #include "IntersLineLine.h"
 #include "PolygonPlane.h"
 #include "PointsPCA.h"
 #include "GeoConst.h"
 #include "/EgtDev/Include/EGkPolyLine.h"
 #include "/EgtDev/Include/EGkPlane3d.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGnStringUtils.h"
 #include "/EgtDev/Include/EgtNumUtils.h"
 

ProjectCurveSurfTm.cpp

@@ -13,8 +13,8 @@
 
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
-#include "DistPointLine.h"
 #include "GeoConst.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EGkDistPointSurfTm.h"
 #include "/EgtDev/Include/EGkIntersLineSurfTm.h"
@@ -22,6 +22,10 @@
 
 using namespace std ;
 
+//----------------------------------------------------------------------------
+// Angolo limite tra normale al triangolo e direzione di proiezione 89°
+const double COS_ANG_LIM = 0.0175 ;
+
 //----------------------------------------------------------------------------
 static bool
 PointsInTolerance( const PNT5AXVECTOR& vPt5ax, int nPrec, int nCurr, int nNext, double dSqTol)
@@ -89,9 +93,9 @@ ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const Vec
   // controllo le tolleranze
    dLinTol = max( dLinTol, LIN_TOL_MIN) ;
    dMaxSegmLen = max( dMaxSegmLen, 10 * EPS_SMALL) ;
-  // approssimo la curva con una polilinea entro la metà della tolleranza
+  // approssimo la curva con una polilinea alla massima risoluzione
    PolyLine PL ;
-   if ( ! crCrv.ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, ICurve::APL_STD, PL))
+   if ( ! crCrv.ApproxWithLines( EPS_SMALL, ANG_TOL_STD_DEG, ICurve::APL_STD, PL))
       return false ;
    const double MAX_SEG_LEN = min( dMaxSegmLen, 1.) ;
    if ( ! PL.AdjustForMaxSegmentLen( MAX_SEG_LEN))
@@ -112,12 +116,17 @@ ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const Vec
    Point3d ptP ;
    bool bFound = PL.GetFirstUPoint( &dPar, &ptP) ;
    while ( bFound) {
+     // intersezione retta di proiezione con superficie
       Point3d ptL = GetToLoc( ptP, frRefLine) ;
       ILSIVECTOR vIntRes ;
       intPLSTM.GetInters( ptL, 1, vIntRes, false) ;
-      if ( ! vIntRes.empty()) {
+     // cerco la prima intersezione valida a partire dall'ultima (è la più alta)
+      int nI = int( vIntRes.size()) - 1 ;
+      while ( nI >= 0  &&  abs( vIntRes[nI].dCosDN) < COS_ANG_LIM)
+         --nI ;
+     // se trovata
+      if ( nI >= 0) {
         // calcolo il punto
-         int nI = int( vIntRes.size()) - 1 ;
          Point3d ptInt ;
          if ( vIntRes[nI].nILTT == ILTT_SEGM  ||  vIntRes[nI].nILTT == ILTT_SEGM_ON_EDGE)
             ptInt = vIntRes[nI].ptI2 ;
@@ -187,9 +196,13 @@ ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const IGe
          vtLine /= dLineLen ;
          ILSIVECTOR vIntRes ;
          if ( IntersLineSurfTm( ptP, vtLine, dLineLen, tmSurf, vIntRes, false)) {
-            if ( vIntRes.size() > 0) {
+           // cerco la prima intersezione valida a partire dall'ultima (è la più alta)
+            int nI = int( vIntRes.size()) - 1 ;
+            while ( nI >= 0  &&  abs( vIntRes[nI].dCosDN) < COS_ANG_LIM)
+               --nI ;
+           // se trovata
+            if ( nI >= 0) {
               // calcolo il punto
-               int nI = int( vIntRes.size()) - 1 ;
                Point3d ptInt ;
                if ( vIntRes[nI].nILTT == ILTT_SEGM  ||  vIntRes[nI].nILTT == ILTT_SEGM_ON_EDGE)
                   ptInt = vIntRes[nI].ptI2 ;
@@ -235,9 +248,9 @@ ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const ICu
    dLinTol = max( dLinTol, LIN_TOL_MIN) ;
    dMaxSegmLen = max( dMaxSegmLen, 10 * EPS_SMALL) ;
 
-  // approssimo la curva con una polilinea entro la metà della tolleranza
+  // approssimo la curva con una polilinea alla massima risoluzione
    PolyLine PL ;
-   if ( ! crCrv.ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, ICurve::APL_STD, PL))
+   if ( ! crCrv.ApproxWithLines( EPS_SMALL, ANG_TOL_STD_DEG, ICurve::APL_STD, PL))
       return false ;
    const double MAX_SEG_LEN = min( dMaxSegmLen, 1.) ;
    if ( ! PL.AdjustForMaxSegmentLen( MAX_SEG_LEN))
@@ -264,9 +277,13 @@ ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const ICu
             vtLine /= dLineLen ;
             ILSIVECTOR vIntRes ;
             if ( IntersLineSurfTm( ptP, vtLine, dLineLen, tmSurf, vIntRes, false)) {
-               if ( vIntRes.size() > 0) {
+              // cerco la prima intersezione valida a partire dall'ultima (è la più alta)
+               int nI = int( vIntRes.size()) - 1 ;
+               while ( nI >= 0  &&  abs( vIntRes[nI].dCosDN) < COS_ANG_LIM)
+                  --nI ;
+              // se trovata
+               if ( nI >= 0) {
                  // calcolo il punto
-                  int nI = int( vIntRes.size()) - 1 ;
                   Point3d ptInt ;
                   if ( vIntRes[nI].nILTT == ILTT_SEGM  ||  vIntRes[nI].nILTT == ILTT_SEGM_ON_EDGE)
                      ptInt = vIntRes[nI].ptI2 ;
@@ -342,9 +359,13 @@ ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const ISu
             vtLine /= dLineLen ;
             ILSIVECTOR vIntRes ;
             if ( IntersLineSurfTm( ptP, vtLine, dLineLen, tmSurf, vIntRes, false)) {
-               if ( vIntRes.size() > 0) {
+              // cerco la prima intersezione valida a partire dall'ultima (è la più alta)
+               int nI = int( vIntRes.size()) - 1 ;
+               while ( nI >= 0  &&  abs( vIntRes[nI].dCosDN) < COS_ANG_LIM)
+                  --nI ;
+              // se trovata
+               if ( nI >= 0) {
                  // calcolo il punto
-                  int nI = int( vIntRes.size()) - 1 ;
                   Point3d ptInt ;
                   if ( vIntRes[nI].nILTT == ILTT_SEGM  ||  vIntRes[nI].nILTT == ILTT_SEGM_ON_EDGE)
                      ptInt = vIntRes[nI].ptI2 ;

RemoveCurveDefects.cpp

@@ -15,8 +15,8 @@
 #include "stdafx.h"
 #include "GeoConst.h"
 #include "CurveComposite.h"
-#include "DistPointLine.h"
 #include "RemoveCurveDefects.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 #include <algorithm>
 

SurfTriMesh.cpp

@@ -20,12 +20,13 @@
 #include "NgeWriter.h"
 #include "NgeReader.h"
 #include "SurfFlatRegion.h"
-#include "DistPointLine.h"
 #include "Triangulate.h"
 #include "GeoConst.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistLineLine.h"
 #include "/EgtDev/Include/EGkIntersLinePlane.h"
 #include "/EgtDev/Include/EGkPointGrid3d.h"
+#include "/EgtDev/Include/EGkPolygon3d.h"
 #include "/EgtDev/Include/EGkPolyLine.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EGkUiUnits.h"
@@ -1177,6 +1178,78 @@ SurfTriMesh::GetSilhouette( const Vector3d& vtDir, double dTol, POLYLINEVECTOR&
    return true ;
 }
 
+//----------------------------------------------------------------------------
+bool
+SurfTriMesh::GetSilhouette( const Plane3d& plPlane, double dTol, POLYLINEVECTOR& vPL, bool bAllTria) const
+{
+  // Verifico lo stato
+   if ( m_nStatus != OK)
+      return false ;
+
+  // Verifico la direzione
+   Vector3d vtVers = plPlane.GetVersN() ;
+   if ( ! vtVers.Normalize())
+      return false ;
+
+  // Controlli su tolleranza
+   dTol = max( dTol, 100 * EPS_SMALL) ;
+
+  // Determino il riferimento di proiezione
+   Frame3d frOCS ; frOCS.Set( plPlane.GetPoint(), vtVers) ;
+
+  // Ottengo la Silhouette come unione delle regioni dei triangoli proiettati (solo parti sopra il piano)
+  // calcolo la regione dei triangoli proiettati
+   PtrOwner<SurfFlatRegion> pSfr ;
+   Triangle3d Tria ;
+   int nT = GetFirstTriangle( Tria) ;
+   while ( nT != SVT_NULL) {
+     // verifico la normale
+      if ( ( bAllTria  &&  abs( Tria.GetN() * vtVers) > EPS_ZERO)  ||
+           ( ! bAllTria  &&  Tria.GetN() * vtVers > EPS_ZERO)) {
+        // ricavo il poligono equivalente al triangolo
+         Polygon3d pgTria ;
+         pgTria.FromTriangle( Tria) ;
+        // taglio il poligono con il piano
+         pgTria.Trim( plPlane, false, true, bAllTria) ;
+        // se rimasto qualcosa
+         if ( pgTria.GetSideCount() > 0) {
+           // lo proietto sul piano e creo la regione
+            pgTria.Scale( frOCS, 1, 1, 0) ;
+            PtrOwner<SurfFlatRegion> pSfrTria( GetBasicSurfFlatRegion( GetSurfFlatRegionFromPolyLine( pgTria.GetPolyLine()))) ;
+            if ( ! IsNull( pSfrTria)) {
+               if ( bAllTria  &&  Tria.GetN() * vtVers < 0)
+                  pSfrTria->Invert() ;
+               pSfrTria->Offset( dTol, ICurve::OFF_FILLET) ;
+               if ( IsNull( pSfr))
+                  pSfr.Set( pSfrTria) ;
+               else
+                  pSfr->Add( *pSfrTria) ;
+            }
+         }
+      }
+     // passo al successivo
+      nT = GetNextTriangle( nT, Tria) ;
+   }
+
+  // Se non esiste la regione
+   if ( IsNull( pSfr))
+      return false ;
+
+  // Effettuo contro-offset
+   pSfr->Offset( -dTol, ICurve::OFF_EXTEND) ;
+
+  // Recupero i contorni della regione
+   for ( int i = 0 ; i < pSfr->GetChunkCount() ; ++ i) {
+      for ( int j = 0 ; j < pSfr->GetLoopCount( i) ; ++ j) {
+         PolyLine PL ;
+         if ( pSfr->ApproxLoopWithLines( i, j, LIN_TOL_STD, ANG_TOL_STD_DEG, ICurve::APL_STD, PL))
+            vPL.emplace_back( PL) ;
+      }
+   }
+
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 SurfTriMesh*
 SurfTriMesh::Clone( void) const

SurfTriMesh.h

@@ -279,6 +279,7 @@ class SurfTriMesh : public ISurfTriMesh, public IGeoObjRW
       SurfTriMesh* CloneTriangle( int nT) const override ;
       bool GetLoops( POLYLINEVECTOR& vPL) const override ;
       bool GetSilhouette( const Vector3d& vtDir, double dTol, POLYLINEVECTOR& vPL, bool bAllTria = false) const override ;
+      bool GetSilhouette( const Plane3d& plPlane, double dTol, POLYLINEVECTOR& vPL, bool bAllTria = false) const override ;
       int  GetFacetCount( void) const override ;
       int  GetFacetSize( void) const override
               { return int( m_vFacet.size()) ; }

SurfTriMeshBooleans.cpp

@@ -17,13 +17,14 @@
 #include "CurveLine.h"
 #include "CurveComposite.h"
 #include "SurfFlatRegion.h"
-#include "DistPointLine.h"
 #include "Triangulate.h"
 #include "GeoConst.h"
 #include "/EgtDev/Include/EgtNumUtils.h"
 #include "/EgtDev/Include/EGkCurve.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EGkDistPointTria.h"
+#include "/EgtDev/Include/EGkDistPointSurfTm.h"
 #include "/EgtDev/Include/EGkIntersLineTria.h"
 #include "/EgtDev/Include/EGkIntersLineBox.h"
 #include "/EgtDev/Include/EGkIntersPlanePlane.h"
@@ -1326,168 +1327,25 @@ SurfTriMesh::IntersectTriMeshTriangle( SurfTriMesh& Other)
    bool bRetriangulated = true ;
    if ( ! bModif  &&  ( int( AmbiguosA.size()) == 0  ||  int( AmbiguosB.size()) == 0)) {
       bRetriangulated = false ;
-      int nVertNum = 0 ;
-      Point3d ptFirstV ;
-      int nCurVert = GetFirstVertex( ptFirstV) ;
+     // devo assegnare a tutti i triangoli della superficie la medesima proprietà ( definita da nInOutNum)
+     // ( -1 -> esterno | 0 -> indefinito | +1 -> interno )
+     // devo farlo sia per la SurfA( *this) che per la SurfB
       int nInOutNum = 0 ;
-      while ( nInOutNum == 0  &&  nCurVert != SVT_NULL) {
-         INTVECTOR vnTriaNum ;
-         double dMinDist = DBL_MAX ;
-         for ( int nTB = 0 ; nTB < nTriaNumB ; ++ nTB) {
-           // Se il triangolo B non è valido, continuo
-            Triangle3d trTriaB ;
-            if ( ! SurfB.GetTriangle( nTB, trTriaB)  ||  ! trTriaB.Validate( true))
-               continue ;
-            double dDist ;
-            // potrei trovare più triangolo equidistanti, li salvo tutti
-            if ( DistPointTriangle( ptFirstV, trTriaB).GetDist( dDist)) {
-               if ( abs(dDist - dMinDist) < EPS_SMALL)
-                  vnTriaNum.push_back( nTB) ;
-               else if ( dDist < dMinDist){
-                  vnTriaNum.clear() ;
-                  vnTriaNum.push_back( nTB) ;
-                  dMinDist = dDist ;
-               }
-            }
-         }
-         if ( ! vnTriaNum.empty()) {
-            Triangle3d trTriaB ;
-            bool bSame = true ;
-            // controllo se rispetto a questi triangoli il punto risulta sempre fuori o sempre dentro
-            for ( int nTriaNum : vnTriaNum) {
-               SurfB.GetTriangle( nTriaNum, trTriaB) ;
-               if ( ( ptFirstV - trTriaB.GetP(0)) * trTriaB.GetN() < - EPS_SMALL) {
-                  if ( nInOutNum == 0)
-                     nInOutNum = 1 ;
-                  else if ( nInOutNum == -1) {
-                     bSame = false ;
-                     break ;
-                  }
-               }
-               else if ( ( ptFirstV - trTriaB.GetP(0)) * trTriaB.GetN() > EPS_SMALL) {
-                  if ( nInOutNum == 0)
-                     nInOutNum = -1 ;
-                  else if ( nInOutNum == 1) {
-                     bSame = false ;
-                     break ;
-                  }
-               }
-            }
-            // se le informazioni date dalle normali dei triangoli non sono concordi valuto il triangolo più vicino
-            // e ricalcolo l'informazione che mi dà la sua normale
-            if ( ! bSame) {
-               Point3d ptBar_tot ;
-               for (int nTriaNum : vnTriaNum) {
-                  SurfB.GetTriangle( nTriaNum, trTriaB) ;
-                  ptBar_tot += trTriaB.GetCentroid();
-               }
-               ptBar_tot /= int( vnTriaNum.size()) ;
-               for ( int nTriaNum : vnTriaNum) {
-                  SurfB.GetTriangle( nTriaNum, trTriaB) ;
-                  Point3d ptInters1, ptInters2 ;
-                  int nInters = IntersLineTria( ptFirstV, ptBar_tot, trTriaB, ptInters1, ptInters2, true) ;
-                  if ( nInters == ILTT_NO)
-                     continue ;
-                  else if ( nInters == ILTT_IN) {
-                     if ( ( ptFirstV - trTriaB.GetP( 0)) * trTriaB.GetN() < - EPS_SMALL)
-                        nInOutNum = 1 ;
-                     else if ( ( ptFirstV - trTriaB.GetP( 0)) * trTriaB.GetN() > EPS_SMALL)
-                        nInOutNum = -1 ;
-                     break ;
-                  }
-                  else
-                     nInOutNum = 0 ;
-               }
-            }
-         }
-         if ( nInOutNum == 0) {
-            nCurVert = GetNextVertex( nVertNum, ptFirstV) ;
-            ++ nVertNum ;
-         }
+      for ( int v = 0 ; v < int( m_vVert.size())  &&  nInOutNum == 0 ; ++ v) {
+         double dDist = 0. ;
+         DistPointSurfTm distCalculator( m_vVert[v].ptP, SurfB) ;
+         if ( distCalculator.GetDist( dDist)  &&  dDist > EPS_SMALL)
+            nInOutNum = ( distCalculator.IsPointOnLeftSide() ? 1 : -1) ;
       }
-
       for ( int nTA = 0 ; nTA < nTriaNumA ; ++ nTA)
          m_vTria[nTA].nTempPart = nInOutNum ;
 
-      nVertNum = 0 ;
-      nCurVert = SurfB.GetFirstVertex( ptFirstV) ;
       nInOutNum = 0 ;
-      while ( nInOutNum == 0  &&  nCurVert != SVT_NULL) {
-         INTVECTOR vnTriaNum ;
-         double dMinDist = DBL_MAX ;
-         for ( int nTA = 0 ; nTA < nTriaNumA ; ++ nTA) {
-            // Se il triangolo A non è valido, continuo
-            Triangle3d trTriaA ;
-            if ( ! ( GetTriangle( nTA, trTriaA)  &&  trTriaA.Validate( true)))
-               continue ;
-            DistPointTriangle DistCalculator( ptFirstV, trTriaA) ;
-            double dDist ;
-            DistCalculator.GetDist( dDist) ;
-            // potrei trovare più triangolo equidistanti, li salvo tutti
-            if ( DistPointTriangle( ptFirstV, trTriaA).GetDist( dDist)) {
-               if ( abs( dDist - dMinDist) < EPS_SMALL)
-                  vnTriaNum.push_back( nTA) ;
-               else if ( dDist < dMinDist){
-                  vnTriaNum.clear() ;
-                  vnTriaNum.push_back( nTA) ;
-                  dMinDist = dDist ;
-               }
-            }
-         }
-         if ( ! vnTriaNum.empty()) {
-            Triangle3d trTriaA ;
-            bool bSame = true ;
-            // controllo se rispetto a questi triangoli il punto risulta sempre fuori o sempre dentro
-            for ( int nTriaNum : vnTriaNum) {
-               GetTriangle( nTriaNum, trTriaA) ;
-               if ( ( ptFirstV - trTriaA.GetP(0)) * trTriaA.GetN() < - EPS_SMALL) {
-                  if ( nInOutNum == 0)
-                     nInOutNum = 1 ;
-                  else if ( nInOutNum == -1) {
-                     bSame = false ;
-                     break ;
-                  }
-               }
-               else if ( ( ptFirstV - trTriaA.GetP(0)) * trTriaA.GetN() > EPS_SMALL) {
-                  if ( nInOutNum == 0)
-                     nInOutNum = -1 ;
-                  else if ( nInOutNum == 1) {
-                     bSame = false ;
-                     break ;
-                  }
-               }
-            }
-            // se le informazioni date dalle normali dei triangoli non sono concordi valuto il triangolo più vicino
-            // e ricalcolo l'informazione che mi dà la sua normale
-            if ( ! bSame) {
-               Point3d ptBar_tot ;
-               for ( int nTriaNum : vnTriaNum) {
-                  GetTriangle( nTriaNum, trTriaA) ;
-                  ptBar_tot += trTriaA.GetCentroid();
-               }
-               ptBar_tot /= int( vnTriaNum.size()) ;
-               for ( int nTriaNum : vnTriaNum) {
-                  GetTriangle( nTriaNum, trTriaA) ;
-                  Point3d ptInters1, ptInters2 ;
-                  int nInters = IntersLineTria( ptFirstV, ptBar_tot, trTriaA, ptInters1, ptInters2, true) ;
-                  if ( nInters == ILTT_NO)
-                     continue ;
-                  else if ( nInters == ILTT_IN) {
-                     if ( ( ptFirstV - trTriaA.GetP( 0)) * trTriaA.GetN() < - EPS_SMALL)
-                        nInOutNum = 1 ;
-                     else if ( ( ptFirstV - trTriaA.GetP( 0)) * trTriaA.GetN() > EPS_SMALL)
-                        nInOutNum = -1 ;
-                     break ;
-                  }
-                  else
-                     nInOutNum = 0 ;
-               }
-            }
-         }
-         if ( nInOutNum == 0) {
-            nCurVert = SurfB.GetNextVertex( nVertNum, ptFirstV) ;
-            ++ nVertNum ;
-         }
+      for ( int v = 0 ; v < int( SurfB.m_vVert.size())  &&  nInOutNum == 0 ; ++ v) {
+         double dDist = 0. ;
+         DistPointSurfTm distCalculator( SurfB.m_vVert[v].ptP, *this) ;
+         if ( distCalculator.GetDist( dDist)  &&  dDist > EPS_SMALL)
+            nInOutNum = ( distCalculator.IsPointOnLeftSide() ? 1 : -1) ;
       }
       for ( int nTB = 0 ; nTB < nTriaNumB ; ++ nTB)
          SurfB.m_vTria[nTB].nTempPart = nInOutNum ;
@@ -1583,66 +1441,102 @@ SurfTriMesh::IdentifyParts( void) const
 bool
 SurfTriMesh::Add( const ISurfTriMesh& Other)
 {
-  // Le superfici devono essere valide
+
+  // le superfici devono essere valide
    if ( ! IsValid()  ||  ! Other.IsValid())
       return false ;
 
-  // Se la seconda è vuota non devo fare alcunchè
+  // se la seconda è vuota non devo fare alcunchè
    if ( Other.IsEmpty())
       return true ;
 
    m_OGrMgr.Clear() ;
 
-  // Se la prima è vuota, copio la seconda nella prima
+  // se la prima è vuota, copio la seconda nella prima
    if ( IsEmpty()) {
       CopyFrom( &Other) ;
       return true ;
    }
 
+  // clono la superficie B
    SurfTriMesh SurfB ;
    SurfB.CopyFrom( &Other) ;
 
+  // creazione del frame per scalare A e B
    Frame3d frScalingRef ;
    frScalingRef.Set( m_vVert[0].ptP, X_AX, Y_AX, Z_AX) ;
+  // scalo A e B
    Scale( frScalingRef, BOOLEAN_SCALE, BOOLEAN_SCALE, BOOLEAN_SCALE) ;
    SurfB.Scale( frScalingRef, BOOLEAN_SCALE, BOOLEAN_SCALE, BOOLEAN_SCALE) ;
 
+  // tengo una copia di B ( la superficie B viene modificata durante la ritriangolazione )
+   SurfTriMesh SurfB_cl ;
+   SurfB_cl.CopyFrom( &SurfB) ;
+
+  // tengo una copia di B ( la superficie B viene modificata durante la ritriangolazione )
+   SurfTriMesh SurfA_cl ;
+   SurfA_cl.CopyFrom( this) ;
+ 
+  // ritriangolo le due superfici mediante ogni intersezione Triangolo-Triangolo
    IntersectTriMeshTriangle( SurfB) ;
+
+  // assegno un medesimo indice ai triangoli che non interferiscono con altri
    IdentifyParts() ;
    SurfB.IdentifyParts() ;
 
+  // rimozione dei triangoli di A con proprietà 1 e -2 ( e gestione dei triangoli ambigui, 0)
    int nTriaNumA = GetTriangleSize() ;
    for ( int nTA = 0 ; nTA < nTriaNumA ; ++ nTA) {
       if ( m_vTria[nTA].nTempPart == 1  ||  m_vTria[nTA].nTempPart == - 2)
          RemoveTriangle( nTA) ;
+     // se triangolo ambiguo
+      if ( m_vTria[nTA].nTempPart == 0) {
+         Triangle3d TriaA ;
+         GetTriangle( nTA, TriaA) ;
+        // rimuovo il triangolo se interno a surfB ( basta controllare un solo vertice(?) )
+         DistPointSurfTm distCalculator( TriaA.GetP( 0), SurfB_cl) ;
+         if ( distCalculator.IsPointOnLeftSide())
+            RemoveTriangle( nTA) ;
+      }
    }
+
+  // aggiunta di tutti i triangoli di B con proprietà -1 ( e gestione dei triangoli ambigui, 0)
    int nPrevMaxTFlag = m_nMaxTFlag ;
    int nTriaNumB = SurfB.GetTriangleSize() ;
    for ( int nTB = 0 ; nTB < nTriaNumB ; ++ nTB) {
-      if ( SurfB.m_vTria[nTB].nTempPart == - 1) {
-         int nNewVert[3] ;
-         for ( int nV = 0 ; nV < 3 ; ++ nV) {
-            nNewVert[nV] = AddVertex( SurfB.m_vVert[SurfB.m_vTria[nTB].nIdVert[nV]].ptP) ;
+      bool bAdd = ( SurfB.m_vTria[nTB].nTempPart == - 1) ;
+      if ( ! bAdd) {
+        // se ambiguo
+         if ( SurfB.m_vTria[nTB].nTempPart == 0) {
+           // aggiungo se il triangolo è a surfA ( basta controllare un solo vertice(?) )
+            DistPointSurfTm distCalculator( SurfB.m_vVert[SurfB.m_vTria[nTB].nIdVert[0]].ptP, SurfA_cl) ;
+            bAdd = ! distCalculator.IsPointOnLeftSide() ;
          }
+      }
+      if ( bAdd) {
+         int nNewVert[3] ;
+         for ( int nV = 0 ; nV < 3 ; ++ nV)
+            nNewVert[nV] = AddVertex( SurfB.m_vVert[SurfB.m_vTria[nTB].nIdVert[nV]].ptP) ;
          if ( nPrevMaxTFlag == m_nMaxTFlag)
             ++ m_nMaxTFlag ;
          AddTriangle( nNewVert, m_nMaxTFlag) ;
       }
    }
 
+  // sistemazioni varie
    bool bOk = ( AdjustVertices()  &&  DoCompacting()) ;
-
    bool bModified = false ;
    bOk = bOk && RemoveDoubleTriangles( bModified) ;
    if ( bModified)
       bOk = bOk && ( AdjustVertices()  &&  DoCompacting()) ;
-
    bOk = bOk && RemoveTJunctions( bModified) ;
    if ( bModified)
       bOk = bOk && ( AdjustVertices()  &&  DoCompacting()) ;
 
+  // scalo alla dimensioni originali
    Scale( frScalingRef, 1. / BOOLEAN_SCALE, 1. / BOOLEAN_SCALE, 1. / BOOLEAN_SCALE) ;
 
+  // semplifico eventuale geometria delle facce
    if ( ! SimplifyFacets())
       LOG_ERROR( GetEGkLogger(), "Error in SimplifyFacets of Stm::Add")
 
@@ -1653,6 +1547,7 @@ SurfTriMesh::Add( const ISurfTriMesh& Other)
 bool
 SurfTriMesh::Intersect( const ISurfTriMesh& Other)
 {
+
   // Le superfici devono essere valide
    if ( ! IsValid()  ||  ! Other.IsValid())
       return false ;
@@ -1681,6 +1576,14 @@ SurfTriMesh::Intersect( const ISurfTriMesh& Other)
    Scale( frScalingRef, BOOLEAN_SCALE, BOOLEAN_SCALE, BOOLEAN_SCALE) ;
    SurfB.Scale( frScalingRef, BOOLEAN_SCALE, BOOLEAN_SCALE, BOOLEAN_SCALE) ;
 
+  // tengo una copia di B ( la superficie B viene modificata durante la ritriangolazione )
+   SurfTriMesh SurfB_cl ;
+   SurfB_cl.CopyFrom( &SurfB) ;
+
+  // tengo una copia di B ( la superficie B viene modificata durante la ritriangolazione )
+   SurfTriMesh SurfA_cl ;
+   SurfA_cl.CopyFrom( this) ;
+
   // ritriangolo le due superfici mediante ogni intersezione Triangolo-Triangolo
    IntersectTriMeshTriangle( SurfB) ;
 
@@ -1688,22 +1591,36 @@ SurfTriMesh::Intersect( const ISurfTriMesh& Other)
    IdentifyParts() ;
    SurfB.IdentifyParts() ;
 
-  // rimozione dei triangoli di A con proprietà -1 e -2
+  // rimozione dei triangoli di A con proprietà -1 e -2 (e gestione dei triangoli ambigui, 0)
    int nTriaNumA = GetTriangleSize() ;
    for ( int nTA = 0 ; nTA < nTriaNumA ; ++ nTA) {
       if ( m_vTria[nTA].nTempPart == - 1  ||  m_vTria[nTA].nTempPart == - 2)
          RemoveTriangle( nTA) ;
+     // se triangolo ambiguo
+      else if ( m_vTria[nTA].nTempPart == 0) {
+         Triangle3d TriaA ;
+         GetTriangle( nTA, TriaA) ;
+        // rimuovo il triangolo se fuori a surfB ( basta controllare un solo vertice(?) )
+         DistPointSurfTm distCalculator( TriaA.GetP( 0), SurfB_cl) ;
+         if ( ! distCalculator.IsPointOnLeftSide())
+            RemoveTriangle( nTA) ;
+      }
    }
 
-  // aggiunta dei triangoli di B con proprietà +1
+  // aggiunta dei triangoli di B con proprietà +1 ( e gestione dei triangoli ambigui, 0)
    int nPrevMaxTFlag = m_nMaxTFlag ;
    int nTriaNumB = SurfB.GetTriangleSize() ;
    for ( int nTB = 0 ; nTB < nTriaNumB ; ++ nTB) {
-      if ( SurfB.m_vTria[nTB].nTempPart == 1) {
+      bool bAdd = ( SurfB.m_vTria[nTB].nTempPart == 1) ;
+      if ( ! bAdd  &&  SurfB.m_vTria[nTB].nTempPart == 0) {
+        // aggiungo se il triangolo è interno a surfA ( basta controllare un solo vertice(?) )
+         DistPointSurfTm distCalculator( SurfB.m_vVert[SurfB.m_vTria[nTB].nIdVert[0]].ptP, SurfA_cl) ;
+         bAdd = distCalculator.IsPointOnLeftSide() ;
+      }
+      if ( bAdd) {
          int nNewVert[3] ;
          for ( int nV = 0 ; nV < 3 ; ++ nV)
             nNewVert[nV] = AddVertex( SurfB.m_vVert[SurfB.m_vTria[nTB].nIdVert[nV]].ptP) ;
-
          if ( nPrevMaxTFlag == m_nMaxTFlag)
             ++ m_nMaxTFlag ;
          AddTriangle( nNewVert, m_nMaxTFlag) ;
@@ -1720,33 +1637,6 @@ SurfTriMesh::Intersect( const ISurfTriMesh& Other)
    if ( bModified)
       bOk = bOk && ( AdjustVertices()  &&  DoCompacting()) ;
 
-  // rimuovo tutte le parti esterne all'intersezione
-   int nParts = GetPartCount() ;
-   if ( nParts > 1) {
-      for ( int i = 0 ; i < nParts ; ++ i) {
-        // recupero i triangoli della stessa Part
-         INTVECTOR vTriaPart ;
-         for ( int j = 0 ; j < int( m_vTria.size()) ; ++ j)
-            if ( m_vTria[j].nPart == i)
-               vTriaPart.push_back( j) ;
-        // controllo se il loro box interferisce con il box della superficie B
-         bool bErasePart = true ;
-         for ( int j = 0 ; j < int( vTriaPart.size())  &&  bErasePart ; ++ j) {
-           // Se il triangolo A non è valido, continuo
-            Triangle3d Tria ;
-            if ( ! GetTriangle( j, Tria)  ||  ! Tria.Validate( true))
-               continue ;
-           // Box del triangolo A
-            BBox3d b3dTriaA ; Tria.GetLocalBBox( b3dTriaA) ;
-           // Recupero i triangoli di B che interferiscono col box del triangolo di A
-            INTVECTOR vNearTria ; SurfB.GetAllTriaOverlapBox( b3dTriaA, vNearTria) ;
-            bErasePart = int( vNearTria.size() == 0) ;
-         }
-         if ( bErasePart)
-            RemovePart( i) ;
-      }
-   }
-
   // scalo alle dimensioni originali
    Scale( frScalingRef, 1. / BOOLEAN_SCALE, 1. / BOOLEAN_SCALE, 1. / BOOLEAN_SCALE) ;
 
@@ -1760,42 +1650,77 @@ SurfTriMesh::Intersect( const ISurfTriMesh& Other)
 bool
 SurfTriMesh::Subtract( const ISurfTriMesh& Other)
 {
-  // Le superfici devono essere valide
+
+  // le superfici devono essere valide
    if ( ! IsValid()  ||  ! Other.IsValid())
       return false ;
 
-  // Se una delle due è vuota non devo fare alcunchè
+  // se una delle due è vuota non devo fare alcunchè
    if ( IsEmpty()  ||  Other.IsEmpty())
       return true ;
 
+  // pulisco grafica
    m_OGrMgr.Clear() ;
 
+  // clono superficie B
    SurfTriMesh SurfB ;
    SurfB.CopyFrom( &Other) ;
 
-   Frame3d frScalingRef;
+  // creazione del frame per scalare A e B
+   Frame3d frScalingRef ;
    frScalingRef.Set( m_vVert[0].ptP, X_AX, Y_AX, Z_AX) ;
+  // scalo A e B
    Scale( frScalingRef, BOOLEAN_SCALE, BOOLEAN_SCALE, BOOLEAN_SCALE) ;
    SurfB.Scale( frScalingRef, BOOLEAN_SCALE, BOOLEAN_SCALE, BOOLEAN_SCALE) ;
 
+  // tengo una copia di B ( la superficie B viene modificata durante la ritriangolazione )
+   SurfTriMesh SurfB_cl ;
+   SurfB_cl.CopyFrom( &SurfB) ;
+
+  // tengo una copia di B ( la superficie B viene modificata durante la ritriangolazione )
+   SurfTriMesh SurfA_cl ;
+   SurfA_cl.CopyFrom( this) ;
+ 
+  // ritriangolo le due superfici mediante ogni intersezione Triangolo-Triangolo
    IntersectTriMeshTriangle( SurfB) ;
 
+  // assegno un medesimo indice ai triangoli che non interferiscono con altri
    IdentifyParts() ;
    SurfB.IdentifyParts() ;
 
+  // rimozione dei triangoli di A con proprietà 1 e 2 ( e gestione triangoli ambigui, 0)
    int nTriaNumA = GetTriangleSize() ;
    for ( int nTA = 0 ; nTA < nTriaNumA ; ++ nTA) { 
       if  ( m_vTria[nTA].nTempPart == 1  ||  m_vTria[nTA].nTempPart == 2)
          RemoveTriangle( nTA) ;
+     // se triangolo ambiguo...
+      if ( m_vTria[nTA].nTempPart == 0) {
+         Triangle3d TriaA ;
+         GetTriangle( nTA, TriaA) ;
+        // rimuovo il triangolo se interno a SurfB ( basta controllare un solo vertice(?) )
+         DistPointSurfTm distCalculator( TriaA.GetP( 0), SurfB_cl) ;
+         if ( distCalculator.IsPointOnLeftSide())
+            RemoveTriangle( nTA) ;
+      }
    }
+
+  // aggiunta dei triangoli di B con proprietà +1 ( e gestione triangoli ambigui, 0)
    int nPrevMaxTFlag = m_nMaxTFlag ;
    int nTriaNumB = SurfB.GetTriangleSize() ;
    for ( int nTB = 0 ; nTB < nTriaNumB ; ++ nTB) {
-      if ( SurfB.m_vTria[nTB].nTempPart == 1) {
-         int nNewVert[3] ;
-         for ( int nV = 0 ; nV < 3 ; ++ nV) {
-            nNewVert[nV] = AddVertex( SurfB.m_vVert[SurfB.m_vTria[nTB].nIdVert[nV]].ptP) ;
+      bool bAdd = SurfB.m_vTria[nTB].nTempPart == 1 ;
+      if ( ! bAdd) {
+        // se ambiguo
+         if ( SurfB.m_vTria[nTB].nTempPart == 0) {
+           // aggiungo il triangolo se interno alla SurfA ( basta controllare un solo vertice(?) )
+            DistPointSurfTm distCalculator( SurfB.m_vVert[SurfB.m_vTria[nTB].nIdVert[0]].ptP, SurfA_cl) ;
+            bAdd = distCalculator.IsPointOnLeftSide() ;
          }
+      }
+      if ( bAdd) {
+         int nNewVert[3] ;
+         for ( int nV = 0 ; nV < 3 ; ++ nV)
+            nNewVert[nV] = AddVertex( SurfB.m_vVert[SurfB.m_vTria[nTB].nIdVert[nV]].ptP) ;
          swap( nNewVert[1], nNewVert[2]) ;
          if ( nPrevMaxTFlag == m_nMaxTFlag)
             ++ m_nMaxTFlag ;
@@ -1803,22 +1728,23 @@ SurfTriMesh::Subtract( const ISurfTriMesh& Other)
       }
    }
 
+  // sistemazioni varie
    bool bOk = ( AdjustVertices()  &&  DoCompacting()) ;
-
    bool bModified = false ;
    bOk = bOk && RemoveDoubleTriangles( bModified) ;
    if ( bModified)
       bOk = bOk && ( AdjustVertices()  &&  DoCompacting()) ;
-
    bOk = bOk && RemoveTJunctions( bModified) ;
    if ( bModified)
       bOk = bOk && ( AdjustVertices()  &&  DoCompacting()) ;
 
+  // scalo alle dimensioni originali
    Scale( frScalingRef, 1. / BOOLEAN_SCALE, 1. / BOOLEAN_SCALE, 1. / BOOLEAN_SCALE) ;
 
+  // semplifico le facce
    if ( ! SimplifyFacets())
       LOG_ERROR( GetEGkLogger(), "Error in SimplifyFacets of Stm::Subtract")
-   
+
    return bOk ;
 }
 

SurfTriMeshCuts.cpp

@@ -15,10 +15,10 @@
 #include "CurveComposite.h"
 #include "SurfTriMesh.h"
 #include "SurfFlatRegion.h"
-#include "DistPointLine.h"
 #include "Triangulate.h"
 #include "GeoConst.h"
 #include "/EgtDev/Include/EGkSfrCreate.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EGkIntersLinePlane.h"
 #include "/EgtDev/Include/EGkIntersPlaneTria.h"

SurfTriMeshUtilities.cpp

@@ -15,7 +15,7 @@
 #include "SurfTriMesh.h"
 #include "CurveLine.h"
 #include "Triangulate.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistLineLine.h"
 #include <unordered_map>
 

VolZmap.cpp

@@ -18,8 +18,8 @@
 #include "GdbGeo.h"
 #include "NgeWriter.h"
 #include "NgeReader.h"
-#include "DistPointLine.h"
 #include "GeoConst.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkIntersLinePlane.h"
 #include "/EgtDev/Include/EGkUiUnits.h"
 #include "/EgtDev/Include/EGkIntervals.h"

VolZmapVolume.cpp

@@ -892,7 +892,7 @@ VolZmap::MillingGeneralMotionStep( const Point3d& ptPs, const Vector3d& vtDs, co
                                    const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe)
 {
   // Divido il movimento in tratti con direzione utensile costante
-   const double ANG_STEP = 0.02 ;
+   const double ANG_STEP = 0.04 ;
    double dAngDeg ; vtDs.GetAngle( vtDe, dAngDeg) ;
    int nStepCnt = int( abs( dAngDeg) / ANG_STEP) + 1 ;
    bool bOk = true ;