EgtGeomKernel :

- aggiunta dipendenza header - aggiornata cartella header.
Merge branch 'master' into abseil
2025-09-29 09:17:20 +02:00 · 2025-09-26 12:56:07 +02:00 · 2025-09-26 12:48:48 +02:00 · 2025-09-26 12:10:18 +02:00 · 2025-09-26 11:00:20 +02:00 · 2025-09-26 10:49:41 +02:00
212 changed files with 53652 additions and 10806 deletions
@@ -15,15 +15,30 @@
 #include "stdafx.h"
 #include "GeoConst.h"
 #include "CurveComposite.h"
-#include "RemoveCurveSpikes.h"
+#include "RemoveCurveDefects.h"
 #include "AdjustLoops.h"
 #include "/EgtDev/Include/EGkIntersCurves.h"
 #include "/EgtDev/Include/EGkIntervals.h"
+#include "/EgtDev/Include/EgtNumUtils.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
 #include <algorithm>

 using namespace std ;

+//-------------------------------------------------------
+static bool
+SortCrvCrvInfo( const IntCrvCrvInfo& aInfo1, const IntCrvCrvInfo& aInfo2)
+{
+  // confronto i valori del primo punto della curva A 
+   double dU1 = aInfo1.IciA[0].dU ;
+   double dU2 = aInfo2.IciA[0].dU ;  
+   if ( abs( dU1 - dU2) < EPS_SMALL)
+     // se sono uguali confronto i valori del primo punto della curva B
+      return aInfo1.IciB[0].dU > aInfo2.IciB[0].dU ;
+   else
+      return dU1 < dU2 ;   
+}
+
 //----------------------------------------------------------------------------
 static bool
 MyAdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
@@ -73,43 +88,100 @@ MyAdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
      return false ;
   Intervals inOk( EPS_PARAM) ;
   inOk.Set( dStart, dEnd) ;
-
-  // Tolgo le parti da eliminare
+     
+  // recupero tutte le info delle autointersezioni
   IntCrvCrvInfo iccInfo ;
-   for ( int i = 0 ; sintC.GetIntCrvCrvInfo( i, iccInfo) ; ++ i) {
+   ICCIVECTOR vIccInfo( sintC.GetIntersCount()) ;
+   for ( int i = 0 ; sintC.GetIntCrvCrvInfo( i, iccInfo) ; ++ i)
+      vIccInfo[i]= iccInfo ;
+  // ordino il vettore
+   sort( vIccInfo.begin(), vIccInfo.end(), SortCrvCrvInfo) ;
+  
+  // Tolgo le parti da eliminare
+   int nCross = 0 ;
+   for ( int i = 0 ; i < int( vIccInfo.size()) ; ++ i) {
+
+      if ( i < int( vIccInfo.size()) - 1) {
+        // se anche l'intersezione successiva è overlap che parte dallo stesso punto 
+         if ( vIccInfo[i].bOverlap && vIccInfo[i+1].bOverlap && 
+              abs( vIccInfo[i].IciA[0].dU - vIccInfo[i+1].IciA[0].dU) < EPS_SMALL && 
+              abs( vIccInfo[i].IciB[0].dU - vIccInfo[i+1].IciB[0].dU) < EPS_SMALL) {
+           // elimino il tratto 
+            inOk.Subtract( vIccInfo[i].IciA[0].dU, vIccInfo[i].IciB[0].dU) ;
+           // salto le intersezioni successive già considerate rimuovendo questo intervallo 
+            int j = i + 2 ;
+            while ( j < ( int)vIccInfo.size() && vIccInfo[j].IciA[0].dU > vIccInfo[i].IciA[0].dU - EPS_SMALL && 
+               vIccInfo[j].IciA[1].dU < vIccInfo[i].IciB[0].dU + EPS_SMALL) {
+               j ++ ;
+            }
+           // aggiorno il contatore 
+            i = j - 1 ;
+            continue ;
+         }     
+      } 
+
     // se con sovrapposizione
-      if ( iccInfo.bOverlap) {
+      if ( vIccInfo[i].bOverlap) {
        // se solo touch
-         if ( ( iccInfo.IciA[0].nPrevTy == iccInfo.IciA[1].nNextTy  ||
-                iccInfo.IciA[0].nPrevTy == ICCT_SPK  ||  iccInfo.IciA[1].nNextTy == ICCT_SPK)  &&
-              iccInfo.IciA[0].nPrevTy != ICCT_NULL  &&  iccInfo.IciA[1].nNextTy != ICCT_NULL) {
+         if ( ( vIccInfo[i].IciA[0].nPrevTy == vIccInfo[i].IciA[1].nNextTy  ||
+                vIccInfo[i].IciA[0].nPrevTy == ICCT_SPK  ||  vIccInfo[i].IciA[1].nNextTy == ICCT_SPK)  &&
+                vIccInfo[i].IciA[0].nPrevTy != ICCT_NULL  &&  vIccInfo[i].IciA[1].nNextTy != ICCT_NULL) {
           // obbligatoriamente controversi, elimino entrambi i tratti
-            inOk.Subtract( iccInfo.IciA[0].dU, iccInfo.IciA[1].dU) ;
-            inOk.Subtract( iccInfo.IciB[0].dU, iccInfo.IciB[1].dU) ;
+            inOk.Subtract( vIccInfo[i].IciA[0].dU, vIccInfo[i].IciA[1].dU) ;
+            inOk.Subtract( vIccInfo[i].IciB[0].dU, vIccInfo[i].IciB[1].dU) ;
         }
        // altrimenti attraversamento
         else {
           // elimino la parte interna
-            if ( iccInfo.bCBOverEq)
-               inOk.Subtract( iccInfo.IciA[0].dU, iccInfo.IciB[0].dU) ;
+            if ( vIccInfo[i].bCBOverEq)
+               inOk.Subtract( vIccInfo[i].IciA[0].dU, vIccInfo[i].IciB[0].dU) ;
            else
-               inOk.Subtract( min( iccInfo.IciA[0].dU, iccInfo.IciB[1].dU), max( iccInfo.IciB[0].dU, iccInfo.IciA[1].dU)) ;
+               inOk.Subtract( min( vIccInfo[i].IciA[0].dU, vIccInfo[i].IciB[1].dU), max( vIccInfo[i].IciB[0].dU, vIccInfo[i].IciA[1].dU)) ;
         }
      }
     // altrimenti
      else {
        // se solo touch
-         if ( iccInfo.IciA[0].nPrevTy == iccInfo.IciA[0].nNextTy  &&
-              iccInfo.IciA[0].nPrevTy != ICCT_NULL  &&  iccInfo.IciA[0].nNextTy != ICCT_NULL) {
-            inOk.Subtract( iccInfo.IciA[0].dU, iccInfo.IciA[0].dU) ;
-            inOk.Subtract( iccInfo.IciB[0].dU, iccInfo.IciB[0].dU) ;
+         if ( vIccInfo[i].IciA[0].nPrevTy == vIccInfo[i].IciA[0].nNextTy  &&
+              vIccInfo[i].IciA[0].nPrevTy != ICCT_NULL  &&  vIccInfo[i].IciA[0].nNextTy != ICCT_NULL) {
+            inOk.Subtract( vIccInfo[i].IciA[0].dU, vIccInfo[i].IciA[0].dU) ;
+            inOk.Subtract( vIccInfo[i].IciB[0].dU, vIccInfo[i].IciB[0].dU) ;
         }
        // altrimenti attraversamento
         else {
-            inOk.Subtract( iccInfo.IciA[0].dU, iccInfo.IciB[0].dU) ;
+            double dParA = vIccInfo[i].IciA[0].dU ;
+            double dParB = vIccInfo[i].IciB[0].dU ;
+            if ( abs( dParA - dEnd) < EPS_SMALL)
+               swap( dParA, dParB) ;
+           // verifico se uno dei due intervalli dà origine ad un tratto trascurabile
+            PtrOwner<ICurve> pCrv1( pMyCrv->CopyParamRange( dParA, dParB)) ;
+            PtrOwner<ICurve> pCrv2( pMyCrv->CopyParamRange( dParB, dParA)) ;           
+            double dArea1 = 0, dArea2 = 0 ;
+            if ( ! IsNull( pCrv1))
+               pCrv1->GetAreaXY( dArea1) ;
+            if ( ! IsNull( pCrv2))
+               pCrv2->GetAreaXY( dArea2) ;
+
+            if ( abs( dArea1) > 1e6 * abs( dArea2)) {
+              // se il tratto dParB->dParA non è significativo
+               inOk.Subtract( dStart, dParA) ;
+               inOk.Subtract( dParB, dEnd) ;             
+            }
+            else if ( abs( dArea2) > 1e6 * abs( dArea1)) {
+              // se il tratto dParA->dParB non è siginificativo
+               inOk.Subtract( dParA, dParB) ;          
+            }
+            else {
+              // se entrambe le regioni sono significative
+               if ( IsEven( nCross))
+                  inOk.Subtract( vIccInfo[i].IciA[0].dU, vIccInfo[i].IciB[0].dU) ;
+               else
+                  inOk.Add( vIccInfo[i].IciA[0].dU, vIccInfo[i].IciB[0].dU) ;
+               ++ nCross ; 
+            }         
         }
      }
-   }
+   } 

  // Copio le parti da conservare
   double dParS, dParE ;
@@ -179,14 +251,14 @@ MyAdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
            Point3d ptEnd2 ; pCrvCo2->GetEndPoint( ptEnd2) ;
           // se aperta, verifico se concatenabile alla principale
            if ( ! AreSamePointEpsilon( ptStart2, ptEnd2, 10 * EPS_SMALL)) {
-               if ( AreSamePointEpsilon( ptEnd, ptStart2, 10 * EPS_SMALL)) {
-                  pCrvCo->AddCurve( pCrvCo2, true, 10 * EPS_SMALL) ;
+               if ( AreSamePointEpsilon( ptEnd, ptStart2, 100 * EPS_SMALL)) {
+                  pCrvCo->AddCurve( pCrvCo2, true, 100 * EPS_SMALL) ;
                  CrvLst.erase( iIter2) ;
                  ptEnd = ptEnd2 ;
                  iIter2 = next( iIter) ;
               }
-               else if ( AreSamePointEpsilon( ptEnd2, ptStart, 10 * EPS_SMALL)) {
-                  pCrvCo->AddCurve( pCrvCo2, false, 10 * EPS_SMALL) ;
+               else if ( AreSamePointEpsilon( ptEnd2, ptStart, 100 * EPS_SMALL)) {
+                  pCrvCo->AddCurve( pCrvCo2, false, 100 * EPS_SMALL) ;
                  CrvLst.erase( iIter2) ;
                  ptStart = ptStart2 ;
                  iIter2 = next( iIter) ;
@@ -201,6 +273,22 @@ MyAdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
      ++ iIter ;
   }

+  // elimino le curve troppo piccole
+   for ( auto iIter = CrvLst.begin() ; iIter != CrvLst.end() ;) {
+      CurveComposite* pCrvCo = GetBasicCurveComposite( *iIter) ;
+      BBox3d b3CrvCo ;
+      double dDiam ;
+      if ( ! pCrvCo->GetLocalBBox( b3CrvCo)  ||  b3CrvCo.IsEmpty()  ||
+           ! b3CrvCo.GetDiameter( dDiam)  ||  dDiam < 20 * EPS_SMALL) {
+         delete pCrvCo ;
+         pCrvCo = nullptr ;
+         iIter = CrvLst.erase( iIter) ; 
+      }
+      else {
+         ++ iIter ;
+      }
+   }
+
  // riporto le curve nel riferimento originale
   if ( bNeedRef) {
      for ( auto pCrv : CrvLst)
@@ -215,7 +303,7 @@ MyAdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)

 //----------------------------------------------------------------------------
 bool
-AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
+AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst, bool bNeedSameProp)
 {
  // elimino eventuali sovrapposizioni e accostamenti
   if ( ! MyAdjustLoops( pCurve, CrvLst))
@@ -225,10 +313,12 @@ AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst)
     // se curva composita
      CurveComposite* pCrvCo = GetBasicCurveComposite( pCrv) ;
      if ( pCrvCo != nullptr) {
+        // elimino eventuali Spikes e Small Z
+         pCrvCo->RemoveSmallDefects( 2 * LIN_TOL_MIN, ANG_TOL_STD_DEG, true) ;
        // unisco eventuali tratti allineati
-         pCrvCo->MergeCurves( LIN_TOL_MIN, ANG_TOL_STD_DEG) ;
-        // elimino eventuali spikes
-         RemoveCurveSpikes( pCrvCo) ;
+         pCrvCo->MergeCurves( LIN_TOL_MIN, ANG_TOL_STD_DEG, true, bNeedSameProp) ;
+        // richiudo i loop per sicurezza
+         pCrvCo->Close() ;
      }
   }

@@ -17,4 +17,4 @@


 //----------------------------------------------------------------------------
-bool AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst) ;
+bool AdjustLoops( ICurve* pCurve, ICURVEPLIST& CrvLst, bool bNeedSameProp) ;
@@ -63,3 +63,57 @@ AngleInSpan( double dAngDeg, double dAngRefDeg, double dAngSpanDeg)
               dAngDiffDeg < dHalfAngSpanDeg + EPS_ANG_SMALL) ;
   }
 }
+
+//----------------------------------------------------------------------------
+bool
+AngleInRange( double dAngDeg, double dAngMinDeg, double dAngMaxDeg)
+{
+   return AngleInSpan( dAngDeg, ( dAngMinDeg + dAngMaxDeg) / 2, dAngMaxDeg - dAngMinDeg) ;
+}
+
+//----------------------------------------------------------------------------
+bool
+AdjustAngleInSpan( double& dAngDeg, double dAngRefDeg, double dAngSpanDeg)
+{
+  // Verifico consistenza intervallo
+   if ( dAngSpanDeg < -EPS_ANG_ZERO)
+      return false ;
+   // Se intervallo vero
+   if ( dAngSpanDeg > EPS_ANG_SMALL) {
+      double dTryDeg = dAngDeg ;
+     // eseguo gli aggiustamenti
+      while ( dTryDeg < dAngRefDeg - dAngSpanDeg)
+         dTryDeg += ANG_FULL ;
+      while ( dTryDeg > dAngRefDeg + dAngSpanDeg)
+         dTryDeg -= ANG_FULL ;
+     // verifico
+      if ( dTryDeg >= dAngRefDeg - dAngSpanDeg  &&  dTryDeg <= dAngRefDeg + dAngSpanDeg) {
+         dAngDeg = dTryDeg ;
+         return true ;
+      }
+      return false ;
+   }
+  // altrimenti un valore
+   else {
+      double dTryDeg = dAngDeg ;
+     // eseguo gli aggiustamenti
+      while ( dTryDeg < dAngRefDeg - EPS_ANG_SMALL)
+         dTryDeg += ANG_FULL ;
+      while ( dTryDeg > dAngRefDeg + EPS_ANG_SMALL)
+         dTryDeg -= ANG_FULL ;
+     // verifico
+      if ( abs( dTryDeg - dAngRefDeg) < EPS_ANG_SMALL) {
+         dAngDeg = dAngRefDeg ;
+         return true ;
+      }
+      else
+         return false ;
+   }
+}
+
+//----------------------------------------------------------------------------
+bool
+AdjustAngleInRange( double& dAngDeg, double dAngMinDeg, double dAngMaxDeg)
+{
+   return AdjustAngleInSpan( dAngDeg, ( dAngMinDeg + dAngMaxDeg) / 2, dAngMaxDeg - dAngMinDeg) ;
+}
@@ -17,10 +17,10 @@
 #include "CurveComposite.h"
 #include "CreateCurveAux.h"
 #include "GeoConst.h"
-#include "/EgtDev/Include/EgkArcCenTgCurvePnt.h"
-#include "/EgtDev/Include/EgkArcSpecial.h"
-#include "/EgtDev/Include/EgkCircleCenTgCurve.h"
-#include "/EgtDev/Include/EgkDistPointCurve.h"
+#include "/EgtDev/Include/EGkArcCenTgCurvePnt.h"
+#include "/EgtDev/Include/EGkArcSpecial.h"
+#include "/EgtDev/Include/EGkCircleCenTgCurve.h"
+#include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"


@@ -168,7 +168,7 @@ CurveArc* GetArcCenTgCompoPnt( const Point3d& ptCen, const CurveComposite& crvCo
      double dSqDist = SqDist( ptNearStart, ptTg) ;
      if ( dSqDist < dMinSqDist) {
         dMinSqDist = dSqDist ;
-         pCrvArc.Set( Release( pCrvAtmp)) ;
+         pCrvArc.Set( pCrvAtmp) ;
         if ( pPtTg != nullptr)
            *pPtTg = ptTg ;
      }
@@ -16,11 +16,11 @@
 #include "CurveBezier.h"
 #include "CurveComposite.h"
 #include "CreateCurveAux.h"
-#include "DistPointLine.h"
 #include "GeoConst.h"
-#include "/EgtDev/Include/EgkArcPntDirTgCurve.h"
-#include "/EgtDev/Include/EgkDistPointCurve.h"
-#include "/EgtDev/Include/EgkArcSpecial.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"


@@ -204,7 +204,7 @@ GetArcPntDirTgArc( const Point3d& ptP, const Vector3d& vtDir, const CurveArc& cr
   if ( bOk1) {
      double dOffset = ( bOutSide ? crvArcL.GetRadius() : - crvArcL.GetRadius()) ;
      if ( pCrv1->GetType() == CRV_ARC)
-         bOk1 = (dynamic_cast<CurveArc*>(Get(pCrv1)))->ExtendedOffset( dOffset) ;
+         bOk1 = (static_cast<CurveArc*>( Get( pCrv1)))->ExtendedOffset( dOffset) ;
      else
         bOk1 = pCrv1->SimpleOffset( dOffset) ;
   }
@@ -235,7 +235,7 @@ GetArcPntDirTgArc( const Point3d& ptP, const Vector3d& vtDir, const CurveArc& cr
   if ( bOk2) {
      double dOffset = ( bOutSide ? - crvArcL.GetRadius() : crvArcL.GetRadius()) ;
      if ( pCrv2->GetType() == CRV_ARC)
-         bOk2 = (dynamic_cast<CurveArc*>(Get(pCrv2)))->ExtendedOffset( dOffset) ;
+         bOk2 = (static_cast<CurveArc*>( Get( pCrv2)))->ExtendedOffset( dOffset) ;
      else
         bOk2 = pCrv2->SimpleOffset( dOffset) ;
   }
@@ -297,7 +297,7 @@ GetArcPntDirTgBezier( const Point3d& ptP, const Vector3d& vtDir, const CurveBezi
      return nullptr ;
  // calcolo la circonferenza tangente a questa approssimazione
   Point3d ptTg ;
-   PtrOwner<ICurve> pCrv( GetCurve( GetArcPntDirTgCurve( ptP, vtDir, *pCrvCompo, ptNear, vtN, &ptTg))) ; 
+   PtrOwner<ICurve> pCrv( GetArcPntDirTgCurve( ptP, vtDir, *pCrvCompo, ptNear, vtN, &ptTg)) ; 
   if ( IsNull( pCrv))
      return nullptr ;
  // porto il punto di tangenza della circonferenza esattamente sulla curva di Bezier
@@ -330,14 +330,14 @@ GetArcPntDirTgCompo( const Point3d& ptP, const Vector3d& vtDir, const CurveCompo
         pCrv = crvCompo.GetNextCurve()) {
     // recupero la circonferenza tangente alla curva elementare
      Point3d ptTg ;
-      PtrOwner<ICurve> pCrvTmp( GetCurve( GetArcPntDirTgCurve( ptP, vtDir, *pCrv, ptNear, vtN, &ptTg))) ;
+      PtrOwner<ICurve> pCrvTmp( GetArcPntDirTgCurve( ptP, vtDir, *pCrv, ptNear, vtN, &ptTg)) ;
      if ( IsNull( pCrvTmp))
         continue ;
     // verifico se è la più vicina al punto desiderato
      double dSqDist = SqDist( ptNear, ptTg) ;
      if ( dSqDist < dMinSqDist) {
         dMinSqDist = dSqDist ;
-         pCrvNew.Set( Release( pCrvTmp)) ;
+         pCrvNew.Set( pCrvTmp) ;
         if ( pPtTg != nullptr)
            *pPtTg = ptTg ;
      }
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2014-2015
+//  EgalTech 2014-2023
 //----------------------------------------------------------------------------
-// File : ArcSpecial.cpp         Data : 15.03.15       Versione : 1.6c2
+// File : ArcSpecial.cpp         Data : 04.08.23       Versione : 2.5h1
 // Contenuto : Implementazione funzioni per calcoli speciali archi.
 //
 //
@@ -14,13 +14,12 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "CreateCurveAux.h"
-#include "/EgtDev/Include/EgkCurveLine.h"
-#include "/EgtDev/Include/EgkArcSpecial.h"
+#include "/EgtDev/Include/EGkCurveLine.h"
+#include "/EgtDev/Include/EGkArcSpecial.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

 using namespace std ;

-
 //----------------------------------------------------------------------------
 // Come la CurveArc::Set2PD, ma se raggio infinito restituisce una retta
 //----------------------------------------------------------------------------
@@ -28,15 +27,13 @@ ICurve*
 GetArc2PD( const Point3d& ptStart, const Point3d& ptEnd, double dDirStartDeg)
 {
  // creo l'oggetto arco
-   ICurveArc* pArc = CreateCurveArc() ; 
-   if ( pArc == nullptr)
+   PtrOwner<CurveArc> pArc( CreateBasicCurveArc()) ;
+   if ( IsNull( pArc))
      return nullptr ;
-  // inizializzo il puntatore a curva con l'arco
-   PtrOwner<ICurve> pCrv( pArc) ;

  // calcolo l'arco, se ok lo restituisco ed esco
   if ( pArc->Set2PD( ptStart, ptEnd, dDirStartDeg))
-      return Release( pCrv) ;
+      return Release( pArc) ;

  // calcolo arco non riuscito, verifico se retta va bene
   Vector3d vtDiff = ptEnd - ptStart ;
@@ -45,14 +42,12 @@ GetArc2PD( const Point3d& ptStart, const Point3d& ptEnd, double dDirStartDeg)
   // verifico se i punti sono allineati con la direzione e nel giusto verso
   if ( abs( CrossXY( vtDiff, vtDir)) < EPS_SMALL  &&  ScalarXY( vtDiff, vtDir) > EPS_SMALL) {
     // creo l'oggetto retta
-      ICurveLine* pLine = CreateCurveLine() ;
-      if ( pLine == nullptr)
+      PtrOwner<CurveLine> pLine( CreateBasicCurveLine()) ;
+      if ( IsNull( pLine))
         return nullptr ;
-     // inizializzo il puntatore a curva con la retta
-      pCrv.Set( pLine) ;
     // calcolo retta, se ok la restituisco ed esco
      if ( pLine->Set( ptStart, ptEnd))
-         return Release( pCrv) ;
+         return Release( pLine) ;
   }

   return nullptr ;
@@ -65,34 +60,59 @@ ICurve*
 GetArc2PVN( const Point3d& ptStart, const Point3d& ptEnd, const Vector3d& vtDirS, const Vector3d& vtN)
 {
  // creo l'oggetto arco
-   ICurveArc* pArc = CreateCurveArc() ; 
-   if ( pArc == nullptr)
+   PtrOwner<CurveArc> pArc( CreateBasicCurveArc()) ;
+   if ( IsNull( pArc))
      return nullptr ;
-  // inizializzo il puntatore a curva con l'arco
-   PtrOwner<ICurve> pCrv( pArc) ;

  // calcolo l'arco, se ok lo restituisco ed esco
   if ( pArc->Set2PVN( ptStart, ptEnd, vtDirS, vtN))
-      return Release( pCrv) ;
+      return Release( pArc) ;

  // calcolo arco non riuscito, verifico se retta va bene
   Vector3d vtDiff = ptEnd - ptStart ;
   // verifico se i punti sono allineati con la direzione e nel giusto verso nel piano perpendicolare a vtN
   if ( abs( ( vtDiff ^ vtDirS) * vtN) < EPS_SMALL  &&  vtDiff * vtDirS > EPS_SMALL) {
     // creo l'oggetto retta
-      ICurveLine* pLine = CreateCurveLine() ;
-      if ( pLine == nullptr)
+      PtrOwner<CurveLine> pLine( CreateBasicCurveLine()) ;
+      if ( IsNull( pLine))
         return nullptr ;
-     // inizializzo il puntatore a curva con la retta
-      pCrv.Set( pLine) ;
     // calcolo retta, se ok la restituisco ed esco
      if ( pLine->Set( ptStart, ptEnd))
-         return Release( pCrv) ;
+         return Release( pLine) ;
   }

   return nullptr ;
 }

+//----------------------------------------------------------------------------
+// Come la CurveArc::Set2PNB, ma se bulge nullo restituisce una retta
+//----------------------------------------------------------------------------
+ICurve*
+GetArc2PNB( const Point3d& ptStart, const Point3d& ptEnd, const Vector3d& vtN, double dBulge)
+{
+  // creo l'oggetto arco
+   PtrOwner<CurveArc> pArc( CreateBasicCurveArc()) ;
+   if ( IsNull( pArc))
+      return nullptr ;
+
+  // calcolo l'arco, se ok lo restituisco ed esco
+   if ( pArc->Set2PNB( ptStart, ptEnd, vtN, dBulge))
+      return Release( pArc) ;
+
+  // calcolo arco non riuscito, verifico se retta va bene
+   if ( abs( dBulge) > EPS_SMALL)
+      return nullptr ;
+  // creo l'oggetto retta
+   PtrOwner<CurveLine> pLine( CreateBasicCurveLine()) ;
+   if ( IsNull( pLine))
+      return nullptr ;
+  // calcolo retta, se ok la restituisco ed esco
+   if ( pLine->Set( ptStart, ptEnd))
+      return Release( pLine) ;
+
+   return nullptr ;
+}
+
 //----------------------------------------------------------------------------
 // Come la CurveArc::Set3P, ma se raggio infinito restituisce una retta
 //----------------------------------------------------------------------------
@@ -100,33 +120,64 @@ ICurve*
 GetArc3P( const Point3d& ptStart, const Point3d& ptOther, const Point3d& ptEnd, bool bCirc)
 {
  // creo l'oggetto arco
-   ICurveArc* pArc = CreateCurveArc() ; 
-   if ( pArc == nullptr)
+   PtrOwner<CurveArc> pArc( CreateBasicCurveArc()) ;
+   if ( IsNull( pArc))
      return nullptr ;
-  // inizializzo il puntatore a curva con l'arco
-   PtrOwner<ICurve> pCrv( pArc) ;

  // calcolo l'arco, se ok lo restituisco ed esco
   if ( pArc->Set3P( ptStart, ptOther, ptEnd, bCirc))
-      return Release( pCrv) ;
+      return Release( pArc) ;

-  // se era richiesta una circonferenza, errore
+  // se era richiesta una circonferenza, errore perchè punti allineati
   if ( bCirc)
      return nullptr ;

  // calcolo arco non riuscito, se i punti sono allineati nel giusto verso per essere una retta
   // verifico se i punti sono allineati nel giusto verso
-   if ( ( ptOther - ptStart) * ( ptEnd - ptOther) > EPS_ZERO) {
+   if ( ( ptOther - ptStart) * ( ptEnd - ptOther) > EPS_ZERO  ||
+        AreSamePointApprox( ptOther, ptStart)  ||  AreSamePointApprox( ptEnd, ptOther)) {
     // creo l'oggetto retta
-      ICurveLine* pLine = CreateCurveLine() ;
-      if ( pLine == nullptr)
+      PtrOwner<CurveLine> pLine( CreateBasicCurveLine()) ;
+      if ( IsNull( pLine))
         return nullptr ;
-     // inizializzo il puntatore a curva con la retta
-      pCrv.Set( pLine) ;
     // calcolo retta, se ok la restituisco ed esco
      if ( pLine->Set( ptStart, ptEnd))
-         return Release( pCrv) ;
+         return Release( pLine) ;
   }

   return nullptr ;
 }
+
+//----------------------------------------------------------------------------
+// Come la CurveArc::SetC2PN, ma garantisce il passaggio per gli estremi e minimizza errore sul centro
+//----------------------------------------------------------------------------
+ICurveArc*
+GetArc2PCN( const Point3d& ptStart, const Point3d& ptEnd, const Point3d& ptNearCen, const Vector3d& vtN)
+{
+  // creo l'oggetto arco
+   PtrOwner<CurveArc> pArc( CreateBasicCurveArc()) ;
+   if ( IsNull( pArc))
+      return nullptr ;
+
+  // vettori dal centro a inizio e fine
+   Vector3d vtStart = ptStart - ptNearCen ;
+   Vector3d vtEnd = ptEnd - ptNearCen ;
+
+  // determino il raggio medio
+   double dStartRad = OrthoCompo( vtStart, vtN).Len() ;
+   double dEndRad = OrthoCompo( vtEnd, vtN).Len() ;
+   double dRad = ( dStartRad + dEndRad) / 2 ;
+   if ( dRad < EPS_SMALL)
+      return nullptr ;
+
+  // determino un valore approssimato dell'angolo al centro
+   double dAngDeg ; bool bDet ;
+   if ( ! vtStart.GetRotation( vtEnd, vtN, dAngDeg, bDet)  ||  ! bDet  ||  abs( dAngDeg) < EPS_ANG_ZERO) 
+      return nullptr ;
+
+  // calcolo l'arco antiorario per i due punti con il raggio medio
+   if ( pArc->Set2PNRS( ptStart, ptEnd, vtN, dRad, ( dAngDeg > 0)))
+      return Release( pArc) ;
+
+   return nullptr ;
+}
@@ -18,7 +18,7 @@
 #include "NgeReader.h"
 #include "GeomDB.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
-#include "/EgtDev/Include/EgnStringKeyVal.h"
+#include "/EgtDev/Include/EGnStringKeyVal.h"

 using namespace std ;

@@ -81,8 +81,7 @@ Attribs::Dump( const GeomDB& GDB, string& sOut, bool bMM, const char* szNewLine)
   }
   sOut += szNewLine ;
  // eventuali nome e stringhe informative
-   STRLIST::const_iterator iIter ;
-   for ( iIter = m_slInfo.begin() ; iIter != m_slInfo.end() ; ++ iIter)
+   for ( auto iIter = m_slInfo.cbegin() ; iIter != m_slInfo.cend() ; ++ iIter)
      sOut += *iIter + szNewLine ;

   return true ;
@@ -101,7 +100,7 @@ Attribs::Save( NgeWriter& ngeOut) const
  // modo
   if ( ! ngeOut.WriteUchar( m_Data[MODE], ","))
      return false ;
-  // stato (se SEL è convertito in ON)
+  // stato (se SEL è convertito in ON)
   int nStat = (( m_Data[STATUS] > GDB_ST_ON) ? GDB_ST_ON : m_Data[STATUS]) ;
   if ( ! ngeOut.WriteUchar( nStat, ","))
      return false ;
@@ -118,8 +117,7 @@ Attribs::Save( NgeWriter& ngeOut) const
   if ( ! ngeOut.WriteInt( int( m_slInfo.size()), ";", true))
      return false ;
  // stringhe di info
-   STRLIST::const_iterator iIter ;
-   for ( iIter = m_slInfo.begin() ; iIter != m_slInfo.end() ; ++ iIter) {
+   for ( auto iIter = m_slInfo.cbegin() ; iIter != m_slInfo.cend() ; ++ iIter) {
      if ( ! ngeOut.WriteString( *iIter, nullptr, true))
         return false ;
   }
@@ -135,22 +133,22 @@ Attribs::Load( NgeReader& ngeIn)
   unsigned char ucLev ;
   if ( ! ngeIn.ReadUchar( ucLev, ","))
      return false ;
-   m_Data[LEVEL] = CLIP( ucLev, GDB_LV_USER, GDB_LV_TEMP) ;
+   m_Data[LEVEL] = Clamp( ucLev, GDB_LV_USER, GDB_LV_TEMP) ;
  // modo
   unsigned char ucMode ;
   if ( ! ngeIn.ReadUchar( ucMode, ","))
      return false ;
-   m_Data[MODE] = CLIP( ucMode, GDB_MD_STD, GDB_MD_HIDDEN) ;
-  // stato (se SEL è convertito in ON)
+   m_Data[MODE] = Clamp( ucMode, GDB_MD_STD, GDB_MD_HIDDEN) ;
+  // stato (se SEL è convertito in ON)
   unsigned char ucStat ;
   if ( ! ngeIn.ReadUchar( ucStat, ","))
      return false ;
-   m_Data[STATUS] = CLIP( ucStat, GDB_ST_OFF, GDB_ST_ON) ;
+   m_Data[STATUS] = Clamp( ucStat, GDB_ST_OFF, GDB_ST_ON) ;
  // marcatura (sempre OFF)
   unsigned char ucMark ;
   if ( ! ngeIn.ReadUchar( ucMark, ";"))
      return false ;
-   m_Data[MARK] = CLIP( ucMark, GDB_MK_OFF, GDB_MK_OFF) ;
+   m_Data[MARK] = Clamp( ucMark, GDB_MK_OFF, GDB_MK_OFF) ;
  // materiale
   if ( ! ngeIn.ReadInt( m_Material, ";"))
      return false ;
@@ -177,7 +175,7 @@ Attribs::Load( NgeReader& ngeIn)
 bool
 Attribs::DataFromString( const string& sParam)
 {
-  // il primo parametro è diviso in 4 parti
+  // il primo parametro è diviso in 4 parti
   STRVECTOR vsParams ;
   Tokenize( sParam, ",", vsParams) ;
  // 4 parti
@@ -187,22 +185,22 @@ Attribs::DataFromString( const string& sParam)
   int nLev ;
   if ( ! FromString( vsParams[0], nLev))
      return false ;
-   m_Data[LEVEL] = CLIP( nLev, GDB_LV_USER, GDB_LV_TEMP) ;
+   m_Data[LEVEL] = Clamp( nLev, GDB_LV_USER, GDB_LV_TEMP) ;
  // modo
   int nMode ;
   if ( ! FromString( vsParams[1], nMode))
      return false ;
-   m_Data[MODE] = CLIP( nMode, GDB_MD_STD, GDB_MD_HIDDEN) ;
+   m_Data[MODE] = Clamp( nMode, GDB_MD_STD, GDB_MD_HIDDEN) ;
  // stato (ammessi solo OFF e ON)
   int nStat ;
   if ( ! FromString( vsParams[2], nStat))
      return false ;
-   m_Data[STATUS] = CLIP( nStat, GDB_ST_OFF, GDB_ST_ON) ;
+   m_Data[STATUS] = Clamp( nStat, GDB_ST_OFF, GDB_ST_ON) ;
  // marcatura (ammesso solo OFF)
   int nMark ;
   if ( ! FromString( vsParams[3], nMark))
      return false ;
-   m_Data[MARK] = CLIP( nMark, GDB_MK_OFF, GDB_MK_OFF) ;
+   m_Data[MARK] = Clamp( nMark, GDB_MK_OFF, GDB_MK_OFF) ;

   return true ;
 }
@@ -212,13 +210,12 @@ bool
 Attribs::SetName( const string& sName)
 {
  // se nome non valido, esco con errore
-   if ( ! IsValidVal( sName))
+   if ( sName.empty()  ||  ! IsValidVal( sName))
      return false ;

-  // può essere solo la prima stringa 
-   STRLIST::iterator iIter ;
-   if ( ( iIter = m_slInfo.begin()) != m_slInfo.end()  &&
-        FindKey( *iIter, NAME)) {
+  // può essere solo la prima stringa 
+   auto iIter = m_slInfo.begin() ;
+   if ( iIter != m_slInfo.end()  &&  FindKey( *iIter, NAME)) {
      *iIter = NAME + EQUAL + sName ;
      return true ;
   }
@@ -237,10 +234,9 @@ Attribs::SetName( const string& sName)
 bool
 Attribs::GetName( string& sName) const
 {
-  // può essere solo la prima stringa 
-   STRLIST::const_iterator iIter ;
-   if ( ( iIter = m_slInfo.begin()) != m_slInfo.end()  &&
-        FindKey( *iIter, NAME)) {
+  // può essere solo la prima stringa 
+   const auto iIter = m_slInfo.cbegin() ;
+   if ( iIter != m_slInfo.cend()  &&  FindKey( *iIter, NAME)) {
      sName = iIter->substr( NAME.length() + 1) ;
      return true ;
   }
@@ -252,23 +248,18 @@ Attribs::GetName( string& sName) const
 bool
 Attribs::ExistsName( void) const
 {
-  // può essere solo la prima stringa 
-   STRLIST::const_iterator iIter ;
-   if ( ( iIter = m_slInfo.begin()) != m_slInfo.end()  &&
-        FindKey( *iIter, NAME))
-      return true ;
-   
-   return false ;
+  // può essere solo la prima stringa 
+   const auto iIter = m_slInfo.cbegin() ;
+   return ( iIter != m_slInfo.cend()  &&  FindKey( *iIter, NAME)) ;
 }

 //----------------------------------------------------------------------------
 bool
 Attribs::RemoveName( void)
 {
-  // può essere solo la prima stringa 
-   STRLIST::const_iterator iIter ;
-   if ( ( iIter = m_slInfo.begin()) != m_slInfo.end()  &&
-        FindKey( *iIter, NAME)) {
+  // può essere solo la prima stringa 
+   const auto iIter = m_slInfo.cbegin() ;
+   if ( iIter != m_slInfo.cend()  &&  FindKey( *iIter, NAME)) {
      m_slInfo.pop_front() ;
      return true ;
   }
@@ -282,14 +273,14 @@ bool
 Attribs::SetInfo( const string& sKey, const string& sVal)
 {
  // se chiave o valore non validi, esco con errore
-   if ( ! IsValidKey( sKey)  ||  ! IsValidVal( sVal))
+   if ( ! IsValidKey( sKey)  ||  sVal.empty()  ||  ! IsValidVal( sVal))
      return false ;

-  // se è il nome
+  // se è il nome
   if ( sKey == NAME)
      return SetName( sVal) ;

-  // se esiste già una stringa con quella chiave la sostituisco
+  // se esiste già una stringa con quella chiave la sostituisco
   for ( auto iIter = m_slInfo.begin() ; iIter != m_slInfo.end() ; ++ iIter) {
      if ( FindKey( *iIter, sKey)) {
         *iIter = sKey + EQUAL + sVal ;
@@ -356,6 +347,27 @@ Attribs::RemoveInfo( const string& sKey)
   return true ;
 }

+//----------------------------------------------------------------------------
+bool
+Attribs::GetAllInfo( STRVECTOR& vsInfo) const
+{
+  // riservo spazio opportuno per il vettore delle stringhe
+   vsInfo.clear() ;
+
+  // se non ci sono info esco
+   if ( m_slInfo.empty())
+      return true ;
+
+   vsInfo.reserve( m_slInfo.size()) ;
+  // recupero tutte le info tranne il nome (se presente sempre al primo posto) 
+   auto iIter = m_slInfo.cbegin() ;
+   if ( FindKey( *iIter, NAME))
+      ++ iIter ;
+   for (  ; iIter != m_slInfo.cend() ; ++ iIter)
+      vsInfo.emplace_back( *iIter) ;
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 bool
 Attribs::CopyAllInfoFrom( const Attribs& attrSou)
@@ -16,14 +16,12 @@
 #include "/EgtDev/Include/EGkGdbConst.h"
 #include "/EgtDev/Include/EGkColor.h"
 #include "/EgtDev/Include/EgtStringBase.h"
+#include "/EgtDev/Include/EgtNumUtils.h"

 class NgeWriter ;
 class NgeReader ;
 class GeomDB ;

-//----------------------------------------------------------------------------
-#define CLIP( nV, nMIN, nMAX)  (( nV < nMIN) ? nMIN : (( nV > nMAX) ? nMAX : nV))
-
 //----------------------------------------------------------------------------
 class Attribs
 {
@@ -46,14 +44,14 @@ class Attribs
      bool Load( NgeReader& ngeIn) ;
      void SetLevel( int nLev)
              { m_OldData[LEVEL] = m_Data[LEVEL] ;
-                m_Data[LEVEL] = CLIP( nLev, GDB_LV_USER, GDB_LV_TEMP) ; }
+                m_Data[LEVEL] = Clamp( nLev, GDB_LV_USER, GDB_LV_TEMP) ; }
      void RevertLevel( void)
              { std::swap( m_Data[LEVEL], m_OldData[LEVEL]) ; }
      int  GetLevel( void) const
              { return m_Data[LEVEL] ; }
      void SetMode( int nMode)
              { m_OldData[MODE] = m_Data[MODE] ;
-                m_Data[MODE] = CLIP( nMode, GDB_MD_STD, GDB_MD_HIDDEN) ; }
+                m_Data[MODE] = Clamp( nMode, GDB_MD_STD, GDB_MD_HIDDEN) ; }
      void RevertMode( void)
              { std::swap( m_Data[MODE], m_OldData[MODE]) ; }
      int  GetMode( void) const
@@ -61,13 +59,13 @@ class Attribs
      void SetStatus( int nStat)
              { if ( m_Data[STATUS] != GDB_ST_SEL)
                   m_OldData[STATUS] = m_Data[STATUS] ;
-                m_Data[STATUS] = CLIP( nStat, GDB_ST_OFF, GDB_ST_SEL) ; }
+                m_Data[STATUS] = Clamp( nStat, GDB_ST_OFF, GDB_ST_SEL) ; }
      void RevertStatus( void)
              { SetStatus( m_OldData[STATUS]) ; }
      int  GetStatus( void) const
              { return m_Data[STATUS] ; }
-      void SetMark( void)
-              { m_Data[MARK] = GDB_MK_ON ; }
+      void SetMark( int nMark)
+              { m_Data[MARK] = Clamp( nMark, GDB_MK_OFF, GDB_MK_ON_2) ; }
      void ResetMark( void)
              { m_Data[MARK] = GDB_MK_OFF ; }
      int  GetMark( void) const
@@ -89,6 +87,7 @@ class Attribs
      bool GetInfo( const std::string& sKey, std::string& sVal) const ;
      bool ExistsInfo( const std::string& sKey) const ;
      bool RemoveInfo( const std::string& sKey) ;
+      bool GetAllInfo( STRVECTOR& vsInfo) const ;
      bool CopyAllInfoFrom( const Attribs& attrSou) ;

   private :
@@ -100,7 +99,7 @@ class Attribs
   private :
      unsigned char m_Data[DIM] ;
      unsigned char m_OldData[DIM] ;
-      int   m_Material ;
-      Color m_Color ;
-      STRLIST m_slInfo ;
+      int           m_Material ;
+      Color         m_Color ;
+      STRLIST       m_slInfo ;
 } ;
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2013-2013
+//  EgalTech 2014-2022
 //----------------------------------------------------------------------------
-// File : BBox3d.cpp          Data : 14.01.14          Versione : 1.5a3
+// File : BBox3d.cpp          Data : 17.08.22          Versione : 2.4h1
 // Contenuto : Implementazione della classe axis aligned bounding box BBox3d.
 //
 //
@@ -53,7 +53,8 @@ BBox3d::Set( double dX1, double dY1, double dZ1, double dX2, double dY2, double
 bool
 BBox3d::IsValid( void) const
 {
-   return ( m_ptMin.x < ( m_ptMax.x + EPS_SMALL)  &&
+   return ( m_ptMin.IsValid()  &&  m_ptMax.IsValid()  &&
+            m_ptMin.x < ( m_ptMax.x + EPS_SMALL)  &&
            m_ptMin.y < ( m_ptMax.y + EPS_SMALL)  &&
            m_ptMin.z < ( m_ptMax.z + EPS_SMALL)) ;
 }
@@ -210,6 +211,33 @@ BBox3d::GetMinDim( Point3d& ptMin, double& dDimX, double& dDimY, double& dDimZ)
   return true ;
 }

+//----------------------------------------------------------------------------
+double
+BBox3d::GetDimX( void) const
+{
+   if ( ! IsValid())
+      return 0 ;
+   return ( m_ptMax.x - m_ptMin.x) ;
+}
+
+//----------------------------------------------------------------------------
+double
+BBox3d::GetDimY( void) const
+{
+   if ( ! IsValid())
+      return 0 ;
+   return ( m_ptMax.y - m_ptMin.y) ;
+}
+
+//----------------------------------------------------------------------------
+double
+BBox3d::GetDimZ( void) const
+{
+   if ( ! IsValid())
+      return 0 ;
+   return ( m_ptMax.z - m_ptMin.z) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 BBox3d::GetCenterExtent( Point3d& ptCenter, Vector3d& vtExtent) const
@@ -420,69 +448,141 @@ BBox3d::EnclosesXY( const BBox3d& b3Box) const

 //----------------------------------------------------------------------------
 bool
-BBox3d::Overlaps( const BBox3d& b3B) const
+BBox3d::Overlaps( const BBox3d& b3Box) const
 {
-   if ( m_ptMax.x < b3B.m_ptMin.x - EPS_SMALL  ||  m_ptMin.x > b3B.m_ptMax.x + EPS_SMALL)
+   if ( m_ptMax.x < b3Box.m_ptMin.x - EPS_SMALL  ||  m_ptMin.x > b3Box.m_ptMax.x + EPS_SMALL)
      return false ;
-   if ( m_ptMax.y < b3B.m_ptMin.y - EPS_SMALL  ||  m_ptMin.y > b3B.m_ptMax.y + EPS_SMALL)
+   if ( m_ptMax.y < b3Box.m_ptMin.y - EPS_SMALL  ||  m_ptMin.y > b3Box.m_ptMax.y + EPS_SMALL)
      return false ;
-   if ( m_ptMax.z < b3B.m_ptMin.z - EPS_SMALL  ||  m_ptMin.z > b3B.m_ptMax.z + EPS_SMALL)
+   if ( m_ptMax.z < b3Box.m_ptMin.z - EPS_SMALL  ||  m_ptMin.z > b3Box.m_ptMax.z + EPS_SMALL)
      return false ;
   return true ;
 }

 //----------------------------------------------------------------------------
 bool
-BBox3d::OverlapsXY( const BBox3d& b3B) const
+BBox3d::OverlapsXY( const BBox3d& b3Box) const
 {
-   if ( m_ptMax.x < b3B.m_ptMin.x - EPS_SMALL  ||  m_ptMin.x > b3B.m_ptMax.x + EPS_SMALL)
+   if ( m_ptMax.x < b3Box.m_ptMin.x - EPS_SMALL  ||  m_ptMin.x > b3Box.m_ptMax.x + EPS_SMALL)
      return false ;
-   if ( m_ptMax.y < b3B.m_ptMin.y - EPS_SMALL  ||  m_ptMin.y > b3B.m_ptMax.y + EPS_SMALL)
+   if ( m_ptMax.y < b3Box.m_ptMin.y - EPS_SMALL  ||  m_ptMin.y > b3Box.m_ptMax.y + EPS_SMALL)
      return false ;
   return true ;
 }

 //----------------------------------------------------------------------------
-bool
-BBox3d::FindIntersection( const BBox3d& b3B, BBox3d& b3Int) const
+inline bool
+TestSeparatingAxis( const Vector3d& vtAx, const Vector3d& vtDiff, const Vector3d& vtHe,
+                    const Vector3d& vtHe2X, const Vector3d& vtHe2Y, const Vector3d& vtHe2Z)
 {
-   if ( ! IsValid()  ||  ! b3B.IsValid())
+   if ( vtAx.IsSmall())
+      return false ;
+   double dLen = ( vtAx.IsNormalized() ? 1 : vtAx.Len()) ;
+   return ( abs( vtDiff * vtAx) >
+            abs( vtHe.x * vtAx.x) + abs( vtHe.y * vtAx.y) + abs( vtHe.z * vtAx.z) +
+            abs( vtHe2X * vtAx) + abs( vtHe2Y * vtAx) + abs( vtHe2Z * vtAx) + EPS_SMALL * dLen) ;
+}
+
+//----------------------------------------------------------------------------
+bool
+BBox3d::Overlaps( const Frame3d& frBox, const BBox3d& b3Box) const
+{
+  // Verifico validità di entrambi i box
+   if ( ! IsValid()  ||  ! b3Box.IsValid())
+      return false ;
+
+  // Centro e semiampiezza del box
+   Point3d ptCen = ( m_ptMin + m_ptMax) / 2 ;
+   Vector3d vtHe = ( m_ptMax - m_ptMin) / 2 ;
+  // Centro e semiampiezza dell'altro box
+   Point3d ptCen2 = GetToGlob( ( b3Box.m_ptMin + b3Box.m_ptMax) / 2, frBox) ;
+   Vector3d vtHe2X = GetToGlob( Vector3d( ( b3Box.GetDimX()) / 2, 0, 0), frBox) ;
+   Vector3d vtHe2Y = GetToGlob( Vector3d( 0, ( b3Box.GetDimY()) / 2, 0), frBox) ;
+   Vector3d vtHe2Z = GetToGlob( Vector3d( 0, 0, ( b3Box.GetDimZ()) / 2), frBox) ;
+  // Vettore tra i due centri
+   Vector3d vtDiff = ptCen2 - ptCen ;
+
+  // Verifico separazione sulle normali ai piani principali del riferimento globale
+   if ( TestSeparatingAxis( X_AX, vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( Y_AX, vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( Z_AX, vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+
+  // Verifico separazione sulle normali ai piani principali del secondo riferimento
+   if ( TestSeparatingAxis( frBox.VersX(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( frBox.VersY(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( frBox.VersZ(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+
+  // Verifico separazione sulle altre normali ottenute come prodotto vettoriali di quelle precedenti
+   if ( TestSeparatingAxis( X_AX ^ frBox.VersX(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( X_AX ^ frBox.VersY(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( X_AX ^ frBox.VersZ(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( Y_AX ^ frBox.VersX(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( Y_AX ^ frBox.VersY(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( Y_AX ^ frBox.VersZ(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( Z_AX ^ frBox.VersX(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( Z_AX ^ frBox.VersY(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+   if ( TestSeparatingAxis( Z_AX ^ frBox.VersZ(), vtDiff, vtHe, vtHe2X, vtHe2Y, vtHe2Z))
+      return false ;
+
+  // Si sovrappongono
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+BBox3d::FindIntersection( const BBox3d& b3Box, BBox3d& b3Int) const
+{
+   if ( ! IsValid()  ||  ! b3Box.IsValid())
      return false ;
  // verifico direttamente la sovrapposizione
-   if ( m_ptMax.x < b3B.m_ptMin.x - EPS_SMALL  ||  m_ptMin.x > b3B.m_ptMax.x + EPS_SMALL)
+   if ( m_ptMax.x < b3Box.m_ptMin.x - EPS_SMALL  ||  m_ptMin.x > b3Box.m_ptMax.x + EPS_SMALL)
      return false ;
-   if ( m_ptMax.y < b3B.m_ptMin.y - EPS_SMALL  ||  m_ptMin.y > b3B.m_ptMax.y + EPS_SMALL)
+   if ( m_ptMax.y < b3Box.m_ptMin.y - EPS_SMALL  ||  m_ptMin.y > b3Box.m_ptMax.y + EPS_SMALL)
      return false ;
-   if ( m_ptMax.z < b3B.m_ptMin.z - EPS_SMALL  ||  m_ptMin.z > b3B.m_ptMax.z + EPS_SMALL)
+   if ( m_ptMax.z < b3Box.m_ptMin.z - EPS_SMALL  ||  m_ptMin.z > b3Box.m_ptMax.z + EPS_SMALL)
      return false ;
  // calcolo il box intersezione
-   b3Int.m_ptMin.x = (( m_ptMin.x >= b3B.m_ptMin.x) ? m_ptMin.x : b3B.m_ptMin.x) ;
-   b3Int.m_ptMin.y = (( m_ptMin.y >= b3B.m_ptMin.y) ? m_ptMin.y : b3B.m_ptMin.y) ;
-   b3Int.m_ptMin.z = (( m_ptMin.z >= b3B.m_ptMin.z) ? m_ptMin.z : b3B.m_ptMin.z) ;
-   b3Int.m_ptMax.x = (( m_ptMax.x <= b3B.m_ptMax.x) ? m_ptMax.x : b3B.m_ptMax.x) ;
-   b3Int.m_ptMax.y = (( m_ptMax.y <= b3B.m_ptMax.y) ? m_ptMax.y : b3B.m_ptMax.y) ;
-   b3Int.m_ptMax.z = (( m_ptMax.z <= b3B.m_ptMax.z) ? m_ptMax.z : b3B.m_ptMax.z) ;
+   b3Int.m_ptMin.x = (( m_ptMin.x >= b3Box.m_ptMin.x) ? m_ptMin.x : b3Box.m_ptMin.x) ;
+   b3Int.m_ptMin.y = (( m_ptMin.y >= b3Box.m_ptMin.y) ? m_ptMin.y : b3Box.m_ptMin.y) ;
+   b3Int.m_ptMin.z = (( m_ptMin.z >= b3Box.m_ptMin.z) ? m_ptMin.z : b3Box.m_ptMin.z) ;
+   b3Int.m_ptMax.x = (( m_ptMax.x <= b3Box.m_ptMax.x) ? m_ptMax.x : b3Box.m_ptMax.x) ;
+   b3Int.m_ptMax.y = (( m_ptMax.y <= b3Box.m_ptMax.y) ? m_ptMax.y : b3Box.m_ptMax.y) ;
+   b3Int.m_ptMax.z = (( m_ptMax.z <= b3Box.m_ptMax.z) ? m_ptMax.z : b3Box.m_ptMax.z) ;
   return true ;
 }

 //----------------------------------------------------------------------------
 bool
-BBox3d::FindIntersectionXY( const BBox3d& b3B, BBox3d& b3Int) const
+BBox3d::FindIntersectionXY( const BBox3d& b3Box, BBox3d& b3Int) const
 {
-   if ( ! IsValid()  ||  ! b3B.IsValid())
+   if ( ! IsValid()  ||  ! b3Box.IsValid())
      return false ;
  // verifico direttamente la sovrapposizione
-   if ( m_ptMax.x < b3B.m_ptMin.x - EPS_SMALL  ||  m_ptMin.x > b3B.m_ptMax.x + EPS_SMALL)
+   if ( m_ptMax.x < b3Box.m_ptMin.x - EPS_SMALL  ||  m_ptMin.x > b3Box.m_ptMax.x + EPS_SMALL)
      return false ;
-   if ( m_ptMax.y < b3B.m_ptMin.y - EPS_SMALL  ||  m_ptMin.y > b3B.m_ptMax.y + EPS_SMALL)
+   if ( m_ptMax.y < b3Box.m_ptMin.y - EPS_SMALL  ||  m_ptMin.y > b3Box.m_ptMax.y + EPS_SMALL)
      return false ;
  // calcolo il box intersezione
-   b3Int.m_ptMin.x = (( m_ptMin.x >= b3B.m_ptMin.x) ? m_ptMin.x : b3B.m_ptMin.x) ;
-   b3Int.m_ptMin.y = (( m_ptMin.y >= b3B.m_ptMin.y) ? m_ptMin.y : b3B.m_ptMin.y) ;
-   b3Int.m_ptMin.z = 0.5 * ( m_ptMin.z + b3B.m_ptMin.z) ;
-   b3Int.m_ptMax.x = (( m_ptMax.x <= b3B.m_ptMax.x) ? m_ptMax.x : b3B.m_ptMax.x) ;
-   b3Int.m_ptMax.y = (( m_ptMax.y <= b3B.m_ptMax.y) ? m_ptMax.y : b3B.m_ptMax.y) ;
-   b3Int.m_ptMax.z = 0.5 * ( m_ptMax.z + b3B.m_ptMax.z) ;
+   b3Int.m_ptMin.x = (( m_ptMin.x >= b3Box.m_ptMin.x) ? m_ptMin.x : b3Box.m_ptMin.x) ;
+   b3Int.m_ptMin.y = (( m_ptMin.y >= b3Box.m_ptMin.y) ? m_ptMin.y : b3Box.m_ptMin.y) ;
+   b3Int.m_ptMin.z = 0.5 * ( m_ptMin.z + b3Box.m_ptMin.z) ;
+   b3Int.m_ptMax.x = (( m_ptMax.x <= b3Box.m_ptMax.x) ? m_ptMax.x : b3Box.m_ptMax.x) ;
+   b3Int.m_ptMax.y = (( m_ptMax.y <= b3Box.m_ptMax.y) ? m_ptMax.y : b3Box.m_ptMax.y) ;
+   b3Int.m_ptMax.z = 0.5 * ( m_ptMax.z + b3Box.m_ptMax.z) ;
   return true ;
 }

@@ -14,12 +14,13 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "BiArcs.h"
+#include "CurveLine.h"
 #include "CurveArc.h"
+#include "CurveComposite.h"
 #include "/EgtDev/Include/EGkAngle.h"
-#include "/EgtDev/Include/EgkCurveLine.h"
-#include "/EgtDev/Include/EgkCurveComposite.h"
-#include "/EgtDev/Include/EgkArcSpecial.h"
+#include "/EgtDev/Include/EGkArcSpecial.h"
 #include "/EgtDev/Include/EGkDistPointCurve.h"
+#include "/EgtDev/Include/EgtNumUtils.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

 using namespace std ;
@@ -49,7 +50,7 @@ GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir
      return nullptr ;

  // preparo la curva composita per i biarchi
-   PtrOwner<ICurveComposite> pBiArc( CreateCurveComposite()) ;
+   PtrOwner<CurveComposite> pBiArc( CreateBasicCurveComposite()) ;
   if ( IsNull( pBiArc))
      return nullptr ;

@@ -82,7 +83,7 @@ GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir
 //----------------------------------------------------------------------------
 ICurve*
 GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir1Deg,
-          const PolyLine& PL, double& dDist)
+          const PolyLine& PL, double& dDist, double dTol)
 {
  // calcolo la curva dove giacciono i punti di giunzione tra i due archi del biarco
   PtrOwner<ICurve> pJCrv( CalcJCurve( ptP0, dDir0Deg, ptP1, dDir1Deg)) ;
@@ -94,10 +95,10 @@ GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir
      pBiArc.Set( GetBiArc( ptP0, dDir0Deg, ptP1, dDir1Deg, 0.5)) ;
   }
   else {
-      CurveArc* pArc = GetBasicCurveArc( pJCrv) ;
+      const CurveArc* pArc = GetBasicCurveArc( pJCrv) ;
      if ( pArc == nullptr)
         return nullptr ;
-      double dU = - 1 ;
+      double dU = -1 ;
      double dRad = pArc->GetRadius() ;
      double dSqRad = dRad * dRad ;
      Point3d ptCen = pArc->GetCenter() ;
@@ -121,9 +122,11 @@ GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir
            }
         }
      }
-     // elimino casi vicino agli estremi, danno solo problemi
-      if ( dU < 0.1  ||  dU > 0.9)
+     // non c'è intersezione, assegno valore medio
+      if ( dU < -0.5)
         dU = 0.5 ;
+     // elimino casi vicino agli estremi, danno solo problemi
+      dU = Clamp( dU, 0.1, 0.9) ;
      pBiArc.Set( GetBiArc( ptP0, dDir0Deg, ptP1, dDir1Deg, dU)) ;
   }

@@ -132,15 +135,27 @@ GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir
      return nullptr ;

  // determino la massima distanza tra la curva e il biarco
-   Point3d ptP ;
   double dSqDist = 0 ;
-   for ( bool bPnt = PL.GetFirstPoint( ptP) ;
-         bPnt ;
-         bPnt = PL.GetNextPoint( ptP)) {
-      DistPointCurve dstPC( ptP, *pBiArc) ;
-      double dSqDistPC ;
-      if ( dstPC.GetSqDist( dSqDistPC)  &&  dSqDistPC > dSqDist)
-         dSqDist = dSqDistPC ;
+   const double STEP = 10 ;
+   Point3d ptCurr ;
+   bool bPnt = PL.GetFirstPoint( ptCurr) ;
+   Point3d ptPrev = ptCurr ;
+   while ( bPnt) {
+      double dLen = Dist( ptCurr, ptPrev) ;
+      int nStep = int( dLen / STEP) + 1 ;
+      int nMinStep = ( dLen > 50 * dTol ? 3 : ( dLen > 10 * dTol ? 2 : 1)) ;
+      int nMaxStep = 10 ;
+      nStep = Clamp( nStep, nMinStep, nMaxStep) ;
+      for ( int i = 1 ; i <= nStep ; ++ i) {
+         double dCoeff = double( i) / nStep ;
+         Point3d ptP = Media( ptPrev, ptCurr, dCoeff) ;
+         DistPointCurve dstPC( ptP, *pBiArc) ;
+         double dSqDistPC ;
+         if ( dstPC.GetSqDist( dSqDistPC)  &&  dSqDistPC > dSqDist)
+            dSqDist = dSqDistPC ;
+      }
+      ptPrev = ptCurr ;
+      bPnt = PL.GetNextPoint( ptCurr) ;
   }
   dDist = sqrt( dSqDist) ;

@@ -151,7 +166,7 @@ GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir
 static ICurve*
 CalcJCurve( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir1Deg)
 {
-  // se i due punti coincidono, non si può fare alcunché
+  // se i due punti coincidono, non si può fare alcunché
   if ( AreSamePointApprox( ptP0, ptP1))
      return nullptr ;

@@ -160,7 +175,7 @@ CalcJCurve( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dD

  // se rotazione nulla, allora segmento di retta tra i due punti
   if ( abs( dAngDeg) < EPS_ANG_SMALL) {
-      PtrOwner<ICurveLine> pLine( CreateCurveLine()) ;
+      PtrOwner<CurveLine> pLine( CreateBasicCurveLine()) ;
      if ( IsNull( pLine)  ||  ! pLine->Set( ptP0, ptP1))
         return nullptr ;
     // inverto per avere parametrizzazione crescente allontanandosi da Dir0 e avvicinandosi a Dir1
@@ -182,7 +197,7 @@ CalcJCurve( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dD
   Vector3d vtStart = ptP0 - ptCen ;
   double dRad, dAngStart ;
   vtStart.ToSpherical( &dRad, nullptr, &dAngStart) ;
-   PtrOwner<ICurveArc> pArc( CreateCurveArc()) ;
+   PtrOwner<CurveArc> pArc( CreateBasicCurveArc()) ;
   if ( IsNull( pArc)  ||  ! pArc->SetXY( ptCen, dRad, dAngStart, dAngDeg, ( ptP1.z - ptP0.z)))
      return nullptr ;
   double dDirStartDeg = dAngStart + ( dAngDeg > 0 ? ANG_RIGHT : - ANG_RIGHT) ;
@@ -193,14 +208,14 @@ CalcJCurve( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dD
   double dDir0RelDeg = DiffAngle( dDir0Deg, dDirDiffDeg) ;
   // direzione iniziale secondo arco limite rispetto a direzione P0->P1 (dalla finale simmetrico e invert)
   double dDir1RelDeg = - DiffAngle( dDir1Deg, dDirDiffDeg) ;
-   // nel caso di direzioni a 180deg si sceglie la più compatta
+   // nel caso di direzioni a 180deg si sceglie la più compatta
   if ( abs( abs( dDir1RelDeg) - ANG_STRAIGHT) < EPS_SMALL)
      dDir1RelDeg = ( dDir0RelDeg > 0 ? ANG_STRAIGHT : - ANG_STRAIGHT) ;
   else if ( abs( abs( dDir0RelDeg) - ANG_STRAIGHT) < EPS_SMALL)
      dDir0RelDeg = ( dDir1RelDeg > 0 ? ANG_STRAIGHT : - ANG_STRAIGHT) ;
   // intervallo angolare ammissibile a partire da direzione iniziale primo arco ammissibile ( == Dir0)
   double dDeltaAngDeg = - dDir0RelDeg + dDir1RelDeg ;
-  // se non è nella regione, prendo l'altra parte di arco
+  // se non è nella regione, prendo l'altra parte di arco
   if ( ! AngleInSpan( dDirStartRelDeg, dDir0RelDeg, dDeltaAngDeg)) 
      pArc->ToExplementary() ;
  // inverto per avere parametrizzazione crescente allontanandosi da Dir0 e avvicinandosi a Dir1
@@ -13,9 +13,9 @@

 #pragma once

-#include "/EgtDev/Include/EgkBiArcs.h"
+#include "/EgtDev/Include/EGkBiArcs.h"

 //-----------------------------------------------------------------------------
 ICurve* GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir1Deg,
-                  const PolyLine& PL, double& dDist) ;
+                  const PolyLine& PL, double& dDist, double dTol) ;

@@ -0,0 +1,57 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2024-2024
+//----------------------------------------------------------------------------
+// File : CAvSilhouetteSurfTm.h      Data : 16.06.24      Versione : 2.6f2
+// Contenuto : Dichiarazione della classe calcolo multi-silhouette.
+//
+//
+//
+// Modifiche : 10.06.24 DS Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+#include "CAvToolSurfTm.h"
+#include "SurfFlatRegion.h"
+#include "/EgtDev/Include/EGkCAvSilhouetteSurfTm.h"
+
+
+//-----------------------------------------------------------------------------
+class CAvParSilhouettesSurfTm : public ICAvParSilhouettesSurfTm
+{
+   public :
+     // generica
+      bool SetData( const CISURFTMPVECTOR& vpStm, const Frame3d& frPlanes, double dTol) override ;
+      bool SetData( const CISURFTMPVECTOR& vpStm, const Frame3d& frPlanes, double dTol,
+                    double dSideAng, double dDiam, double dCornRad, double dMaxMat, double dOffsR,
+                    double dMaxDepth) override ;
+      bool GetSilhouette( double dLevel, POLYLINEVECTOR& vPL) override ;
+
+   public :
+      CAvParSilhouettesSurfTm( void) ;
+
+   private :
+      bool Prepare( void) ;
+
+   private :
+      CISURFTMPVECTOR  m_vpStm ;
+      CAvToolSurfTm    m_cavTstm ;
+      Frame3d          m_frGrid ;
+      double           m_dTol ;
+      double           m_dSharpedTol ;
+      int              m_nStepX ;
+      int              m_nStepY ;
+      double           m_dRad ;
+      double           m_dCornRad ;
+      double           m_dMaxMat ;
+      double           m_dSideAng ;
+      double           m_dOffsR ;
+      double           m_dDimZ ;
+      double           m_dLevelOffs ;
+      double           m_dMaxDepth ;
+      bool             m_bGridOk ;
+      bool             m_bTool ;
+      DBLVECTOR        m_vdGrid ;
+} ;
@@ -1,21 +1,21 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2018-2018
+//  EgalTech 2018-2024
 //----------------------------------------------------------------------------
-// File : CAToolSurfTm.cpp    Data : 08.05.18    Versione : 1.9e2
-// Contenuto : Implementazione della classe CAToolSurfTm.
+// File : CAvToolSurfTm.cpp    Data : 07.06.24    Versione : 2.6f2
+// Contenuto : Implementazione della classe CAvToolSurfTm.
 //
 //
 //
 // Modifiche : 27.04.18 DS Creazione modulo.
-//
+//             07.06.24 DS Con tolleranza lineare negativa non si controlla il punto medio.
 //
 //----------------------------------------------------------------------------

 #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>
@@ -24,6 +24,7 @@ using namespace std ;

 //----------------------------------------------------------------------------
 const int STEP_PE = 50 ;
+const double MAX_MOVE = 20000 ;

 //----------------------------------------------------------------------------
 ICAvToolSurfTm*
@@ -37,10 +38,29 @@ CreateCAvToolSurfTm( void)
 // CAvToolSurfTm
 //----------------------------------------------------------------------------
 CAvToolSurfTm::CAvToolSurfTm( void)
-   :  m_Tool( false)
+   :  m_frMove( false), m_Tool( false)
 {
 }

+//----------------------------------------------------------------------------
+bool
+CAvToolSurfTm::Clear( void)
+{
+  // pulisco la lista dei puntatori a Stm
+   m_vSTM.clear() ;
+  // pulisco e inizializzo la prima posizione della lista delle basi per gli indici dei triangoli
+   m_vBaseInd.clear() ;
+   m_vBaseInd.emplace_back( 0) ;
+  // pulisco HashGrid 2d
+   m_HGrids.Clear() ;
+  // reset utensile
+   m_Tool.Clear() ;
+  // reset riferimento
+   m_frMove.Reset( false) ;
+
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 bool
 CAvToolSurfTm::SetSurfTm( const ISurfTriMesh& Stm)
@@ -50,6 +70,9 @@ CAvToolSurfTm::SetSurfTm( const ISurfTriMesh& Stm)
  // pulisco e inizializzo la prima posizione della lista delle basi per gli indici dei triangoli
   m_vBaseInd.clear() ;
   m_vBaseInd.emplace_back( 0) ;
+  // pulisco HashGrid 2d
+   m_HGrids.Clear() ;
+  // non tocco l'utensile
  // aggiungo la superficie
   return AddSurfTm( Stm) ;
 }
@@ -58,7 +81,7 @@ CAvToolSurfTm::SetSurfTm( const ISurfTriMesh& Stm)
 bool
 CAvToolSurfTm::AddSurfTm( const ISurfTriMesh& Stm)
 {
-  // verifico validità superficie
+  // verifico validità superficie
   const SurfTriMesh* pStm = GetBasicSurfTriMesh( &Stm) ;
   if ( pStm == nullptr  ||  ! pStm->IsValid())
      return false ;
@@ -99,40 +122,227 @@ CAvToolSurfTm::SetGenTool( const ICurveComposite* pToolOutline)

 //----------------------------------------------------------------------------
 bool
-CAvToolSurfTm::TestPosition( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, double& dTotDist)
+CAvToolSurfTm::TestPosition( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove,
+                             double& dTotDist, Vector3d* pvtTriaN) const
 {
  // Se utensile non definito, errore
   if ( m_Tool.GetType() == Tool::UNDEF)
      return false ;
-  // Imposto il riferimento di movimento
-   if ( ! AreSameOrOppositeVectorApprox( vtDir, vtMove))
-      m_frMove.Set( ORIG, vtMove, vtDir) ;
-   else
-      m_frMove.Set( ORIG, vtMove) ;
-  // Eseguo controllo
+  // Se direzioni non definite, errore
+   if ( vtDir.IsSmall()  ||  vtMove.IsSmall())
+      return false ;
+  // Se riferimento di movimento già presente
+   if ( m_frMove.IsValid()) {
+     // Calcolo nuovo riferimento di movimento
+      Frame3d frMove ;
+      if ( ! AreSameOrOppositeVectorApprox( vtDir, vtMove))
+         frMove.Set( ORIG, vtMove, vtDir) ;
+      else
+         frMove.Set( ORIG, vtMove) ;
+     // Se riferimenti di movimento uguali, sfrutto HashGrid 2d
+      if ( AreSameFrame( frMove, m_frMove)) {
+        // Eseguo controllo
+         Point3d ptCurr = ptT ;
+         Vector3d vtTriaN ;
+         dTotDist = MyTestPositionHG( ptCurr, vtDir, vtTriaN) ;
+         if ( pvtTriaN != nullptr)
+            *pvtTriaN = vtTriaN ;
+         return ( dTotDist > - EPS_SMALL) ;
+      }
+   }
+  // Altrimenti eseguo controllo diretto
   Point3d ptCurr = ptT ;
-   dTotDist = MyTestPosition( ptCurr, vtDir) ;
+   Vector3d vtTriaN ;
+   dTotDist = MyTestPosition( ptCurr, vtDir, vtMove, vtTriaN) ;
+   if ( pvtTriaN != nullptr)
+      *pvtTriaN = vtTriaN ;
   return ( dTotDist > - EPS_SMALL) ;
 }

 //----------------------------------------------------------------------------
 bool
-CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dLinTol)
+CAvToolSurfTm::TestPositionAdv( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove,
+                                double& dTotDist, VCT3DVECTOR& vVtN) const
+{
+  // Funzione per calcolo collisione tra utensile e superfici ;
+  // dToTDist è la distanza di traslazione del punto ptT lungo vtDir per evitare la collisione,
+  // vVtN è la normale del triangolo che genera collsione ( NB. Nel caso di più triangoli concorrenti,
+  // vengono restituite tutte le normali trovate)
+
+  // Inizializzazione parametri
+   dTotDist = 0 ;
+   vVtN.clear() ;
+ // Se utensile non definito, errore
+   if ( m_Tool.GetType() == Tool::UNDEF)
+      return false ;
+  // Se direzioni non definite, errore
+   if ( vtDir.IsSmall()  ||  vtMove.IsSmall())
+      return false ;
+  // Se riferimento di movimento già presente
+   if ( m_frMove.IsValid()) {
+     // Calcolo nuovo riferimento di movimento
+      Frame3d frMove ;
+      if ( ! AreSameOrOppositeVectorApprox( vtDir, vtMove))
+         frMove.Set( ORIG, vtMove, vtDir) ;
+      else
+         frMove.Set( ORIG, vtMove) ;
+     // Se riferimenti di movimento uguali, sfrutto HashGrid 2d
+      if ( AreSameFrame( frMove, m_frMove)) {
+        // Eseguo controllo
+         Point3d ptCurr = ptT ;
+         dTotDist = MyTestPositionHGAdv( ptCurr, vtDir, vVtN) ;
+         return ( dTotDist > - EPS_SMALL) ;
+      }
+   }
+  // Altrimenti eseguo controllo diretto
+   Point3d ptCurr = ptT ;
+   dTotDist = MyTestPositionAdv( ptCurr, vtDir, vtMove, vVtN) ;
+   return ( dTotDist > - EPS_SMALL) ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CAvToolSurfTm::TestSeries( PNTUVECTOR& vPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dProgCoeff)
 {
  // Se utensile non definito, errore
   if ( m_Tool.GetType() == Tool::UNDEF)
      return false ;
-  // Se lista vuota, non devo fare alcunché
+  // Se direzioni non definite, errore
+   if ( vtDir.IsSmall()  ||  vtMove.IsSmall())
+      return false ;
+  // Se vettore vuoto, non devo fare alcunché
+   if ( vPntM.empty())
+      return true ;
+  // Calcolo nuovo riferimento di movimento
+   Frame3d frMove ;
+   if ( ! AreSameOrOppositeVectorApprox( vtDir, vtMove))
+      frMove.Set( ORIG, vtMove, vtDir) ;
+   else
+      frMove.Set( ORIG, vtMove) ;
+  // Se riferimento di movimento non presente o diverso dal calcolato
+   if ( ! m_frMove.IsValid()  ||  ! AreSameFrame( frMove, m_frMove)) {
+     // Salvo nuovo riferimento
+      m_frMove = frMove ;
+     // Ricalcolo HashGrid
+      if ( ! PrepareHashGrid())
+         return false ;
+   }
+  // Determino il numero di punti dell'insieme
+   m_nTotPnt = int( vPntM.size()) ;
+  // Recupero il numero massimo di thread concorrenti
+   int nThreadMax = thread::hardware_concurrency() ;
+   bool bOk = true ;
+  // Se un solo thread o pochi punti
+   if ( nThreadMax <= 1  ||  m_nTotPnt < 500) {
+      m_nCurrPnt = 0 ;
+      bOk = TestSubSeries( -1, vPntM, vtDir, 0, m_nTotPnt - 1, dProgCoeff) ;
+      ProcessEvents( int( 100 * dProgCoeff), 0) ;
+   }
+  // altrimenti
+   else {
+      const int MAX_PARTS = 32 ;
+      INTINTVECTOR vFstLst( MAX_PARTS) ;
+     // calcolo le parti del vettore
+      int nPartCnt = min( nThreadMax, MAX_PARTS) ;
+      int nPartDim = m_nTotPnt / nPartCnt + 1 ;
+      for ( int i = 0 ; i < nPartCnt ; ++ i) {
+         vFstLst[i].first = i * nPartDim ;
+         vFstLst[i].second = min( ( i + 1) * nPartDim, m_nTotPnt) - 1 ;
+      }
+     // processo le parti
+      m_nCurrPnt = 0 ;
+      m_bBreak = false ;
+      future<bool> vRes[MAX_PARTS] ;
+      for ( int i = 0 ; i < nPartCnt ; ++ i)
+         vRes[i] = async( launch::async, &CAvToolSurfTm::TestSubSeries, this, i, ref( vPntM), cref( vtDir), vFstLst[i].first, vFstLst[i].second, dProgCoeff) ;
+     // attendo i risultati
+      int nFin = 0 ;
+      int nNextPE = 0 ;
+      while ( nFin < nPartCnt) {
+         for ( int i = 0 ; i < nPartCnt ; ++ i) {
+            if ( vRes[i].valid()  &&  vRes[i].wait_for( chrono::nanoseconds{ 1}) == future_status::ready) {
+               bOk = vRes[i].get() && bOk ;
+               ++ nFin ;
+            }
+         }
+         if ( m_nCurrPnt > nNextPE) {
+            int nRes = ProcessEvents( int( m_nCurrPnt * 100. / m_nTotPnt * dProgCoeff), 10) ;
+            nNextPE += STEP_PE ;
+            if ( nRes == 1)
+               m_bBreak = true ;
+         }
+      }
+      ProcessEvents( int( 100 * dProgCoeff), 0) ;
+   }
+   return bOk ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CAvToolSurfTm::TestSubSeries( int nId, PNTUVECTOR& vPntM, const Vector3d& vtDir, int nFirst, int nLast, double dProgCoeff)
+{
+  // Se vettore vuoto, non devo fare alcunché
+   if ( vPntM.empty())
+      return true ;
+  // Ciclo sui punti da verificare
+   for ( int i = nFirst ; i <= nLast ; ++ i) {
+     // verifico il punto
+      Vector3d vtTriaN ;
+      double dMove = MyTestPositionHG( vPntM[i].first, vtDir, vtTriaN) ;
+      vPntM[i].second = dMove ;
+      if ( dMove < - EPS_SMALL)
+         return false ;
+      ++ m_nCurrPnt ;
+     // se singolo thread
+      if ( nId == -1) {
+        // gestione eventi (ogni STEP_PE punti)
+         if (( m_nCurrPnt % STEP_PE) == 0) {
+            int nRes = ProcessEvents( int( m_nCurrPnt * 100. / m_nTotPnt * dProgCoeff), 0) ;
+            if ( nRes == 1)
+               return false ;
+         }
+      }
+     // altrimenti multithread
+      else {
+         if ( m_bBreak)
+            return false ;
+      }
+   }
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+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)
+      return false ;
+  // Se direzioni non definite, errore
+   if ( vtDir.IsSmall()  ||  vtMove.IsSmall())
+      return false ;
+  // Se lista vuota, non devo fare alcunché
   if ( lPntM.empty())
      return true ;
-  // Imposto il riferimento di movimento
-   if ( ! AreSameOrOppositeVectorApprox( vtDir, vtMove))
-      m_frMove.Set( ORIG, vtMove, vtDir) ;
+  // Controllo la tolleranza lineare (se negativa non vanno fatti controlli sui punti medi)
+   if ( dLinTol > -EPS_ZERO)
+      dLinTol = max( dLinTol, EPS_SMALL) ;
   else
-      m_frMove.Set( ORIG, vtMove) ;
-  // Predispongo Hash Grid
-   if ( ! PrepareHashGrid())
-      return false ;
+      dLinTol = -1 ;
+  // Calcolo nuovo riferimento di movimento
+   Frame3d frMove ;
+   if ( ! AreSameOrOppositeVectorApprox( vtDir, vtMove))
+      frMove.Set( ORIG, vtMove, vtDir) ;
+   else
+      frMove.Set( ORIG, vtMove) ;
+  // Se riferimento di movimento non presente o diverso dal calcolato
+   if ( ! m_frMove.IsValid()  ||  ! AreSameFrame( frMove, m_frMove)) {
+     // Salvo nuovo riferimento
+      m_frMove = frMove ;
+     // Ricalcolo HashGrid
+      if ( ! PrepareHashGrid())
+         return false ;
+   }
  // Determino il numero di punti del path
   m_nTotPnt = int( lPntM.size()) ;
  // Recupero il numero massimo di thread concorrenti
@@ -140,8 +350,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 {
@@ -161,7 +372,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 ;
@@ -173,7 +384,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 ;
@@ -185,18 +396,98 @@ 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() ;
   return bOk ;
 }

 //----------------------------------------------------------------------------
 bool
-CAvToolSurfTm::TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol)
+CAvToolSurfTm::TestSeriesAdv( PNTUVVECTVECTOR& vPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dProgCoeff)
 {
-  // Se lista vuota, non devo fare alcunché
+  // NB. la posizione del punto non viene modificata :
+  // get<0> vPntM[i] è il punto su cui viene posizionata la testa dell'utensile ( const)
+  // get<1> vPntM[i] è il parametro di traslazione del punto lungo vtDir per evitare collisioni con i triangoli
+  // get<2> vPntM[i] è un vettore di Vector3d contenente tutte le normali di tangenza ( a meno di 10 * EPS_SMALL)
+
+  // Se utensile non definito, errore
+   if ( m_Tool.GetType() == Tool::UNDEF)
+      return false ;
+  // Se direzioni non definite, errore
+   if ( vtDir.IsSmall()  ||  vtMove.IsSmall())
+      return false ;
+  // Se vettore vuoto, non devo fare alcunché
+   if ( vPntM.empty())
+      return true ;
+  // Calcolo nuovo riferimento di movimento
+   Frame3d frMove ;
+   if ( ! AreSameOrOppositeVectorApprox( vtDir, vtMove))
+      frMove.Set( ORIG, vtMove, vtDir) ;
+   else
+      frMove.Set( ORIG, vtMove) ;
+  // Se riferimento di movimento non presente o diverso dal calcolato
+   if ( ! m_frMove.IsValid()  ||  ! AreSameFrame( frMove, m_frMove)) {
+     // Salvo nuovo riferimento
+      m_frMove = frMove ;
+     // Ricalcolo HashGrid
+      if ( ! PrepareHashGrid())
+         return false ;
+   }
+  // Determino il numero di punti del path
+   m_nTotPnt = int( vPntM.size()) ;
+  // Recupero il numero massimo di thread concorrenti
+   int nThreadMax = thread::hardware_concurrency() ;
+   bool bOk = true ;
+  // Se un solo thread o pochi punti
+   if ( nThreadMax <= 1  ||  m_nTotPnt < 500) {
+      m_nCurrPnt = 0 ;
+      bOk = TestSubSeriesAdv( -1, vPntM, vtDir, 0, m_nTotPnt - 1, dProgCoeff) ;
+      ProcessEvents( int( 100 * dProgCoeff), 0) ;
+   }
+  // altrimenti
+   else {
+      const int MAX_PARTS = 32 ;
+      INTINTVECTOR vFstLst( MAX_PARTS) ;
+     // calcolo le parti del vettore
+      int nPartCnt = min( nThreadMax, MAX_PARTS) ;
+      int nPartDim = m_nTotPnt / nPartCnt + 1 ;
+      for ( int i = 0 ; i < nPartCnt ; ++ i) {
+         vFstLst[i].first = i * nPartDim ;
+         vFstLst[i].second = min( ( i + 1) * nPartDim, m_nTotPnt) - 1 ;
+      }
+     // processo le parti
+      m_nCurrPnt = 0 ;
+      m_bBreak = false ;
+      future<bool> vRes[MAX_PARTS] ;
+      for ( int i = 0 ; i < nPartCnt ; ++ i)
+         vRes[i] = async( launch::async, &CAvToolSurfTm::TestSubSeriesAdv, this, i, ref( vPntM), cref( vtDir), vFstLst[i].first, vFstLst[i].second, dProgCoeff) ;
+     // attendo i risultati
+      int nFin = 0 ;
+      int nNextPE = 0 ;
+      while ( nFin < nPartCnt) {
+         for ( int i = 0 ; i < nPartCnt ; ++ i) {
+            if ( vRes[i].valid()  &&  vRes[i].wait_for( chrono::nanoseconds{ 1}) == future_status::ready) {
+               bOk = vRes[i].get() && bOk ;
+               ++ nFin ;
+            }
+         }
+         if ( m_nCurrPnt > nNextPE) {
+            int nRes = ProcessEvents( int( m_nCurrPnt * 100. / m_nTotPnt * dProgCoeff), 10) ;
+            nNextPE += STEP_PE ;
+            if ( nRes == 1)
+               m_bBreak = true ;
+         }
+      }
+      ProcessEvents( int( 100 * dProgCoeff), 0) ;
+   }
+   return bOk ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CAvToolSurfTm::TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol, double dProgCoeff)
+{
+  // Se lista vuota, non devo fare alcunché
   if ( lPntM.empty())
      return true ;
  // Ciclo sui punti
@@ -206,11 +497,13 @@ CAvToolSurfTm::TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, dou
   while ( itPntMCurr != lPntM.end()) {
     // verifico il punto
      ptCurr = itPntMCurr->first ;
-      itPntMCurr->second = MyTestPositionHG( itPntMCurr->first, vtDir) ;
-      if ( itPntMCurr->second < - EPS_SMALL)
+      Vector3d vtTriaN ;
+      double dMove = MyTestPositionHG( itPntMCurr->first, vtDir, vtTriaN) ;
+      itPntMCurr->second = dMove ;
+      if ( dMove < - EPS_SMALL)
         return false ;
-     // se esiste il punto precedente devo verificare il medio
-      if ( itPntMPrev != lPntM.end()) {
+     // se esiste il punto precedente e richiesto devo verificare il medio
+      if ( itPntMPrev != lPntM.end()  &&  dLinTol > 0) {
         MyTestMidPointHG( lPntM, itPntMPrev, itPntMCurr, ptPrev, ptCurr, vtDir, dLinTol, 1) ;
      }
     // passo al successivo
@@ -222,7 +515,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 ;
         }
@@ -236,10 +529,44 @@ CAvToolSurfTm::TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, dou
   return true ;
 }

+//----------------------------------------------------------------------------
+bool
+CAvToolSurfTm::TestSubSeriesAdv( int nId, PNTUVVECTVECTOR& vPntM, const Vector3d& vtDir, int nFirst, int nLast, double dProgCoeff)
+{
+  // Se vettore vuoto, non devo fare alcunché
+   if ( vPntM.empty())
+      return true ;
+  // Ciclo sui punti da verificare
+   for ( int i = nFirst ; i <= nLast ; ++ i) {
+     // verifico il punto
+      Point3d ptCurr = get<0>( vPntM[i]) ;
+      get<1>( vPntM[i]) = MyTestPositionHGAdv( ptCurr, vtDir, get<2>( vPntM[i])) ;
+      if ( get<1>( vPntM[i]) < - EPS_SMALL)
+         return false ;
+      ++ m_nCurrPnt ;
+     // se singolo thread
+      if ( nId == -1) {
+        // gestione eventi (ogni STEP_PE punti)
+         if (( m_nCurrPnt % STEP_PE) == 0) {
+            int nRes = ProcessEvents( int( m_nCurrPnt * 100. / m_nTotPnt * dProgCoeff), 0) ;
+            if ( nRes == 1)
+               return false ;
+         }
+      }
+     // altrimenti multithread
+      else {
+         if ( m_bBreak)
+            return false ;
+      }
+   }
+
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 bool
 CAvToolSurfTm::MyTestMidPointHG( PNTULIST& lPntM, const PNTULIST::iterator& itPntMPrev, const PNTULIST::iterator& itPntMCurr,
-                                 const Point3d& ptPrev, const Point3d& ptCurr, const Vector3d& vtDir, double dLinTol, int nLev)
+                                 const Point3d& ptPrev, const Point3d& ptCurr, const Vector3d& vtDir, double dLinTol, int nLev) const
 {
  // se superato limite di ricursione, esco
   const int MAX_LEV = 10 ;
@@ -249,7 +576,8 @@ CAvToolSurfTm::MyTestMidPointHG( PNTULIST& lPntM, const PNTULIST::iterator& itPn
   Point3d ptMid = Media( ptPrev, ptCurr, 0.5) ;
  // ne effettuo la correzione per evitare la collisione
   Point3d ptNewMid = ptMid ;
-   double dMidMove = MyTestPositionHG( ptNewMid, vtDir) ;
+   Vector3d vtTriaN ;
+   double dMidMove = MyTestPositionHG( ptNewMid, vtDir, vtTriaN) ;
   if ( dMidMove < - EPS_SMALL)
      return false ;
  // massima distanza ammissibile
@@ -258,7 +586,7 @@ CAvToolSurfTm::MyTestMidPointHG( PNTULIST& lPntM, const PNTULIST::iterator& itPn
   if ( abs(( Media( itPntMPrev->first, itPntMCurr->first, 0.5) - ptNewMid) * m_frMove.VersZ()) > 0.5 * dLinTol  ||
        SqDist( itPntMPrev->first, itPntMCurr->first) > dMaxSqDist) {
     // aggiungo
-      lPntM.emplace( itPntMCurr, ptNewMid, - dMidMove) ;
+      lPntM.emplace( itPntMCurr, ptNewMid, dMidMove) ;
      auto itPntMMid = itPntMCurr ;
      -- itPntMMid ;
     // verifico intervallo precedente
@@ -271,20 +599,48 @@ CAvToolSurfTm::MyTestMidPointHG( PNTULIST& lPntM, const PNTULIST::iterator& itPn

 //----------------------------------------------------------------------------
 double
-CAvToolSurfTm::MyTestPosition( Point3d& ptT, const Vector3d& vtDir)
+CAvToolSurfTm::MyTestPosition( Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, Vector3d& vtTriaN) const
 {
+  // box dell'utensile con suo movimento
+   BBox3d b3Tool ;
+   // utensile
+   b3Tool.Add( ptT) ;
+   b3Tool.Add( ptT - vtDir * m_Tool.GetHeigth()) ;
+   if ( vtDir.IsX())
+      b3Tool.Expand( 0, m_Tool.GetRadius(), m_Tool.GetRadius()) ;
+   else if ( vtDir.IsY())
+      b3Tool.Expand( m_Tool.GetRadius(), 0, m_Tool.GetRadius()) ;
+   else if ( vtDir.IsZ())
+      b3Tool.Expand( m_Tool.GetRadius(), m_Tool.GetRadius(), 0) ;
+   else {
+      double dExpandX = m_Tool.GetRadius() * sqrt( 1 - vtDir.x * vtDir.x) ;
+      double dExpandY = m_Tool.GetRadius() * sqrt( 1 - vtDir.y * vtDir.y) ;
+      double dExpandZ = m_Tool.GetRadius() * sqrt( 1 - vtDir.z * vtDir.z) ;
+      b3Tool.Expand( dExpandX, dExpandY, dExpandZ) ;
+   }
+   // aggiungo movimento
+   BBox3d b3Moved = b3Tool ;
+   b3Moved.Translate( MAX_MOVE * vtMove) ;
+   b3Tool.Add( b3Moved) ;
+
+  // determino movimento minimo per evitare collisione con superfici
   double dTotDist = 0 ;
+   vtTriaN = V_NULL ;
   for ( auto pStm : m_vSTM) {
-      Triangle3d Tria ;
-      for ( int nTria = pStm->GetFirstTriangle( Tria) ;
-            nTria != SVT_NULL ;
-            nTria = pStm->GetNextTriangle( nTria, Tria)) {
-         double dDist = CAvToolTriangle( m_Tool, ptT, vtDir, Tria, m_frMove.VersZ()) ;
-         if ( dDist < - EPS_SMALL)
-            return -1 ;
-         if ( dDist > EPS_SMALL) {
-            dTotDist += dDist ;
-            ptT += dDist * m_frMove.VersZ() ;
+      INTVECTOR vTria ;
+      if ( pStm->GetAllTriaOverlapBox( b3Tool, vTria)) {
+         for ( int nTria : vTria) {
+            Triangle3d Tria ;
+            if ( pStm->GetTriangle( nTria, Tria)) {
+               double dDist = CAvToolTriangle( m_Tool, ptT, vtDir, Tria, vtMove) ;
+               if ( dDist < - EPS_SMALL)
+                  return -1 ;
+               if ( dDist > EPS_SMALL) {
+                  dTotDist += dDist ;
+                  ptT += dDist * vtMove ;
+                  vtTriaN = Tria.GetN() ;
+               }
+            }
         }
      }
   }
@@ -293,7 +649,61 @@ CAvToolSurfTm::MyTestPosition( Point3d& ptT, const Vector3d& vtDir)

 //----------------------------------------------------------------------------
 double
-CAvToolSurfTm::MyTestPositionHG( Point3d& ptT, const Vector3d& vtDir)
+CAvToolSurfTm::MyTestPositionAdv( Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, VCT3DVECTOR& vVtTriaN) const
+{
+  // box dell'utensile con suo movimento
+   BBox3d b3Tool ;
+   // utensile
+   b3Tool.Add( ptT) ;
+   b3Tool.Add( ptT - vtDir * m_Tool.GetHeigth()) ;
+   if ( vtDir.IsX())
+      b3Tool.Expand( 0, m_Tool.GetRadius(), m_Tool.GetRadius()) ;
+   else if ( vtDir.IsY())
+      b3Tool.Expand( m_Tool.GetRadius(), 0, m_Tool.GetRadius()) ;
+   else if ( vtDir.IsZ())
+      b3Tool.Expand( m_Tool.GetRadius(), m_Tool.GetRadius(), 0) ;
+   else {
+      double dExpandX = m_Tool.GetRadius() * sqrt( 1 - vtDir.x * vtDir.x) ;
+      double dExpandY = m_Tool.GetRadius() * sqrt( 1 - vtDir.y * vtDir.y) ;
+      double dExpandZ = m_Tool.GetRadius() * sqrt( 1 - vtDir.z * vtDir.z) ;
+      b3Tool.Expand( dExpandX, dExpandY, dExpandZ) ;
+   }
+   // aggiungo movimento
+   BBox3d b3Moved = b3Tool ;
+   b3Moved.Translate( MAX_MOVE * vtMove) ;
+   b3Tool.Add( b3Moved) ;
+
+  // determino movimento minimo per evitare collisione con superfici
+   double dTotDist = 0 ;
+   vVtTriaN.clear() ;
+   for ( auto pStm : m_vSTM) {
+      INTVECTOR vTria ;
+      if ( pStm->GetAllTriaOverlapBox( b3Tool, vTria)) {
+         for ( int nTria : vTria) {
+            Triangle3d Tria ;
+            if ( pStm->GetTriangle( nTria, Tria)) {
+               double dDist = CAvToolTriangle( m_Tool, ptT, vtDir, Tria, vtMove) ;
+               if ( dDist < - EPS_SMALL)
+                  return -1 ;
+              // se devo traslare il punto, c'è collisione
+               if ( dDist > EPS_SMALL) {
+                  if ( dDist > 10 * EPS_SMALL) {
+                     vVtTriaN.clear() ;
+                     dTotDist += dDist ;
+                     ptT += ( dDist - 5 * EPS_SMALL) * m_frMove.VersZ() ;
+                  }
+                  vVtTriaN.push_back( Tria.GetN()) ;
+               }
+            }
+         }
+      }
+   }
+   return dTotDist ;
+}
+
+//----------------------------------------------------------------------------
+double
+CAvToolSurfTm::MyTestPositionHG( Point3d& ptT, const Vector3d& vtDir, Vector3d& vtTriaN) const
 {
  // calcolo box utensile nel riferimento di movimento
   BBox3d b3Tool ;
@@ -301,11 +711,11 @@ CAvToolSurfTm::MyTestPositionHG( Point3d& ptT, const Vector3d& vtDir)
   Vector3d vtDirL = vtDir ; vtDirL.ToLoc( m_frMove) ;
   b3Tool.Add( ptTL) ;
   b3Tool.Add( ptTL - vtDirL * m_Tool.GetHeigth()) ;
-   if ( vtDirL.IsXplus()  ||  vtDirL.IsXminus())
+   if ( vtDirL.IsX())
      b3Tool.Expand( 0, m_Tool.GetRadius(), m_Tool.GetRadius()) ;
-   else if ( vtDirL.IsYplus()  ||  vtDirL.IsYminus())
+   else if ( vtDirL.IsY())
      b3Tool.Expand( m_Tool.GetRadius(), 0, m_Tool.GetRadius()) ;
-   else if ( vtDirL.IsZplus()  ||  vtDirL.IsZminus())
+   else if ( vtDirL.IsZ())
      b3Tool.Expand( m_Tool.GetRadius(), m_Tool.GetRadius(), 0) ;
   else {
      double dExpandX = m_Tool.GetRadius() * sqrt( 1 - vtDirL.x * vtDirL.x) ;
@@ -313,8 +723,10 @@ CAvToolSurfTm::MyTestPositionHG( Point3d& ptT, const Vector3d& vtDir)
      double dExpandZ = m_Tool.GetRadius() * sqrt( 1 - vtDirL.z * vtDirL.z) ;
      b3Tool.Expand( dExpandX, dExpandY, dExpandZ) ;
   }
-  // ciclo sui triangoli che intersecano box in 2d 
+
+  // ciclo sui triangoli che intersecano box in 2d
   double dTotDist = 0 ;
+   vtTriaN = V_NULL ;
   INTVECTOR vnIds ;
   if ( m_HGrids.Find( b3Tool, vnIds)) {
      for ( int i = 0 ; i < int( vnIds.size()) ; ++ i) {
@@ -330,11 +742,70 @@ CAvToolSurfTm::MyTestPositionHG( Point3d& ptT, const Vector3d& vtDir)
         if ( dDist > EPS_SMALL) {
            dTotDist += dDist ;
            ptT += dDist * m_frMove.VersZ() ;
+            vtTriaN = Tria.GetN() ;
         }
         else if ( dDist < -EPS_SMALL)
            return -1 ;
      }
   }
+
+   return dTotDist ;
+}
+
+//----------------------------------------------------------------------------
+double
+CAvToolSurfTm::MyTestPositionHGAdv( Point3d& ptT, const Vector3d& vtDir, VCT3DVECTOR& vVtTriaN) const
+{
+  // calcolo box utensile nel riferimento di movimento
+   BBox3d b3Tool ;
+   Point3d ptTL = ptT ; ptTL.ToLoc( m_frMove) ;
+   Vector3d vtDirL = vtDir ; vtDirL.ToLoc( m_frMove) ;
+   b3Tool.Add( ptTL) ;
+   b3Tool.Add( ptTL - vtDirL * m_Tool.GetHeigth()) ;
+   if ( vtDirL.IsX())
+      b3Tool.Expand( 0, m_Tool.GetRadius(), m_Tool.GetRadius()) ;
+   else if ( vtDirL.IsY())
+      b3Tool.Expand( m_Tool.GetRadius(), 0, m_Tool.GetRadius()) ;
+   else if ( vtDirL.IsZ())
+      b3Tool.Expand( m_Tool.GetRadius(), m_Tool.GetRadius(), 0) ;
+   else {
+      double dExpandX = m_Tool.GetRadius() * sqrt( 1 - vtDirL.x * vtDirL.x) ;
+      double dExpandY = m_Tool.GetRadius() * sqrt( 1 - vtDirL.y * vtDirL.y) ;
+      double dExpandZ = m_Tool.GetRadius() * sqrt( 1 - vtDirL.z * vtDirL.z) ;
+      b3Tool.Expand( dExpandX, dExpandY, dExpandZ) ;
+   }
+
+  // ciclo sui triangoli che intersecano box in 2d
+   double dTotDist = 0. ;
+   INTVECTOR vnIds ;
+   if ( m_HGrids.Find( b3Tool, vnIds)) {
+      for ( int i = 0 ; i < int( vnIds.size()) ; ++ i) {
+        // recupero la superficie
+         int nInd = vnIds[i] ;
+         int nSurf = GetSurfInd( nInd) ;
+         if ( nSurf == -1)
+            return -1 ;
+        // recupero il triangolo
+         int nT = nInd - m_vBaseInd[nSurf] ;
+         Triangle3d Tria ;
+         if ( ! m_vSTM[nSurf]->GetTriangle( nT, Tria))
+            return -1 ;
+        // calcolo della collisione
+         double dDist = CAvToolTriangle( m_Tool, ptT, vtDir, Tria, m_frMove.VersZ()) ;
+         if ( dDist < - EPS_SMALL)
+            return -1 ;
+        // se devo traslare il punto, c'è collisione
+         if ( dDist > EPS_SMALL) {
+            if ( dDist > 10 * EPS_SMALL) {
+               vVtTriaN.clear() ;
+               dTotDist += dDist ;
+               ptT += ( dDist - 5 * EPS_SMALL) * m_frMove.VersZ() ;
+            }
+            vVtTriaN.push_back( Tria.GetN()) ;
+         }
+      }
+   }
+
   return dTotDist ;
 }

@@ -345,7 +816,7 @@ CAvToolSurfTm::PrepareHashGrid( void)
  // pulisco HashGrid 2d
   m_HGrids.Clear() ;
  // verifico esistenza superfici
-   if ( m_vSTM.size() == 0  ||  m_vBaseInd.size() < m_vSTM.size() + 1)
+   if ( m_vSTM.empty()  ||  m_vBaseInd.size() < m_vSTM.size() + 1)
      return false ;
  // creo HashGrid 2d
   const int LIM_HG_TRIA = 256 ;
@@ -372,7 +843,7 @@ CAvToolSurfTm::PrepareHashGrid( void)

 //----------------------------------------------------------------------------
 int
-CAvToolSurfTm::GetSurfInd( int nT)
+CAvToolSurfTm::GetSurfInd( int nT) const
 {
  // verifico la presenza di almeno un intervallo
   if ( m_vBaseInd.size() < 2)
@@ -34,22 +34,47 @@ class CAvToolSurfTm : public ICAvToolSurfTm
                  { return m_Tool.GetRadius() ; }
      double GetToolHeight( void) const override
                  { return m_Tool.GetHeigth() ; }
+      double GetToolTipHeight( void) const override
+                  { return m_Tool.GetTipHeigth() ; } ;
+      double GetToolTipRadius( void) const override
+                  { return m_Tool.GetTipRadius() ; } ;
+      double GetToolCornRadius( void) const override
+                  { return m_Tool.GetCornRadius() ; } ;
+      CISURFTMPVECTOR GetvStm( void) const {
+                     CISURFTMPVECTOR vcStm ;
+                     for ( int i = 0 ; i < int( m_vSTM.size()) ; ++ i)
+                        vcStm.emplace_back( CloneSurfTriMesh( m_vSTM[i])) ;
+                     return vcStm ;
+                  }
      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 TestPosition( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove,
+                         double& dTotDist, Vector3d* pvtTriaN = nullptr) const override ;
+      bool TestPositionAdv( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove,
+                            double& dTotDist, VCT3DVECTOR& vVtN) const override ;
+
+      bool TestSeries( PNTUVECTOR& vPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dProgCoeff = 1) override ;
+      bool TestSeriesAdv( PNTUVVECTVECTOR& vPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dProgCoeff = 1) override ;
+
+      bool TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dLinTol, double dProgCoeff = 1) override ;

   public :
      CAvToolSurfTm( void) ;
+      bool Clear( void) ;

   private :
-      bool   TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol) ;
-      double MyTestPosition( Point3d& ptT, const Vector3d& vtDir) ;
-      double MyTestPositionHG( Point3d& ptT, const Vector3d& vtDir) ;
+      bool   TestSubSeries( int nId, PNTUVECTOR& vPntM, const Vector3d& vtDir, int nFirst, int nLast, double dProgCoeff) ;
+      bool   TestSubSeriesAdv( int nId, PNTUVVECTVECTOR& vPntM, const Vector3d& vtDir, int nFirst, int nLast, double dProgCoeff) ;
+      bool   TestSubPath( int nId, PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol, double dProgCoeff) ;
+      double MyTestPosition( Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, Vector3d& vtTriaN) const ;
+      double MyTestPositionAdv( Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, VCT3DVECTOR& vVtTriaN) const ;
+      double MyTestPositionHG( Point3d& ptT, const Vector3d& vtDir, Vector3d& vtTriaN) const ;
+      double MyTestPositionHGAdv( Point3d& ptT, const Vector3d& vtDir, VCT3DVECTOR& vVtTriaN) const ;
      bool   MyTestMidPointHG( PNTULIST& lPntM, const PNTULIST::iterator& itPntMPrev, const PNTULIST::iterator& itPntMCurr,
-                               const Point3d& ptPrev, const Point3d& ptCurr, const Vector3d& vtDir, double dLinTol, int nLev) ;
+                               const Point3d& ptPrev, const Point3d& ptCurr, const Vector3d& vtDir, double dLinTol, int nLev) const ;
      bool   PrepareHashGrid( void) ;
-      int    GetSurfInd( int nT) ;
+      int    GetSurfInd( int nT) const ;

   private :
      typedef std::vector<const SurfTriMesh*>    CSURFTMPVECTOR ;   // vettore di puntatori a const SurfTriMesh
@@ -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"
@@ -146,18 +146,20 @@ CAvToolTriangle( const Tool& tlTool, const Point3d& ptToolOrig,  const Vector3d&
                 const Triangle3d& trTria, const Vector3d& vtMove)
 {
  // Non ha senso che il movimento sia in direzione "opposta" a quella dell'asse utensile
-   if ( vtMove * vtToolAx < - EPS_ZERO)
+   if ( vtMove * vtToolAx < - 10 * EPS_ZERO)
      return -1. ;
  // Se avvicinamento non devo fare nulla
   if ( vtMove * trTria.GetN() < - EPS_ZERO)
-      return 0. ; 
+      return 0. ;
+  // Tolleranza su dischi (parti piatte perpendicolari all'asse utensile)
+   double dEpsilon = ( vtMove * vtToolAx > 0.5 ? 0 : EPS_SMALL) ;
  // se utensile cilindrico
   if ( tlTool.GetType() == Tool::CYLMILL) {
     // parametri geometrici
      double dHeigth = tlTool.GetHeigth() ;
      double dRadius = tlTool.GetRadius() ;
     // prima determino l'allontanamento del disco inferiore
-      double dDist = CAvDiskTriangle( ptToolOrig - ( dHeigth - EPS_SMALL) * vtToolAx, vtToolAx, dRadius, trTria, vtMove) ;      
+      double dDist = CAvDiskTriangle( ptToolOrig - ( dHeigth - dEpsilon) * vtToolAx, vtToolAx, dRadius, trTria, vtMove) ;      
      if ( dDist < - EPS_SMALL)
         return dDist ; 
     // poi verifico quello del cilindro (tenendo conto di quanto è stata allontanato il disco)
@@ -165,7 +167,7 @@ CAvToolTriangle( const Tool& tlTool, const Point3d& ptToolOrig,  const Vector3d&
      if ( dDist2 < - EPS_SMALL)
         return dDist2 ;
     // verifico quello del disco sopra
-     double dDist3 = CAvDiskTriangle( ptToolOrig - EPS_SMALL * vtToolAx + ( dDist + dDist2) * vtMove, vtToolAx, dRadius, trTria, vtMove) ;   
+     double dDist3 = CAvDiskTriangle( ptToolOrig - dEpsilon * vtToolAx + ( dDist + dDist2) * vtMove, vtToolAx, dRadius, trTria, vtMove) ;   
     if ( dDist3 < - EPS_SMALL)
         return dDist3 ;   
      return ( dDist + dDist2 + dDist3) ;
@@ -189,7 +191,7 @@ CAvToolTriangle( const Tool& tlTool, const Point3d& ptToolOrig,  const Vector3d&
         return dDist2 ;
     // verifico quello del disco sopra
     Point3d ptDiskUpOrig = ptCylOrig + dDist2 * vtMove ;
-      double dDist3 = CAvDiskTriangle( ptDiskUpOrig - EPS_SMALL * vtToolAx, vtToolAx, dRadius, trTria, vtMove) ;   
+      double dDist3 = CAvDiskTriangle( ptDiskUpOrig - dEpsilon * vtToolAx, vtToolAx, dRadius, trTria, vtMove) ;   
      if ( dDist3 < - EPS_SMALL)
         return dDist3 ;   
      return ( dDist + dDist2 + dDist3) ;
@@ -199,7 +201,7 @@ CAvToolTriangle( const Tool& tlTool, const Point3d& ptToolOrig,  const Vector3d&
     // parametri geometrici
      double dCylHeigth = tlTool.GetHeigth() - tlTool.GetTipHeigth() ;     
     // prima determino l'allontanamento del disco inferiore
-      double dDist = CAvDiskTriangle( ptToolOrig - ( tlTool.GetHeigth() - EPS_SMALL) * vtToolAx, vtToolAx, tlTool.GetTipRadius(),
+      double dDist = CAvDiskTriangle( ptToolOrig - ( tlTool.GetHeigth() - dEpsilon) * vtToolAx, vtToolAx, tlTool.GetTipRadius(),
                                      trTria, vtMove) ;
      if ( dDist < - EPS_SMALL)
         return dDist ;
@@ -220,7 +222,7 @@ CAvToolTriangle( const Tool& tlTool, const Point3d& ptToolOrig,  const Vector3d&
         return dDist3 ;
      // verifico quello del disco sopra
      Point3d ptDiskUpOrig = ptCylOrig + vtMove * dDist3 ;
-      double dDist4 = CAvDiskTriangle( ptDiskUpOrig - EPS_SMALL * vtToolAx, vtToolAx, tlTool.GetRadius(), trTria, vtMove) ;   
+      double dDist4 = CAvDiskTriangle( ptDiskUpOrig - dEpsilon * vtToolAx, vtToolAx, tlTool.GetRadius(), trTria, vtMove) ;   
      if ( dDist4 < - EPS_SMALL)
         return dDist4 ;   
      return ( dDist + dDist2 + dDist3 + dDist4) ;
@@ -247,7 +249,7 @@ CAvToolTriangle( const Tool& tlTool, const Point3d& ptToolOrig,  const Vector3d&
      double dMaxR = max( tlTool.GetRadius(), tlTool.GetTipRadius()) ;
      double dCylHeigth = tlTool.GetHeigth() - tlTool.GetTipHeigth() ;
     // prima determino l'allontanamento del disco inferiore
-      double dDist = CAvDiskTriangle( ptToolOrig - ( tlTool.GetHeigth() - EPS_SMALL) * vtToolAx, vtToolAx, tlTool.GetTipRadius(),
+      double dDist = CAvDiskTriangle( ptToolOrig - ( tlTool.GetHeigth() - dEpsilon) * vtToolAx, vtToolAx, tlTool.GetTipRadius(),
                                      trTria, vtMove) ;
      if ( dDist < - EPS_SMALL)
         return dDist ;
@@ -266,7 +268,7 @@ CAvToolTriangle( const Tool& tlTool, const Point3d& ptToolOrig,  const Vector3d&
         return dDist3 ;
     // verifico quello del disco sopra
      Point3d ptDiskUpOrig = ptCylOrig + vtMove * dDist3 ;
-      double dDist4 = CAvDiskTriangle( ptDiskUpOrig - EPS_SMALL * vtToolAx, vtToolAx, tlTool.GetRadius(), trTria, vtMove) ;   
+      double dDist4 = CAvDiskTriangle( ptDiskUpOrig - dEpsilon * vtToolAx, vtToolAx, tlTool.GetRadius(), trTria, vtMove) ;   
      if ( dDist4 < - EPS_SMALL)
         return dDist4 ;   
      return ( dDist + dDist2 + dDist3 + dDist4) ;
@@ -299,10 +301,10 @@ CAvToolTriangle( const Tool& tlTool, const Point3d& ptToolOrig,  const Vector3d&
               double dRadius = max( ptStart.x, ptEnd.x) ;
              // Se disco verso il basso dell'utensile
               if ( ptStart.x > ptEnd.x)                  
-                  dDist2 = CAvDiskTriangle( ptCompOrig + EPS_SMALL * vtToolAx, vtToolAx, dRadius, trTria, vtMove) ;                
+                  dDist2 = CAvDiskTriangle( ptCompOrig + dEpsilon * vtToolAx, vtToolAx, dRadius, trTria, vtMove) ;                
               // Se disco verso l'alto
               else                
-                  dDist2 = CAvDiskTriangle( ptCompOrig - EPS_SMALL * vtToolAx, vtToolAx, dRadius, trTria, vtMove) ;               
+                  dDist2 = CAvDiskTriangle( ptCompOrig - dEpsilon * vtToolAx, vtToolAx, dRadius, trTria, vtMove) ;               
            }
            else {
              // Verifiche curva precedente per eventuale tappo sopra
@@ -2501,7 +2503,7 @@ DiskSegmentEscapeDistLongMot( const Point3d& ptDiskCen, double dDiskRad,
   double dSegDist = 0. ;
   for ( int nSol = 0 ; nSol < nRoot ; ++ nSol) {
     // Soluzione interna al segmento
-      if ( vdRoots[nSol] > 0.  &&  vdRoots[nSol] < dSegLen) {
+      if ( vdRoots[nSol] > 0.  &&  vdRoots[nSol] < dSegLen + EPS_ZERO) {
         Point3d ptC = ptSeg + vdRoots[nSol] * vtSeg ;
        // Distanza del punto soluzione dal piano del disco nella posizione iniziale
         double dCurDist = PointPlaneSignedDist( ptC, ptDiskCen, vtMove) ;
@@ -1,13 +1,14 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2016-2020
+//  EgalTech 2016-2024
 //----------------------------------------------------------------------------
-// File : CDBoxSurfTm.cpp      Data : 09.01.20        Versione : 2.2a2
+// File : CDeBoxClosedSurfTm.cpp      Data : 24.03.24        Versione : 2.6c2
 // Contenuto : Implementazione della verifica di collisione tra
 //             BoundingBox e Closed SurftriMesh.
 //
 //
 // Modifiche : 05.10.16 DS Creazione modulo.
 //             09.01.20 DS Cambio nome alla funzione.
+//             24.03.24 DS Aggiunta TestCylSurfTm.
 //
 //----------------------------------------------------------------------------

@@ -19,36 +20,86 @@

 using namespace std ;

+//----------------------------------------------------------------------------
+// Il sistema di riferimento è allineato con il box e ha origine in un suo vertice.
+// La distanza di sicurezza ha effetto solo se maggiore di EPS_SMALL.
+// Il sistema di riferimento del box è riferito a quello della superficie.
+// La funzione restituisce :
+// - true in caso di collisione o inconsistenza dei parametri di input
+// - false in caso di assenza di collisione.
 //----------------------------------------------------------------------------
 bool
-CDeBoxClosedSurfTm( const Frame3d& frBox, const Vector3d& vtDiag, double dSafeDist, const ISurfTriMesh& Stm)
+CDeBoxClosedSurfTm( const Frame3d& frBox, const Vector3d& vtDiag, const ISurfTriMesh& Stm, double dSafeDist)
 {
-  // recupero BBox del poliedro
+  // Se il box non è ben definito non ha senso proseguire
+   if ( vtDiag.IsSmall())
+      return true ;
+  // Se superficie non valida o aperta, non ha senso proseguire
+   if ( ! Stm.IsValid()  ||  ! Stm.IsClosed())
+      return true ;
+  // Recupero BBox del poliedro
   BBox3d b3Poly = Stm.GetAllTriaBox() ;
-  // calcolo il BBox del parallelepipedo
-   BBox3d b3Box( ORIG, ORIG + vtDiag) ;
-   b3Box.Expand( dSafeDist) ;
-   b3Box.ToGlob( frBox) ;
-  // confronto i due Box
-   if ( ! b3Box.Overlaps( b3Poly))
+  // Calcolo il BBox del parallelepipedo
+   BBox3d b3BoxL( ORIG, ORIG + vtDiag) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3BoxL.Expand( dSafeDist) ;
+   BBox3d b3Box = GetToGlob( b3BoxL, frBox) ;
+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Poly.Overlaps( b3Box)  ||  ! b3Poly.Overlaps( frBox, b3BoxL))
      return false ;
-  // recupero i triangoli che interferiscono con il box
+  // Verifico se il parallelepipedo interferisce con i triangoli del poliedro presenti nel suo BBox
   INTVECTOR vT ;
   Stm.GetAllTriaOverlapBox( b3Box, vT) ;
   for ( int nT : vT) {
      Triangle3d Tria ;
      if ( Stm.GetTriangle( nT, Tria)) {
-         if ( CDeBoxTria( frBox, vtDiag, dSafeDist, Tria))
+         if ( CDeBoxTria( frBox, vtDiag, Tria, dSafeDist))
            return true ;
      }
   }
-  // Se superficie aperta, non c'è collisione
-   if ( ! Stm.IsClosed())
+  // Se il BBox del parallelepipedo non è interno a quello del poliedro e viceversa, non c'è collisione
+   if ( ! b3Poly.Encloses( b3Box)  &&  ! b3Box.Encloses( b3Poly))
      return false ;
-  // Verifico se il box è dentro la superficie tramite calcolo distanza minima.
-   Point3d ptBoxOrig, ptBoxMax ;
-   b3Box.GetMinMax( ptBoxOrig, ptBoxMax) ;
-   DistPointSurfTm DistBoxOrigSurfCalc( ptBoxOrig, Stm) ;
+  // Verifico se il box è dentro la superficie tramite calcolo distanza minima del suo centro
+   Point3d ptBoxCen = ORIG + vtDiag / 2 ;
+   ptBoxCen.ToGlob( frBox) ;
+   DistPointSurfTm DistBoxCenSurfCalc( ptBoxCen, Stm) ;
  // Se il box è interno c'è collisione
-   return DistBoxOrigSurfCalc.IsPointInside() ;
+   return DistBoxCenSurfCalc.IsPointInside() ;
+}
+
+//----------------------------------------------------------------------------
+// Verifica l'interferenza tra il box e la superficie : restituisce true in caso di interferenza.
+//----------------------------------------------------------------------------
+bool
+TestBoxSurfTm( const Frame3d& frBox, const Vector3d& vtDiag, const ISurfTriMesh& Stm, double dSafeDist)
+{
+  // Se il box non è ben definito non ha senso proseguire
+   if ( vtDiag.IsSmall())
+      return true ;
+  // Se superficie non valida, non ha senso proseguire
+   if ( ! Stm.IsValid())
+      return true ;
+  // Recupero BBox del poliedro
+   BBox3d b3Poly = Stm.GetAllTriaBox() ;
+  // Calcolo il BBox del parallelepipedo
+   BBox3d b3BoxL( ORIG, ORIG + vtDiag) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3BoxL.Expand( dSafeDist) ;
+   BBox3d b3Box = GetToGlob( b3BoxL, frBox) ;
+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Poly.Overlaps( b3Box)  ||  ! b3Poly.Overlaps( frBox, b3BoxL))
+      return false ;
+  // Verifico se il parallelepipedo interferisce con i triangoli del poliedro presenti nel suo BBox
+   INTVECTOR vT ;
+   Stm.GetAllTriaOverlapBox( b3Box, vT) ;
+   for ( int nT : vT) {
+      Triangle3d Tria ;
+      if ( Stm.GetTriangle( nT, Tria)) {
+         if ( CDeBoxTria( frBox, vtDiag, Tria, dSafeDist))
+            return true ;
+      }
+   }
+  // Non c'è interferenza
+   return false ;
 }
@@ -16,6 +16,7 @@
 #include "CDeBoxTria.h"
 #include "CDeSpheTria.h"
 #include "CDeCylTria.h"
+#include "CDeCapsTria.h"
 #include "/EgtDev/Include/EGkPlane3d.h"

 using namespace std ;
@@ -99,9 +100,17 @@ CDeSimpleBoxTria( const Frame3d& frBox, const Vector3d& vtDiag, const Triangle3d
   Triangle3d trTriaL = trTria ;
   trTriaL.ToLoc( frBox) ;

+  // Calcolo il box locale del triangolo
+   BBox3d b3TriaL ;
+   trTriaL.GetLocalBBox( b3TriaL) ;
+
  // Calcolo il box come tale
   BBox3d b3Box( ORIG, ORIG + vtDiag) ;

+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Box.Overlaps( b3TriaL))
+      return false ;
+
  // Compute box center and extents
   Point3d  ptCen ;
   Vector3d vtExt ;
@@ -162,7 +171,7 @@ CDeSimpleBoxTria( const Frame3d& frBox, const Vector3d& vtDiag, const Triangle3d

 //----------------------------------------------------------------------------
 bool
-CDeBoxTria( const Frame3d& frBox, const Vector3d& vtDiag, double dSafeDist, const Triangle3d& trTria)
+CDeBoxTria( const Frame3d& frBox, const Vector3d& vtDiag, const Triangle3d& trTria, double dSafeDist)
 {
  // Porto il triangolo nel riferimento del box
   Triangle3d trTriaL = trTria ;
@@ -173,75 +182,45 @@ CDeBoxTria( const Frame3d& frBox, const Vector3d& vtDiag, double dSafeDist, cons
      return CDeSimpleBoxTria( Frame3d(), vtDiag, trTriaL) ;

  // Verifica preliminare con box esteso
-   Frame3d frEst( Point3d( -dSafeDist, -dSafeDist, -dSafeDist)) ;
-   if ( ! CDeSimpleBoxTria( frEst, vtDiag + 2 * Vector3d( dSafeDist, dSafeDist, dSafeDist), trTriaL))
+   Frame3d frTmp( Point3d( -dSafeDist, -dSafeDist, -dSafeDist)) ;
+   if ( ! CDeSimpleBoxTria( frTmp, vtDiag + 2 * Vector3d( dSafeDist, dSafeDist, dSafeDist), trTriaL))
      return false ;

  // Tre box aumentati con distanza di sicurezza in un sola dimensione
-   Frame3d frTmp = frBox ; frTmp.Translate( - dSafeDist * frBox.VersX()) ;
+   frTmp.ChangeOrig( Point3d( -dSafeDist, 0, 0)) ;
   if ( CDeSimpleBoxTria( frTmp, vtDiag + 2 * dSafeDist * X_AX, trTriaL))
      return true ;
-   frTmp = frBox ; frTmp.Translate( - dSafeDist * frBox.VersY()) ;
+   frTmp.ChangeOrig( Point3d( 0, -dSafeDist, 0)) ;
   if ( CDeSimpleBoxTria( frTmp, vtDiag + 2 * dSafeDist * Y_AX, trTriaL))
      return true ;
-   frTmp = frBox ; frTmp.Translate( - dSafeDist * frBox.VersZ()) ;
+   frTmp.ChangeOrig( Point3d( 0, 0, -dSafeDist)) ;
   if ( CDeSimpleBoxTria( frTmp, vtDiag + 2 * dSafeDist * Z_AX, trTriaL))
      return true ;

-  // Sfere centrate negli otto vertici
-   if ( CDeSimpleSpheTria( Point3d( 0, 0, 0), dSafeDist, trTriaL))
+  // Capsule centrati sui dodici spigoli
+   if ( CDeSimpleCapsTria( Point3d( 0, 0, 0), Point3d( vtDiag.x, 0, 0), dSafeDist, trTriaL))
      return true ;
-   if ( CDeSimpleSpheTria( Point3d( vtDiag.x, 0, 0), dSafeDist, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( 0, vtDiag.y, 0), Point3d( vtDiag.x, vtDiag.y, 0), dSafeDist, trTriaL))
      return true ;
-   if ( CDeSimpleSpheTria( Point3d( vtDiag.x, vtDiag.y, 0), dSafeDist, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( 0, 0, 0), Point3d( 0, vtDiag.y, 0), dSafeDist, trTriaL))
      return true ;
-   if ( CDeSimpleSpheTria( Point3d( 0, vtDiag.y, 0), dSafeDist, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( vtDiag.x, 0, 0), Point3d( vtDiag.x, vtDiag.y, 0), dSafeDist, trTriaL))
      return true ;
-   if ( CDeSimpleSpheTria( Point3d( 0, 0, vtDiag.z), dSafeDist, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( 0, 0, vtDiag.z), Point3d( vtDiag.x, 0, vtDiag.z), dSafeDist, trTriaL))
      return true ;
-   if ( CDeSimpleSpheTria( Point3d( vtDiag.x, 0, vtDiag.z), dSafeDist, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( 0, vtDiag.y, vtDiag.z), Point3d( vtDiag.x, vtDiag.y, vtDiag.z), dSafeDist, trTriaL))
      return true ;
-   if ( CDeSimpleSpheTria( Point3d( vtDiag.x, vtDiag.y, vtDiag.z), dSafeDist, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( 0, 0, vtDiag.z), Point3d( 0, vtDiag.y, vtDiag.z), dSafeDist, trTriaL))
      return true ;
-   if ( CDeSimpleSpheTria( Point3d( 0, vtDiag.y, vtDiag.z), dSafeDist, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( vtDiag.x, 0, vtDiag.z), Point3d( vtDiag.x, vtDiag.y, vtDiag.z), dSafeDist, trTriaL))
      return true ;
-
-  // Cilindri centrati sui dodici spigoli
-   frTmp.Set( Point3d( 0, 0, 0), X_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.x, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( 0, 0, 0), Point3d( 0, 0, vtDiag.z), dSafeDist, trTriaL))
      return true ;
-   frTmp.Set( Point3d( 0, vtDiag.y, 0), X_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.x, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( vtDiag.x, 0, 0), Point3d( vtDiag.x, 0, vtDiag.z), dSafeDist, trTriaL))
      return true ;
-   frTmp.Set( Point3d( 0, 0, 0), Y_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.y, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( vtDiag.x, vtDiag.y, 0), Point3d( vtDiag.x, vtDiag.y, vtDiag.z), dSafeDist, trTriaL))
      return true ;
-   frTmp.Set( Point3d( vtDiag.x, 0, 0), Y_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.y, trTriaL))
-      return true ;
-   frTmp.Set( Point3d( 0, 0, vtDiag.z), X_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.x, trTriaL))
-      return true ;
-   frTmp.Set( Point3d( 0, vtDiag.y, vtDiag.z), X_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.x, trTriaL))
-      return true ;
-   frTmp.Set( Point3d( 0, 0, vtDiag.z), Y_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.y, trTriaL))
-      return true ;
-   frTmp.Set( Point3d( vtDiag.x, 0, vtDiag.z), Y_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.y, trTriaL))
-      return true ;
-   frTmp.Set( Point3d( 0., 0., 0.), Z_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.z, trTriaL))
-      return true ;
-   frTmp.Set( Point3d( vtDiag.x, 0., 0.), Z_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.z, trTriaL))
-      return true ;
-   frTmp.Set( Point3d( vtDiag.x, vtDiag.y, 0.), Z_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.z, trTriaL))
-      return true ;
-   frTmp.Set( Point3d( 0., vtDiag.y, 0.), Z_AX) ;
-   if ( CDeSimpleCylTria( frTmp, dSafeDist, vtDiag.z, trTriaL))
+   if ( CDeSimpleCapsTria( Point3d( 0, vtDiag.y, 0), Point3d( 0, vtDiag.y, vtDiag.z), dSafeDist, trTriaL))
      return true ;

   return false ;
@@ -17,4 +17,4 @@

 //----------------------------------------------------------------------------
 bool CDeSimpleBoxTria( const Frame3d& frBox, const Vector3d& vtDiag, const Triangle3d& trTria) ;
-bool CDeBoxTria( const Frame3d& frBox, const Vector3d& vtDiag, double dSafeDist, const Triangle3d& trTria) ;
+bool CDeBoxTria( const Frame3d& frBox, const Vector3d& vtDiag, const Triangle3d& trTria, double dSafeDist) ;
@@ -0,0 +1,104 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2022-2022
+//----------------------------------------------------------------------------
+// File : CDeCapsTria.cpp   Data : 14.05.22     Versione : 2.4e2
+// Contenuto : Implementazione della verifica di collisione tra 
+//             Capsule (cilindro con estremità semisferiche) e Triangle3d.
+//
+//
+// Modifiche :14.05.22 DS Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+//--------------------------- Include ----------------------------------------
+#include "stdafx.h"
+#include "CDeCapsTria.h"
+#include "CDeSpheTria.h"
+#include "ProjPlane.h"
+#include "IntersLineCaps.h"
+#include "/EgtDev/Include/EGkPolygon3d.h"
+#include "/EgtDev/Include/EGkIntersLinePlane.h"
+#include "/EgtDev/Include/EGkDistPointTria.h"
+#include "/EgtDev/Include/EGkIntersLineSphere.h"
+
+using namespace std ;
+
+//----------------------------------------------------------------------------
+bool
+CDeSimpleCapsTria( const Point3d& ptP1, const Point3d& ptP2, double dR, const Triangle3d& trTria)
+{
+   // vedi Ericson, Real-Time Collision Detection, pag. 226 (Nettle method)
+
+  // Dati della capsule come sfera che si muove
+   Point3d ptC = ptP1 ;
+   Point3d ptE = ptP2 ;
+   Vector3d vtDir = ptP2 - ptP1 ;
+   double dLen = vtDir.Len() ;
+   if ( dLen < EPS_SMALL)
+      return CDeSimpleSpheTria( Media( ptP1, ptP2), dR, trTria) ;
+   vtDir /= dLen ;
+   if ( vtDir * trTria.GetN() > 0) {
+      vtDir.Invert() ;
+      ptC = ptP2 ;
+      ptE = ptP1 ;
+   }
+  // Se sfera finale dista dal piano come o meno del raggio, devo verificarla direttamente (il retro è escluso dal calcolo standard)
+   double dDistE = DistPointPlane( ptE, trTria.GetPlane()) ;
+   if ( abs( dDistE) <= dR) {
+      if ( CDeSimpleSpheTria( ptE, dR, trTria))
+         return true ;
+   }
+  // Determinazione primo possibile punto di contatto della sfera con il piano
+   Point3d ptD = ptC - trTria.GetN() * dR ;
+  // Intersezione della linea di movimento di questo punto con il piano del triangolo
+   Point3d ptP ;
+   int nLpRes = IntersLinePlane( ptD, vtDir, 1, trTria.GetPlane(), ptP, false) ;
+  // Se non c'è intersezione passante
+   if ( nLpRes != ILPT_YES) {
+     // se il centro dista dal piano non meno del raggio, allora non c'è sicuramente collisione
+      double dDistM = DistPointPlane( Media( ptP1, ptP2), trTria.GetPlane()) ;
+      if ( abs( dDistM) >= dR)
+         return false ;
+     // interseco l'asse del capsule con capsule di pari raggio con asse i lati del triangolo
+      double dU1 = INFINITO, dU2 = -INFINITO ;
+      for ( int i = 0 ; i < 3 ; ++ i) {
+         double dInt1, dInt2 ;
+         if ( IntersLineCaps( ptC, vtDir, trTria.GetP( i), trTria.GetP( ( i + 1) % 3), dR, dInt1, dInt2)) {
+            dU1 = min( dU1, dInt1) ;
+            dU2 = max( dU2, dInt2) ;
+            if ( ! ( dU1 >= dLen  ||  dU2 <= 0))
+               return true ;
+         } 
+      }
+      return false ;
+   }
+  // Determino la posizione dell'intersezione rispetto al triangolo
+   DistPointTriangle dptDist( ptP, trTria) ;
+  // Se l'intersezione sta nel triangolo
+   double dSqDist ;
+   if ( dptDist.GetSqDist( dSqDist)  &&  dSqDist < 4 * SQ_EPS_SMALL) {
+      double dPos = ( ptP - ptD) * vtDir ;
+      return ( dPos > 0  &&  dPos < dLen) ;
+   }
+  // Altrimenti, recupero il punto del triangolo più vicino all'intersezione
+   Point3d ptQ ;
+   if ( dptDist.GetMinDistPoint( ptQ)) {
+      Point3d ptI1, ptI2 ;
+      int nLsRes = IntersLineSphere( ptQ, -vtDir, ptC, dR, ptI1, ptI2) ;
+      if ( nLsRes != ILST_SEC)
+         return false ;
+      double dPos = ( ptQ - ptI1) * vtDir ;
+      return ( dPos > 0  &&  dPos < dLen) ;
+   }
+
+   return false ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CDeCapsTria( const Point3d& ptP1, const Point3d& ptP2, double dR, const Triangle3d& trTria, double dSafeDist)
+{
+   return CDeSimpleCapsTria( ptP1, ptP2, dR + max( 0., dSafeDist), trTria) ;
+}
+ 
@@ -0,0 +1,19 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2022-2022
+//----------------------------------------------------------------------------
+// File : EGkCDeCapsTria.h      Data : 14.05.22    Versione : 2.4e2
+// Contenuto : Dichiarazione funzione verifica collisione tra
+//             Capsule (cilindro con estremità semisferiche) e Triangle3d.
+//
+// Modifiche : 14.05.22 DS Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+#include "/EgtDev/Include/EGkTriangle3d.h"
+
+//----------------------------------------------------------------------------
+bool CDeSimpleCapsTria( const Point3d& ptP1, const Point3d& ptP2, double dR, const Triangle3d& trTria) ;
+bool CDeCapsTria( const Point3d& ptP1, const Point3d& ptP2, double dR, const Triangle3d& trTria, double dSafeDist) ;
@@ -1,12 +1,12 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2020
+//  EgalTech 2020-2024
 //----------------------------------------------------------------------------
-// File :      CDeSurfTmSurfTm.h      Data : 13.11.20    Versione : 
+// File : CDeClosedSurfTmClosedSurfTm.h    Data : 24.03.24  Versione : 2.6c2 
 // Contenuto : Implementazione funzione verifica collisione tra
 //             SurfTm e SurfTm.
 //
 // Modifiche : 13.11.20 LM Creazione modulo.
-//
+//             24.03.24 DS Aggiunta TestSurfTmSurfTm.
 //
 //----------------------------------------------------------------------------

@@ -18,78 +18,81 @@
 #include "/EgtDev/Include/EGkBBox3d.h"
 #include "/EgtDev/Include/EGkCDeClosedSurfTmClosedSurfTm.h"
 #include "/EgtDev/Include/EGkDistPointSurfTm.h"
-#include <unordered_set>
-#include <utility>

 using namespace std ;

 //----------------------------------------------------------------------------
-// La funzione restituisce true in caso di collisone, false in caso di assenza
-// di collisione o inconsistenza dei parametri di input.
 // Le due superfici devono essere espresse nel medesimo sistema di riferimento.
 // La distanza di sicurezza ha effetto solo se maggiore di EPS_SMALL.
 // Se necessario cerco la collisione con un offset della superficie B costituito
-// da sfere centrate nei vertici, cilindri con i segmenti per asse e il triangolo
-// originale traslato di una costante pari alla distanza di sicurezza lungo la
-// sua normale.
+// da sfere centrate nei vertici, cilindri con gli spigoli per asse e il triangolo
+// originale traslato della distanza di sicurezza lungo la sua normale.
+// La funzione restituisce :
+// - true in caso di collisione o inconsistenza dei parametri di input
+// - false in caso di assenza di collisione.
+//----------------------------------------------------------------------------
 bool
-CDeClosedSurfTmClosedSurfTm( const SurfTriMesh& SurfA, const SurfTriMesh& SurfB, double dSafeDist)
+CDeClosedSurfTmClosedSurfTm( const ISurfTriMesh& SurfA, const ISurfTriMesh& SurfB, double dSafeDist)
 {
-   // Se le superfici non sono valide o non sono chiuse, non ha senso proseguire.
-   if ( ! ( SurfA.IsValid()  &&  SurfB.IsValid())  ||  ! ( SurfA.IsClosed()  &&  SurfB.IsClosed()))
-      return false ;
-   // Se i box delle superfici non si intersecano, ho finito.
+  // Recupero le superfici base
+   const SurfTriMesh* pSrfA = GetBasicSurfTriMesh( &SurfA) ;
+   const SurfTriMesh* pSrfB = GetBasicSurfTriMesh( &SurfB) ;
+  // Se le superfici non sono valide o non sono chiuse, non ha senso proseguire
+   if ( pSrfA == nullptr ||  ! pSrfA->IsValid()  ||  ! pSrfA->IsClosed()  ||
+        pSrfB == nullptr ||  ! pSrfB->IsValid()  ||  ! pSrfB->IsClosed())
+      return true ;
+  // Se i box delle superfici non si intersecano, ho finito.
   BBox3d b3BoxA, b3BoxB ;
-   SurfA.GetLocalBBox( b3BoxA) ;
-   SurfB.GetLocalBBox( b3BoxB) ;
-   // Se è necessario, espando il box di una costante additiva pari alla distanza di sicurezza.
+   pSrfA->GetLocalBBox( b3BoxA) ;
+   pSrfB->GetLocalBBox( b3BoxB) ;
+  // Se è necessario, espando il box di B di una costante additiva pari alla distanza di sicurezza.
   if ( dSafeDist > EPS_SMALL)
-      b3BoxA.Expand( dSafeDist) ;
-   // Se i box non si sovrappongono, non c'è collisione. Ho finito.
+      b3BoxB.Expand( dSafeDist) ;
+  // Se i box non si sovrappongono, non c'è collisione. Ho finito.
   if ( ! b3BoxA.Overlaps( b3BoxB))
      return false ;
-   // Recupero i triangoli di B che interferiscono col box del triangolo di A
+  // Recupero i triangoli di A che interferiscono col box di B
   INTVECTOR vTriaIndex ;
-   SurfA.GetAllTriaOverlapBox( b3BoxB, vTriaIndex) ;
-   // Ciclo sui triangoli della superficie A che cadono nel box della superficie B.
+   pSrfA->GetAllTriaOverlapBox( b3BoxB, vTriaIndex) ;
+  // Ciclo sui triangoli della superficie A che interferiscono col box della superficie B.
   for ( int nTA : vTriaIndex) {
      Triangle3d trTriaA ;
-      if ( ! ( SurfA.GetTriangle( nTA, trTriaA)  &&  trTriaA.Validate()))
+      if ( ! ( pSrfA->GetTriangle( nTA, trTriaA)  &&  trTriaA.Validate()))
         continue ;
      BBox3d b3BoxTriaA ;
      trTriaA.GetLocalBBox( b3BoxTriaA) ;
-      // Se è necessario, espando il box di una costante additiva pari alla distanza di sicurezza.
+     // Se è necessario, espando il box di una costante additiva pari alla distanza di sicurezza.
      if ( dSafeDist > EPS_SMALL)
         b3BoxTriaA.Expand( dSafeDist) ;
-      // Recupero i triangoli di B che interferiscono col box del triangolo di A
+     // Recupero i triangoli di B che interferiscono col box del triangolo di A
      INTVECTOR vNearTria ;
-      SurfB.GetAllTriaOverlapBox( b3BoxTriaA, vNearTria) ;
-      // Settare tutti i triangoli come già processati.
-      // Al termine della chiamata i TFlags dei triangoli valgono 0.
-      SurfB.ResetTempInt() ;
-      // Ciclo sui triangoli della superficie B che cadono nel box del triangolo corrente della Superficie A.
+      pSrfB->GetAllTriaOverlapBox( b3BoxTriaA, vNearTria) ;
+     // Settare tutti i triangoli come già processati.
+     // Al termine della chiamata i TempInt dei triangoli valgono 0.
+      pSrfB->ResetTempInts() ;
+     // Ciclo sui triangoli della superficie B che cadono nel box del triangolo corrente della Superficie A.
      for ( int nTB : vNearTria) {
-         // Recupero il triangolo corrente della superficie B.
-         // Se triangolo non valido salto al successivo.
+        // Recupero il triangolo corrente della superficie B.
+        // Se triangolo non valido salto al successivo.
         Triangle3d trTriaB ;
-         if ( ! ( SurfB.GetTriangle( nTB, trTriaB)  &&  trTriaB.Validate()))
+         if ( ! ( pSrfB->GetTriangle( nTB, trTriaB)  &&  trTriaB.Validate()))
            continue ;   
-         // Se necessario considero l'offset
+        // Se necessario considero l'offset
         if ( dSafeDist > EPS_SMALL) {
            int nAdjTriaId[3] ;
-            SurfB.GetTriangleAdjacencies( nTB, nAdjTriaId) ;
-            // Ciclo sui vertici del triangolo.
+            pSrfB->GetTriangleAdjacencies( nTB, nAdjTriaId) ;
+           // Ciclo sui vertici del triangolo.
            for ( int nVB = 0 ; nVB < 3 ; ++ nVB) {
-               // Se il triangolo adiacente al triangolo corrente su questo edge
-               // non è stato processato, processo il vertice e l'edge.
+              // Se il triangolo adiacente al triangolo corrente su questo edge
+              // non è stato processato, processo il vertice e l'edge.
               int nAdjTriaTempFlag ;
-               if ( ! ( SurfB.GetTriangleTempInt( nAdjTriaId[nVB], nAdjTriaTempFlag)  ||  nAdjTriaTempFlag == 0))
+               if ( ! ( pSrfB->GetTempInt( nAdjTriaId[nVB], nAdjTriaTempFlag)  ||  nAdjTriaTempFlag == 0))
                  continue ;
-               // Processo il vertice: se c'è collisione fra triangolo A e sfera ho finito.
+              // Processo il vertice: se c'è collisione fra triangolo A e sfera ho finito.
               if ( CDeSimpleSpheTria( trTriaB.GetP( nVB), dSafeDist, trTriaA))
                  return true ;
-               // Processo l'edge: se c'è collisione fra triangolo A e cilindro ho finito.
-               Vector3d vtEdgeV = trTriaB.GetP( nVB) - trTriaB.GetP( ( nVB + 1) % 3) ;
+              // Processo l'edge: se c'è collisione fra triangolo A e cilindro ho finito.
+               Vector3d vtEdgeV = trTriaB.GetP( ( nVB + 1) % 3) - trTriaB.GetP( nVB) ;
               double dEdgeLen = vtEdgeV.Len() ;
               vtEdgeV /= dEdgeLen ;
               Frame3d frCyl ;
@@ -97,22 +100,111 @@ CDeClosedSurfTmClosedSurfTm( const SurfTriMesh& SurfA, const SurfTriMesh& SurfB,
               if ( CDeSimpleCylTria( frCyl, dSafeDist, dEdgeLen, trTriaA))
                  return true ;  
            }
-            // Traslo il triangolo
+           // Traslo il triangolo
            trTriaB.Translate( dSafeDist * trTriaB.GetN()) ;
         }
-         // Processo il triangolo: se i due triangoli collidono ho finito.
+        // Processo il triangolo: se i due triangoli collidono ho finito.
         if ( CDeTriaTria( trTriaA, trTriaB))
            return true ;
-         // Segno il triangolo come processato: nTFlag = 1
-         SurfB.SetTempInt( nTB, 1) ;
+        // Segno il triangolo come processato: nTemp = 1
+         pSrfB->SetTempInt( nTB, 1) ;
      }
   }
-   // Non ho trovato collisioni fra triangoli delle superfici.
-   // La collisione c'è se una superficie è dentro l'altra.
+  // Non ho trovato collisioni fra triangoli delle superfici.
+  // Se il BBox della prima superficie non è interno a quello della seconda e viceversa, non c'è collisione
+   if ( ! b3BoxA.Encloses( b3BoxB)  &&  ! b3BoxB.Encloses( b3BoxA))
+      return false ;
+  // La collisione c'è se una superficie è dentro l'altra.
   Point3d ptPointA, ptPointB ;
-   SurfA.GetFirstVertex( ptPointA) ;
-   SurfB.GetFirstVertex( ptPointB) ;
-   DistPointSurfTm DistPoinASurfB( ptPointA, SurfB) ;
-   DistPointSurfTm DistPoinBSurfA( ptPointB, SurfA) ;
-   return ( DistPoinASurfB.IsPointInside()  ||  DistPoinBSurfA.IsPointInside()) ;
-}
+   pSrfA->GetFirstVertex( ptPointA) ;
+   pSrfB->GetFirstVertex( ptPointB) ;
+   DistPointSurfTm DistPoinASrfB( ptPointA, *pSrfB) ;
+   DistPointSurfTm DistPoinBSrfA( ptPointB, *pSrfA) ;
+   return ( DistPoinASrfB.IsPointInside()  ||  DistPoinBSrfA.IsPointInside()) ;
+}
+
+//----------------------------------------------------------------------------
+// Verifica l'interferenza tra le due superfici : restituisce true in caso di interferenza.
+//----------------------------------------------------------------------------
+bool
+TestSurfTmSurfTm( const ISurfTriMesh& SurfA, const ISurfTriMesh& SurfB, double dSafeDist)
+{
+  // Recupero le superfici base
+   const SurfTriMesh* pSrfA = GetBasicSurfTriMesh( &SurfA) ;
+   const SurfTriMesh* pSrfB = GetBasicSurfTriMesh( &SurfB) ;
+  // Se le superfici non sono valide, non ha senso proseguire
+   if ( pSrfA == nullptr ||  ! pSrfA->IsValid()  ||
+        pSrfB == nullptr ||  ! pSrfB->IsValid())
+      return true ;
+  // Se i box delle superfici non si intersecano, ho finito.
+   BBox3d b3BoxA, b3BoxB ;
+   pSrfA->GetLocalBBox( b3BoxA) ;
+   pSrfB->GetLocalBBox( b3BoxB) ;
+  // Se è necessario, espando il box di B di una costante additiva pari alla distanza di sicurezza.
+   if ( dSafeDist > EPS_SMALL)
+      b3BoxB.Expand( dSafeDist) ;
+  // Se i box non si sovrappongono, non c'è collisione. Ho finito.
+   if ( ! b3BoxA.Overlaps( b3BoxB))
+      return false ;
+  // Recupero i triangoli di A che interferiscono col box di B
+   INTVECTOR vTriaIndex ;
+   pSrfA->GetAllTriaOverlapBox( b3BoxB, vTriaIndex) ;
+  // Ciclo sui triangoli della superficie A che interferiscono col box della superficie B.
+   for ( int nTA : vTriaIndex) {
+      Triangle3d trTriaA ;
+      if ( ! ( pSrfA->GetTriangle( nTA, trTriaA)  &&  trTriaA.Validate()))
+         continue ;
+      BBox3d b3BoxTriaA ;
+      trTriaA.GetLocalBBox( b3BoxTriaA) ;
+     // Se è necessario, espando il box di una costante additiva pari alla distanza di sicurezza.
+      if ( dSafeDist > EPS_SMALL)
+         b3BoxTriaA.Expand( dSafeDist) ;
+     // Recupero i triangoli di B che interferiscono col box del triangolo di A
+      INTVECTOR vNearTria ;
+      pSrfB->GetAllTriaOverlapBox( b3BoxTriaA, vNearTria) ;
+     // Settare tutti i triangoli come già processati.
+     // Al termine della chiamata i TempInt dei triangoli valgono 0.
+      pSrfB->ResetTempInts() ;
+     // Ciclo sui triangoli della superficie B che cadono nel box del triangolo corrente della Superficie A.
+      for ( int nTB : vNearTria) {
+        // Recupero il triangolo corrente della superficie B.
+        // Se triangolo non valido salto al successivo.
+         Triangle3d trTriaB ;
+         if ( ! ( pSrfB->GetTriangle( nTB, trTriaB)  &&  trTriaB.Validate()))
+            continue ;   
+        // Se necessario considero l'offset
+         if ( dSafeDist > EPS_SMALL) {
+            int nAdjTriaId[3] ;
+            pSrfB->GetTriangleAdjacencies( nTB, nAdjTriaId) ;
+           // Ciclo sui vertici del triangolo.
+            for ( int nVB = 0 ; nVB < 3 ; ++ nVB) {
+              // Se il triangolo adiacente al triangolo corrente su questo edge
+              // non è stato processato, processo il vertice e l'edge.
+               int nAdjTriaTempFlag ;
+               if ( ! ( pSrfB->GetTempInt( nAdjTriaId[nVB], nAdjTriaTempFlag)  ||  nAdjTriaTempFlag == 0))
+                  continue ;
+              // Processo il vertice: se c'è collisione fra triangolo A e sfera ho finito.
+               if ( CDeSimpleSpheTria( trTriaB.GetP( nVB), dSafeDist, trTriaA))
+                  return true ;
+              // Processo l'edge: se c'è collisione fra triangolo A e cilindro ho finito.
+               Vector3d vtEdgeV = trTriaB.GetP( ( nVB + 1) % 3) - trTriaB.GetP( nVB) ;
+               double dEdgeLen = vtEdgeV.Len() ;
+               vtEdgeV /= dEdgeLen ;
+               Frame3d frCyl ;
+               frCyl.Set( trTriaB.GetP( nVB), vtEdgeV) ;
+               if ( CDeSimpleCylTria( frCyl, dSafeDist, dEdgeLen, trTriaA))
+                  return true ;  
+            }
+           // Traslo il triangolo
+            trTriaB.Translate( dSafeDist * trTriaB.GetN()) ;
+         }
+        // Processo il triangolo: se i due triangoli collidono ho finito.
+         if ( CDeTriaTria( trTriaA, trTriaB))
+            return true ;
+        // Segno il triangolo come processato: nTemp = 1
+         pSrfB->SetTempInt( nTB, 1) ;
+      }
+   }
+  // Non c'è interferenza
+   return false ;
+}
@@ -1,12 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2020
+//  EgalTech 2020-2024
 //----------------------------------------------------------------------------
-// File : CDCylSurfTm.cpp      Data : 09.11.20        Versione : 
+// File : CDeConeFrustumClosedSurfTm.cpp  Data : 24.031.24  Versione : 2.6c2 
 // Contenuto : Implementazione della verifica di collisione tra
 //             Cone e Closed SurftriMesh.
 //
 //
 // Modifiche : 09.11.20 LM Creazione modulo.
+//             24.03.24 DS Aggiunta TestConeFrustumSurfTm.
 //
 //
 //----------------------------------------------------------------------------
@@ -20,45 +21,93 @@
 using namespace std ;

 //----------------------------------------------------------------------------
-// Il sisitema di riferimento deve avere l'asse di simmetria del cono come asse Z e origine nel centro della base.
-// La distanza di sicurezza ha effetto solo se maggiore di epsilon, altrimenti è ignorata ed è ininfluente.
-// Il sistema di riferimento del cono deve essere immerso in quello della superficie.
+// Il sistema di riferimento deve avere l'asse di simmetria del cono come asse Z e origine nel centro della base.
+// La distanza di sicurezza ha effetto solo se maggiore di EPS_SMALL, altrimenti è ignorata ed è ininfluente.
+// Il sistema di riferimento del cono è riferito a quello della superficie.
+// La funzione restituisce :
+// - true in caso di collisione o inconsistenza dei parametri di input
+// - false in caso di assenza di collisione.
+//----------------------------------------------------------------------------
 bool
 CDeConeFrustumClosedSurfTm( const Frame3d& frCone, double dBaseRad, double dTopRad, double dHeight,
-                            double dSafeDist, const ISurfTriMesh& Stm)
+                            const ISurfTriMesh& Stm, double dSafeDist)
 {
-  // Se il tronco di cono non è ben definito non ha senso proseguire.
+  // Se il tronco di cono non è ben definito non ha senso proseguire
   if ( max( dBaseRad, dTopRad) < EPS_SMALL  ||  dHeight < EPS_SMALL)
-      return false ;
+      return true ;
+  // Se superficie non valida o aperta, non ha senso proseguire
+   if ( ! Stm.IsValid()  ||  ! Stm.IsClosed())
+      return true ;
  // Recupero BBox della trimesh
   BBox3d b3Surf = Stm.GetAllTriaBox() ;
  // Calcolo il BBox del tronco di cono
   double dMaxRad = max( dBaseRad, dTopRad) ;
-   BBox3d b3Cone( - dMaxRad, - dMaxRad, 0, dMaxRad, dMaxRad, dHeight) ;
-   b3Cone.Expand( dSafeDist) ;
-  // Porto BBox del cono nel sistema della superficie.
-   b3Cone.ToGlob( frCone) ;
-  // Se i BBox non interferiscono, ho finito.
-   if ( ! b3Cone.Overlaps( b3Surf))
+   BBox3d b3ConeL( Point3d( -dMaxRad, -dMaxRad, 0),
+                   Point3d( dMaxRad, dMaxRad, dHeight)) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3ConeL.Expand( dSafeDist) ;
+   BBox3d b3Cone = GetToGlob( b3ConeL, frCone) ;
+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Surf.Overlaps( b3Cone)  ||  ! b3Surf.Overlaps( frCone, b3ConeL))
      return false ;
  // Recupero i triangoli che interferiscono con il box del cono
   INTVECTOR vT ;
   Stm.GetAllTriaOverlapBox( b3Cone, vT) ;
-  // Ciclo sui triangoli che interferiscono col box del cono
+  // Verifico se il tronco di cono interferisce con i triangoli del poliedro presenti nel suo BBox
   for ( int nT : vT) {
      Triangle3d trTria ;
      if ( Stm.GetTriangle( nT, trTria)) {
-         if ( CDeConeFrustumTria( frCone, dBaseRad, dTopRad, dHeight, dSafeDist, trTria))
+         if ( CDeConeFrustumTria( frCone, dBaseRad, dTopRad, dHeight, trTria, dSafeDist))
            return true ;
      }
   }
-  // Se superficie aperta, non c'è collisione
-   if ( ! Stm.IsClosed())
+  // Se il BBox del tronco di cono non è interno a quello del poliedro e viceversa, non c'è collisione
+   if ( ! b3Surf.Encloses( b3Cone)  &&  ! b3Cone.Encloses( b3Surf))
      return false ;
  // Verifico se il tronco di cono è dentro la superficie tramite calcolo distanza minima.
-   Point3d ptConeOrig ;
-   ptConeOrig.ToGlob( frCone) ;
-   DistPointSurfTm DistConeOrigSurfCalc( ptConeOrig, Stm) ;
+   Point3d ptConeCen( 0, 0, dHeight / 2) ;
+   ptConeCen.ToGlob( frCone) ;
+   DistPointSurfTm DistConeCenSurfCalc( ptConeCen, Stm) ;
  // Se il tronco di cono è interno c'è collisione
-   return DistConeOrigSurfCalc.IsPointInside() ;
-}
+   return DistConeCenSurfCalc.IsPointInside() ;
+}
+
+//----------------------------------------------------------------------------
+// Verifica l'interferenza tra il tronco di cono e la superficie : restituisce true in caso di interferenza.
+//----------------------------------------------------------------------------
+bool
+TestConeFrustumSurfTm( const Frame3d& frCone, double dBaseRad, double dTopRad, double dHeight,
+                       const ISurfTriMesh& Stm, double dSafeDist)
+{
+  // Se il tronco di cono non è ben definito non ha senso proseguire
+   if ( max( dBaseRad, dTopRad) < EPS_SMALL  ||  dHeight < EPS_SMALL)
+      return true ;
+  // Se superficie non valida, non ha senso proseguire
+   if ( ! Stm.IsValid())
+      return true ;
+  // Recupero BBox della trimesh
+   BBox3d b3Surf = Stm.GetAllTriaBox() ;
+  // Calcolo il BBox del tronco di cono
+   double dMaxRad = max( dBaseRad, dTopRad) ;
+   BBox3d b3ConeL( Point3d( -dMaxRad, -dMaxRad, 0),
+                   Point3d( dMaxRad, dMaxRad, dHeight)) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3ConeL.Expand( dSafeDist) ;
+   BBox3d b3Cone = GetToGlob( b3ConeL, frCone) ;
+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Surf.Overlaps( b3Cone)  ||  ! b3Surf.Overlaps( frCone, b3ConeL))
+      return false ;
+  // Recupero i triangoli che interferiscono con il box del cono
+   INTVECTOR vT ;
+   Stm.GetAllTriaOverlapBox( b3Cone, vT) ;
+  // Verifico se il tronco di cono interferisce con i triangoli del poliedro presenti nel suo BBox
+   for ( int nT : vT) {
+      Triangle3d trTria ;
+      if ( Stm.GetTriangle( nT, trTria)) {
+         if ( CDeConeFrustumTria( frCone, dBaseRad, dTopRad, dHeight, trTria, dSafeDist))
+            return true ;
+      }
+   }
+  // Non c'è interferenza
+   return false ;
+}
@@ -134,7 +134,7 @@ CDeSimpleConeFrustumTria( const Frame3d& frCone, double dMinRad, double dMaxRad,
 // La distanza di sicurezza ha effetto solo se maggiore di epsilon, altrimenti è ignorata ed è ininfluente.
 bool
 CDeConeFrustumTria( const Frame3d& frCone, double dBaseRad, double dTopRad, double dHeight,
-                    double dSafeDist, const Triangle3d& trTria)
+                    const Triangle3d& trTria, double dSafeDist)
 {
  // Se il tronco di cono o il triangolo non sono ben definiti non procedo
   if ( max( dBaseRad, dTopRad) < EPS_SMALL  ||  dHeight < EPS_SMALL  ||  ! trTria.IsValid())
@@ -142,7 +142,7 @@ CDeConeFrustumTria( const Frame3d& frCone, double dBaseRad, double dTopRad, doub

  // Se è un cilindro chiamo la routine apposita.
   if ( abs( dBaseRad - dTopRad) < EPS_SMALL)
-      return CDeCylTria( frCone, max( dBaseRad, dTopRad), dHeight, dSafeDist, trTria) ;
+      return CDeCylTria( frCone, max( dBaseRad, dTopRad), dHeight, trTria, dSafeDist) ;

  // Se il raggio di base è maggiore del raggio top cambio il sistema di riferimento.
   double dMinRad = dBaseRad ;
@@ -156,11 +156,11 @@ CDeConeFrustumTria( const Frame3d& frCone, double dBaseRad, double dTopRad, doub

  // Se è un cono, chiamo la routine apposita
   if ( dMinRad < EPS_SMALL)
-      return CDeConeTria( frMyCone, dMaxRad, dHeight, dSafeDist, trTria) ;
+      return CDeConeTria( frMyCone, dMaxRad, dHeight, trTria, dSafeDist) ;

  // Se distanza di sicurezza nulla
   if ( dSafeDist < EPS_SMALL)
-      return CDeSimpleConeFrustumTria( frMyCone, dBaseRad, dTopRad, dHeight, trTria ) ;
+      return CDeSimpleConeFrustumTria( frMyCone, dBaseRad, dTopRad, dHeight, trTria) ;

  // Verifica preliminare con tronco di cono esteso
   double dDiffRad = dMaxRad - dMinRad ;
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
 //  EgalTech 2020-2020
 //----------------------------------------------------------------------------
-// File : CDeConTria.cpp   Data : 28.10.20     Versione : 2.2k1
+// File : CDeConeFrustumTria.h   Data : 28.10.20     Versione : 2.2k1
 // Contenuto : Dichiarazione della verifica di collisione tra 
 //             Cone e Triangle3d.
 //
@@ -20,6 +20,5 @@
 // Il sistema di riferimento deve avere l'origine nel centro della base minore e l'asse
 // di simmetria del cono, rivolto verso la direzione di apertura, come asse Z.
 bool CDeSimpleConeFrustumTria( const Frame3d& frCone, double dMinRad, double dMaxRad, double dHeight, const Triangle3d& trTria) ;
-// Il sistema di riferimento ha l'asse Z coincidente con l'asse di simmetria del cono e l'origine nel centro della base.
 bool CDeConeFrustumTria( const Frame3d& frCone, double dBaseRad, double dTopRad, double dHeight,
-                         double dSafeDist, const Triangle3d& trTria) ;
+                         const Triangle3d& trTria, double dSafeDist) ;
@@ -111,7 +111,7 @@ CDeSimpleConeTria( const Frame3d& frCone, double dRad, double dHeight, const Tri

 //----------------------------------------------------------------------------
 bool
-CDeConeTria( const Frame3d& frCone, double dRad, double dHeight, double dSafeDist, const Triangle3d& trTria)
+CDeConeTria( const Frame3d& frCone, double dRad, double dHeight, const Triangle3d& trTria, double dSafeDist)
 {
  // Verifico validità del cono
   if ( dRad < EPS_SMALL  ||  dHeight < EPS_SMALL)
@@ -19,4 +19,4 @@
 //----------------------------------------------------------------------------
 // Il sistema di riferimento ha asse Z coincidente con l'asse del cono e origine nel vertice del cono (punto più basso).
 bool CDeSimpleConeTria( const Frame3d& frCone, double dRad, double dHeight, const Triangle3d& trTria) ;
-bool CDeConeTria( const Frame3d& frCone, double dRad, double dHeight, double dSafeDist, const Triangle3d& trTria) ;
+bool CDeConeTria( const Frame3d& frCone, double dRad, double dHeight, const Triangle3d& trTria, double dSafeDist) ;
@@ -1,12 +1,12 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2020
+//  EgalTech 2020-2024
 //----------------------------------------------------------------------------
-// File : CDeConvexTorusTria.cpp      Data : 18.11.20    Versione : 
+// File : CDeConvexTorusTria.cpp      Data : 24.03.24    Versione : 2.6c2
 // Contenuto : Implementazione funzione verifica collisione tra
 //             toro convesso e SurfTriMesh.
 //
 // Modifiche : 18.11.20 LM Creazione modulo.
-//
+//             24.03.24 DS Aggiunta TestConvexTorusSurfTm.
 //
 //----------------------------------------------------------------------------

@@ -18,48 +18,90 @@
 using namespace std ;

 //----------------------------------------------------------------------------
-// Il toro convesso è il disco limitato dalla sola parte esterna del toro.
+// Il toro convesso è il solido a disco limitato dalla sola parte esterna del toro.
 // Raggio principale R1, raggio secondario R2.
 // Il toro è posto nel piano XY del suo riferimento, centrato sull'origine.
-// La funzione restituisce true in caso di collisione.
+// La funzione restituisce :
+// - true in caso di collisione o inconsistenza dei parametri di input
+// - false in caso di assenza di collisione.
+//----------------------------------------------------------------------------
 bool
-CDeConvexTorusClosedSurfTm( const Frame3d& frTorusFrame, double dRad1, double dRad2,
-                            double dSafeDist, const ISurfTriMesh& Stm)
+CDeConvexTorusClosedSurfTm( const Frame3d& frTorus, double dRad1, double dRad2,
+                            const ISurfTriMesh& Stm, double dSafeDist)
 {
-  // I raggi devono essere non nulli e la superficie ben definita.
-   if ( dRad1 < EPS_SMALL  ||  dRad2 < EPS_SMALL  ||  ! Stm.IsValid())
-      return false ;
-  // Box del toro (sempre completo)
-   BBox3d b3ConvTorusBox ;
-   b3ConvTorusBox.Set( Point3d( - dRad1 - dRad2, - dRad1 - dRad2, - dRad2),
-                       Point3d(   dRad1 + dRad2,   dRad1 + dRad2,   dRad2)) ;
-  // Aggiungo eventuale distanza di sicurezza
-   if ( dSafeDist > EPS_SMALL)
-      b3ConvTorusBox.Expand( dSafeDist) ;
-  // Porto il box del toro nel riferimento della superficie (inteso some globale)
-   b3ConvTorusBox.ToGlob( frTorusFrame) ;
+  // I raggi devono essere non nulli
+   if ( dRad1 < EPS_SMALL  ||  dRad2 < EPS_SMALL)
+      return true ;
+  // Se superficie non valida o aperta, non ha senso proseguire
+   if ( ! Stm.IsValid()  ||  ! Stm.IsClosed())
+      return true ;
  // Box della superficie
-   BBox3d b3SurfBox = Stm.GetAllTriaBox() ;
+   BBox3d b3Surf = Stm.GetAllTriaBox() ;
+  // Box del toro (sempre completo)
+   BBox3d b3TorusL( Point3d( -dRad1 - dRad2, -dRad1 - dRad2, -dRad2),
+                    Point3d(  dRad1 + dRad2,  dRad1 + dRad2,  dRad2)) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3TorusL.Expand( dSafeDist) ;
+   BBox3d b3Torus = GetToGlob( b3TorusL, frTorus) ;
  // Se i BBox non interferiscono, non c'è collisione
-   if ( ! b3ConvTorusBox.Overlaps( b3SurfBox))
+   if ( ! b3Surf.Overlaps( b3Torus)  ||  ! b3Surf.Overlaps( frTorus, b3TorusL))
      return false ;
  // Recupero i triangoli che interferiscono con il box del toro
   INTVECTOR vT ;
-   Stm.GetAllTriaOverlapBox( b3ConvTorusBox, vT) ;
-  // Ciclo sui triangoli recuperati
+   Stm.GetAllTriaOverlapBox( b3Torus, vT) ;
+  // Verifico se il toro interferisce con i triangoli del poliedro presenti nel suo BBox
   for ( int nT : vT) {
      Triangle3d trTria ;
      if ( Stm.GetTriangle( nT, trTria)) {
-         if ( CDeConvexTorusTria( frTorusFrame, dRad1, dRad2, CT_TOT, dSafeDist, trTria))
+         if ( CDeConvexTorusTria( frTorus, dRad1, dRad2, CT_TOT, trTria, dSafeDist))
            return true ;
      }
   }
-  // Se superficie aperta, non c'è collisione
-   if ( ! Stm.IsClosed())
+  // Se il BBox del toro non è interno a quello del poliedro e viceversa, non c'è collisione
+   if ( ! b3Surf.Encloses( b3Torus)  &&  ! b3Torus.Encloses( b3Surf))
      return false ;
-  // Verifico se il toro è dentro la superficie tramite calcolo distanza minima.
-   Point3d ptTorusOrig = frTorusFrame.Orig() ;
+  // Verifico se il toro è dentro la superficie tramite calcolo distanza minima del suo centro
+   Point3d ptTorusOrig = frTorus.Orig() ;
   DistPointSurfTm DistConeOrigSurfCalc( ptTorusOrig, Stm) ;
  // Se il toro è interno c'è collisione
   return ( DistConeOrigSurfCalc.IsPointInside()) ;
 }
+
+//----------------------------------------------------------------------------
+// Verifica l'interferenza tra il toro convesso e la superficie : restituisce true in caso di interferenza
+//----------------------------------------------------------------------------
+bool
+TestConvexTorusSurfTm( const Frame3d& frTorus, double dRad1, double dRad2,
+                       const ISurfTriMesh& Stm, double dSafeDist)
+{
+  // I raggi devono essere non nulli
+   if ( dRad1 < EPS_SMALL  ||  dRad2 < EPS_SMALL)
+      return true ;
+  // Se superficie non valida, non ha senso proseguire
+   if ( ! Stm.IsValid())
+      return true ;
+  // Box della superficie
+   BBox3d b3Surf = Stm.GetAllTriaBox() ;
+  // Box del toro (sempre completo)
+   BBox3d b3TorusL( Point3d( -dRad1 - dRad2, -dRad1 - dRad2, -dRad2),
+                    Point3d(  dRad1 + dRad2,  dRad1 + dRad2,  dRad2)) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3TorusL.Expand( dSafeDist) ;
+   BBox3d b3Torus = GetToGlob( b3TorusL, frTorus) ;
+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Surf.Overlaps( b3Torus)  ||  ! b3Surf.Overlaps( frTorus, b3TorusL))
+      return false ;
+  // Recupero i triangoli che interferiscono con il box del toro
+   INTVECTOR vT ;
+   Stm.GetAllTriaOverlapBox( b3Torus, vT) ;
+  // Verifico se il toro interferisce con i triangoli del poliedro presenti nel suo BBox
+   for ( int nT : vT) {
+      Triangle3d trTria ;
+      if ( Stm.GetTriangle( nT, trTria)) {
+         if ( CDeConvexTorusTria( frTorus, dRad1, dRad2, CT_TOT, trTria, dSafeDist))
+            return true ;
+      }
+   }
+  // Non c'è interferenza
+   return false ;
+}
@@ -61,7 +61,7 @@ CDeSimpleConvexTorusTria( const Frame3d& frTorus, double dRad1, double dRad2, in
   bool bContinue = plyApprox.GetFirstPoint( ptSt)  &&  plyApprox.GetNextPoint( ptEn) ;
   while ( bContinue  &&  ! bCollision) {
      frConus.Set( Point3d( 0., 0., ptSt.z), Frame3d::TOP) ;
-      bCollision = CDeConeFrustumTria( frConus, ptSt.x, ptEn.x, ptEn.z - ptSt.z, 0., trMyTria) ;
+      bCollision = CDeSimpleConeFrustumTria( frConus, ptSt.x, ptEn.x, ptEn.z - ptSt.z, trMyTria) ;
      ptSt = ptEn ;
      bContinue = plyApprox.GetNextPoint( ptEn) ;
   }
@@ -71,7 +71,7 @@ CDeSimpleConvexTorusTria( const Frame3d& frTorus, double dRad1, double dRad2, in
 //----------------------------------------------------------------------------
 bool
 CDeConvexTorusTria( const Frame3d& frTorus, double dRad1, double dRad2, int nCtType,
-                    double dSafeDist, const Triangle3d& trTria)
+                    const Triangle3d& trTria, double dSafeDist)
 {
  // I raggi devono essere non nulli e il triangolo ben definito.
   if ( dRad1 < EPS_SMALL  ||  dRad2 < EPS_SMALL  ||  ! trTria.IsValid())
@@ -28,4 +28,4 @@ enum ConvexTorusType { CT_INF = -1, CT_SUP = 1, CT_TOT = 0} ;
 bool CDeSimpleConvexTorusTria( const Frame3d& frTorus, double dRad1, double dRad2, int nCtType,
                               const Triangle3d& trTria) ;
 bool CDeConvexTorusTria( const Frame3d& frTorus, double dRad1, double dRad2, int nCtType,
-                         double dSafeDist, const Triangle3d& trTria) ;
+                         const Triangle3d& trTria, double dSafeDist) ;
@@ -1,13 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2020
+//  EgalTech 2020-2024
 //----------------------------------------------------------------------------
-// File : CDCylSurfTm.cpp      Data : 09.01.20        Versione : 2.2a2
+// File : CDeCylClosedSurfTm.cpp      Data : 24.03.24        Versione : 2.6c2
 // Contenuto : Implementazione della verifica di collisione tra
 //             Cylinder e Closed SurftriMesh.
 //
 //
 // Modifiche : 09.01.20 DS Creazione modulo.
-//
+//             24.03.24 DS Aggiunta TestCylSurfTm.
 //
 //----------------------------------------------------------------------------

@@ -19,42 +19,100 @@

 using namespace std ;

+//----------------------------------------------------------------------------
+// Il sistema di riferimento deve avere l'asse di simmetria del cilindro come asse Z e origine nel centro della base o del top.
+// La distanza di sicurezza ha effetto solo se maggiore di EPS_SMALL, altrimenti è ignorata ed è ininfluente.
+// Il sistema di riferimento del cilindro è riferito a quello della superficie.
+// La funzione restituisce :
+// - true in caso di collisione o inconsistenza dei parametri di input
+// - false in caso di assenza di collisione.
 //----------------------------------------------------------------------------
 bool
-CDeCylClosedSurfTm( const Frame3d& frCyl, double dR, double dH, double dSafeDist, const ISurfTriMesh& Stm)
+CDeCylClosedSurfTm( const Frame3d& frCyl, double dR, double dH, const ISurfTriMesh& Stm, double dSafeDist)
 {
-  // recupero BBox del poliedro
+  // Il cilindro deve essere ben definito
+   if ( dR < EPS_SMALL  ||  dH < EPS_SMALL)
+      return true ;
+  // Se superficie non valida o aperta, non ha senso proseguire
+   if ( ! Stm.IsValid()  ||  ! Stm.IsClosed())
+      return true ;
+  // Recupero BBox del poliedro
   BBox3d b3Poly = Stm.GetAllTriaBox() ;
-  // sistemazioni cilindro
-   Frame3d frC = frCyl ;
+  // Sistemazioni cilindro
+   Frame3d frMyCyl = frCyl ;
   if ( dH < 0) {
-      frC.Translate( dH * frC.VersZ()) ;
-      dH = - dH ;
+      frMyCyl.Translate( dH * frMyCyl.VersZ()) ;
+      dH = -dH ;
   }
-  // calcolo il BBox del cilindro
-   BBox3d b3Cyl( -dR, -dR, 0, dR, dR, dH) ;
-   b3Cyl.Expand( dSafeDist) ;
-   b3Cyl.ToGlob( frC) ;
-  // confronto i due Box
-   if ( ! b3Cyl.Overlaps( b3Poly))
+  // Calcolo il BBox del cilindro
+   BBox3d b3CylL( Point3d( -dR, -dR, 0),
+                  Point3d(  dR,  dR, dH)) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3CylL.Expand( dSafeDist) ;
+   BBox3d b3Cyl = GetToGlob( b3CylL, frMyCyl) ;
+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Poly.Overlaps( b3Cyl)  ||  ! b3Poly.Overlaps( frMyCyl, b3CylL))
      return false ;
-  // recupero i triangoli che interferiscono con il box del Cilindro
+  // Verifico se il cilindro interferisce con i triangoli del poliedro presenti nel suo BBox
   INTVECTOR vT ;
   Stm.GetAllTriaOverlapBox( b3Cyl, vT) ;
   for ( int nT : vT) {
      Triangle3d Tria ;
      if ( Stm.GetTriangle( nT, Tria)) {
-         if ( CDeCylTria( frC, dR, dH, dSafeDist, Tria))
+         if ( CDeCylTria( frMyCyl, dR, dH, Tria, dSafeDist))
            return true ;
      }
   }
-  // Se superficie aperta, non c'è collisione
-   if ( ! Stm.IsClosed())
+  // Se il BBox del cilindro non è interno a quello del poliedro e viceversa, non c'è collisione
+   if ( ! b3Poly.Encloses( b3Cyl)  &&  ! b3Cyl.Encloses( b3Poly))
      return false ;
-  // Verifico se il cilindro è dentro la superficie tramite calcolo distanza minima.
-   Point3d ptCylOrig( 0., 0., - dSafeDist) ;
-   ptCylOrig.ToGlob( frC) ;
-   DistPointSurfTm DistCylOrigSurfCalc( ptCylOrig, Stm) ;
+  // Verifico se il cilindro è dentro la superficie tramite calcolo distanza minima del suo centro
+   Point3d ptCylCen( 0, 0, dH / 2) ;
+   ptCylCen.ToGlob( frMyCyl) ;
+   DistPointSurfTm DistCylCenSurfCalc( ptCylCen, Stm) ;
  // Se il cilindro è interno c'è collisione
-   return ( DistCylOrigSurfCalc.IsPointInside()) ;
+   return ( DistCylCenSurfCalc.IsPointInside()) ;
+}
+
+//----------------------------------------------------------------------------
+// Verifica l'interferenza tra il cilindro e la superficie : restituisce true in caso di interferenza
+//----------------------------------------------------------------------------
+bool
+TestCylSurfTm( const Frame3d& frCyl, double dR, double dH, const ISurfTriMesh& Stm, double dSafeDist)
+{
+  // Il cilindro deve essere ben definito
+   if ( dR < EPS_SMALL  ||  dH < EPS_SMALL)
+      return true ;
+  // Se superficie non valida, non ha senso proseguire
+   if ( ! Stm.IsValid())
+      return true ;
+  // Recupero BBox della superficie poligonale
+   BBox3d b3Poly = Stm.GetAllTriaBox() ;
+  // Sistemazioni cilindro
+   Frame3d frMyCyl = frCyl ;
+   if ( dH < 0) {
+      frMyCyl.Translate( dH * frMyCyl.VersZ()) ;
+      dH = -dH ;
+   }
+  // Calcolo il BBox del cilindro
+   BBox3d b3CylL( Point3d( -dR, -dR, 0),
+                  Point3d(  dR,  dR, dH)) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3CylL.Expand( dSafeDist) ;
+   BBox3d b3Cyl = GetToGlob( b3CylL, frMyCyl) ;
+  // Se i BBox non interferiscono, non c'è interferenza
+   if ( ! b3Poly.Overlaps( b3Cyl)  ||  ! b3Poly.Overlaps( frMyCyl, b3CylL))
+      return false ;
+  // Verifico se il cilindro interferisce con i triangoli del poliedro presenti nel suo BBox
+   INTVECTOR vT ;
+   Stm.GetAllTriaOverlapBox( b3Cyl, vT) ;
+   for ( int nT : vT) {
+      Triangle3d Tria ;
+      if ( Stm.GetTriangle( nT, Tria)) {
+         if ( CDeCylTria( frMyCyl, dR, dH, Tria, dSafeDist))
+            return true ;
+      }
+   }
+  // Non c'è interferenza
+   return false ;
 }
@@ -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 ;
@@ -84,7 +84,7 @@ CDeSimpleCylTria( const Frame3d& frCyl, double dR, double dH, const Triangle3d&

 //----------------------------------------------------------------------------
 bool
-CDeCylTria( const Frame3d& frCyl, double dR, double dH, double dSafeDist, const Triangle3d& trTria)
+CDeCylTria( const Frame3d& frCyl, double dR, double dH, const Triangle3d& trTria, double dSafeDist)
 {
  // Se distanza di sicurezza nulla
   if ( dSafeDist < EPS_SMALL)
@@ -16,4 +16,4 @@

 //----------------------------------------------------------------------------
 bool CDeSimpleCylTria( const Frame3d& frCyl, double dR, double dH, const Triangle3d& trTria) ;
-bool CDeCylTria( const Frame3d& frCyl, double dR, double dH, double dSafeDist, const Triangle3d& trTria) ;
+bool CDeCylTria( const Frame3d& frCyl, double dR, double dH, const Triangle3d& trTria, double dSafeDist) ;
@@ -1,12 +1,12 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2020
+//  EgalTech 2020-2024
 //----------------------------------------------------------------------------
-// File : CDePyramidClosedSurfTm.h      Data : 09.11.20    Versione : 
+// File : CDeRectPrismoidClosedSurfTm.h    Data : 24.03.24  Versione : 2.6c2
 // Contenuto : Implementazione funzione verifica collisione tra
 //             Prismoide a basi rettangolari e Closed SurfTriMesh.
 //
 // Modifiche : 09.11.20 LM Creazione modulo.
-//
+//             24.03.24 DS Aggiunta TestRectPrismoidSurfTm.
 //
 //----------------------------------------------------------------------------

@@ -22,49 +22,100 @@ using namespace std ;
 // Il sistema di riferimento deve avere l'origine nel centro della Base, asse X lungo
 // un segmento della stessa e asse Z ortogonale alle basi e diretta verso la base Top.
 // Il sistema di riferimento della piramide deve essere immerso in quello della superficie.
+// La funzione restituisce :
+// - true in caso di collisione o inconsistenza dei parametri di input
+// - false in caso di assenza di collisione.
+//----------------------------------------------------------------------------
 bool
 CDeRectPrismoidClosedSurfTm( const Frame3d& frPrismoid, double dLenghtBaseX, double dLenghtBaseY,
                             double dLenghtTopX, double dLenghtTopY, double dHeight,
-                             double dSafeDist, const ISurfTriMesh& Stm)
+                             const ISurfTriMesh& Stm, double dSafeDist)
 {
-  // Se il tronco di piramide non è definito o la superficie non ben definita non ha senso proseguire.
+  // Se il tronco di piramide non è definito non ha senso proseguire.
   if ( max( dLenghtBaseX, dLenghtTopX) < EPS_SMALL  ||
        max( dLenghtBaseY, dLenghtTopY) < EPS_SMALL  ||
-        dHeight < EPS_SMALL  ||  ! Stm.IsValid())
-      return false ;
+        dHeight < EPS_SMALL)
+      return true ;
+  // Se superficie non valida o aperta, non ha senso proseguire
+   if ( ! Stm.IsValid()  ||  ! Stm.IsClosed())
+      return true ;
  // Recupero BBox della trimesh
   BBox3d b3Surf = Stm.GetAllTriaBox() ;
  // Calcolo il BBox del tronco di piramide
   double dMaxLenX = max( dLenghtBaseX, dLenghtTopX) ;
   double dMaxLenY = max( dLenghtBaseY, dLenghtTopY) ;
-   BBox3d b3Pyr( -dMaxLenX / 2, -dMaxLenY / 2, 0., dMaxLenX / 2, dMaxLenY / 2, dHeight) ;
-  // Se la distanza di sicurezza è maggiore di epsilon aumento le dimensioni del tronco di piramide.
-   if ( dSafeDist > EPS_SMALL) {
-      b3Pyr.Expand( dSafeDist) ;
-   }
-  // Porto BBox del tronco di piramide nel sistema della superficie.
-   b3Pyr.ToGlob( frPrismoid) ;
+   BBox3d b3PyrL( Point3d( -dMaxLenX / 2, -dMaxLenY / 2, 0.),
+                  Point3d(  dMaxLenX / 2,  dMaxLenY / 2, dHeight)) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3PyrL.Expand( dSafeDist) ;
+   BBox3d b3Pyr = GetToGlob( b3PyrL, frPrismoid) ;
  // Se i BBox non interferiscono, non c'è collisione
-   if ( ! b3Pyr.Overlaps( b3Surf))
+   if ( ! b3Surf.Overlaps( b3Pyr)  ||  ! b3Surf.Overlaps( frPrismoid, b3PyrL))
      return false ;
  // Recupero i triangoli che interferiscono con il box del tronco di piramide.
   INTVECTOR vT ;
   Stm.GetAllTriaOverlapBox( b3Pyr, vT) ;
-  // Ciclo sui triangoli che interferiscono col box del tronco di piramide.
+  // Verifico se il tronco di piramide interferisce con i triangoli del poliedro presenti nel suo BBox
   for ( int nT : vT) {
      Triangle3d trTria ; 
      if ( Stm.GetTriangle( nT, trTria)) {
         if ( CDeRectPrismoidTria( frPrismoid, dLenghtBaseX, dLenghtBaseY, dLenghtTopX, dLenghtTopY, dHeight,
-                                   dSafeDist, trTria))
+                                    trTria, dSafeDist))
            return true ;
      }
   }
-  // Se superficie aperta, non c'è collisione
-   if ( ! Stm.IsClosed())
+  // Se il BBox del tronco di piramide non è interno a quello del poliedro e viceversa, non c'è collisione
+   if ( ! b3Surf.Encloses( b3Pyr)  &&  ! b3Pyr.Encloses( b3Surf))
      return false ;
-  // Verifico se il tronco di piramide è dentro la superficie tramite calcolo distanza minima.
-   Point3d ptPyrOrig = frPrismoid.Orig() ;
-   DistPointSurfTm DistBoxOrigSurfCalc( ptPyrOrig, Stm) ;
-   // C'è collisione se il tronco di piramide è interno.
-   return ( DistBoxOrigSurfCalc.IsPointInside()) ;
+  // Verifico se il tronco di piramide è dentro la superficie tramite calcolo distanza minima del suo centro
+   Point3d ptPyrCen( 0, 0, dHeight / 2) ;
+   ptPyrCen.ToGlob( frPrismoid) ;
+   DistPointSurfTm DistPyrCenSurfCalc( ptPyrCen, Stm) ;
+  // C'è collisione se il tronco di piramide è interno
+   return ( DistPyrCenSurfCalc.IsPointInside()) ;
+}
+
+//----------------------------------------------------------------------------
+// Verifica l'interferenza tra il Prismoide a basi rettangolari e la superficie : restituisce true in caso di interferenza.
+//----------------------------------------------------------------------------
+bool
+TestRectPrismoidSurfTm( const Frame3d& frPrismoid, double dLenghtBaseX, double dLenghtBaseY,
+                        double dLenghtTopX, double dLenghtTopY, double dHeight,
+                        const ISurfTriMesh& Stm, double dSafeDist)
+{
+  // Se il tronco di piramide non è definito non ha senso proseguire.
+   if ( max( dLenghtBaseX, dLenghtTopX) < EPS_SMALL  ||
+        max( dLenghtBaseY, dLenghtTopY) < EPS_SMALL  ||
+        dHeight < EPS_SMALL)
+      return true ;
+  // Se superficie non valida, non ha senso proseguire
+   if ( ! Stm.IsValid())
+      return true ;
+  // Recupero BBox della trimesh
+   BBox3d b3Surf = Stm.GetAllTriaBox() ;
+  // Calcolo il BBox del tronco di piramide
+   double dMaxLenX = max( dLenghtBaseX, dLenghtTopX) ;
+   double dMaxLenY = max( dLenghtBaseY, dLenghtTopY) ;
+   BBox3d b3PyrL( Point3d( -dMaxLenX / 2, -dMaxLenY / 2, 0.),
+                  Point3d(  dMaxLenX / 2,  dMaxLenY / 2, dHeight)) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3PyrL.Expand( dSafeDist) ;
+   BBox3d b3Pyr = GetToGlob( b3PyrL, frPrismoid) ;
+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Surf.Overlaps( b3Pyr)  ||  ! b3Surf.Overlaps( frPrismoid, b3PyrL))
+      return false ;
+  // Recupero i triangoli che interferiscono con il box del tronco di piramide.
+   INTVECTOR vT ;
+   Stm.GetAllTriaOverlapBox( b3Pyr, vT) ;
+  // Verifico se il tronco di piramide interferisce con i triangoli del poliedro presenti nel suo BBox
+   for ( int nT : vT) {
+      Triangle3d trTria ; 
+      if ( Stm.GetTriangle( nT, trTria)) {
+         if ( CDeRectPrismoidTria( frPrismoid, dLenghtBaseX, dLenghtBaseY, dLenghtTopX, dLenghtTopY, dHeight,
+                                    trTria, dSafeDist))
+            return true ;
+      }
+   }
+  // Non c'è interferenza
+   return false ;
 }
@@ -14,6 +14,7 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "CDeRectPrismoidTria.h"
+#include "CDeCapsTria.h"
 #include "CDeBoxTria.h"
 #include "CDeCylTria.h"
 #include "CDeSpheTria.h"
@@ -133,7 +134,7 @@ CDeSimpleRectPrismoidTria( const Frame3d& frPrismoid, double dLenghtBaseX, doubl
 bool
 CDeRectPrismoidTria( const Frame3d& frPrismoid, double dLenghtBaseX, double dLenghtBaseY,
                     double dLenghtTopX, double dLenghtTopY, double dHeight,
-                     double dSafeDist, const Triangle3d& trTria)
+                     const Triangle3d& trTria, double dSafeDist)
 {
  // Se il tronco di piramide o il triangolo non sono ben definiti non procedo
   if ( max( dLenghtBaseX, dLenghtTopX) < EPS_SMALL  ||
@@ -141,9 +142,13 @@ CDeRectPrismoidTria( const Frame3d& frPrismoid, double dLenghtBaseX, double dLen
        dHeight < EPS_SMALL  ||  ! trTria.IsValid())
      return false ;

+  // Porto il triangolo nel riferimento del prismoide
+   Triangle3d trTriaL = trTria ;
+   trTriaL.ToLoc( frPrismoid) ;
+
  // Se distanza di sicurezza nulla
   if ( dSafeDist < EPS_SMALL)
-      return CDeSimpleRectPrismoidTria( frPrismoid, dLenghtBaseX, dLenghtBaseY, dLenghtTopX, dLenghtTopY, dHeight, trTria) ;
+      return CDeSimpleRectPrismoidTria( Frame3d(), dLenghtBaseX, dLenghtBaseY, dLenghtTopX, dLenghtTopY, dHeight, trTriaL) ;
   
  // Verifiche con offset esteso
   double dHDiffX = ( dLenghtBaseX - dLenghtTopX) / 2 ;
@@ -156,37 +161,37 @@ CDeRectPrismoidTria( const Frame3d& frPrismoid, double dLenghtBaseX, double dLen
   double dSecAy = sqrt( 1 + dTgAy * dTgAy) ;
   double dOffsBaseY = dSafeDist * ( dSecAy + dTgAy) ;
   double dOffsTopY = dSafeDist * ( dSecAy - dTgAy) ;
-   Frame3d frFrame = frPrismoid ; frFrame.Translate( - dSafeDist * frFrame.VersZ()) ;
-   if ( ! CDeSimpleRectPrismoidTria( frFrame, dLenghtBaseX + 2 * dOffsBaseX, dLenghtBaseY + 2 * dOffsBaseY,
-                                     dLenghtTopX + 2 * dOffsTopX, dLenghtTopY + 2 * dOffsTopY, dHeight + 2 * dSafeDist, trTria))
+   Frame3d frTmp( Point3d( 0, 0, -dSafeDist)) ;
+   if ( ! CDeSimpleRectPrismoidTria( frTmp, dLenghtBaseX + 2 * dOffsBaseX, dLenghtBaseY + 2 * dOffsBaseY,
+                                     dLenghtTopX + 2 * dOffsTopX, dLenghtTopY + 2 * dOffsTopY, dHeight + 2 * dSafeDist, trTriaL))
      return false ;

  // Offset fine
  // Box sotto
-   frFrame = frPrismoid ; frFrame.Translate( - dSafeDist * frFrame.VersZ()) ;
-   if ( CDeSimpleBoxTria( frFrame, Vector3d( dLenghtBaseX, dLenghtBaseY, dSafeDist), trTria))
+   frTmp.ChangeOrig( Point3d( 0, 0, -dSafeDist)) ;
+   if ( CDeSimpleBoxTria( frTmp, Vector3d( dLenghtBaseX, dLenghtBaseY, dSafeDist), trTriaL))
      return true ;
  // Box sopra
-   frFrame = frPrismoid ; frFrame.Translate( dHeight * frFrame.VersZ()) ;
-   if ( CDeSimpleBoxTria( frFrame, Vector3d( dLenghtTopX, dLenghtTopY, dSafeDist), trTria))
+   frTmp.ChangeOrig( Point3d( 0, 0, dHeight)) ;
+   if ( CDeSimpleBoxTria( frTmp, Vector3d( dLenghtTopX, dLenghtTopY, dSafeDist), trTriaL))
      return true ;
  // Prismoide allungato in X
   double dHypoX = sqrt( dHDiffX * dHDiffX + dHeight * dHeight) ;
   double dOffsX = dSafeDist * dHeight / dHypoX ;
   double dMoveXZ = dSafeDist * dHDiffX / dHypoX ;
-   frFrame = frPrismoid ; frFrame.Translate( dMoveXZ * frFrame.VersZ()) ;
-   if ( CDeSimpleRectPrismoidTria( frFrame, dLenghtBaseX + 2 * dOffsX, dLenghtBaseY,
-                                   dLenghtTopX + 2 * dOffsX, dLenghtTopY, dHeight, trTria))
+   frTmp.ChangeOrig( Point3d( 0, 0, dMoveXZ)) ;
+   if ( CDeSimpleRectPrismoidTria( frTmp, dLenghtBaseX + 2 * dOffsX, dLenghtBaseY,
+                                   dLenghtTopX + 2 * dOffsX, dLenghtTopY, dHeight, trTriaL))
      return true ;
  // Prismoide allungato in Y
   double dHypoY = sqrt( dHDiffY * dHDiffY + dHeight * dHeight) ;
   double dOffsY = dSafeDist * dHeight / dHypoY ;
   double dMoveYZ = dSafeDist * dHDiffY / dHypoY ;
-   frFrame = frPrismoid ; frFrame.Translate( dMoveYZ * frFrame.VersZ()) ;
-   if ( CDeSimpleRectPrismoidTria( frFrame, dLenghtBaseX, dLenghtBaseY + 2 * dOffsY,
-                                   dLenghtTopX, dLenghtTopY + 2 * dOffsY, dHeight, trTria))
+   frTmp.ChangeOrig( Point3d( 0, 0, dMoveYZ)) ;
+   if ( CDeSimpleRectPrismoidTria( frTmp, dLenghtBaseX, dLenghtBaseY + 2 * dOffsY,
+                                   dLenghtTopX, dLenghtTopY + 2 * dOffsY, dHeight, trTriaL))
      return true ;
-  // Sfere centrate nei vertici
+  // Vertici
   double dHalfBaseX = dLenghtBaseX / 2 ;
   double dHalfBaseY = dLenghtBaseY / 2 ;
   double dHalfTopX = dLenghtTopX / 2 ;
@@ -199,55 +204,30 @@ CDeRectPrismoidTria( const Frame3d& frPrismoid, double dLenghtBaseX, double dLen
                       Point3d( dHalfTopX, -dHalfTopY, dHeight),
                       Point3d( dHalfTopX, dHalfTopY, dHeight),
                       Point3d( -dHalfTopX, dHalfTopY, dHeight)} ;
-   for ( auto& ptV : vVert) {
-      ptV.ToGlob( frPrismoid) ;
-      if ( CDeSimpleSpheTria( ptV, dSafeDist, trTria))
-         return true ;
-   }
-  // Cilindri con i segmenti come asse
-   frFrame.Set( vVert[0], frPrismoid.VersX()) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenghtBaseX, trTria))
+  // Capsule centrati sui dodici spigoli
+   if ( CDeSimpleCapsTria( vVert[0], vVert[1], dSafeDist, trTriaL))
      return true ;
-   frFrame.Set( vVert[1], frPrismoid.VersY()) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenghtBaseY, trTria))
+   if ( CDeSimpleCapsTria( vVert[1], vVert[2], dSafeDist, trTriaL))
      return true ;
-   frFrame.Set( vVert[2], -frPrismoid.VersX()) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenghtBaseX, trTria))
+   if ( CDeSimpleCapsTria( vVert[2], vVert[3], dSafeDist, trTriaL))
      return true ;
-   frFrame.Set( vVert[3], -frPrismoid.VersY()) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenghtBaseY, trTria))
+   if ( CDeSimpleCapsTria( vVert[3], vVert[0], dSafeDist, trTriaL))
      return true ;
-   frFrame.Set( vVert[4], frPrismoid.VersX()) ;
-   if (CDeSimpleCylTria( frFrame, dSafeDist, dLenghtTopX, trTria))
+   if ( CDeSimpleCapsTria( vVert[4], vVert[5], dSafeDist, trTriaL))
      return true ;
-   frFrame.Set( vVert[5], frPrismoid.VersY()) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenghtTopY, trTria))
+   if ( CDeSimpleCapsTria( vVert[5], vVert[6], dSafeDist, trTriaL))
      return true ;
-   frFrame.Set( vVert[6], -frPrismoid.VersX()) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenghtTopX, trTria))
+   if ( CDeSimpleCapsTria( vVert[6], vVert[7], dSafeDist, trTriaL))
      return true ;
-   frFrame.Set( vVert[7], -frPrismoid.VersY()) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenghtTopY, trTria))
+   if ( CDeSimpleCapsTria( vVert[7], vVert[4], dSafeDist, trTriaL))
      return true ;
-   Vector3d vtSeg04 = vVert[4] - vVert[0] ;
-   double dLenSeg04 = vtSeg04.Len() ;
-   frFrame.Set( vVert[0], vtSeg04) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenSeg04, trTria))
+   if ( CDeSimpleCapsTria( vVert[0], vVert[4], dSafeDist, trTriaL))
      return true ;
-   Vector3d vtSeg15 = vVert[5] - vVert[1] ;
-   double dLenSeg15 = vtSeg15.Len() ;
-   frFrame.Set( vVert[1], vtSeg15) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenSeg15, trTria))
+   if ( CDeSimpleCapsTria( vVert[1], vVert[5], dSafeDist, trTriaL))
      return true ;
-   Vector3d vtSeg26 = vVert[6] - vVert[2] ;
-   double dLenSeg26 = vtSeg26.Len() ;
-   frFrame.Set( vVert[2], vtSeg26) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenSeg26, trTria))
+   if ( CDeSimpleCapsTria( vVert[2], vVert[6], dSafeDist, trTriaL))
      return true ;
-   Vector3d vtSeg37 = vVert[7] - vVert[3] ;
-   double dLenSeg37 = vtSeg37.Len();
-   frFrame.Set( vVert[3], vtSeg37) ;
-   if ( CDeSimpleCylTria( frFrame, dSafeDist, dLenSeg37, trTria))
+   if ( CDeSimpleCapsTria( vVert[3], vVert[7], dSafeDist, trTriaL))
      return true ;

   return false ;
@@ -26,4 +26,4 @@ bool CDeSimpleRectPrismoidTria( const Frame3d& frPrismoid, double dLenghtBaseX,
 // asse X lungo un lato della stessa e asse Z ortogonale alle basi e diretta verso la base Top.
 bool CDeRectPrismoidTria( const Frame3d& frPrismoid, double dLenghtBaseX, double dLenghtBaseY,
                          double dLenghtTopX, double dLenghtTopY, double dHeight,
-                          double dSafeDist, const Triangle3d& trTria) ;
+                          const Triangle3d& trTria, double dSafeDist) ;
@@ -1,13 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2020
+//  EgalTech 2020-2024
 //----------------------------------------------------------------------------
-// File : CDCylSurfTm.cpp      Data : 09.01.20        Versione : 2.2a2
+// File : CDCylSurfTm.cpp      Data : 24.03.24        Versione : 2.6c2
 // Contenuto : Implementazione della verifica di collisione tra
 //             Sphere e Closed SurftriMesh.
 //
 //
 // Modifiche : 09.01.20 DS Creazione modulo.
-//
+//             24.03.24 DS Aggiunta TestSpheSurfTm.
 //
 //----------------------------------------------------------------------------

@@ -19,33 +19,79 @@

 using namespace std ;

+//----------------------------------------------------------------------------
+// La funzione restituisce :
+// - true in caso di collisione o inconsistenza dei parametri di input
+// - false in caso di assenza di collisione.
 //----------------------------------------------------------------------------
 bool
-CDeSpheClosedSurfTm( const Point3d& ptCen, double dR, double dSafeDist, const ISurfTriMesh& Stm)
+CDeSpheClosedSurfTm( const Point3d& ptCen, double dR, const ISurfTriMesh& Stm, double dSafeDist)
 {
-  // recupero BBox del poliedro
+  // Il raggio deve essere non nullo
+   if ( dR < EPS_SMALL)
+      return true ;
+  // Se superficie non valida o aperta, non ha senso proseguire
+   if ( ! Stm.IsValid()  ||  ! Stm.IsClosed())
+      return true ;
+  // Recupero BBox del poliedro
   BBox3d b3Poly = Stm.GetAllTriaBox() ;
-  // calcolo il BBox della sfera
+  // Calcolo il BBox della sfera
   BBox3d b3Sphe( ptCen, dR) ;
-   b3Sphe.Expand( dSafeDist) ;
-  // confronto i due Box
+   if ( dSafeDist > EPS_SMALL)
+      b3Sphe.Expand( dSafeDist) ;
+  // Se i BBox non interferiscono, non c'è collisione
   if ( ! b3Sphe.Overlaps( b3Poly))
      return false ;
-  // recupero i triangoli che interferiscono con il box della Sfera
+  // Verifico se la sfera interferisce con i triangoli del poliedro presenti nel suo BBox
   INTVECTOR vT ;
   Stm.GetAllTriaOverlapBox( b3Sphe, vT) ;
   for ( int nT : vT) {
      Triangle3d Tria ;
      if ( Stm.GetTriangle( nT, Tria)) {
-         if ( CDeSpheTria( ptCen, dR, dSafeDist, Tria))
+         if ( CDeSpheTria( ptCen, dR, Tria, dSafeDist))
            return true ;
      }
   }
-  // Se superficie aperta, non c'è collisione
-   if ( ! Stm.IsClosed())
+  // Se il BBox della sfera non è interno a quello del poliedro e viceversa, non c'è collisione
+   if ( ! b3Sphe.Encloses( b3Poly)  &&  ! b3Poly.Encloses( b3Sphe))
      return false ;
-  // Verifico se la sfera è dentro la superficie tramite calcolo distanza minima.
+  // Verifico se la sfera è dentro la superficie tramite calcolo distanza minima del suo centro
   DistPointSurfTm DistCenSurfCalc( ptCen, Stm) ;
-   // C'è collisione se la sfera è interna.
+  // C'è collisione se la sfera è interna.
   return ( DistCenSurfCalc.IsPointInside()) ;
 }
+
+//----------------------------------------------------------------------------
+// Verifica l'interferenza tra la sfera e la superficie : restituisce true in caso di interferenza
+//----------------------------------------------------------------------------
+bool
+TestSpheSurfTm( const Point3d& ptCen, double dR, const ISurfTriMesh& Stm, double dSafeDist)
+{
+  // Il raggio deve essere non nullo
+   if ( dR < EPS_SMALL)
+      return true ;
+  // Se superficie non valida, non ha senso proseguire
+   if ( ! Stm.IsValid())
+      return true ;
+  // Recupero BBox del poliedro
+   BBox3d b3Poly = Stm.GetAllTriaBox() ;
+  // Calcolo il BBox della sfera
+   BBox3d b3Sphe( ptCen, dR) ;
+   if ( dSafeDist > EPS_SMALL)
+      b3Sphe.Expand( dSafeDist) ;
+  // Se i BBox non interferiscono, non c'è collisione
+   if ( ! b3Sphe.Overlaps( b3Poly))
+      return false ;
+  // Verifico se la sfera interferisce con i triangoli del poliedro presenti nel suo BBox
+   INTVECTOR vT ;
+   Stm.GetAllTriaOverlapBox( b3Sphe, vT) ;
+   for ( int nT : vT) {
+      Triangle3d Tria ;
+      if ( Stm.GetTriangle( nT, Tria)) {
+         if ( CDeSpheTria( ptCen, dR, Tria, dSafeDist))
+            return true ;
+      }
+   }
+  // Non c'è interferenza
+   return false ;
+}
@@ -31,7 +31,7 @@ CDeSimpleSpheTria( const Point3d& ptCen, double dR, const Triangle3d& trTria)

 //----------------------------------------------------------------------------
 bool
-CDeSpheTria( const Point3d& ptCen, double dR, double dSafeDist, const Triangle3d& trTria)
+CDeSpheTria( const Point3d& ptCen, double dR, const Triangle3d& trTria, double dSafeDist)
 {
   return CDeSimpleSpheTria( ptCen, dR + max( 0., dSafeDist), trTria) ;
 }
@@ -16,4 +16,4 @@

 //----------------------------------------------------------------------------
 bool CDeSimpleSpheTria( const Point3d& ptCen, double dR, const Triangle3d& trTria) ;
-bool CDeSpheTria( const Point3d& ptCen, double dR, double dSafeDist, const Triangle3d& trTria) ;
+bool CDeSpheTria( const Point3d& ptCen, double dR, const Triangle3d& trTria, double dSafeDist) ;
@@ -12,11 +12,10 @@
 //----------------------------------------------------------------------------

 #include "stdafx.h"
-#include "DistLineLine.h"
 #include "CDeTriaTria.h"
+#include "/EgtDev/Include/EGkDistLineLine.h"
 #include "/EgtDev/Include/EGkIntersPlanePlane.h"
 #include <array>
-#include <algorithm>

 using namespace std ;

@@ -34,7 +33,7 @@ GetTwoGreater( int nVal0, int nVal1, int nVal2, int& nFirstMaxPos, int& nSecondM
      }
      else {
         nFirstMaxPos = 2 ;
-         nSecondMaxPos = 1 ;
+         nSecondMaxPos = 0 ;
      }
   }
   else if ( nVal0 > nVal2) {
@@ -109,7 +108,7 @@ CDeTriaTria( const Triangle3d& trTriaA, const Triangle3d& trTriaB)
            DistLineLine LineLineDistCalc( ptStA, PtEnA, ptStB, PtEnB) ;
            double dSqSegSegDist ;
            LineLineDistCalc.GetSqDist( dSqSegSegDist) ;
-            if ( dSqSegSegDist < EPS_SMALL * EPS_SMALL)
+            if ( dSqSegSegDist < SQ_EPS_SMALL)
               return true ;
         }
      }
@@ -136,14 +135,14 @@ CDeTriaTria( const Triangle3d& trTriaA, const Triangle3d& trTriaB)
   vtSegFirstA /= dSegLenFirstA ;
   DistLineLine LineLineDistCalcFirstA( ptLineP, vtLineV, 100., trTriaA.GetP( nFirstMaxPosA), vtSegFirstA, dSegLenFirstA, false) ;
   double dIntParStA, dOtherParFirstA ;
-   LineLineDistCalcFirstA.GetParamsAtMinDistPoints( dIntParStA, dOtherParFirstA) ;
+   LineLineDistCalcFirstA.GetPositionsAtMinDistPoints( dIntParStA, dOtherParFirstA) ;
   // Limito la retta col secondo segmento trovato di A
   Vector3d vtSegSecondA = trTriaA.GetP( ( nSecondMaxPosA + 1) % 3) - trTriaA.GetP( nSecondMaxPosA) ;
   double dSegLenSecondA = vtSegSecondA.Len() ;
   vtSegSecondA /= dSegLenSecondA ;
   DistLineLine LineLineDistCalcSecondA( ptLineP, vtLineV, 100., trTriaA.GetP( nSecondMaxPosA), vtSegSecondA, dSegLenSecondA, false) ;
   double dIntParEnA, dOtherParSecondA ;
-   LineLineDistCalcSecondA.GetParamsAtMinDistPoints( dIntParEnA, dOtherParSecondA) ;
+   LineLineDistCalcSecondA.GetPositionsAtMinDistPoints( dIntParEnA, dOtherParSecondA) ;
   // Ordino i parametri lungo la retta di intersezione fra i piani
   if ( dIntParStA > dIntParEnA) {
      swap( dIntParStA, dIntParEnA) ;
@@ -163,14 +162,14 @@ CDeTriaTria( const Triangle3d& trTriaA, const Triangle3d& trTriaB)
   vtSegFirstB /= dSegLenFirstB ;
   DistLineLine LineLineDistCalcFirstB( ptLineP, vtLineV, 100., trTriaB.GetP( nFirstMaxPosB), vtSegFirstB, dSegLenFirstB, false) ;
   double dIntParStB, dOtherParFirstB ;
-   LineLineDistCalcFirstB.GetParamsAtMinDistPoints( dIntParStB, dOtherParFirstB) ;
+   LineLineDistCalcFirstB.GetPositionsAtMinDistPoints( dIntParStB, dOtherParFirstB) ;
   // Limito la retta col secondo segmento trovato di B
   Vector3d vtSegSecondB = trTriaB.GetP( ( nSecondMaxPosB + 1) % 3) - trTriaB.GetP( nSecondMaxPosB) ;
   double dSegLenSecondB = vtSegSecondB.Len() ;
   vtSegSecondB /= dSegLenSecondB ;
-   DistLineLine LineLineDistCalcSecondB( ptLineP, vtLineV, 100., trTriaB.GetP( nSecondMaxPosA), vtSegSecondB, dSegLenSecondB, false) ;
+   DistLineLine LineLineDistCalcSecondB( ptLineP, vtLineV, 100., trTriaB.GetP( nSecondMaxPosB), vtSegSecondB, dSegLenSecondB, false) ;
   double dIntParEnB, dOtherParSecondB ;
-   LineLineDistCalcSecondB.GetParamsAtMinDistPoints( dIntParEnB, dOtherParSecondB) ;
+   LineLineDistCalcSecondB.GetPositionsAtMinDistPoints( dIntParEnB, dOtherParSecondB) ;
   // Ordino i parametri lungo la retta di intersezione fra i piani
   if ( dIntParStB > dIntParEnB) {
      swap( dIntParStB, dIntParEnB) ;
@@ -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 ;
@@ -368,4 +368,4 @@ ClampSegmentOutPlane( const Plane3d& plPlane, Point3d& ptSegP, const Vector3d& v
      dSegLen -= dIntersLen ;
   }
   return true ;
-}
+}
@@ -2,7 +2,7 @@
 //  EgalTech 2013-2014
 //----------------------------------------------------------------------------
 // File : ChainCurves.cpp           Data : 20.07.14       Versione : 1.5g3
-// Contenuto : Implementazione della funzione ChainCurves, per creare una o più
+// Contenuto : Implementazione della funzione ChainCurves, per creare una o più
 //             curve composite a partire dalle curve date.
 //
 //
@@ -13,9 +13,9 @@

 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
-#include "/EgtDev/Include/EgkChainCurves.h"
-#include "/EgtDev/Include/EgkGeomDB.h"
-#include "/EgtDev/Include/EgkCurve.h"
+#include "/EgtDev/Include/EGkChainCurves.h"
+#include "/EgtDev/Include/EGkGeomDB.h"
+#include "/EgtDev/Include/EGkCurve.h"
 #include <algorithm>

 using namespace std ;
@@ -43,10 +43,10 @@ bool
 ChainCurves::AddCurve( int nId, const Point3d& ptStart, const Vector3d& vtStart,
                       const Point3d& ptEnd, const Vector3d& vtEnd)
 {
-  // verifico validità Id
+  // verifico validità Id
   if ( nId <= 0)
      return false ;
-  // verifico non sia già stata aggiunta la stessa entità
+  // verifico non sia già stata aggiunta la stessa entità
   if ( ! m_sCrvId.insert( nId).second)
      return true ;
  // inserisco i dati della curva nel vettore
@@ -68,7 +68,7 @@ ChainCurves::GetChainFromNear( const Point3d& ptStart, bool bHaltOnFork, INTVECT
   m_bIsFork = false ;
   m_vFork.clear() ;

-  // recupero l'entità più vicina al punto di start
+  // recupero l'entità più vicina al punto di start
   int nStart ;
   INTVECTOR vStart ;
   if ( ! m_PointGrid.FindNearest( ptStart, vStart)  ||
@@ -82,7 +82,7 @@ ChainCurves::GetChainFromNear( const Point3d& ptStart, bool bHaltOnFork, INTVECT
   // tolgo dal grid
   RemoveEntityFromGrid( nId) ;

-  // se devo fermarmi su biforcazione, verifico se sono già su vecchia biforcazione
+  // se devo fermarmi su biforcazione, verifico se sono già su vecchia biforcazione
   bool bSkip = false ;
   if ( bHaltOnFork) {
      auto iIter = GetForkPoint( m_vCrvData[nId].ptEnd) ;
@@ -93,7 +93,7 @@ ChainCurves::GetChainFromNear( const Point3d& ptStart, bool bHaltOnFork, INTVECT
      }
   }

-  // concateno dopo la fine dell'entità di partenza
+  // concateno dopo la fine dell'entità di partenza
   INTVECTOR vIdsAfter ;
   bool bClosed = false ;
   if ( ! bSkip  &&  ! GetChainFromPoint( m_vCrvData[nId].ptEnd, m_vCrvData[nId].vtEnd,
@@ -102,7 +102,7 @@ ChainCurves::GetChainFromNear( const Point3d& ptStart, bool bHaltOnFork, INTVECT
      return false ;
   }

-  // se devo fermarmi su biforcazione, verifico se sono già su vecchia biforcazione
+  // se devo fermarmi su biforcazione, verifico se sono già su vecchia biforcazione
   bool bRevSkip = false ;
   if ( bHaltOnFork) {
      auto iIter = GetForkPoint( m_vCrvData[nId].ptStart) ;
@@ -113,7 +113,7 @@ ChainCurves::GetChainFromNear( const Point3d& ptStart, bool bHaltOnFork, INTVECT
      }
   }

-  // se non ho già chiuso l'anello, concateno prima dell'inizio dell'entità di partenza
+  // se non ho già chiuso l'anello, concateno prima dell'inizio dell'entità di partenza
   INTVECTOR vIdsBefore ;
   if ( ! bClosed) {
      bool bRevClosed ;
@@ -258,7 +258,7 @@ ChainCurves::RemoveEntityFromGrid( int nId)
 bool
 ChainCurves::ChooseStart( const Point3d& ptStart, const INTVECTOR& vStart, int& nStart)
 {
-  // numero di entità candidate
+  // numero di entità candidate
   int nSize = int( vStart.size()) ;

  // se nessuna, errore
@@ -273,7 +273,7 @@ ChainCurves::ChooseStart( const Point3d& ptStart, const INTVECTOR& vStart, int&

  // altrimenti, cerco la migliore
   int nI = - 1 ;
-   double dSqDistMin = SQ_INFINITO ;
+   double dDistMin = INFINITO ;
   for ( int i = 0 ; i < nSize ; ++ i) {
     // recupero indice e verso
      int nId = abs( vStart[i]) - 1 ;
@@ -281,9 +281,12 @@ ChainCurves::ChooseStart( const Point3d& ptStart, const INTVECTOR& vStart, int&
     // calcolo un punto vicino all'estremo lungo la tangente
      Point3d ptNear = ( bEquiv ? m_vCrvData[nId].ptStart + m_vCrvData[nId].vtStart :
                                  m_vCrvData[nId].ptEnd - m_vCrvData[nId].vtEnd) ;
-      double dSqDist = SqDist( ptStart, ptNear) ;
-      if ( dSqDist < dSqDistMin) {
-         dSqDistMin = dSqDist ;
+      double dDist = Dist( ptStart, ptNear) ;
+      // tengo il segmento più vicino al punto
+      // favorendo eventualmente quello equiverso se entro EPS da un concorrente
+      if ( dDist < dDistMin - EPS_SMALL  ||
+         ((dDist < dDistMin + EPS_SMALL)  &&  bEquiv  &&  vStart[nI] < 0)) {
+         dDistMin = dDist ;
         nI = i ;
      }
   }
@@ -302,7 +305,7 @@ bool
 ChainCurves::ChooseNext( const Point3d& ptCurr, const Vector3d& vtCurr, const INTVECTOR& vNext, bool bHaltOnFork, int& nNext)
 {
   INTVECTOR vMyNext = vNext ;
-  // scarto quelle entità che sono più vicine all'altro estremo del più vicino
+  // scarto quelle entità che sono più vicine all'altro estremo del più vicino
   int nM = -1 ;
   Point3d ptRef ;
   double dSqMinDist = m_dToler * m_dToler ;
@@ -319,19 +322,19 @@ ChainCurves::ChooseNext( const Point3d& ptCurr, const Vector3d& vtCurr, const IN
      }
   }
   for ( int i = 0 ; i < int( vMyNext.size()) ; ++ i) {
-     // salto l'entità più vicina
+     // salto l'entità più vicina
      if ( i == nM)
         continue ;
     // recupero indice e verso
      int nId = abs( vMyNext[i]) - 1 ;
      bool bEquiv = ( vMyNext[i] > 0) ;
-     // verifico se più vicino al più vicino
+     // verifico se più vicino al più vicino
      double dCurrSqDist = SqDist( ptCurr, ( bEquiv ? m_vCrvData[nId].ptStart : m_vCrvData[nId].ptEnd)) ;
      double dRefSqDist = SqDist( ptRef, ( bEquiv ? m_vCrvData[nId].ptStart : m_vCrvData[nId].ptEnd)) ;
      if ( dRefSqDist < dCurrSqDist)
         vMyNext[i] = 0 ;
   }
-  // cerco la direzione più vicina
+  // cerco la direzione più vicina
   int nI = -1 ;
   int nF = 0 ;
   INTVECTOR vFork ;
@@ -343,7 +346,7 @@ ChainCurves::ChooseNext( const Point3d& ptCurr, const Vector3d& vtCurr, const IN
     // recupero indice e verso
      int nId = abs( vMyNext[i]) - 1 ;
      bool bEquiv = ( vMyNext[i] > 0) ;
-     // incremento contatore indice entità tra cui scegliere
+     // incremento contatore indice entità tra cui scegliere
      ++ nF ;
      vFork.push_back( vMyNext[i]) ;
     // se vietata inversione, salto se controverso
@@ -387,7 +390,7 @@ bool
 ChainCurves::ChoosePrev( const Point3d& ptCurr, const Vector3d& vtCurr, const INTVECTOR& vPrev, bool bHaltOnFork, int& nPrev)
 {
   INTVECTOR vMyPrev = vPrev ;
-  // scarto quelle entità che sono più vicine all'altro estremo del più vicino
+  // scarto quelle entità che sono più vicine all'altro estremo del più vicino
   int nM = -1 ;
   Point3d ptRef ;
   double dSqMinDist = m_dToler * m_dToler ;
@@ -404,19 +407,19 @@ ChainCurves::ChoosePrev( const Point3d& ptCurr, const Vector3d& vtCurr, const IN
      }
   }
   for ( int i = 0 ; i < int( vMyPrev.size()) ; ++ i) {
-     // salto l'entità più vicina
+     // salto l'entità più vicina
      if ( i == nM)
         continue ;
     // recupero indice e verso
      int nId = abs( vMyPrev[i]) - 1 ;
      bool bEquiv = ( vMyPrev[i] < 0) ;
-     // verifico se più vicino al più vicino
+     // verifico se più vicino al più vicino
      double dCurrSqDist = SqDist( ptCurr, ( bEquiv ? m_vCrvData[nId].ptEnd : m_vCrvData[nId].ptStart)) ;
      double dRefSqDist = SqDist( ptRef, ( bEquiv ? m_vCrvData[nId].ptEnd : m_vCrvData[nId].ptStart)) ;
      if ( dRefSqDist < dCurrSqDist)
         vMyPrev[i] = 0 ;
   }
-  // cerco la direzione più vicina
+  // cerco la direzione più vicina
   int nI = - 1 ;
   int nF = 0 ;
   double dProScaMax = - 1.1 ; 
@@ -428,7 +431,7 @@ ChainCurves::ChoosePrev( const Point3d& ptCurr, const Vector3d& vtCurr, const IN
     // recupero indice e verso
      int nId = abs( vMyPrev[i]) - 1 ;
      bool bEquiv = ( vMyPrev[i] < 0) ;
-     // incremento contatore indice entità tra cui scegliere
+     // incremento contatore indice entità tra cui scegliere
      ++ nF ;
      vFork.push_back( vMyPrev[i]) ;
     // se vietata inversione, salto se controverso
@@ -0,0 +1,44 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2022-2022
+//----------------------------------------------------------------------------
+// File : Circle2P.cpp        Data : 18.08.22       Versione : 2.4h2
+// Contenuto : Implementazione funzioni per calcolo circonferenze per 2 punti
+//             diametrali.
+//
+//
+// Modifiche : 18.08.22 DS Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+//--------------------------- Include ----------------------------------------
+#include "stdafx.h"
+#include "CurveArc.h"
+#include "/EgtDev/Include/EGkCircle2P.h"
+#include "/EgtDev/Include/EgtPointerOwner.h"
+
+using namespace std ;
+
+//----------------------------------------------------------------------------
+ICurveArc*
+GetCircle2P( const Point3d& ptP1, const Point3d& ptP2, const Vector3d& vtN)
+{
+  // Verifico che i due punti siano distinti
+   if ( AreSamePointEpsilon( ptP1, ptP2, EPS_SMALL))
+      return nullptr ;
+  // verifico che la normale non sia allineata con i punti
+   Vector3d vtO = OrthoCompo( vtN, ptP2 - ptP1) ;
+   if ( ! vtO.Normalize())
+      return nullptr ;
+
+  // Creo l'oggetto arco
+   PtrOwner<CurveArc> pCrvArc( CreateBasicCurveArc()) ;
+   if ( IsNull( pCrvArc))
+      return nullptr ;
+
+  // Eseguo calcoli
+   if ( ! pCrvArc->SetCPAN( Media( ptP1, ptP2), ptP1, ANG_FULL, 0, vtO))
+      return nullptr ;
+
+   return Release( pCrvArc) ;
+}
@@ -16,10 +16,10 @@
 #include "CurveBezier.h"
 #include "CurveComposite.h"
 #include "CreateCurveAux.h"
-#include "DistPointLine.h"
 #include "GeoConst.h"
-#include "/EgtDev/Include/EgkCircleCenTgCurve.h"
-#include "/EgtDev/Include/EgkDistPointCurve.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
+#include "/EgtDev/Include/EGkCircleCenTgCurve.h"
+#include "/EgtDev/Include/EGkDistPointCurve.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

 using namespace std ;
@@ -239,7 +239,7 @@ GetCircleCenTgCompo( const Point3d& ptCen, const Vector3d& vtN, const CurveCompo
      double dSqDist = SqDist( ptNear, ptTg) ;
      if ( dSqDist < dMinSqDist) {
         dMinSqDist = dSqDist ;
-         pCrvArc.Set( Release( pCrvAtmp)) ;
+         pCrvArc.Set( pCrvAtmp) ;
         if ( pPtTg != nullptr)
            *pPtTg = ptTg ;
      }
@@ -17,7 +17,7 @@
 #include "/EgtDev/Include/EGkColor.h"
 #include "/EgtDev/Include/EGkAngle.h"
 #include "/EgtDev/Include/EGnStringUtils.h"
-#include "/EgtDev/Include/EGtNumUtils.h"
+#include "/EgtDev/Include/EgtNumUtils.h"
 #include <algorithm>

 using namespace std ;
@@ -22,9 +22,12 @@
 #include "GeoObjFactory.h"
 #include "NgeWriter.h"
 #include "NgeReader.h"
+#include "Voronoi.h"
 #include "/EgtDev/Include/EGkAngle.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EGkUiUnits.h"
+#include "/EgtDev/Include/ENkPolynomialRoots.h"
+#include "/EgtDev/Include/EgtNumUtils.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
 #include <new>

@@ -59,15 +62,14 @@ class ArcApproxer
 //----------------------------------------------------------------------------
 CurveArc::CurveArc( void)
   : m_nStatus( TO_VERIFY), m_PtCen(), m_VtN(), m_VtS(), m_dRad(),
-     m_dAngCenDeg(), m_dDeltaN(), m_VtExtr(), m_dThick()
+     m_dAngCenDeg(), m_dDeltaN(), m_VtExtr(), m_dThick(), m_nTempProp{0,0}, m_dTempParam{0.0, 0.0}, m_pVoronoiObj( nullptr)
 {
-   m_nTempProp[0] = 0 ;
-   m_nTempProp[1] = 0 ;
 }

 //----------------------------------------------------------------------------
 CurveArc::~CurveArc( void)
 {
+   ResetVoronoiObject() ;
 }

 //----------------------------------------------------------------------------
@@ -89,7 +91,9 @@ CurveArc::Set( const Point3d& ptCen, const Vector3d& vtN, double dRad,
  // sistemo i versori
   m_VtN.Normalize() ;
   m_VtS.Normalize() ;
-
+  
+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -115,6 +119,8 @@ CurveArc::Set( const Point3d& ptCen, const Vector3d& vtN, double dRad)
   m_dDeltaN = 0 ;
   m_nStatus = TO_VERIFY ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -136,6 +142,8 @@ CurveArc::SetXY( const Point3d& ptCen, double dRad, double dAngIniDeg, double dA
   m_dDeltaN = dDeltaZ ;
   m_nStatus = TO_VERIFY ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -157,6 +165,8 @@ CurveArc::SetXY( const Point3d& ptCen, double dRad)
   m_dDeltaN = 0 ;
   m_nStatus = TO_VERIFY ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -179,7 +189,7 @@ CurveArc::Set3P( const Point3d& ptStart, const Point3d& ptOther, const Point3d&
  // calcolo del versore normale
   m_VtN = vtA ^ vtB ;
   double dNSqLen = m_VtN.SqLen() ;
-   // se i punti sono praticamente allineati non si può calcolare la circonferenza
+   // se i punti sono praticamente allineati non si può calcolare la circonferenza
   if ( ! m_VtN.Normalize( EPS_ZERO))
      return false ;
  // calcolo del centro
@@ -206,19 +216,21 @@ CurveArc::Set3P( const Point3d& ptStart, const Point3d& ptOther, const Point3d&
      if ( ! m_VtS.GetRotation( ( ptEnd - m_PtCen), m_VtN, dAng2Deg, bDet2)  ||  ! bDet2)
         return false ;
     // deduzione dell'angolo al centro
-      // se uno dei due angoli è nullo, errore
+      // se uno dei due angoli è nullo, errore
      if ( abs( dAng1Deg) < EPS_ANG_SMALL  ||  abs( dAng2Deg) < EPS_ANG_SMALL)
         return false ;
-      // se i due angoli hanno lo stesso segno e Ang1 è minore di Ang2 in modulo
+      // se i due angoli hanno lo stesso segno e Ang1 è minore di Ang2 in modulo
      else if ( dAng1Deg * dAng2Deg > 0  &&  abs( dAng1Deg) < abs( dAng2Deg))
         m_dAngCenDeg = dAng2Deg ;
-     // altrimenti hanno segno opposto oppure Ang1 è maggiore di Ang2 in modulo
+     // altrimenti hanno segno opposto oppure Ang1 è maggiore di Ang2 in modulo
      else
         m_dAngCenDeg = - _copysign( ANG_FULL, dAng2Deg) + dAng2Deg ;
   }
-  // non c'è DeltaN
+  // non c'è DeltaN
   m_dDeltaN = 0 ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -243,7 +255,7 @@ CurveArc::Set2PNB( const Point3d& ptIni, const Point3d& ptFin, const Vector3d& v
   Vector3d vtDiff = ptFin - ptIni ;
   if ( vtDiff.IsSmall())
      return false ;
-  // deltaN eventuale ( è componente parallela a VtN)
+  // deltaN eventuale ( è componente parallela a VtN)
   m_dDeltaN = vtDiff * m_VtN ;
   vtDiff -= m_dDeltaN * m_VtN ;
   if ( abs( m_dDeltaN) < EPS_SMALL)
@@ -266,6 +278,8 @@ CurveArc::Set2PNB( const Point3d& ptIni, const Point3d& ptFin, const Vector3d& v
  // calcolo l'angolo al centro
   m_dAngCenDeg = 4 * atan( dBulge) * RADTODEG ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -290,7 +304,7 @@ CurveArc::Set2PD( const Point3d& ptStart, const Point3d& ptEnd, double dDirStart
  // calcolo del versore normale
   m_VtN = vtA ^ vtB ;
   double dNSqLen = m_VtN.SqLen() ;
-   // se tangente e punti sono praticamente allineati non si può calcolare la circonferenza
+   // se tangente e punti sono praticamente allineati non si può calcolare la circonferenza
   if ( ! m_VtN.Normalize( EPS_ZERO))
      return false ;
  // calcolo del centro
@@ -307,7 +321,7 @@ CurveArc::Set2PD( const Point3d& ptStart, const Point3d& ptEnd, double dDirStart
   double dAng1Deg ;
   if ( ! m_VtS.GetRotation( ( ptEnd - m_PtCen), m_VtN, dAng1Deg, bDet1)  ||  ! bDet1)
      return false ;
-   // poichè il senso di rotazione è sempre CCW, se l'angolo è negativo prendo il suo complemento al giro
+   // poichè il senso di rotazione è sempre CCW, se l'angolo è negativo prendo il suo complemento al giro
    if ( dAng1Deg < 0)
       m_dAngCenDeg = ANG_FULL + dAng1Deg ;
    else
@@ -322,6 +336,8 @@ CurveArc::Set2PD( const Point3d& ptStart, const Point3d& ptEnd, double dDirStart
      m_dDeltaN = - m_dDeltaN ;
   }

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -382,7 +398,7 @@ CurveArc::Set2PRS( const Point3d& ptStart, const Point3d& ptEnd, double dRad, bo
   if ( dLenA > ( dRad - EPS_ZERO))
      dLenH = 0 ;
   else
-      dLenH= sqrt( dRad * dRad - dLenA * dLenA) ;
+      dLenH = sqrt( dRad * dRad - dLenA * dLenA) ;
  // versore dal punto medio della corda al centro
   Vector3d vtH = vtA / dLenA ;
   vtH.Rotate( Z_AX, 0, ( bCCW ? 1 : -1)) ;
@@ -394,16 +410,19 @@ CurveArc::Set2PRS( const Point3d& ptStart, const Point3d& ptEnd, double dRad, bo
   m_dRad = dRad ;
  // calcolo il versore di start
   m_VtS = ( ptStart - m_PtCen) / m_dRad ;
+   m_VtS.Normalize() ;
  // calcolo l'angolo al centro
   bool bDet ;
   if ( ! m_VtS.GetRotation( ( ptEnd - m_PtCen), m_VtN, m_dAngCenDeg, bDet)  ||  ! bDet)
      return false ;
-   // quando è 180deg il segno è determinato solo dal senso
+   // quando è 180deg il segno è determinato solo dal senso
   if ( abs( m_dAngCenDeg - ANG_STRAIGHT) < 10 * EPS_ANG_SMALL  &&
        ( ( bCCW  &&  m_dAngCenDeg < 0)  ||
          ( ! bCCW  &&  m_dAngCenDeg > 0)))
      m_dAngCenDeg = - m_dAngCenDeg ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -458,6 +477,8 @@ CurveArc::SetCPA( const Point3d& ptCen, const Point3d& ptStart, double dAngCenDe
  // assegno l'angolo al centro
   m_dAngCenDeg = dAngCenDeg ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -509,11 +530,12 @@ CurveArc::SetC2P( const Point3d& ptCen, const Point3d& ptStart, const Point3d& p
   if ( m_dRad < EPS_ZERO)
      return false ;
   m_VtS /= m_dRad ;
-  // calcolo l'angolo al centro (la funzione trova sempre il più piccolo)
+  // calcolo l'angolo al centro (la funzione trova sempre il più piccolo)
   bool bDet ;
   if ( ! m_VtS.GetRotation( ( ptNearEnd - m_PtCen), m_VtN, m_dAngCenDeg, bDet)  ||  ! bDet)
      return false ;
-
+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -566,7 +588,7 @@ CurveArc::Clone( void) const
 bool
 CurveArc::CopyFrom( const IGeoObj* pGObjSrc)
 {
-   const CurveArc* pCA = dynamic_cast<const CurveArc*>( pGObjSrc) ;
+   const CurveArc* pCA = GetBasicCurveArc( pGObjSrc) ;
   if ( pCA == nullptr)
      return false ;
   return CopyFrom( *pCA) ;
@@ -582,6 +604,8 @@ CurveArc::CopyFrom( const CurveArc& caSrc)
   m_dThick = caSrc.m_dThick ;
   m_nTempProp[0] = caSrc.m_nTempProp[0] ;
   m_nTempProp[1] = caSrc.m_nTempProp[1] ;
+   m_dTempParam[0] = caSrc.m_dTempParam[0] ;
+   m_dTempParam[1] = caSrc.m_dTempParam[1] ;
   return Set( caSrc.m_PtCen, caSrc.m_VtN, caSrc.m_dRad,
               caSrc.m_VtS, caSrc.m_dAngCenDeg, caSrc.m_dDeltaN) ;
 }
@@ -699,29 +723,8 @@ CurveArc::Load( NgeReader& ngeIn)
 bool
 CurveArc::GetLocalBBox( BBox3d& b3Loc, int nFlag) const
 {
-  // verifico lo stato
-   if ( m_nStatus != OK)
-      return false ;
-  // assegno il box in locale
-   b3Loc.Reset() ;
-   double dLinTol = LIN_TOL_APPROX ;
-   double dAngTolDeg = ANG_TOL_APPROX_DEG ;
-   if ( ( nFlag & BBF_EXACT) != 0)
-      dLinTol = LIN_TOL_MIN ;
-   ArcApproxer aAppr( dLinTol, dAngTolDeg, false, *this) ;
-   double  dU ;
-   Point3d ptPos ;
-   while ( aAppr.GetPoint( dU, ptPos))
-      b3Loc.Add( ptPos) ;
-  // se c'è estrusione, devo tenerne conto
-   if ( ! m_VtExtr.IsSmall()  &&  abs( m_dThick) > EPS_SMALL) {
-      Point3d ptMinExtr = b3Loc.GetMin() + m_VtExtr * m_dThick ;
-      Point3d ptMaxExtr = b3Loc.GetMax() + m_VtExtr * m_dThick ;
-      b3Loc.Add( ptMinExtr) ;
-      b3Loc.Add( ptMaxExtr) ;
-   } 
-
-   return true ;
+  // richiamo della funzione generale
+   return GetBBox( GLOB_FRM, b3Loc, nFlag) ;
 }

 //----------------------------------------------------------------------------
@@ -731,23 +734,94 @@ CurveArc::GetBBox( const Frame3d& frRef, BBox3d& b3Ref, int nFlag) const
  // verifico lo stato
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità del frame
+  // verifico validità del frame
   if ( frRef.GetType() == Frame3d::ERR)
      return false ;
  // assegno il box nel riferimento
   b3Ref.Reset() ;
-   double dLinTol = LIN_TOL_APPROX ;
-   double dAngTolDeg = ANG_TOL_APPROX_DEG ;
-   if ( ( nFlag & BBF_EXACT) != 0)
-      dLinTol = LIN_TOL_MIN ;
-   ArcApproxer aAppr( dLinTol, dAngTolDeg, false, *this) ;
-   double  dU ;
-   Point3d ptPos ;
-   while ( aAppr.GetPoint( dU, ptPos)) {
-      ptPos.ToGlob( frRef) ;
-      b3Ref.Add( ptPos) ;
+
+  // ricavo il riferimento intrinseco dell'arco
+   Frame3d frArc;
+   frArc.Set( m_PtCen, ( m_dAngCenDeg > 0 ? m_VtN : -m_VtN), m_VtS) ;
+
+  // pendenza intrinseca
+   double dPitch = m_dDeltaN * ( m_dAngCenDeg > 0 ? 1 : -1) / abs( m_dAngCenDeg * DEGTORAD) ;
+
+  // cordinate nel frRef dei versori del sistema di riferimento dell'arco
+   Vector3d vtXRef = frArc.VersX() ;
+   vtXRef.ToGlob( frRef) ;
+   Vector3d vtYRef = frArc.VersY() ;
+   vtYRef.ToGlob( frRef) ;
+   Vector3d vtZRef = frArc.VersZ() ;
+   vtZRef.ToGlob( frRef) ;
+
+  // il punto iniziale e finale sono punti candidati per estremanti
+   Point3d ptS, ptE ;
+   GetStartPoint( ptS) ;
+   ptS.ToGlob( frRef) ;
+   b3Ref.Add( ptS) ;
+   GetEndPoint( ptE) ;
+   ptE.ToGlob( frRef) ;
+   b3Ref.Add( ptE) ;
+
+  // vettore degli angoli dei punti candidati estremi
+   DBLVECTOR vdTheta ;
+
+   // arco piatto
+   if ( abs( dPitch) < EPS_SMALL) {
+      double dAngXDeg = atan2( vtYRef.x, vtXRef.x) * RADTODEG ;
+      bool bAngXSmall = (abs( dAngXDeg) <= EPS_ANG_ZERO) ;
+      if ( ! bAngXSmall) {
+         vdTheta.push_back( dAngXDeg) ;
+         vdTheta.push_back( dAngXDeg + ANG_STRAIGHT) ;
+      }
+      double dAngYDeg = atan2( vtYRef.y, vtXRef.y) * RADTODEG ;
+      bool bAngYSmall = (abs( dAngYDeg) <= EPS_ANG_ZERO) ;
+      if ( ! bAngYSmall) {
+         vdTheta.push_back( dAngYDeg) ;
+         vdTheta.push_back( dAngYDeg + ANG_STRAIGHT) ;
+      }
+      double dAngZDeg = atan2( vtYRef.z, vtXRef.z) * RADTODEG ;
+      bool bAngZSmall = (abs( dAngZDeg) <= EPS_ANG_ZERO) ;
+      if ( ! bAngZSmall) {
+         vdTheta.push_back( dAngZDeg) ;
+         vdTheta.push_back( dAngZDeg + ANG_STRAIGHT) ;
+      }
+      if ( bAngXSmall  ||  bAngYSmall  || bAngZSmall)
+         vdTheta.push_back( ANG_STRAIGHT) ;
   }
-  // se c'è estrusione, devo tenerne conto
+  // altrimenti arco di elica
+   else {
+      for ( int i = 0 ; i < 3 ; ++ i) {
+         DBLVECTOR vdPoly{ m_dRad * vtYRef.v[i] + dPitch * vtZRef.v[i],
+                           - 2 * m_dRad * vtXRef.v[i],
+                           - m_dRad * vtYRef.v[i] + dPitch * vtZRef.v[i]} ;
+         DBLVECTOR vdRoot ;
+         int nRoot = PolynomialRoots( 2, vdPoly, vdRoot) ;
+         for ( int i = 0 ; i < nRoot ; ++ i) {
+            double dAngDeg = atan2( 2 * vdRoot[i], (1 - vdRoot[i] * vdRoot[i])) * RADTODEG ;
+            if ( abs( dAngDeg) > EPS_ANG_ZERO) {
+               vdTheta.push_back( dAngDeg) ;
+               vdTheta.push_back( dAngDeg + ANG_STRAIGHT) ;
+            }
+            else
+               vdTheta.push_back( ANG_STRAIGHT) ;
+         }
+      }
+   }
+
+  // verifica degli angoli sull'arco ed eventuale considerazione dei punti
+   for ( int i = 0 ; i < int( vdTheta.size()) ; ++ i) {
+      double dTheta = ( vdTheta[i] > 0 ? vdTheta[i] : vdTheta[i] + ANG_FULL) ;
+      if ( dTheta < abs( m_dAngCenDeg)) {
+         Point3d ptP ;
+         GetPointD1D2( dTheta / ( abs( m_dAngCenDeg)), FROM_MINUS, ptP) ;
+         ptP.ToGlob( frRef) ;
+         b3Ref.Add( ptP) ;
+      }
+   }
+   
+  // se c'è estrusione, devo tenerne conto
   if ( ! m_VtExtr.IsSmall()  &&  abs( m_dThick) > EPS_SMALL) {
      Vector3d vtFrExtr = m_VtExtr ;
      vtFrExtr.ToGlob( frRef) ;
@@ -765,7 +839,7 @@ bool
 CurveArc::Validate( void)
 {
   if ( m_nStatus == TO_VERIFY) {
-     // limito l'angolo al centro a un giro se è piatto ( non è elica)
+     // limito l'angolo al centro a un giro se è piatto ( non è elica)
      if ( abs( m_dDeltaN) < EPS_SMALL) {
         if ( m_dAngCenDeg > ANG_FULL)
            m_dAngCenDeg = ANG_FULL ;
@@ -773,10 +847,10 @@ CurveArc::Validate( void)
            m_dAngCenDeg = - ANG_FULL ;
      }
     // eseguo il controllo
-      m_nStatus = ( ( m_VtN.IsNormalized()  &&  m_VtS.IsNormalized()  &&
-                    AreOrthoApprox( m_VtN, m_VtS)  &&
-                    m_dRad > EPS_SMALL  &&  m_dRad < MAX_ARC_RAD  &&
-                    abs( m_dAngCenDeg) > EPS_ANG_ZERO) ? OK : ERR) ;
+      m_nStatus = ( ( m_PtCen.IsValid()  &&
+                      m_VtN.IsNormalized()  &&  m_VtS.IsNormalized()  &&  AreOrthoApprox( m_VtN, m_VtS)  &&
+                      m_dRad > EPS_SMALL  &&  m_dRad < MAX_ARC_RAD  &&
+                      abs( m_dAngCenDeg) > EPS_ANG_ZERO) ? OK : ERR) ;
   }

   return ( m_nStatus == OK) ;
@@ -831,7 +905,7 @@ CurveArc::GetEndPoint( Point3d& ptEnd) const
   double dAng = m_dAngCenDeg * DEGTORAD ;
   Vector3d vtDir = cos( dAng) * m_VtS + sin( dAng) * ( m_VtN ^ m_VtS) ;
   ptEnd = m_PtCen + m_dRad * vtDir ;
-   if ( abs( m_dDeltaN) > EPS_SMALL)
+   if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
      ptEnd += m_dDeltaN * m_VtN  ;

   return true ;
@@ -849,7 +923,7 @@ CurveArc::GetMidPoint( Point3d& ptMid) const
   double dAng = 0.5 * m_dAngCenDeg * DEGTORAD ;
   Vector3d vtDir = cos( dAng) * m_VtS + sin( dAng) * ( m_VtN ^ m_VtS) ;
   ptMid = m_PtCen + m_dRad * vtDir ;
-   if ( abs( m_dDeltaN) > EPS_SMALL)
+   if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
      ptMid += ( 0.5 * m_dDeltaN) * m_VtN  ;

   return true ;
@@ -877,7 +951,7 @@ CurveArc::GetCentroid( Point3d& ptCen) const
      return false ;
  // approssimo la curva con una polilinea
   PolyLine PL ;
-   if ( ! ApproxWithLines( LIN_TOL_STD, ANG_TOL_STD_DEG, ICurve::APL_STD, PL))
+   if ( ! ApproxWithLines( LIN_TOL_STD, ANG_TOL_STD_DEG, APL_STD, PL))
      return false ;
  // calcolo il centro mediante PolygonPlane
   Point3d ptP ;
@@ -899,17 +973,14 @@ CurveArc::GetDir( double dU, Vector3d& vtDir) const
      return false ;

  // il parametro U deve essere compreso tra 0 e 1
-   if ( dU < 0)
-      dU = 0 ;
-   else if ( dU > 1)
-      dU = 1 ;
+   dU = Clamp( dU, 0., 1.) ;

  // versore al punto  nel piano della circonferenza (ruoto m_VtS di dU * m_dAngCenDeg attorno a m_VtN)
   double dAng = dU * m_dAngCenDeg * DEGTORAD ;
   Vector3d vtRad = cos( dAng) * m_VtS + sin( dAng) * ( m_VtN ^ m_VtS) ;
  // calcolo della tangente nel punto finale
   vtDir = ( m_dRad * m_dAngCenDeg * DEGTORAD) * ( m_VtN ^ vtRad) ;
-   if ( abs( m_dDeltaN) > EPS_SMALL)
+   if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
      vtDir += m_dDeltaN * m_VtN ;
  // normalizzo
   return vtDir.Normalize( EPS_ZERO) ;
@@ -924,10 +995,7 @@ CurveArc::GetPointD1D2( double dU, Side nS, Point3d& ptPos, Vector3d* pvtDer1, V
      return false ;

  // il parametro U deve essere compreso tra 0 e 1
-   if ( dU < 0)
-      dU = 0 ;
-   else if ( dU > 1)
-      dU = 1 ;
+   dU = Clamp( dU, 0., 1.) ;

  // versore al punto nel piano della circonferenza (ruoto m_VtS di dU di m_dAngCenDeg attorno a m_VtN)
   double dAng = dU * m_dAngCenDeg * DEGTORAD ;
@@ -935,13 +1003,13 @@ CurveArc::GetPointD1D2( double dU, Side nS, Point3d& ptPos, Vector3d* pvtDer1, V

  // calcolo del punto
   ptPos = m_PtCen + m_dRad * vtDir ;
-   if ( abs( m_dDeltaN) > EPS_SMALL)
+   if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
      ptPos += ( dU * m_dDeltaN) * m_VtN  ;

  // calcolo della derivata prima
   if ( pvtDer1 != nullptr) {
      *pvtDer1 = ( m_dRad * m_dAngCenDeg * DEGTORAD) * ( m_VtN ^ vtDir) ;
-      if ( abs( m_dDeltaN) > EPS_SMALL)
+      if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
         *pvtDer1 += m_dDeltaN * m_VtN ;
   }    

@@ -963,7 +1031,7 @@ CurveArc::GetLength( double& dLen) const
  // lunghezza dell'arco piano
   dLen = m_dRad * abs( m_dAngCenDeg) * DEGTORAD ;
  // aggiunta eventuale parte ortogonale
-   if ( abs( m_dDeltaN) > EPS_SMALL)
+   if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
      dLen = sqrt( dLen * dLen + m_dDeltaN * m_dDeltaN) ;

   return ( dLen > EPS_SMALL) ;
@@ -1100,7 +1168,7 @@ CurveArc::ApproxWithLines( double dLinTol, double dAngTolDeg, int nType, PolyLin
         return false ;
   }

-  // se necessario, sistemo per convessità dalla parte ammessa
+  // se necessario, sistemo per convessità dalla parte ammessa
   if ( nType == APL_RIGHT_CONVEX  ||  nType == APL_LEFT_CONVEX) {
      if ( ! PL.MakeConvex( vtExtr, ( nType == APL_LEFT_CONVEX)))
         return false ;
@@ -1174,7 +1242,7 @@ CurveArc::CopyParamRange( double dUStart, double dUEnd) const
      return nullptr ;
  // se il parametro start supera quello di end
   if ( dUStart > dUEnd - EPS_PARAM) {
-     // se curva aperta, il trim la cancella completamente quindi non resta alcunchè
+     // se curva aperta, il trim la cancella completamente quindi non resta alcunchè
      if ( ! IsClosed())
         return nullptr ;
     // se curva chiusa, il trim si avvolge attorno al punto di giunzione
@@ -1204,7 +1272,7 @@ CurveArc::Invert( void)
      return false ;

  // il centro va spostato di DeltaN
-   if ( abs( m_dDeltaN) > EPS_SMALL)
+   if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
      m_PtCen += m_dDeltaN * m_VtN ;
  // il versore normale rimane inalterato
  // il versore iniziale diventa quello finale
@@ -1215,7 +1283,9 @@ CurveArc::Invert( void)
   m_dAngCenDeg = - m_dAngCenDeg ;
  // l'incremento sulla normale inverte il segno
   m_dDeltaN = - m_dDeltaN ;
-
+   
+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;
  
@@ -1249,6 +1319,8 @@ CurveArc::SimpleOffset( double dDist, int nType)
  // aggiorno il raggio
   m_dRad = dNewRad ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -1260,7 +1332,7 @@ bool
 CurveArc::MyExtendedOffset( double dDist, bool bAll, int nType)
 {
  // bAll == true fa accettare raggi nulli ==> da usare solo internamente 
-  // quando si è sicuri di aumentare subito il raggio o di cancellare
+  // quando si è sicuri di aumentare subito il raggio o di cancellare

  // la curva deve essere validata
   if ( m_nStatus != OK)
@@ -1293,6 +1365,8 @@ CurveArc::MyExtendedOffset( double dDist, bool bAll, int nType)
  // aggiorno il raggio
   m_dRad = dNewRad ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -1336,7 +1410,7 @@ CurveArc::ModifyEnd( const Point3d& ptNewEnd)
   ptOldEndIntr.ToLoc( frIntr) ;
   Point3d ptEndIntr = ptNewEnd ;
   ptEndIntr.ToLoc( frIntr) ;
-  // se coincidono nel piano XY, è cambiato solo il deltaN
+  // se coincidono nel piano XY, è cambiato solo il deltaN
   if ( AreSamePointXYExact( ptOldEndIntr, ptEndIntr)) {
      m_dDeltaN += ptEndIntr.z - ptOldEndIntr.z ;
   }
@@ -1365,6 +1439,8 @@ CurveArc::ModifyEnd( const Point3d& ptNewEnd)
      m_dDeltaN = arcAux.m_dDeltaN ;
   }

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1375,13 +1451,11 @@ CurveArc::ModifyEnd( const Point3d& ptNewEnd)
 bool
 CurveArc::TrimStartAtParam( double dUTrim)
 {
-   double dLen ;
-
-
  // riporto i parametri nel loro range
-   dUTrim = ( ( dUTrim < 0) ? 0 : (( dUTrim > 1) ? 1 : dUTrim)) ;
+   dUTrim = Clamp( dUTrim, 0., 1.) ;

  // recupero lunghezza
+   double dLen ;
   if ( ! GetLength( dLen))
      return false ;

@@ -1393,13 +1467,11 @@ CurveArc::TrimStartAtParam( double dUTrim)
 bool
 CurveArc::TrimEndAtParam( double dUTrim)
 {
-   double dLen ;
-
-
  // riporto i parametri nel loro range
-   dUTrim = ( ( dUTrim < 0) ? 0 : (( dUTrim > 1) ? 1 : dUTrim)) ;
+   dUTrim = Clamp( dUTrim, 0., 1.) ;

  // recupero lunghezza
+   double dLen ;
   if ( ! GetLength( dLen))
      return false ;

@@ -1447,13 +1519,15 @@ CurveArc::TrimStartAtLen( double dLenTrim)
      dAngRot = m_dAngCenDeg * dLenTrim / dLen ;
      m_VtS.Rotate( m_VtN, dAngRot) ;
      m_dAngCenDeg -= dAngRot ;
-      if ( abs( m_dDeltaN) > EPS_SMALL) {
+      if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL) {
         dMoveN = m_dDeltaN * dLenTrim / dLen ;
         m_PtCen.Translate( m_VtN * dMoveN) ;
         m_dDeltaN -= dMoveN ;
      }
   }

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -1477,10 +1551,12 @@ CurveArc::TrimEndAtLen( double dLenTrim)
  // eseguo il trim
   if ( ( dLen - dLenTrim) > EPS_ZERO) {
      m_dAngCenDeg *= dLenTrim / dLen ;
-      if ( abs( m_dDeltaN) > EPS_SMALL)
+      if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
         m_dDeltaN *= dLenTrim / dLen ;
   }

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -1524,6 +1600,8 @@ CurveArc::ExtendEndByLen( double dLenExt)
   else if ( abs( m_dAngCenDeg) > ANG_FULL)
      m_dAngCenDeg = _copysign( ANG_FULL, m_dAngCenDeg) ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -1538,6 +1616,10 @@ CurveArc::Translate( const Vector3d& vtMove)
   if ( m_nStatus != OK)
      return false ;

+  // traslo Voronoi
+   if ( m_pVoronoiObj != nullptr)      
+      m_pVoronoiObj->Translate( vtMove) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1555,10 +1637,14 @@ CurveArc::Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, dou
   if ( m_nStatus != OK)
      return false ;

-  // verifico validità dell'asse di rotazione
+  // verifico validità dell'asse di rotazione
   if ( vtAx.IsSmall())
      return false ;

+  // ruoto Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->Rotate( ptAx, vtAx, dCosAng, dSinAng) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1588,6 +1674,8 @@ CurveArc::Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dC
     // verifico non sia nulla
      if ( abs( dCoeffX) < EPS_ZERO  ||  m_dRad * abs( dCoeffX) <= EPS_SMALL)
         return false ;
+     // imposto ricalcolo di Voronoi
+      ResetVoronoiObject() ;
     // imposto ricalcolo della grafica
      m_OGrMgr.Reset() ;
     // scalo il centro e le dimensioni lineari
@@ -1615,6 +1703,8 @@ CurveArc::Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dC
     // verifico non sia nulla
      if ( abs( dCoeffY) < EPS_ZERO  ||  m_dRad * abs( dCoeffY) <= EPS_SMALL)
         return false ;
+     // imposto ricalcolo di Voronoi
+      ResetVoronoiObject() ;
     // imposto ricalcolo della grafica
      m_OGrMgr.Reset() ;
     // scalo il centro e le dimensioni lineari
@@ -1642,6 +1732,8 @@ CurveArc::Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dC
     // verifico non sia nulla
      if ( abs( dCoeffZ) < EPS_ZERO  ||  m_dRad * abs( dCoeffZ) <= EPS_SMALL)
         return false ;
+     // imposto ricalcolo di Voronoi
+      ResetVoronoiObject() ;
     // imposto ricalcolo della grafica
      m_OGrMgr.Reset() ;
     // scalo il centro e le dimensioni lineari
@@ -1669,6 +1761,8 @@ CurveArc::Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dC
     // verifico non sia nulla
      if ( abs( dCoeffX) < EPS_ZERO  ||  m_dRad * abs( dCoeffX) <= EPS_SMALL)
         return false ;
+     // imposto ricalcolo di Voronoi
+      ResetVoronoiObject() ;
     // imposto ricalcolo della grafica
      m_OGrMgr.Reset() ;
     // scalo il centro e le dimensioni lineari
@@ -1698,10 +1792,12 @@ CurveArc::Mirror( const Point3d& ptOn, const Vector3d& vtNorm)
   if ( m_nStatus != OK)
      return false ;

-  // verifico validità del piano di specchiatura
+  // verifico validità del piano di specchiatura
   if ( vtNorm.IsSmall())
      return false ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1724,15 +1820,17 @@ CurveArc::Shear( const Point3d& ptOn, const Vector3d& vtNorm, const Vector3d& vt
   if ( m_nStatus != OK)
      return false ;

-  // verifico validità dei parametri
+  // verifico validità dei parametri
   if ( vtNorm.IsSmall()  ||  vtDir.IsSmall())
      return false ;

-  // possibile solo se l'arco è piatto e il piano di scorrimento coincide con quello dell'arco
+  // possibile solo se l'arco è piatto e il piano di scorrimento coincide con quello dell'arco
   if ( ! ( abs( m_dDeltaN) < EPS_SMALL)  ||  
        ! AreSameOrOppositeVectorExact( m_VtN, vtNorm))
      return false ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1756,11 +1854,18 @@ CurveArc::ToGlob( const Frame3d& frRef)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-
-  // verifico validità del frame
+  // verifico validità del frame
   if ( frRef.GetType() == Frame3d::ERR)
      return false ;

+  // se frame identità, non devo fare alcunché
+   if ( IsGlobFrame( frRef))
+      return true ;
+
+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->ToGlob( frRef) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1778,11 +1883,18 @@ CurveArc::ToLoc( const Frame3d& frRef)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-
-  // verifico validità del frame
+  // verifico validità del frame
   if ( frRef.GetType() == Frame3d::ERR)
      return false ;

+  // se frame identità, non devo fare alcunché
+   if ( IsGlobFrame( frRef))
+      return true ;
+
+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->ToLoc( frRef) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1800,14 +1912,21 @@ CurveArc::LocToLoc( const Frame3d& frOri, const Frame3d& frDest)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità dei frame
+  // verifico validità dei frame
   if ( frOri.GetType() == Frame3d::ERR  ||  frDest.GetType() == Frame3d::ERR)
      return false ;
-  // se i due riferimenti coincidono, non devo fare alcunché
+
+  // se i due riferimenti coincidono, non devo fare alcunché
   if ( AreSameFrame( frOri, frDest))
      return true ;
+
+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->LocToLoc( frOri, frDest) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;
+
  // trasformo il centro e i versori
   return ( m_PtCen.LocToLoc( frOri, frDest)  &&
            m_VtN.LocToLoc( frOri, frDest)  &&
@@ -1828,6 +1947,8 @@ CurveArc::InvertN( void)
   m_dAngCenDeg = - m_dAngCenDeg ;
   m_dDeltaN = - m_dDeltaN ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1879,12 +2000,12 @@ CurveArc::MyCalcPointParamPosiz( const Point3d& ptP, double& dU, int& nPos, doub
  // verifica posizione punto su arco
   nPos = PP_NULL ;         // fuori
   if ( abs( DiffAngle( dAngDeg, 0) * DEGTORAD * m_dRad) < dLinTol) {
-      nPos = ( IsACircle() ? PP_MID : PP_START) ;   // se cerchio è interno, altrimenti vicino a inizio
+      nPos = ( IsACircle() ? PP_MID : PP_START) ;   // se cerchio è interno, altrimenti vicino a inizio
      dU = AngleNearAngle( dAngDeg, 0) / m_dAngCenDeg ;
      dU = max( dU, 0.) ;
   }
   else if ( abs( DiffAngle( dAngDeg, m_dAngCenDeg) * DEGTORAD * m_dRad) < dLinTol) {
-      nPos = ( IsACircle() ? PP_MID : PP_END) ;     // se cerchio è interno, altrimenti vicino a fine
+      nPos = ( IsACircle() ? PP_MID : PP_END) ;     // se cerchio è interno, altrimenti vicino a fine
      dU = AngleNearAngle( dAngDeg, m_dAngCenDeg) / m_dAngCenDeg ;
      dU = min( dU, 1.) ;
   }
@@ -1901,9 +2022,15 @@ CurveArc::ChangeRadius( double dNewRadius)
   if ( m_nStatus != OK)
      return false ;

+  // verifico validità del raggio
+   if ( ! ( dNewRadius > EPS_SMALL  &&  dNewRadius < MAX_ARC_RAD))
+      return false ;
+  
  // cambio il raggio
   m_dRad = dNewRadius ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1923,6 +2050,8 @@ CurveArc::ChangeDeltaN( double dNewDeltaN)
  // cambio il parametro
   m_dDeltaN = dNewDeltaN ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1939,9 +2068,15 @@ CurveArc::ChangeAngCenter( double dNewAngCenDeg)
   if ( m_nStatus != OK)
      return false ;

+  // verifico accettabilità angolo
+   if ( ! ( abs( m_dAngCenDeg) > EPS_ANG_ZERO))
+      return false ;
+
  // cambio il parametro
   m_dAngCenDeg = dNewAngCenDeg ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1966,6 +2101,8 @@ CurveArc::ChangeStartPoint( double dU)
   if ( ! vtDir.Normalize())
      return false ;
   m_VtS = vtDir ;
+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;
   return true ;
@@ -1985,6 +2122,8 @@ CurveArc::ToExplementary( void)
  // basta prendere l'angolo al centro che completa il giro
   m_dAngCenDeg = - _copysign( ANG_FULL, m_dAngCenDeg) + m_dAngCenDeg ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -2014,6 +2153,8 @@ CurveArc::Flip( void)
   m_VtS.Normalize() ;
   m_dAngCenDeg = - m_dAngCenDeg ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -2023,18 +2164,14 @@ CurveArc::Flip( void)

 //----------------------------------------------------------------------------
 // Oggetto locale per approssimazione di archi
-// Approx interna è quella cordale standard.
-// Approx esterna è quella tangente a inizio e fine con metà tratto e un punto in più.
+// Approx interna è quella cordale standard.
+// Approx esterna è quella tangente a inizio e fine con metà tratto e un punto in più.
 // I punti si calcolano a partire dal triangolo tra due punti consecutivi interni e il centro,
 // usando il versore medio dal centro e moltiplicandolo per il coefficiente ( 2 / ( 1 + cosA)).
-// Il versore dell'ultimo punto è già stato calcolato per il penultimo.
+// Il versore dell'ultimo punto è già stato calcolato per il penultimo.
 //----------------------------------------------------------------------------
 ArcApproxer::ArcApproxer( double dLinTol, double dAngTolDeg, bool bInside, const CurveArc& arArc)
 {
-   int nStep ;
-   double dAngStepDeg ;
-
-
  // inizializzazioni
   m_nTotPnt = 0 ;
   m_nCurrPnt = - 1 ;
@@ -2052,6 +2189,7 @@ ArcApproxer::ArcApproxer( double dLinTol, double dAngTolDeg, bool bInside, const
      dAngTolDeg = min( dAngTolDeg, ANG_TOL_EXT_MAX_DEG) ;

  // determinazione dello step angolare
+   double dAngStepDeg ;
   double dLinTolRel = dLinTol / arArc.GetRadius() ;
   if ( bInside)
      dAngStepDeg = sqrt( 8 * dLinTolRel) * RADTODEG ;
@@ -2060,7 +2198,7 @@ ArcApproxer::ArcApproxer( double dLinTol, double dAngTolDeg, bool bInside, const
   dAngStepDeg = min( dAngStepDeg, dAngTolDeg) ;

  // dall'angolo al centro ricavo il numero di passi
-   nStep = (int) ( abs( arArc.GetAngCenter()) / dAngStepDeg + 0.999) ;
+   int nStep = int( abs( arArc.GetAngCenter()) / dAngStepDeg + 0.999) ;
   nStep = max( nStep, 1) ;

  // sistemo lo step (per il numero intero di passi)
@@ -2087,10 +2225,6 @@ ArcApproxer::ArcApproxer( double dLinTol, double dAngTolDeg, bool bInside, const
 bool
 ArcApproxer::GetPoint( double& dU, Point3d& ptP)
 {
-   Vector3d vtA1p ;
-   Vector3d vtA2p ;
-
-
  // incremento indice punto corrente
   ++ m_nCurrPnt ;

@@ -2109,7 +2243,7 @@ ArcApproxer::GetPoint( double& dU, Point3d& ptP)
   if ( ! m_bInside  &&  m_nCurrPnt == m_nTotPnt - 1) {
      dU = 1 ;
      ptP = m_PtCen + m_vtA1 * m_dRad ;
-      if ( abs( m_dDeltaN) > EPS_SMALL)
+      if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
         ptP += ( dU * m_dDeltaN) * m_VtN  ;
      return true ;
   } 
@@ -2121,8 +2255,8 @@ ArcApproxer::GetPoint( double& dU, Point3d& ptP)
   else
      dU = ( m_nCurrPnt - 0.5) / (double) ( m_nTotPnt - 2)  ;
   // nuovo valore versori
-   vtA1p = m_vtA1 ;
-   vtA2p = m_vtA2 ;
+   Vector3d vtA1p = m_vtA1 ;
+   Vector3d vtA2p = m_vtA2 ;
   m_vtA1 = m_dCosA * vtA1p + m_dSinA * vtA2p ;
   m_vtA2 = - m_dSinA * vtA1p + m_dCosA * vtA2p ;
   // calcolo del punto
@@ -2130,8 +2264,47 @@ ArcApproxer::GetPoint( double& dU, Point3d& ptP)
      ptP = m_PtCen + m_vtA1 * m_dRad ;
   else
      ptP = m_PtCen + ( vtA1p + m_vtA1) * ( m_dRad / ( 1 + m_dCosA)) ;
-   if ( abs( m_dDeltaN) > EPS_SMALL)
+   if ( abs( m_dDeltaN) > 0.1 * EPS_SMALL)
      ptP += ( dU * m_dDeltaN) * m_VtN  ;

   return true ;
 }
+
+//----------------------------------------------------------------------------
+bool
+CurveArc::CalcVoronoiObject() const
+{
+   if ( m_nStatus != OK)
+      return false ;
+ 
+  // creo oggetto vroni con la curva
+   m_pVoronoiObj = new( std::nothrow) Voronoi( this, false) ;
+   if ( m_pVoronoiObj == nullptr)
+      return false ;
+
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+Voronoi*
+CurveArc::GetVoronoiObject() const
+{
+   if ( m_nStatus != OK)
+      return nullptr ;
+
+  // se non è stato calcolato, lo calcolo
+   if ( m_pVoronoiObj == nullptr)
+      CalcVoronoiObject() ;
+
+  // restituisco Voronoi
+   return m_pVoronoiObj ;
+}
+
+//----------------------------------------------------------------------------
+void
+CurveArc::ResetVoronoiObject() const
+{
+   if ( m_pVoronoiObj != nullptr)
+      delete m_pVoronoiObj ;
+   m_pVoronoiObj = nullptr ;
+}
@@ -19,6 +19,8 @@
 #include "GeoObjRW.h"
 #include "/EgtDev/Include/EGkCurveArc.h"

+class Voronoi ;
+
 //----------------------------------------------------------------------------
 class CurveArc : public ICurveArc, public IGeoObjRW
 {
@@ -54,6 +56,11 @@ class CurveArc : public ICurveArc, public IGeoObjRW
                   m_nTempProp[nPropInd] = nProp ; } 
      int  GetTempProp( int nPropInd = 0) const override
              { return (( nPropInd >= 0  &&  nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; }
+      void SetTempParam( double dParam, int nParamInd = 0) override
+              { if ( nParamInd >= 0  &&  nParamInd < 2)
+                   m_dTempParam[nParamInd] = dParam ; } 
+      double GetTempParam( int nParamInd = 0) const override
+                { return (( nParamInd >= 0  &&  nParamInd < 2) ? m_dTempParam[nParamInd] : 0.0) ; }

   public :                      // ICurve
      bool IsSimple( void) const override
@@ -179,11 +186,14 @@ class CurveArc : public ICurveArc, public IGeoObjRW
   public :                      // IGeoObjRW
      int GetNgeId( void) const override ;
      bool Save( NgeWriter& ngeOut) const override ;
+      bool PreSave( GdbGeo& Wrapper) const override { return true ; }
+      bool PostSave( GdbGeo& Wrapper) const override { return true ; }
      bool Load( NgeReader& ngeIn) override ;
+      bool PostLoad( GdbGeo& Wrapper) override { return true ; }

   public :
      CurveArc( void) ;
-      CurveArc( const CurveArc& caSrc)
+      CurveArc( const CurveArc& caSrc) : m_pVoronoiObj( nullptr)
                     { if ( ! CopyFrom( caSrc))
                          LOG_ERROR( GetEGkLogger(), "CurveArc : copy constructor error")}
      CurveArc& operator =( const CurveArc& caSrc)
@@ -192,11 +202,14 @@ class CurveArc : public ICurveArc, public IGeoObjRW
                       return *this ; }
      bool MyExtendedOffset( double dDist, bool bAll, int nType = OFF_FILLET) ;
      bool MyCalcPointParamPosiz( const Point3d& ptP, double& dU, int& nPos, double dLinTol) const ;
+      Voronoi* GetVoronoiObject( void) const ;
+      void ResetVoronoiObject( void) const ;

   private :
      bool CopyFrom( const CurveArc& caSrc) ;
      bool Validate( void) ;
-      bool GetDir( double dU, Vector3d& vtDir) const ;
+      bool GetDir( double dU, Vector3d& vtDir) const ;      
+      bool CalcVoronoiObject( void) const ;

   private :
      enum Status { ERR = 0, OK = 1, TO_VERIFY = 2} ;
@@ -212,17 +225,23 @@ class CurveArc : public ICurveArc, public IGeoObjRW
      double   m_dDeltaN ;             // variazione di quota lungo VtN della fine rispetto all'inizio
      Vector3d m_VtExtr ;              // vettore estrusione (normalmente coincide con m_VtN)
      double   m_dThick ;              // spessore
-      int      m_nTempProp[2] ;        // vettore proprietŕ temporanee
+      int      m_nTempProp[2] ;        // vettore proprietà temporanee 
+      double   m_dTempParam[2] ;       // vettore parametri temporanei
+      mutable Voronoi* m_pVoronoiObj ; // Voronoi
 } ;

 //-----------------------------------------------------------------------------
 inline CurveArc* CreateBasicCurveArc( void)
-               { return (static_cast<CurveArc*>( CreateGeoObj( CRV_ARC))) ; }
+               { return ( static_cast<CurveArc*>( CreateGeoObj( CRV_ARC))) ; }
 inline CurveArc* CloneBasicCurveArc( const IGeoObj* pGObj)
               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_ARC)
                   return nullptr ;
-                 return (static_cast<CurveArc*>(pGObj->Clone())) ; }
+                 return ( static_cast<CurveArc*>( pGObj->Clone())) ; }
 inline const CurveArc* GetBasicCurveArc( const IGeoObj* pGObj)
-               { return (dynamic_cast<const CurveArc*>(pGObj)) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_ARC)
+                   return nullptr ;
+                 return ( static_cast<const CurveArc*>( pGObj)) ; }
 inline CurveArc* GetBasicCurveArc( IGeoObj* pGObj)
-               { return (dynamic_cast<CurveArc*>(pGObj)) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_ARC)
+                   return nullptr ;
+                 return ( static_cast<CurveArc*>( pGObj)) ; }
@@ -13,7 +13,9 @@

 #pragma once

-#include "/EgtDev/Include/EgkCurveAux.h"
+#include "/EgtDev/Include/EGkCurveAux.h"
+
+class Voronoi ;

 //----------------------------------------------------------------------------
 bool IsClosed( const ICurve& crvC) ;
@@ -31,3 +33,5 @@ bool CurveGetArea( const ICurve& crvC, Plane3d& plPlane, double& dArea) ;
 bool CurveDump( const ICurve& crvC, std::string& sOut, bool bMM, const char* szNewLine) ;
 bool CopyExtrusion( const ICurve* pSouCrv, ICurve* pDestCrv) ;
 bool CopyThickness( const ICurve* pSouCrv, ICurve* pDestCrv) ;
+ICurveBezier* ApproxCurveBezierWithSingleCubic( const ICurve* pCrv) ;
+Voronoi* GetCurveVoronoi( const ICurve& crvC) ;
@@ -13,25 +13,30 @@

 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
+#include "CurveAux.h"
 #include "CurveBezier.h"
 #include "CurveComposite.h"
 #include "DistPointCrvBezier.h"
 #include "BiArcs.h"
 #include "GeoConst.h"
 #include "PolygonPlane.h"
-#include "DistPointLine.h"
 #include "GeoObjFactory.h"
 #include "NgeWriter.h"
 #include "NgeReader.h"
 #include "PolynomialPoint3d.h"
 #include "Bernstein.h"
 #include "deCasteljau.h"
+#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"
 #include "/EgtDev/Include/EgtNumUtils.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
+#include "/EgtDev/Include/EGkGeoPoint3d.h"
+#include "/EgtDev/Include/EGkCurveLine.h"
 #include <array>

 using namespace std ;
@@ -45,15 +50,14 @@ GEOOBJ_REGISTER( CRV_BEZIER, NGE_C_BEZ, CurveBezier) ;
 //----------------------------------------------------------------------------
 CurveBezier::CurveBezier( void)
   : m_nStatus( TO_VERIFY), m_nDeg(), m_bRat( false), m_dParSing( -2),
-     m_VtExtr(), m_dThick()
+     m_VtExtr(), m_dThick(), m_nTempProp{0,0}, m_dTempParam{0.0,0.0}, m_pVoronoiObj( nullptr)
 {
-   m_nTempProp[0] = 0 ;
-   m_nTempProp[1] = 0 ;
 }

 //----------------------------------------------------------------------------
 CurveBezier::~CurveBezier( void)
 {
+   ResetVoronoiObject() ;
 }

 //----------------------------------------------------------------------------
@@ -77,6 +81,8 @@ CurveBezier::Init( int nDeg, bool bIsRational)
      m_vWeCtrl.clear() ;
   m_nStatus = TO_VERIFY ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -101,6 +107,8 @@ CurveBezier::SetControlPoint( int nInd, const Point3d& ptCtrl)
  // annullo analisi presenza singolarità
   m_dParSing = - 2 ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -126,12 +134,40 @@ CurveBezier::SetControlPoint( int nInd, const Point3d& ptCtrl, double dW)
  // annullo analisi presenza singolarità
   m_dParSing = - 2 ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

   return true ;
 }

+//----------------------------------------------------------------------------
+bool
+CurveBezier::SetControlWeight( int nInd, double dW)
+{
+   // verifico validità, razionalità e indice
+   if ( m_nStatus != OK  ||  ! m_bRat  ||  nInd < 0  ||  nInd > m_nDeg)
+      return false ;
+
+   // verifico che il peso non sia nullo o negativo
+   if ( dW < EPS_SMALL)
+      return false ;
+
+   // assegno il valore e il peso
+   m_vWeCtrl[nInd] = dW ;
+
+   // annullo analisi presenza singolarità
+   m_dParSing = - 2 ;
+
+   // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
+   // imposto ricalcolo della grafica
+   m_OGrMgr.Reset() ;
+
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 bool
 CurveBezier::FromArc( const ICurveArc& crArc)
@@ -189,6 +225,35 @@ CurveBezier::FromArc( const ICurveArc& crArc)
      SetControlPoint( 1, ptNew1, dW) ;
      SetControlPoint( 2, ptNew2, dW) ;
      SetControlPoint( 3, ptEnd, 1) ;
+
+   //// anziché usare una bezier cubica approssimo le eliche con più bezier quadratiche razionali.
+   //// più è grande l'angolo al centro dell'arco e maggiore sarà l'errore di approssimazione
+   //
+   //  // quadratica razionale
+   //  // peso del punto di controllo intermedio
+   //   double dW = dCosAhalf ;
+   //  // calcolo dei punti di controllo
+   //   Point3d  ptStart ;
+   //   crArc.GetStartPoint( ptStart) ;
+   //   Point3d  ptEnd ;
+   //   crArc.GetEndPoint( ptEnd) ;
+   //  // Point3d ptMed = Media( ptStart, ptEnd, 0.5) ;
+   //  //Vector3d vtDir = ptMed - crArc.GetCenter() ;
+   //  // Point3d ptNew = crArc.GetCenter() + vtDir / ( dCosAhalf * dCosAhalf) ;
+   //   Vector3d vtStart ; crArc.GetStartDir( vtStart) ;
+   //   Vector3d vtEnd ; crArc.GetEndDir( vtEnd) ;
+   //   PtrOwner<CurveLine> pCrvLine1( CreateBasicCurveLine()) ;
+   //   pCrvLine1->SetPVL( ptStart, vtStart, 10) ;
+   //   PtrOwner<CurveLine> pCrvLine2( CreateBasicCurveLine()) ;
+   //   pCrvLine2->SetPVL( ptEnd, vtEnd, 10) ;
+   //   IntersLineLine ill( *pCrvLine1, *pCrvLine2, false) ;
+   //   IntCrvCrvInfo iccInfo ; ill.GetIntCrvCrvInfo( iccInfo) ;
+   //   Point3d ptNew = 0.5 * (iccInfo.IciA->ptI + iccInfo.IciB->ptI) ;
+   //  // inserimento nella curva dei punti di controllo con i pesi
+   //   Init( 2, true) ;
+   //   SetControlPoint( 0, ptStart, 1) ;
+   //   SetControlPoint( 1, ptNew, dW) ;
+   //   SetControlPoint( 2, ptEnd, 1) ;
   }

  // copio estrusione e spessore
@@ -198,6 +263,30 @@ CurveBezier::FromArc( const ICurveArc& crArc)
   return true ;
 }

+//----------------------------------------------------------------------------
+bool
+CurveBezier::FromLine( const ICurveLine& crLine)
+{
+   if ( ! crLine.IsValid())
+      return false ;
+   double dWeight = 1 ;
+   int nCount = 0 ;
+   Point3d ptStart ; crLine.GetStartPoint( ptStart) ;
+   SetControlPoint( nCount, ptStart, dWeight) ;
+   ++nCount ;
+   double dPart = 1. / m_nDeg ;
+   for ( int i = 1 ; i < m_nDeg ; ++i) {
+      double dU = i * dPart ;
+      Point3d ptMid ; crLine.GetPointD1D2( dU, ICurve::FROM_MINUS, ptMid) ;
+      SetControlPoint( nCount, ptMid, dWeight) ;
+      ++nCount ;
+   }
+   Point3d ptEnd ; crLine.GetEndPoint( ptEnd) ;
+   SetControlPoint( nCount, ptEnd, dWeight) ;
+   ++nCount ;
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 bool
 CurveBezier::IsAPoint( void) const
@@ -266,7 +355,7 @@ CurveBezier::Clone( void) const
 bool
 CurveBezier::CopyFrom( const IGeoObj* pGObjSrc)
 {
-   const CurveBezier* pCB = dynamic_cast<const CurveBezier*>( pGObjSrc) ;
+   const CurveBezier* pCB = GetBasicCurveBezier( pGObjSrc) ;
   if ( pCB == nullptr)
      return false ;
   return CopyFrom( *pCB) ;
@@ -280,6 +369,7 @@ CurveBezier::CopyFrom( const CurveBezier& cbSrc)
      return true ;
   if ( ! Init( cbSrc.m_nDeg, cbSrc.m_bRat))
      return false ;
+   m_dParSing = cbSrc.m_dParSing ;
   m_vPtCtrl = cbSrc.m_vPtCtrl ;
   if ( cbSrc.m_bRat)
      m_vWeCtrl = cbSrc.m_vWeCtrl ;
@@ -287,6 +377,8 @@ CurveBezier::CopyFrom( const CurveBezier& cbSrc)
   m_dThick = cbSrc.m_dThick ;
   m_nTempProp[0] = cbSrc.m_nTempProp[0] ;
   m_nTempProp[1] = cbSrc.m_nTempProp[1] ;
+   m_dTempParam[0] = cbSrc.m_dTempParam[0] ;
+   m_dTempParam[1] = cbSrc.m_dTempParam[1] ;
   return true ;
 }

@@ -424,8 +516,24 @@ CurveBezier::Load( NgeReader& ngeIn)
 bool
 CurveBezier::Validate( void)
 {
+   if ( m_nStatus == TO_VERIFY) {
+      for ( const auto& ptP : m_vPtCtrl) {
+         if ( ! ptP.IsValid()) {
+            m_nStatus = ERR ;
+            break ;
+         }
+      }
+   }
+   if ( m_nStatus == TO_VERIFY) {
+      for ( const auto& dWe : m_vWeCtrl) {
+         if ( ! isfinite( dWe)) {
+            m_nStatus = ERR ;
+            break ;
+         }
+      }
+   }
   if ( m_nStatus == TO_VERIFY)
-      m_nStatus = ( ( m_nDeg > 0  &&  m_vPtCtrl.size() > 0) ? OK : ERR) ;
+      m_nStatus = ( ( m_nDeg >= 1  &&  m_vPtCtrl.size() >= 2) ? OK : ERR) ;

   return ( m_nStatus == OK) ;
 }
@@ -448,7 +556,7 @@ CurveBezier::GetLocalBBox( BBox3d& b3Loc, int nFlag) const
   else {
     // costruisco una approssimazione lineare
      PolyLine PL ;
-      if ( ! ApproxWithLines( LIN_TOL_MIN, ANG_TOL_APPROX_DEG, ICurve::APL_STD, PL))
+      if ( ! ApproxWithLines( LIN_TOL_MIN, ANG_TOL_APPROX_DEG, APL_STD, PL))
         return false ;
     // ciclo sui punti della approssimazione
      Point3d  ptTemp ;
@@ -491,7 +599,7 @@ CurveBezier::GetBBox( const Frame3d& frRef, BBox3d& b3Ref, int nFlag) const
   else {
     // costruisco una approssimazione lineare
      PolyLine PL ;
-      if ( ! ApproxWithLines( LIN_TOL_MIN, ANG_TOL_APPROX_DEG, ICurve::APL_STD, PL))
+      if ( ! ApproxWithLines( LIN_TOL_MIN, ANG_TOL_APPROX_DEG, APL_STD, PL))
         return false ;
     // ciclo sui punti della approssimazione
      Point3d  ptTemp ;
@@ -603,7 +711,7 @@ CurveBezier::GetMidPoint( Point3d& ptMid) const
      return false ;
  // determino il valore del parametro a metà lunghezza
   double dLen, dMid ;
-   if ( ! GetLength( dLen)  ||  ! GetParamAtLength( 0.5 * dLen, dMid))
+   if ( ! GetLengthAtParam( 1, dLen)  ||  ! GetParamAtLength( 0.5 * dLen, dMid))
      return false ;      
  // calcolo il punto
   return GetPointD1D2( dMid, ptMid) ;
@@ -618,7 +726,7 @@ CurveBezier::GetCentroid( Point3d& ptCen) const
      return false ;
  // approssimo la curva con una polilinea
   PolyLine PL ;
-   if ( ! ApproxWithLines( LIN_TOL_STD, ANG_TOL_STD_DEG, ICurve::APL_STD, PL))
+   if ( ! ApproxWithLines( LIN_TOL_STD, ANG_TOL_STD_DEG, APL_STD, PL))
      return false ;
  // calcolo il centro mediante PolygonPlane
   Point3d ptP ;
@@ -640,7 +748,7 @@ CurveBezier::GetMidDir( Vector3d& vtDir) const
      return false ;
  // determino il valore del parametro a metà lunghezza
   double dLen, dMid ;
-   if ( ! GetLength( dLen)  ||  ! GetParamAtLength( 0.5 * dLen, dMid))
+   if ( ! GetLengthAtParam( 1, dLen)  ||  ! GetParamAtLength( 0.5 * dLen, dMid))
      return false ;      
  // calcolo la direzione
   return ::GetTang( *this, dMid, FROM_MINUS, vtDir) ;
@@ -1429,7 +1537,7 @@ CurveBezier::ApproxWithArcsXY( double dLinTol, double dAngTolDeg, PolyArc& PA) c

  // costruisco una approssimazione lineare
   PolyLine PL ;
-   if ( ! ApproxWithLines( dLinTol, dAngTolDeg, ICurve::APL_STD, PL))
+   if ( ! ApproxWithLines( dLinTol, dAngTolDeg, APL_STD, PL))
      return false ;

  // approssimo la curva per approssimazioni successive mediante bisezione
@@ -1462,7 +1570,7 @@ CurveBezier::BiArcOrSplit( int nLev, PolyLine& PL, double dLinTol, double dAngTo
            return false ;
         vtDir.ToSpherical( nullptr, nullptr, &dDir1Deg) ;
        // costruisco un biarco sulla polilinea (secondo metodo di Z. Sir)
-         pCrv.Set( GetBiArc( ptP0, dDir0Deg, ptP1, dDir1Deg, PL, dMaxDist)) ;
+         pCrv.Set( GetBiArc( ptP0, dDir0Deg, ptP1, dDir1Deg, PL, dMaxDist, dLinTol)) ;
         if ( IsNull( pCrv))
            return false ;
      }
@@ -1478,7 +1586,7 @@ CurveBezier::BiArcOrSplit( int nLev, PolyLine& PL, double dLinTol, double dAngTo
            return false ;
         if ( ! pCC->FromPolyLine( PL))
            return false ;
-         pCrv.Set( Release( pCC)) ;
+         pCrv.Set( pCC) ;
         dMaxDist = 0 ;
      }
     // se la polilinea ha un solo punto, esco
@@ -1590,6 +1698,8 @@ CurveBezier::Invert( void)
   for ( int i = 0 ; i < nMid ; ++ i)
      swap( m_vPtCtrl[i], m_vPtCtrl[m_nDeg-i]) ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;
  
@@ -1607,6 +1717,8 @@ CurveBezier::ModifyStart( const Point3d& ptNewStart)
  // modifico il primo punto di controllo
   m_vPtCtrl[0] = ptNewStart ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1624,6 +1736,8 @@ CurveBezier::ModifyEnd( const Point3d& ptNewEnd)
  // modifico l'ultimo punto di controllo
   m_vPtCtrl[m_nDeg] = ptNewEnd ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1648,6 +1762,8 @@ CurveBezier::TrimStartAtParam( double dUTrim)
         return false ;
   }

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -1672,6 +1788,8 @@ CurveBezier::TrimEndAtParam( double dUTrim)
         return false ;
   }

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -1689,12 +1807,24 @@ CurveBezier::TrimStartEndAtParam( double dUStartTrim, double dUEndTrim)
  // verifico che i trim non cancellino interamente la curva
   if ( dUStartTrim > dUEndTrim - EPS_PARAM)
      return false ;
+   // se razionale devo trovare il punto di trim iniziale per ricalcolare il parametro di trim
+   Point3d ptStart ;
+   if( m_bRat)
+      GetPointD1D2( dUStartTrim, ptStart) ;
  // trim finale
   if ( ! TrimEndAtParam( dUEndTrim))
      return false ;
  // trim iniziale con il parametro opportunamente ricalcolato
-   double dNewUStartTrim = dUStartTrim / dUEndTrim ;
-   return TrimStartAtParam( dNewUStartTrim) ;
+   double dNewUStartTrim ;
+   if( m_bRat)
+      GetParamAtPoint( ptStart, dNewUStartTrim) ;
+   else
+      dNewUStartTrim = dUStartTrim / dUEndTrim ;
+   //trim iniziale
+   if( ! TrimStartAtParam( dNewUStartTrim))
+      return false ;
+
+   return true ;
 }

 //----------------------------------------------------------------------------
@@ -1710,7 +1840,10 @@ CurveBezier::TrimStartAtLen( double dLenTrim)
      return false ;

  // utilizzo il trim sui parametri
-   return TrimStartAtParam( dUTrim) ;
+   if( ! TrimStartAtParam( dUTrim))
+      return false ;
+
+   return true ;
 }

 //----------------------------------------------------------------------------
@@ -1726,7 +1859,10 @@ CurveBezier::TrimEndAtLen( double dLenTrim)
      return false ;

  // utilizzo il trim sui parametri
-   return TrimEndAtParam( dUTrim) ;
+   if( ! TrimEndAtParam( dUTrim))
+      return false ;
+
+   return true ;
 }

 //----------------------------------------------------------------------------
@@ -1738,7 +1874,7 @@ CurveBezier::ExtendStartByLen( double dLenExt)
      return false ;
  // determino la lunghezza originale della curva
   double dLen ;
-   if ( ! GetLength( dLen))
+   if ( ! GetLengthAtParam( 1, dLen))
      return false ;
  // stimo il valore del parametro al nuovo punto iniziale
   double dUTrim = - dLenExt / dLen ;
@@ -1772,6 +1908,9 @@ CurveBezier::ExtendStartByLen( double dLenExt)
         m_vWeCtrl[i] = vWeCtrl[i] ;
      }
   }
+
+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;
   return true ;
@@ -1786,7 +1925,7 @@ CurveBezier::ExtendEndByLen( double dLenExt)
      return false ;
  // determino la lunghezza originale della curva
   double dLen ;
-   if ( ! GetLength( dLen))
+   if ( ! GetLengthAtParam( 1, dLen))
      return false ;
  // stimo il valore del parametro al nuovo punto finale
   double dUTrim = 1 + dLenExt / dLen ;
@@ -1820,6 +1959,9 @@ CurveBezier::ExtendEndByLen( double dLenExt)
         m_vWeCtrl[i] = vWeCtrl[i] ;
      }
   }
+
+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;
   return true ;   
@@ -1833,6 +1975,10 @@ CurveBezier::Translate( const Vector3d& vtMove)
   if ( m_nStatus != OK)
      return false ;

+  // traslo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->Translate( vtMove) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1855,6 +2001,10 @@ CurveBezier::Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng,
   if ( vtAx.IsSmall())
      return false ;

+  // ruoto Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->Rotate( ptAx, vtAx, dCosAng, dSinAng) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1897,6 +2047,8 @@ CurveBezier::Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double
   if ( ! bOk)
      return false ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1926,6 +2078,8 @@ CurveBezier::Mirror( const Point3d& ptOn, const Vector3d& vtNorm)
   if ( vtNorm.IsSmall())
      return false ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1950,6 +2104,8 @@ CurveBezier::Shear( const Point3d& ptOn, const Vector3d& vtNorm, const Vector3d&
   if ( vtNorm.IsSmall()  ||  vtDir.IsSmall())
      return false ;

+  // imposto ricalcolo Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1974,11 +2130,18 @@ CurveBezier::ToGlob( const Frame3d& frRef)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-
  // verifico validità del frame
   if ( frRef.GetType() == Frame3d::ERR)
      return false ;

+  // se frame identità, non devo fare alcunché
+   if ( IsGlobFrame( frRef))
+      return true ;
+
+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->ToGlob( frRef) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -1998,11 +2161,18 @@ CurveBezier::ToLoc( const Frame3d& frRef)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-
  // verifico validità del frame
   if ( frRef.GetType() == Frame3d::ERR)
      return false ;

+  // se frame identità, non devo fare alcunché
+   if ( IsGlobFrame( frRef))
+      return true ;
+
+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->ToLoc( frRef) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -2022,11 +2192,18 @@ CurveBezier::LocToLoc( const Frame3d& frOri, const Frame3d& frDest)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-
  // verifico validità dei frame
   if ( frOri.GetType() == Frame3d::ERR  ||  frDest.GetType() == Frame3d::ERR)
      return false ;

+  // se i due riferimenti coincidono, non devo fare alcunché
+   if ( AreSameFrame( frOri, frDest))
+      return true ;
+
+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->LocToLoc( frOri, frDest) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -2038,3 +2215,180 @@ CurveBezier::LocToLoc( const Frame3d& frOri, const Frame3d& frDest)

   return true ;
 }
+
+//----------------------------------------------------------------------------
+bool
+CurveBezier::CalcVoronoiObject() const
+{
+   if ( m_nStatus != OK)
+      return false ;
+ 
+  // creo oggetto vroni con la curva
+   m_pVoronoiObj = new( std::nothrow) Voronoi( this, false) ;
+   if ( m_pVoronoiObj == nullptr)
+      return false ;
+
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+Voronoi* 
+CurveBezier::GetVoronoiObject() const
+{
+   if ( m_nStatus != OK)
+      return nullptr ;
+ 
+  // se non è stato calcolato, lo calcolo
+   if ( m_pVoronoiObj == nullptr)
+      CalcVoronoiObject() ;
+ 
+  // restituisco Voronoi
+   return m_pVoronoiObj ;
+}
+
+//----------------------------------------------------------------------------
+void
+CurveBezier::ResetVoronoiObject() const
+{ 
+   if ( m_pVoronoiObj != nullptr)
+      delete m_pVoronoiObj ;
+   m_pVoronoiObj = nullptr ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CurveBezier::MakeRational( void)
+{ 
+   if ( m_bRat)
+      return true ;
+   // creo il vettore dei pesi e li setto tutti a 1
+   m_vWeCtrl.assign( m_nDeg + 1, 1) ;
+   // aggiorno il flag rational
+   m_bRat = true ;
+
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CurveBezier::MakeRationalStandardForm( void)
+{ 
+   if ( ! m_bRat)
+      return false ;
+   double dW0 = m_vWeCtrl.front() ;
+   double dWn = m_vWeCtrl.back() ;
+   if ( dW0 > 1 - EPS_ZERO  &&  dWn > 1 - EPS_ZERO)
+      return true ;
+   if ( dW0 < EPS_ZERO  ||  dWn < EPS_ZERO)
+      return false ;
+
+  // formula del Farin
+   double dCoeff = pow( dW0 / dWn, 1. / m_nDeg) ;
+   for ( int i = 0 ; i < m_nDeg + 1 ; ++i)
+      m_vWeCtrl[i] *= Pow( dCoeff, i) / dW0 ;
+
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CurveBezier::MakeNonRational( double dTol)
+{
+   if ( ! m_bRat)
+      return true ;
+
+   // controllo se i pesi sono tutti == 1 allora è una finta razionale e mi basta fare una copia dei punti di controllo
+   bool bIsActualRat = false ;
+   for ( int i = 0 ; i < m_nDeg ; ++i) {
+      if ( abs( m_vWeCtrl[i] - 1) > EPS_SMALL) {
+         bIsActualRat = true ;
+         break ;
+      }
+   }
+
+   bool bOk = true ;
+   if ( ! bIsActualRat) {
+      PtrOwner<CurveBezier> pNewBez( CreateBasicCurveBezier()) ;
+      for ( int p = 0 ; p < m_nDeg ; ++p) {
+         Point3d pt = GetControlPoint( p) ;
+         pNewBez->SetControlPoint( p, pt) ;
+      }
+   }
+   else {
+      // provo ad approssimare la curva di bezier con una controparte non razionale
+      int nDeg = m_nDeg ;
+      // punto di rientro in caso fallisca il primo tentativo
+      retry :
+         nDeg += 2 ;
+         PtrOwner<CurveBezier> pNewBez( CreateBasicCurveBezier()) ;
+         pNewBez->Init( nDeg, false) ;
+         PNTVECTOR vPntCtrl ;
+         PNTVECTOR vPntSampling ;
+         for ( int p = 0 ; p < nDeg + 1 ; ++p) {
+            Point3d pt ; GetPointD1D2( double( p) / nDeg, pt) ;
+            pNewBez->SetControlPoint( p, pt) ;
+            vPntCtrl.push_back( pt) ;
+         }
+         vPntSampling = vPntCtrl ;
+         int c = 0 ;
+         double dErr = INFINITO ;
+         while ( dErr > dTol  &&  c < 100) {
+            double dErrMax = 0 ;
+            // calcolo le differenze tra i punti di sampling sulla nuova curva e quelli sulla curva originale
+            for ( int p = 0 ; p < nDeg + 1 ; ++p) {
+               Point3d pt ; pNewBez->GetPointD1D2( double( p) / nDeg, pt) ;
+               Vector3d vDiff = vPntSampling[p] - pt ;
+               double dErrLoc = vDiff.Len() ;
+               if( dErrLoc > dErrMax)
+                  dErrMax = dErrLoc ;
+               // aggiorno il vettore dei punti di controllo della nuova curva
+               vPntCtrl[p] += vDiff ;
+            }
+            dErr = dErrMax ;
+            // aggiorno i punti di controllo della nuova curva
+            for ( int i = 0 ; i < nDeg + 1 ; ++i)
+               pNewBez->SetControlPoint( i, vPntCtrl[i]) ;
+            ++c ;
+         }
+
+         // calcolo l'errore di approssimazione sulla curva
+         CalcBezierApproxError( this, pNewBez, dErr) ;
+         bOk = dErr < dTol ;
+         if ( bOk) {
+            // aggiorno la curva di bezier originale con quella approssimata
+            Init( nDeg, false) ;
+            for ( int i = 0 ; i < nDeg + 1 ; ++i) {
+               SetControlPoint( i, pNewBez->GetControlPoint( i)) ;
+               SetControlWeight( i, pNewBez->GetControlWeight( i)) ;
+            }
+         }
+         else if ( nDeg < m_nDeg + 4)
+            goto retry ;
+   }
+
+   return bOk ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CurveBezier::IsALine( void) const
+{
+   Point3d ptStart ; GetStartPoint( ptStart) ;
+   Point3d ptEnd ; GetEndPoint( ptEnd) ;
+   for ( int i = 1 ; i < m_nDeg ; ++i) {
+      Point3d ptCtrl = GetControlPoint( i) ;
+      DistPointLine dpl( ptCtrl, ptStart, ptEnd) ;
+      double dDist = 0 ; dpl.GetDist( dDist) ;
+      if( dDist > EPS_SMALL)
+         return false ;
+   }
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+PNTVECTOR
+CurveBezier::GetAllControlPoints( void) const
+{
+   PNTVECTOR vPntCtrl = m_vPtCtrl ;
+   return vPntCtrl ;
+}
@@ -19,7 +19,8 @@
 #include "DllMain.h"
 #include "GeoObjRW.h"
 #include "/EgtDev/Include/EGkCurveBezier.h"
-#include "/EgtDev/Include/EgtNumCollection.h"
+
+class Voronoi ;

 //----------------------------------------------------------------------------
 class CurveBezier : public ICurveBezier, public IGeoObjRW
@@ -56,6 +57,11 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW
                   m_nTempProp[nPropInd] = nProp ; } 
      int  GetTempProp( int nPropInd = 0) const override
              { return (( nPropInd >= 0  &&  nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; }
+      void SetTempParam( double dParam, int nParamInd = 0) override
+              { if ( nParamInd >= 0  &&  nParamInd < 2)
+                   m_dTempParam[nParamInd] = dParam ; } 
+      double GetTempParam( int nParamInd = 0) const override
+                { return (( nParamInd >= 0  &&  nParamInd < 2) ? m_dTempParam[nParamInd] : 0.0) ; }

   public :                      // ICurve
      bool IsSimple( void) const override { return true ; }
@@ -111,7 +117,7 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW
      ICurve* CopyParamRange( double dUStart, double dUEnd) const override ;
      bool Invert( void) override ;
      bool SimpleOffset( double dDist, int nType = OFF_FILLET) override
-              { return false ; }  // l'offset di crvBezier non è crvBezier tranne in casi molto particolari
+              { return false ; }  // l'offset di crvBezier non è crvBezier tranne in casi molto particolari
      bool ModifyStart( const Point3d& ptNewStart) override ;
      bool ModifyEnd( const Point3d& ptNewEnd) override ;
      bool SetExtrusion( const Vector3d& vtExtr) override
@@ -131,7 +137,9 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW
      bool Init( int nDeg, bool bIsRational) override ;
      bool SetControlPoint( int nInd, const Point3d& ptCtrl) override ;
      bool SetControlPoint( int nInd, const Point3d& ptCtrl, double dW) override ;
+      bool SetControlWeight( int nInd, double dW) override ;
      bool FromArc( const ICurveArc& crArc) override ;
+      bool FromLine( const ICurveLine& crLine) override ;
      int  GetDegree( void) const override
                { return m_nDeg ; }
      bool IsRational( void) const override
@@ -141,15 +149,23 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW
      double GetControlWeight( int nInd, bool* pbOk = NULL) const override ;
      bool GetControlPolygonLength( double& dLen) const override ;
      int  GetSingularParam( double& dPar) const override ;
+      bool MakeRational( void) override ;
+      bool MakeRationalStandardForm( void) override ;
+      bool MakeNonRational( double dTol) override ;
+      bool IsALine( void) const override ;
+      PNTVECTOR GetAllControlPoints( void) const ;  // non aggiunta in interfaccia

   public :                      // IGeoObjRW
      int GetNgeId( void) const override ;
      bool Save( NgeWriter& ngeOut) const override ;
+      bool PreSave( GdbGeo& Wrapper) const override { return true ; }
+      bool PostSave( GdbGeo& Wrapper) const override { return true ; }
      bool Load( NgeReader& ngeIn) override ;
+      bool PostLoad( GdbGeo& Wrapper) override { return true ; }

   public :
      CurveBezier( void) ;
-      CurveBezier( const CurveBezier& cbSrc)
+      CurveBezier( const CurveBezier& cbSrc) : m_pVoronoiObj( nullptr)
                     { if ( ! CopyFrom( cbSrc))
                          LOG_ERROR( GetEGkLogger(), "CurveBezier : copy constructor error")}
      CurveBezier& operator =( const CurveBezier& cbSrc)
@@ -158,6 +174,8 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW
                       return *this ; }
      bool ApproxWithLines( int nStep, PolyLine& PL) const ;
      bool GetApproxLength( double& dLen) const ;
+      Voronoi* GetVoronoiObject( void) const ;
+      void ResetVoronoiObject( void) const ;

   private :
      bool CopyFrom( const CurveBezier& cbSrc) ;
@@ -174,33 +192,40 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW
      bool ApproxWithArcsXY(double dLinTol, double dAngTolDeg, PolyArc& PA) const;
      bool BiArcOrSplit(int nLev, PolyLine& PL, double dLinTol, double dAngTolDeg, PolyArc& PA) const;
      bool ToPowerBase( PolynomialPoint3d& pol3P) const ;
-      bool ToPowerBase( PolynomialPoint3d& pol3Num, Polynomial& polDen) const ;
+      bool ToPowerBase( PolynomialPoint3d& pol3Num, Polynomial& polDen) const ;      
+      bool CalcVoronoiObject( void) const ;

   private :
      enum Status { ERR = 0, OK = 1, TO_VERIFY = 2} ;
-      static const int MAXDEG = 11 ;
+      static const int MAXDEG = 21 ;

   private :
-      ObjGraphicsMgr m_OGrMgr ;        // gestore grafica dell'oggetto
-      Status         m_nStatus ;       // stato
-      int            m_nDeg ;          // grado
-      bool           m_bRat ;          // flag di razionale/polinomiale
-      mutable double m_dParSing ;      // eventuale parametro della singolarità (-1=no, -2=da calcolare)
-      PNTVECTOR      m_vPtCtrl ;       // vettore dei punti di controllo
-      DBLVECTOR      m_vWeCtrl ;       // vettore dei pesi di controllo
-      Vector3d       m_VtExtr ;        // vettore estrusione (normalmente coincide con m_VtN)
-      double         m_dThick ;        // spessore
-      int            m_nTempProp[2] ;  // vettore proprietà temporanee
+      ObjGraphicsMgr m_OGrMgr ;         // gestore grafica dell'oggetto
+      Status         m_nStatus ;        // stato
+      int            m_nDeg ;           // grado
+      bool           m_bRat ;           // flag di razionale/polinomiale
+      mutable double m_dParSing ;       // eventuale parametro della singolarità (-1=no, -2=da calcolare)
+      PNTVECTOR      m_vPtCtrl ;        // vettore dei punti di controllo
+      DBLVECTOR      m_vWeCtrl ;        // vettore dei pesi di controllo
+      Vector3d       m_VtExtr ;         // vettore estrusione (normalmente coincide con m_VtN)
+      double         m_dThick ;         // spessore
+      int            m_nTempProp[2] ;   // vettore proprietà temporanee
+      double         m_dTempParam[2] ;  // vettore parametri temporanei
+      mutable Voronoi* m_pVoronoiObj ;  // Voronoi
 } ;

 //-----------------------------------------------------------------------------
 inline CurveBezier* CreateBasicCurveBezier( void)
-               { return (static_cast<CurveBezier*>( CreateGeoObj( CRV_BEZIER))) ; }
+               { return ( static_cast<CurveBezier*>( CreateGeoObj( CRV_BEZIER))) ; }
 inline CurveBezier* CloneBasicCurveBezier( const IGeoObj* pGObj)
               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_BEZIER)
                    return nullptr ;
-                 return (static_cast<CurveBezier*>(pGObj->Clone())) ; }
+                 return ( static_cast<CurveBezier*>( pGObj->Clone())) ; }
 inline const CurveBezier* GetBasicCurveBezier( const IGeoObj* pGObj)
-               { return (dynamic_cast<const CurveBezier*>(pGObj)) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_BEZIER)
+                    return nullptr ;
+                 return ( static_cast<const CurveBezier*>( pGObj)) ; }
 inline CurveBezier* GetBasicCurveBezier( IGeoObj* pGObj)
-               { return (dynamic_cast<CurveBezier*>(pGObj)) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_BEZIER)
+                    return nullptr ;
+                 return ( static_cast<CurveBezier*>( pGObj)) ; }
@@ -16,7 +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"
@@ -56,28 +57,78 @@ ICurve*
 CurveByApprox::GetCurve( int nType, double dLinTol, double dAngTolDeg, double dLinFea)
 {
  // se da approssimare con archi
-   if ( nType == ARCS_CORNER) {
+   if ( nType == ARCS  ||  nType == ARCS_CORNER) {
     // calcolo approssimazione
      PolyArc PA ;
-      if ( ! GetArcs( dLinTol, dAngTolDeg, dLinFea, PA))
-         return nullptr ;
+      if ( nType == ARCS) {
+         if ( ! GetArcs( dLinTol, dAngTolDeg, PA))
+            return nullptr ;
+      }
+      else {
+         if ( ! GetArcsCorner( dLinTol, dAngTolDeg, dLinFea, PA))
+            return nullptr ;
+      }
     // creo la composita formata da questa approssimazione
      PtrOwner<CurveComposite> pCC( CreateBasicCurveComposite()) ;
      if ( ! pCC->FromPolyArc( PA))
         return nullptr ;
+     // elimino eventuali Small Z
+      pCC->RemoveSmallDefects( dLinTol, dAngTolDeg) ;
     // eventuale fusione di curve compatibili
      pCC->MergeCurves( dLinTol, dAngTolDeg) ;
     // restituisco la curva
      return Release( pCC) ;
   }
  // altrimenti con curve di Bezier cubiche
-   // !!! NON ANCORA IMPLEMENTATA !!!
+   else if ( nType == CUBIC_BEZIERS) {
+      // !!! NON ANCORA IMPLEMENTATA !!!
+      return nullptr ;
+   }
+  // tipi non previsti
   return nullptr ;
 }

 //----------------------------------------------------------------------------
 bool
-CurveByApprox::GetArcs( double dLinTol, double dAngTolDeg, double dLinFea, PolyArc& PA)
+CurveByApprox::GetArcs( double dLinTol, double dAngTolDeg, PolyArc& PA)
+{
+  // pulisco il poliarco
+   PA.Clear() ;
+
+  // calcolo una parametrizzazione
+   if ( ! CalcParameterization())
+      return false ;
+
+  // calcolo le tangenti
+   if ( ! CalcAkimaTangents( false))
+      return false ;
+
+  // approssimo come unico tratto
+
+  // creo la polilinea che unisce i punti
+   PolyLine PL ;
+   int nPnt = int( m_vPnt.size()) ;
+   for ( int j = 0 ; j < nPnt ; ++ j)
+      PL.AddUPoint( j, m_vPnt[j]) ;
+  // verifico se retta verticale
+   BBox3d b3PL ;
+   if ( ! PL.GetLocalBBox( b3PL))
+      return false ;
+   if ( b3PL.GetDimX() < EPS_SMALL  &&  b3PL.GetDimY() < EPS_SMALL) {
+      PA.AddUPoint( 0, m_vPnt[0], 0) ;
+      PA.AddUPoint( nPnt - 1, m_vPnt[nPnt - 1], 0) ;
+   }
+  // altrimenti eseguo l'approssimazione con archi
+   else {
+      if ( ! BiArcOrSplit( 0, PL, dLinTol, dAngTolDeg, PA))
+         return false ;
+   }
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+CurveByApprox::GetArcsCorner( double dLinTol, double dAngTolDeg, double dLinFea, PolyArc& PA)
 {
  // pulisco il poliarco
   PA.Clear() ;
@@ -102,9 +153,18 @@ CurveByApprox::GetArcs( double dLinTol, double dAngTolDeg, double dLinFea, PolyA
      PolyLine PL ;
      for ( int j = nPrev ; j <= m_vSplits[i] ; ++ j)
         PL.AddUPoint( j, m_vPnt[j]) ;
-     // eseguo l'approssimazione con archi
-      if ( ! BiArcOrSplit( 0, PL, dLinTol, dAngTolDeg, PA))
+     // verifico se retta verticale
+      BBox3d b3PL ;
+      if ( ! PL.GetLocalBBox( b3PL))
         return false ;
+      if ( b3PL.GetDimX() < EPS_SMALL  &&  b3PL.GetDimY() < EPS_SMALL) {
+         PA.AddUPoint( m_vSplits[i], m_vPnt[m_vSplits[i]], 0) ;
+      }
+     // altrimenti eseguo l'approssimazione con archi
+      else {
+         if ( ! BiArcOrSplit( 0, PL, dLinTol, dAngTolDeg, PA))
+            return false ;
+      }
     // salvo fine come prox inizio
      nPrev = m_vSplits[i] ;
   }
@@ -379,12 +439,12 @@ CurveByApprox::CalcSplitPoints( double dLinTol, double dAngTolDeg, double dLinFe
         m_vSplits.push_back(i) ;
         continue ;
      }
-     // verifico linearità del tratto precedente
+     // verifico linearità del tratto precedente
      bool bPrevLin = vtPrev.SqLen() > dSqLinFea  &&
                      ( m_vNextDer[i-1] * m_vPrevDer[i]) > dAngTolCos  &&
                      ( vtPrev ^ m_vNextDer[i-1]).SqLen() < dSqLinTol  &&
                      ( vtPrev ^ m_vPrevDer[i]).SqLen() < dSqLinTol ;
-     // verifico linearità del tratto successivo
+     // verifico linearità del tratto successivo
      bool bNextLin = vtNext.SqLen() > dSqLinFea  &&
                      ( m_vNextDer[i] * m_vPrevDer[i+1]) > dAngTolCos  &&
                      ( vtNext ^ m_vNextDer[i]).SqLen() < dSqLinTol  &&
@@ -423,7 +483,7 @@ CurveByApprox::BiArcOrSplit( int nLev, PolyLine& PL, double dLinTol, double dAng
      PtrOwner<ICurve> pCrv ;
      double dMaxDist ;

-     // se la polilinea ha più di 2 punti
+     // se la polilinea ha più di 2 punti
      if ( PL.GetPointNbr() > 2)  {
        // calcolo punti e direzioni agli estremi della polilinea usando la curva di Bezier
         int nI ;
@@ -441,11 +501,12 @@ CurveByApprox::BiArcOrSplit( int nLev, PolyLine& PL, double dLinTol, double dAng
         ptP1 = m_vPnt[nI] ;
         m_vPrevDer[nI].ToSpherical( nullptr, nullptr, &dDir1Deg) ;
        // costruisco un biarco sulla polilinea (secondo metodo di Z. Sir)
-         pCrv.Set( GetBiArc( ptP0, dDir0Deg, ptP1, dDir1Deg, PL, dMaxDist)) ;
+         pCrv.Set( GetBiArc( ptP0, dDir0Deg, ptP1, dDir1Deg, PL, dMaxDist, dLinTol)) ;
+        // forzo la spezzatura della curva
         if ( IsNull( pCrv))
-            return false ;
+            dMaxDist = 2 * dLinTol ;
      }
-     // se la polilinea è formata da 2 punti
+     // se la polilinea è formata da 2 punti
      else if ( PL.GetPointNbr() == 2) {
        // se molto vicini, esco
         double dLen ;
@@ -453,11 +514,9 @@ CurveByApprox::BiArcOrSplit( int nLev, PolyLine& PL, double dLinTol, double dAng
            return true ;
        // costruisco la retta che li unisce
         PtrOwner<CurveComposite> pCC( CreateBasicCurveComposite()) ;
-         if ( IsNull( pCC))
+         if ( IsNull( pCC)  ||  ! pCC->FromPolyLine( PL))
            return false ;
-         if ( ! pCC->FromPolyLine( PL))
-            return false ;
-         pCrv.Set( Release( pCC)) ;
+         pCrv.Set( pCC) ;
         dMaxDist = 0 ;
      }
     // se la polilinea ha un solo punto, esco
@@ -466,13 +525,15 @@ CurveByApprox::BiArcOrSplit( int nLev, PolyLine& PL, double dLinTol, double dAng

     // se raggiunto il massimo livello di recursione, forzo l'accettazione del biarco
      if ( nLev >= MAX_LEV) {
+         if ( IsNull( pCrv))
+            return false ;
         dMaxDist = 0 ;
        // segnalo situazione per debug
         if ( GetEGkDebugLev() >= 5)
            LOG_DBG_ERR( GetEGkLogger(), "ERROR : Exceeded recursions")
      }

-     // se lunghezza abbastanza picccola, forzo l'accettazione della curva
+     // se lunghezza abbastanza piccola, forzo l'accettazione della curva
      double dLen ;
      if ( PL.GetApproxLength( dLen)  &&  dLen < 10 * EPS_SMALL)
         dMaxDist = 0 ;
@@ -503,7 +564,7 @@ CurveByApprox::BiArcOrSplit( int nLev, PolyLine& PL, double dLinTol, double dAng
      return false ;
   }

-  // spezzo l'intervallo in due parti a metà
+  // spezzo l'intervallo in due parti a metà
   double dParStart, dParEnd ;
   if ( ! PL.GetFirstU( dParStart)  ||  ! PL.GetLastU( dParEnd))
      return false ;
@@ -511,9 +572,9 @@ CurveByApprox::BiArcOrSplit( int nLev, PolyLine& PL, double dLinTol, double dAng
   PolyLine PL2 ;
   if ( ! PL.Split( dParMid, PL2))
      return false ;
-  // prima metà
+  // prima metà
   if ( ! BiArcOrSplit( nLev + 1, PL, dLinTol, dAngTolDeg, PA))
      return false ;
-  // seconda metà
+  // seconda metà
   return BiArcOrSplit( nLev + 1, PL2, dLinTol, dAngTolDeg, PA) ;
 }
@@ -14,10 +14,10 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "CalcDerivate.h"
+#include "CurveBezier.h"
+#include "CurveComposite.h"
 #include "/EgtDev/Include/EGkCurveByInterp.h"
-#include "/EgtDev/Include/EgkCurveComposite.h"
-#include "/EgtDev/Include/EgkBiArcs.h"
-#include "/EgtDev/Include/EgkCurveBezier.h"
+#include "/EgtDev/Include/EGkBiArcs.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"


@@ -63,7 +63,7 @@ CurveByInterp::GetCurve( int nMethod, int nType)
  // se richiesti biarchi
   if ( nType == BIARCS) {
     // creo la curva composita
-      PtrOwner<ICurveComposite> pCrvCompo( CreateCurveComposite()) ;
+      PtrOwner<CurveComposite> pCrvCompo( CreateBasicCurveComposite()) ;
      if ( IsNull( pCrvCompo))
         return nullptr ;
     // ciclo sugli intervalli
@@ -83,13 +83,13 @@ CurveByInterp::GetCurve( int nMethod, int nType)
  // se richieste curve di Bezier cubiche
   if ( nType == CUBIC_BEZIERS) {
     // creo la curva composita
-      PtrOwner<ICurveComposite> pCrvCompo( CreateCurveComposite()) ;
+      PtrOwner<CurveComposite> pCrvCompo( CreateBasicCurveComposite()) ;
      if ( IsNull( pCrvCompo))
         return nullptr ;
     // ciclo sugli intervalli
      for ( int i = 1 ; i < int( m_vPnt.size()) ; ++ i) {
        // creo una curva di Bezier cubica per ogni intervallo
-         PtrOwner<ICurveBezier> pCBez( CreateCurveBezier()) ;
+         PtrOwner<CurveBezier> pCBez( CreateBasicCurveBezier()) ;
         if ( IsNull( pCBez))
            return nullptr ;
         pCBez->Init( 3, false) ;
@@ -1,12 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2013-2021
+//  EgalTech 2013-2022
 //----------------------------------------------------------------------------
-// File : CurveComposite.h       Data : 03.04.21          Versione : 2.3d1
+// File : CurveComposite.h       Data : 24.03.22          Versione : 2.4c2
 // Contenuto : Dichiarazione della classe Curva composita.
 //
 //
 //
 // Modifiche : 16.04.13 DS Creazione modulo.
+//             24.03.22 DS Aggiunto metodo AddLineTg.
 //
 //
 //----------------------------------------------------------------------------
@@ -20,6 +21,8 @@
 #include "/EgtDev/Include/EGkCurveComposite.h"
 #include <deque>

+class Voronoi ;
+
 //----------------------------------------------------------------------------
 class CurveComposite : public ICurveComposite, public IGeoObjRW
 {
@@ -52,9 +55,14 @@ class CurveComposite : public ICurveComposite, public IGeoObjRW
              { return m_OGrMgr.GetObjGraphics() ; }
      void SetTempProp( int nProp, int nPropInd = 0) override
              { if ( nPropInd >= 0  &&  nPropInd < 2)
-                   m_nTempProp[nPropInd] = nProp ; } 
+                   m_nTempProp[nPropInd] = nProp ; }
      int  GetTempProp( int nPropInd = 0) const override
              { return (( nPropInd >= 0  &&  nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; }
+      void SetTempParam( double dParam, int nParamInd = 0) override
+              { if ( nParamInd >= 0  &&  nParamInd < 2)
+                  m_dTempParam[nParamInd] = dParam ; } 
+      double GetTempParam( int nParamInd = 0) const override
+                { return (( nParamInd >= 0  &&  nParamInd < 2) ? m_dTempParam[nParamInd] : 0.0) ; }

   public :                      // ICurve
      bool IsSimple( void) const override
@@ -142,10 +150,11 @@ class CurveComposite : public ICurveComposite, public IGeoObjRW
      bool IsParamAtJoint( double dU) const override ;
      ICurve* RemoveFirstOrLastCurve(  bool bLast = true) override ;
      bool ChangeStartPoint( double dU) override ;
-      bool AddPoint( const Point3d& ptStart) override ;
+      bool AddPoint( const Point3d& ptStart) override ;  // funzione per aggiungere il ptStart prima di usare la funzione AddLine
      bool AddLine( const Point3d& ptNew, bool bEndOrStart = true) override ;
-      bool AddArcTg( const Point3d& ptNew, bool bEndOrStart = true) override ;
+      bool AddLineTg( double dLen, bool bEndOrStart = true) override ;
      bool AddArc2P( const Point3d& ptOther, const Point3d& ptNew, bool bEndOrStart = true) override ;
+      bool AddArcTg( const Point3d& ptNew, bool bEndOrStart = true) override ;
      bool AddJoint( double dU) override ;
      bool ModifyJoint( int nU, const Point3d& ptNewJoint) override ;
      bool RemoveJoint( int nU) override ;
@@ -154,22 +163,33 @@ class CurveComposite : public ICurveComposite, public IGeoObjRW
      bool ModifyCurveToLine( int nCrv) override ;
      bool ArcsToBezierCurves( void) override ;
      bool ArcsBezierCurvesToArcsPerpExtr( double dLinTol, double dAngTolDeg) override ;
+      bool StraightArcsToLines( double dLinTol, double dAngTolDeg) override ;
      bool MergeCurves( double dLinTol, double dAngTolDeg, bool bStartEnd = true, bool bNeedSameProp = false) override ;
+      bool RemoveSmallParts( double dLinTol, double dAngTolDeg) override ;
+      bool RemoveSmallDefects( double dLinTol, double dAngTolDeg, bool bAlsoSpikes = false) override ;
      bool RemoveUndercutOnY( double dLinTol, double dAngTolDeg) override ;
      bool IsAPoint( void) const override ;
      bool IsALine( double dLinTol, Point3d& ptStart, Point3d& ptEnd) const override ;
      bool IsACircle( double dLinTol, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const override ;
-      bool SetCurveTempProp( int nCrv, int nProp, int nPropNum = 0) override ;
-      bool GetCurveTempProp( int nCrv, int& nProp, int nPropNum = 0) const override ;
-
+      bool IsARectangle( double dLinTol, Point3d& ptP, Vector3d& vtL1, Vector3d& vtL2) const override ;
+      bool IsATrapezoid( double dLinTol, Point3d& ptP, Vector3d& vtB1, Vector3d& vtL1, Vector3d& vtB2) const override ;
+      bool SetCurveTempProp( int nCrv, int nProp, int nPropInd = 0) override ;
+      bool GetCurveTempProp( int nCrv, int& nProp, int nPropInd = 0) const override ;
+      bool SetCurveTempParam( int nCrv, double dParam, int nParamInd = 0) override ;
+      bool GetCurveTempParam( int nCrv, double& dParam, int nParamInd = 0) const override ;
+      bool GetOnlyPoint( Point3d& ptStart) const override ;
+      
   public :                      // IGeoObjRW
      int GetNgeId( void) const override ;
      bool Save( NgeWriter& ngeOut) const override ;
+      bool PreSave( GdbGeo& Wrapper) const override { return true ; }
+      bool PostSave( GdbGeo& Wrapper) const override { return true ; }
      bool Load( NgeReader& ngeIn) override ;
+      bool PostLoad( GdbGeo& Wrapper) override { return true ; }

   public :
      CurveComposite( void) ;
-      CurveComposite( const CurveComposite& ccSrc)
+      CurveComposite( const CurveComposite& ccSrc) : m_pVoronoiObj( nullptr)
                     { if ( ! CopyFrom( ccSrc))
                          LOG_ERROR( GetEGkLogger(), "CurveComposite : copy constructor error") }
      CurveComposite& operator =( const CurveComposite& ccSrc)
@@ -178,43 +198,82 @@ class CurveComposite : public ICurveComposite, public IGeoObjRW
                       return *this ; }
      bool RelocateFrom( CurveComposite& ccSrc) ;
      bool GetApproxLength( double& dLen) const ;
+      Voronoi* GetVoronoiObject( void) const ;
+      void ResetVoronoiObject( void) const ;

   private :
      bool CopyFrom( const CurveComposite& ccSrc) ;
      bool Validate( void) ;
+      bool TestClosure( void) ;
      bool AddCurveByRelocate( CurveComposite& ccSrc, bool bEndOrStart = true, double dLinTol = EPS_SMALL) ;
      bool AddSimpleCurve( ICurve* pSmplCrv, bool bEndOrStart = true, double dLinTol = EPS_SMALL) ;
      bool GetIndSCurveAndLocPar( double dU, Side nS, int& nSCrv, double& dLocU) const ;
      bool SimpleOffsetXY( double dDist, int nType = OFF_FILLET) ;
-      bool IsOneCircle( Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const ;
+      bool IsOneCircle( Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const ;      
+      bool CalcVoronoiObject( void) const ;

   private :
-      enum Status { ERR = 0, OK = 1, TO_VERIFY = 2} ;
+      enum Status { ERR = 0, OK = 1, TO_VERIFY = 2, IS_A_POINT = 3} ;

   private :
      typedef std::deque<ICurve*>      PCRVSMPL_DEQUE ;
-      typedef PCRVSMPL_DEQUE::iterator PCSD_ITER ;
      typedef PCRVSMPL_DEQUE::const_iterator PCSD_CONST_ITER ;

   private :
-      ObjGraphicsMgr m_OGrMgr ;        // gestore grafica dell'oggetto
-      Status         m_nStatus ;       // stato
-      PCRVSMPL_DEQUE m_CrvSmplS ;      // deque di curve semplici
-      Vector3d       m_VtExtr ;        // vettore estrusione (normalmente coincide con m_VtN)
-      double         m_dThick ;        // spessore
-      Point3d        m_ptStart ;       // punto iniziale per composita vuota per Add di linee o archi
-      int            m_nTempProp[2] ;  // vettore proprietà temporanee 
-      mutable PCSD_CONST_ITER m_Iter ; // iteratore
+      ObjGraphicsMgr   m_OGrMgr ;        // gestore grafica dell'oggetto
+      Status           m_nStatus ;       // stato
+      PCRVSMPL_DEQUE   m_CrvSmplS ;      // deque di curve semplici
+      Vector3d         m_VtExtr ;        // vettore estrusione (normalmente coincide con m_VtN)
+      double           m_dThick ;        // spessore
+      Point3d          m_ptStart ;       // punto iniziale per composita vuota per Add di linee o archi
+      int              m_nTempProp[2] ;  // vettore proprietà temporanee
+      double           m_dTempParam[2] ; // vettore parametri temporanei 
+      mutable Voronoi* m_pVoronoiObj ;   // Voronoi
+      mutable PCSD_CONST_ITER m_Iter ;   // iteratore      
 } ;

 //-----------------------------------------------------------------------------
 inline CurveComposite* CreateBasicCurveComposite( void)
-               { return (static_cast<CurveComposite*>( CreateGeoObj( CRV_COMPO))) ; }
+               { return ( static_cast<CurveComposite*>( CreateGeoObj( CRV_COMPO))) ; }
 inline CurveComposite* CloneBasicCurveComposite( const IGeoObj* pGObj)
               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_COMPO)
                    return nullptr ;
-                 return (static_cast<CurveComposite*>(pGObj->Clone())) ; }
+                 return ( static_cast<CurveComposite*>( pGObj->Clone())) ; }
 inline const CurveComposite* GetBasicCurveComposite( const IGeoObj* pGObj)
-               { return (dynamic_cast<const CurveComposite*>(pGObj)) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_COMPO)
+                    return nullptr ;
+                 return ( static_cast<const CurveComposite*>( pGObj)) ; }
 inline CurveComposite* GetBasicCurveComposite( IGeoObj* pGObj)
-               { return (dynamic_cast<CurveComposite*>(pGObj)) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_COMPO)
+                    return nullptr ;
+                 return ( static_cast<CurveComposite*>( pGObj)) ; }
+inline CurveComposite* ConvertCurveToBasicComposite( IGeoObj* pGObj)
+               { if ( pGObj == nullptr  ||  ( pGObj->GetType() & GEO_CURVE) == 0) {
+                    delete pGObj ;
+                    return nullptr ;
+                 }
+                 CurveComposite* pCrvCo = CreateBasicCurveComposite() ;
+                 if ( pCrvCo == nullptr) {
+                    delete pGObj ;
+                    return nullptr ;
+                 }
+                 ICurve* pCrv = static_cast<ICurve*>( pGObj) ;
+                 Vector3d vtExtr ;
+                 if ( pCrv->GetExtrusion( vtExtr)  &&  ! vtExtr.IsSmall())
+                    pCrvCo->SetExtrusion( vtExtr) ;
+                 double dThick ;
+                 if ( pCrv->GetThickness( dThick)  &&  abs( dThick) > EPS_SMALL)
+                    pCrvCo->SetThickness( dThick) ;
+                 for ( int i = 0 ; i < 2 ; ++ i) {
+                    int nProp = pCrv->GetTempProp( i) ;
+                    if ( nProp != 0)
+                       pCrvCo->SetTempProp( nProp, i) ;
+                 }
+                 for ( int i = 0 ; i < 2 ; ++ i) {
+                    double dParam = pCrv->GetTempParam( i) ;
+                    if ( abs( dParam) > EPS_SMALL)
+                       pCrvCo->SetTempParam( dParam, i) ;
+                 }
+                 pCrvCo->AddCurve( pCrv) ;
+                 return pCrvCo ;
+               }
@@ -17,8 +17,8 @@
 #include "CurveLine.h"
 #include "CurveArc.h"
 #include "GeoConst.h"
-#include "/EgtDev/Include/EgkCurve.h"
-#include "/EgtDev/Include/EgkIntersCurves.h"
+#include "/EgtDev/Include/EGkCurve.h"
+#include "/EgtDev/Include/EGkIntersCurves.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

 using namespace std ;
@@ -14,11 +14,13 @@
 //--------------------------- 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"
 #include <new>

@@ -29,15 +31,15 @@ GEOOBJ_REGISTER( CRV_LINE, NGE_C_LIN, CurveLine) ;

 //----------------------------------------------------------------------------
 CurveLine::CurveLine( void)
-   : m_nStatus( TO_VERIFY), m_PtStart(), m_PtEnd(), m_VtExtr(), m_dThick()
+   : m_nStatus( TO_VERIFY), m_PtStart(), m_PtEnd(), m_VtExtr(), m_dThick(), 
+     m_nTempProp{0,0}, m_dTempParam{0.0,0.0}, m_pVoronoiObj( nullptr)
 {
-   m_nTempProp[0] = 0 ;
-   m_nTempProp[0] = 0 ;
 }

 //----------------------------------------------------------------------------
 CurveLine::~CurveLine( void)
 {
+   ResetVoronoiObject() ;
 }

 //----------------------------------------------------------------------------
@@ -49,6 +51,8 @@ CurveLine::Set( const Point3d& ptStart, const Point3d& ptEnd)
   m_PtEnd = ptEnd ;
   m_nStatus = TO_VERIFY ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -68,6 +72,8 @@ CurveLine::SetPVL( const Point3d& ptStart, const Vector3d& vtDir, double dLen)
   m_PtEnd = ptStart + vtDelta ;
   m_nStatus = TO_VERIFY ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -85,6 +91,8 @@ CurveLine::SetPDL( const Point3d& ptStart, double dDirAngDeg, double dLen)
   m_PtEnd = ptStart + vtDelta ;
   m_nStatus = TO_VERIFY ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -111,7 +119,7 @@ CurveLine::Clone( void) const
 bool
 CurveLine::CopyFrom( const IGeoObj* pGObjSrc)
 {
-   const CurveLine* pCL = dynamic_cast<const CurveLine*>( pGObjSrc) ;
+   const CurveLine* pCL = GetBasicCurveLine( pGObjSrc) ;
   if ( pCL == nullptr)
      return false ;
   return CopyFrom( *pCL) ;
@@ -127,6 +135,8 @@ CurveLine::CopyFrom( const CurveLine& clSrc)
   m_dThick = clSrc.m_dThick ;
   m_nTempProp[0] = clSrc.m_nTempProp[0] ;
   m_nTempProp[1] = clSrc.m_nTempProp[1] ;
+   m_dTempParam[0] = clSrc.m_dTempParam[0] ;
+   m_dTempParam[1] = clSrc.m_dTempParam[1] ;
   return Set( clSrc.m_PtStart, clSrc.m_PtEnd) ;
 }

@@ -152,7 +162,7 @@ CurveLine::Dump( string& sOut, bool bMM, const char* szNewLine) const
  // dati generali di una curva
   if ( ! CurveDump( *this, sOut, bMM, szNewLine))
      return false ;
-  // parametri : sono già compresi nei dati generali (PS e PE)
+  // parametri : sono già compresi nei dati generali (PS e PE)

   return true ;
 }
@@ -213,7 +223,7 @@ CurveLine::GetLocalBBox( BBox3d& b3Loc, int nFlag) const
      return false ;
  // assegno il box in locale
   b3Loc.Set( m_PtStart, m_PtEnd) ;
-  // se c'è estrusione, devo tenerne conto
+  // se c'è estrusione, devo tenerne conto
   if ( ! m_VtExtr.IsSmall()  &&  abs( m_dThick) > EPS_SMALL) {
      Point3d ptMinExtr = b3Loc.GetMin() + m_VtExtr * m_dThick ;
      Point3d ptMaxExtr = b3Loc.GetMax() + m_VtExtr * m_dThick ;
@@ -231,7 +241,7 @@ CurveLine::GetBBox( const Frame3d& frRef, BBox3d& b3Ref, int nFlag) const
  // verifico lo stato
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità del frame
+  // verifico validità del frame
   if ( frRef.GetType() == Frame3d::ERR)
      return false ;
  // porto gli estremi nel riferimento passato
@@ -241,7 +251,7 @@ CurveLine::GetBBox( const Frame3d& frRef, BBox3d& b3Ref, int nFlag) const
   ptFrEnd.ToGlob( frRef) ;
  // assegno il box nel riferimento
   b3Ref.Set( ptFrStart, ptFrEnd) ;
-  // se c'è estrusione, devo tenerne conto
+  // se c'è estrusione, devo tenerne conto
   if ( ! m_VtExtr.IsSmall()  &&  abs( m_dThick) > EPS_SMALL) {
      Vector3d vtFrExtr = m_VtExtr ;
      vtFrExtr.ToGlob( frRef) ;
@@ -259,7 +269,7 @@ bool
 CurveLine::Validate( void)
 {
   if ( m_nStatus == TO_VERIFY)
-      m_nStatus = ( ! AreSamePointApprox( m_PtStart, m_PtEnd) ? OK : ERR) ;
+      m_nStatus = ( m_PtStart.IsValid() && m_PtEnd.IsValid() && ! AreSamePointApprox( m_PtStart, m_PtEnd) ? OK : ERR) ;

   return ( m_nStatus == OK) ;
 }
@@ -356,10 +366,7 @@ CurveLine::GetPointD1D2( double dU, Side nS, Point3d& ptPos, Vector3d* pvtDer1,
      return false ;

  // il parametro U deve essere compreso tra 0 e 1
-   if ( dU < 0)
-      dU = 0 ;
-   else if ( dU > 1)
-      dU = 1 ;
+   dU = Clamp( dU, 0., 1.) ;

  // calcolo del punto
   ptPos = Media( m_PtStart, m_PtEnd, dU) ;
@@ -383,7 +390,7 @@ CurveLine::GetLength( double& dLen) const
   if ( m_nStatus != OK)
      return false ;

-  // la lunghezza è la distanza tra gli estremi
+  // la lunghezza è la distanza tra gli estremi
   dLen = Dist( m_PtStart, m_PtEnd) ;

   return ( dLen > EPS_SMALL) ;
@@ -409,7 +416,7 @@ CurveLine::GetLengthAtParam( double dU, double& dLen) const
      return true ;
   }

-  // la lunghezza totale è la distanza tra gli estremi
+  // la lunghezza totale è la distanza tra gli estremi
   double dTotLen = Dist( m_PtStart, m_PtEnd) ;

  // fine
@@ -441,7 +448,7 @@ CurveLine::GetParamAtLength( double dLen, double& dU) const
      return true ;
   }

-  // la lunghezza totale è la distanza tra gli estremi
+  // la lunghezza totale è la distanza tra gli estremi
   double dTotLen = Dist( m_PtStart, m_PtEnd) ;

  // se dopo fine, errore
@@ -560,6 +567,8 @@ CurveLine::Invert( void)
  // inverto i punti estremi
   swap( m_PtStart, m_PtEnd) ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;
  
@@ -591,6 +600,8 @@ CurveLine::SimpleOffset( double dDist, int nType)
   m_PtStart += vtDir * dDist ;
   m_PtEnd += vtDir * dDist ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -611,6 +622,8 @@ CurveLine::ModifyStart( const Point3d& ptNewStart)
  // assegno il nuovo inizio
   m_PtStart = ptNewStart ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -631,6 +644,8 @@ CurveLine::ModifyEnd( const Point3d& ptNewEnd)
  // assegno la nuova fine
   m_PtEnd = ptNewEnd ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -642,7 +657,7 @@ bool
 CurveLine::TrimStartAtParam( double dUTrim)
 {
  // riporto i parametri nel loro range
-   dUTrim = ( ( dUTrim < 0) ? 0 : (( dUTrim > 1) ? 1 : dUTrim)) ;
+   dUTrim = Clamp( dUTrim, 0., 1.) ;

  // recupero lunghezza
   double dLen ;
@@ -658,7 +673,7 @@ bool
 CurveLine::TrimEndAtParam( double dUTrim)
 {
  // riporto i parametri nel loro range
-   dUTrim = ( ( dUTrim < 0) ? 0 : (( dUTrim > 1) ? 1 : dUTrim)) ;
+   dUTrim = Clamp( dUTrim, 0., 1.) ;

  // recupero lunghezza
   double dLen ;
@@ -706,6 +721,8 @@ CurveLine::TrimStartAtLen( double dLenTrim)
   if ( dLenTrim > EPS_ZERO)
      m_PtStart = Media( m_PtStart, m_PtEnd, ( dLenTrim / dLen)) ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -730,6 +747,8 @@ CurveLine::TrimEndAtLen( double dLenTrim)
   if ( ( dLen - dLenTrim) > EPS_ZERO)
      m_PtEnd = Media( m_PtStart, m_PtEnd, ( dLenTrim / dLen)) ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -752,6 +771,8 @@ CurveLine::ExtendStartByLen( double dLenExt)
  // sposto il punto iniziale
   m_PtStart -= vtDir * dLenExt ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -774,6 +795,8 @@ CurveLine::ExtendEndByLen( double dLenExt)
  // sposto il punto finale
   m_PtEnd += vtDir * dLenExt ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // con i controlli sopra fatti rimane validata, ma la grafica va ricalcolata
   m_OGrMgr.Reset() ;

@@ -787,6 +810,11 @@ CurveLine::Translate( const Vector3d& vtMove)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
+
+  // traslo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->Translate( vtMove) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -804,10 +832,14 @@ CurveLine::Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, do
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità dell'asse di rotazione
+  // verifico validità dell'asse di rotazione
   if ( vtAx.IsSmall())
      return false ;

+  // ruoto Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->Rotate( ptAx, vtAx, dCosAng, dSinAng) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -839,6 +871,8 @@ CurveLine::Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double d
   if ( AreSamePointApprox( ptNewStart, ptNewEnd))
      return false ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -864,10 +898,12 @@ CurveLine::Mirror( const Point3d& ptOn, const Vector3d& vtNorm)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità del piano di specchiatura
+  // verifico validità del piano di specchiatura
   if ( vtNorm.IsSmall())
      return false ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -887,10 +923,12 @@ CurveLine::Shear( const Point3d& ptOn, const Vector3d& vtNorm, const Vector3d& v
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità dei parametri
+  // verifico validità dei parametri
   if ( vtNorm.IsSmall()  ||  vtDir.IsSmall())
      return false ;

+  // imposto ricalcolo di Voronoi
+   ResetVoronoiObject() ;
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -915,10 +953,18 @@ CurveLine::ToGlob( const Frame3d& frRef)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità del frame
+  // verifico validità del frame
   if ( frRef.GetType() == Frame3d::ERR)
      return false ;

+  // se frame identità, non devo fare alcunché
+   if ( IsGlobFrame( frRef))
+      return true ;
+
+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->ToGlob( frRef) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -933,10 +979,18 @@ CurveLine::ToLoc( const Frame3d& frRef)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità del frame
+  // verifico validità del frame
   if ( frRef.GetType() == Frame3d::ERR)
      return false ;

+  // se frame identità, non devo fare alcunché
+   if ( IsGlobFrame( frRef))
+      return true ;
+
+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->ToLoc( frRef) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -951,13 +1005,18 @@ CurveLine::LocToLoc( const Frame3d& frOri, const Frame3d& frDest)
  // la curva deve essere validata
   if ( m_nStatus != OK)
      return false ;
-  // verifico validità dei frame
+  // verifico validità dei frame
   if ( frOri.GetType() == Frame3d::ERR  ||  frDest.GetType() == Frame3d::ERR)
      return false ;
-  // se i due riferimenti coincidono, non devo fare alcunché
+
+  // se i due riferimenti coincidono, non devo fare alcunché
   if ( AreSameFrame( frOri, frDest))
      return true ;

+  // trasformo Voronoi
+   if ( m_pVoronoiObj != nullptr)
+      m_pVoronoiObj->LocToLoc( frOri, frDest) ;
+
  // imposto ricalcolo della grafica
   m_OGrMgr.Reset() ;

@@ -993,3 +1052,42 @@ CurveLine::CalcPointParamPosiz( const Point3d& ptP, bool bOnXY, double& dU, int&
      nPos = ICurve::PP_MID ;       // nell'interno
   return true ;
 }
+
+//----------------------------------------------------------------------------
+bool
+CurveLine::CalcVoronoiObject() const
+{
+   if ( m_nStatus != OK)
+      return false ;
+
+  // creo oggetto vroni con la curva
+   m_pVoronoiObj = new( std::nothrow) Voronoi( this, false) ;
+   if ( m_pVoronoiObj == nullptr)
+      return false ;
+
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+Voronoi* 
+CurveLine::GetVoronoiObject() const
+{
+   if ( m_nStatus != OK)
+      return nullptr ;
+
+  // se non è stato calcolato, lo calcolo
+   if ( m_pVoronoiObj == nullptr)
+      CalcVoronoiObject() ;
+
+  // restituisco Voronoi
+   return m_pVoronoiObj ;
+}
+
+//----------------------------------------------------------------------------
+void
+CurveLine::ResetVoronoiObject() const
+{
+   if ( m_pVoronoiObj != nullptr)
+      delete m_pVoronoiObj ;
+   m_pVoronoiObj = nullptr ;
+}
@@ -19,6 +19,8 @@
 #include "GeoObjRW.h"
 #include "/EgtDev/Include/EGkCurveLine.h"

+class Voronoi ;
+
 //----------------------------------------------------------------------------
 class CurveLine : public ICurveLine, public IGeoObjRW
 {
@@ -54,6 +56,11 @@ class CurveLine : public ICurveLine, public IGeoObjRW
                   m_nTempProp[nPropInd] = nProp ; } 
      int  GetTempProp( int nPropInd = 0) const override
              { return (( nPropInd >= 0  &&  nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; }
+      void SetTempParam( double dParam, int nParamInd = 0) override
+              { if ( nParamInd >= 0  &&  nParamInd < 2)
+                  m_dTempParam[nParamInd] = dParam ; } 
+      double GetTempParam( int nParamInd = 0) const override
+                { return (( nParamInd >= 0  &&  nParamInd < 2) ? m_dTempParam[nParamInd] : 0.0) ; }

   public :                      // ICurve
      bool IsSimple( void) const override
@@ -139,43 +146,55 @@ class CurveLine : public ICurveLine, public IGeoObjRW
   public :                      // IGeoObjRW
      int GetNgeId( void) const override ;
      bool Save( NgeWriter& ngeOut) const override ;
+      bool PreSave( GdbGeo& Wrapper) const override { return true ; }
+      bool PostSave( GdbGeo& Wrapper) const override { return true ; }
      bool Load( NgeReader& ngeIn) override ;
+      bool PostLoad( GdbGeo& Wrapper) override { return true ; }

   public :
      CurveLine( void) ;
-      CurveLine( const CurveLine& clSrc)
+      CurveLine( const CurveLine& clSrc) : m_pVoronoiObj( nullptr)
                  { if ( ! CopyFrom( clSrc))
                       LOG_ERROR( GetEGkLogger(), "CurveLine : copy constructor error") }
      CurveLine& operator =( const CurveLine& clSrc)
                  { if ( ! CopyFrom( clSrc))
                       LOG_ERROR( GetEGkLogger(), "CurveLine : copy error")
                    return *this ; }
+      Voronoi* GetVoronoiObject( void) const ;
+      void ResetVoronoiObject( void) const ;

   private :
      bool CopyFrom( const CurveLine& clSrc) ;
-      bool Validate( void) ;
+      bool Validate( void) ;      
+      bool CalcVoronoiObject( void) const ;      

   private :
      enum Status { ERR = 0, OK = 1, TO_VERIFY = 2} ;

   private :
-      ObjGraphicsMgr m_OGrMgr ;        // gestore grafica dell'oggetto
-      Status   m_nStatus ;             // stato
-      Point3d  m_PtStart ;             // punto iniziale
-      Point3d  m_PtEnd ;               // punto finale
-      Vector3d m_VtExtr ;              // vettore estrusione
-      double   m_dThick ;              // spessore
-      int      m_nTempProp[2] ;        // vettore proprietŕ temporanee
+      ObjGraphicsMgr m_OGrMgr ;         // gestore grafica dell'oggetto
+      Status   m_nStatus ;              // stato
+      Point3d  m_PtStart ;              // punto iniziale
+      Point3d  m_PtEnd ;                // punto finale
+      Vector3d m_VtExtr ;               // vettore estrusione
+      double   m_dThick ;               // spessore
+      int      m_nTempProp[2] ;         // vettore proprietà temporanee
+      double   m_dTempParam[2] ;        // vettore parametri temporanei
+      mutable Voronoi* m_pVoronoiObj ;  // Voronoi
 } ;

 //-----------------------------------------------------------------------------
 inline CurveLine* CreateBasicCurveLine( void)
-               { return (static_cast<CurveLine*>( CreateGeoObj( CRV_LINE))) ; }
+               { return ( static_cast<CurveLine*>( CreateGeoObj( CRV_LINE))) ; }
 inline CurveLine* CloneBasicCurveLine( const IGeoObj* pGObj)
               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_LINE)
                    return nullptr ;
-                 return (static_cast<CurveLine*>(pGObj->Clone())) ; }
+                 return ( static_cast<CurveLine*>( pGObj->Clone())) ; }
 inline const CurveLine* GetBasicCurveLine( const IGeoObj* pGObj)
-               { return (dynamic_cast<const CurveLine*>(pGObj)) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_LINE)
+                    return nullptr ;
+                 return ( static_cast<const CurveLine*>( pGObj)) ; }
 inline CurveLine* GetBasicCurveLine( IGeoObj* pGObj)
-               { return (dynamic_cast<CurveLine*>(pGObj)) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != CRV_LINE)
+                    return nullptr ;
+                 return ( static_cast<CurveLine*>( pGObj)) ; }
@@ -1,39 +1,42 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2020
+//  EgalTech 2020-2024
 //----------------------------------------------------------------------------
-// File : DistLineLine.h      Data : 06.11.20         Versione : 2.2k1
+// File : DistLineLine.cpp      Data : 10.05.24         Versione : 2.6e3
 // Contenuto : Implementazione della classe distanza fra elementi lineari.
 //
 //
 //
 // Modifiche : 06.11.20 LM Creazione modulo.
-//
+//             12.08.22 DS Correzioni e migliorie varie.
 //
 //----------------------------------------------------------------------------

 #include "stdafx.h"
-#include "DistLineLine.h"
+#include "/EgtDev/Include/EGkDistLineLine.h"
 #include "/EgtDev/Include/EgtNumUtils.h"
 #include "/EgtDev/Include/EGkGeoCollection.h"
 #include "/EgtDev/Include/EGkGeoConst.h"
-#include <algorithm>
+
+using namespace std ;

 //----------------------------------------------------------------------------
 DistLineLine::DistLineLine( const Point3d& ptSt1, const Point3d& ptEn1,
                            const Point3d& ptSt2, const Point3d& ptEn2,
                            bool bIsSegment1, bool bIsSegment2)
 {
+  // reset oggetto
+   m_dSqDist = - 1 ;
+   m_dDist = - 1 ;
+  // calcolo direzione segmenti
   Vector3d vtD1 = ptEn1 - ptSt1 ;
   double dLen1 = vtD1.Len() ;
   Vector3d vtD2 = ptEn2 - ptSt2 ;
-   double dLen2 = vtD1.Len() ;
-   if ( dLen1 < EPS_SMALL  ||  dLen2 < EPS_SMALL) {
-      m_dSqDist = - 1 ;
-      m_dDist = - 1 ;
+   double dLen2 = vtD2.Len() ;
+   if ( dLen1 < EPS_SMALL  ||  dLen2 < EPS_SMALL)
      return ;
-   }
   vtD1 /= dLen1 ;
   vtD2 /= dLen2 ;
+  // eseguo
   Calculate( ptSt1, vtD1, dLen1, ptSt2, vtD2, dLen2, bIsSegment1, bIsSegment2) ;
 }

@@ -43,37 +46,43 @@ DistLineLine::DistLineLine( const Point3d& ptSt1, const Vector3d& vtD1, double d
                            const Point3d& ptSt2, const Vector3d& vtD2, double dLen2,
                            bool bIsSegment1, bool bIsSegment2)
 {
-   if ( dLen1 < EPS_SMALL  ||  dLen2 < EPS_SMALL) {
-      m_dSqDist = - 1 ;
-      m_dDist = - 1 ;
+  // reset oggetto
+   m_dSqDist = - 1 ;
+   m_dDist = - 1 ;
+  // verifico segmenti
+   if ( dLen1 < EPS_SMALL  ||  dLen2 < EPS_SMALL)
      return ;
-   }
+  // eseguo
   Calculate( ptSt1, vtD1, dLen1, ptSt2, vtD2, dLen2, bIsSegment1, bIsSegment2) ;
 }

 //----------------------------------------------------------------------------
 bool
-DistLineLine::GetSqDist( double& dSqDist)
+DistLineLine::GetSqDist( double& dSqDist) const
 {
   if ( m_dSqDist < 0)
      return false ;
+
   dSqDist = m_dSqDist ;
   return true ;
 }

 //----------------------------------------------------------------------------
 bool
-DistLineLine::GetDist( double& dDist)
+DistLineLine::GetDist( double& dDist) const
 {
   if ( m_dSqDist < 0)
      return false ;
-   dDist = sqrt( m_dSqDist) ;
+
+   if ( m_dDist < 0)
+      m_dDist = sqrt( m_dSqDist) ;
+   dDist = m_dDist ;
   return true ;
 }

 //----------------------------------------------------------------------------
 bool
-DistLineLine::GetMinDistPoints( Point3d& ptMinDist1, Point3d& ptMinDist2)
+DistLineLine::GetMinDistPoints( Point3d& ptMinDist1, Point3d& ptMinDist2) const
 {
   if ( m_dSqDist < 0)
      return false ;
@@ -84,55 +93,48 @@ DistLineLine::GetMinDistPoints( Point3d& ptMinDist1, Point3d& ptMinDist2)

 //----------------------------------------------------------------------------
 bool
-DistLineLine::GetParamsAtMinDistPoints( double& dPar1, double& dPar2)
+DistLineLine::GetPositionsAtMinDistPoints( double& dPos1, double& dPos2) const
 {
   if ( m_dSqDist < 0)
      return false ;
-   dPar1 = m_dPar1 ;
-   dPar2 = m_dPar2 ;
+   dPos1 = m_dPos1 ;
+   dPos2 = m_dPos2 ;
   return true ;
 }

 //----------------------------------------------------------------------------
-// Calcola la distanza fra i due elemnti lineari, i punti di minima distanza e
-// i loro rispettivi parametri.
-// Se la coppia di punti di minima distanza non è unica ne viene scelta una
-// in base a comodità di calcolo.
+// Calcola la distanza fra i due elementi lineari, i punti di minima distanza e le loro posizioni.
+// Se i due elementi sono paralleli i punti di minimo sono scelti secondo convenienza.
 void
 DistLineLine::Calculate( const Point3d& ptSt1, const Vector3d& vtD1, double dLen1,
                         const Point3d& ptSt2, const Vector3d& vtD2, double dLen2,
                         bool bIsSegment1, bool bIsSegment2)
 {
-  // Caso di elementi lineari paralleli/antiparalleli
+  // Se elementi paralleli o antiparalleli
   if ( AreSameOrOppositeVectorExact( vtD1, vtD2)) {
-     // Almeno un elemento è una retta
-      if ( ! ( bIsSegment1  &&  bIsSegment2)) {
-        // Il primo elemento è segmento, quindi deve essere una retta il secondo
-         if ( bIsSegment1) {
-            Vector3d vtStSt = ptSt1 - ptSt2 ;
-            double dLong = vtStSt * vtD2 ;
-            Vector3d vtDist = vtStSt - dLong * vtD2 ;
-            m_dSqDist = vtDist.SqLen() ;
-            m_dDist = sqrt( m_dSqDist) ;
-            m_dPar1 = 0 ;
-            m_dPar2 = dLong ;
-            m_ptMinDist1 = ptSt1 ;
-            m_ptMinDist2 = ptSt2 + dLong * vtD2 ;
-         }
-        // Il primo elemento è una retta
-         else {
-            Vector3d vtStSt = ptSt2 - ptSt1 ;
-            double dLong = vtStSt * vtD1 ;
-            Vector3d vtDist = vtStSt - dLong * vtD1 ;
-            m_dSqDist = vtDist.SqLen() ;
-            m_dDist = sqrt( m_dSqDist) ;
-            m_dPar1 = dLong ;
-            m_dPar2 = 0 ;
-            m_ptMinDist1 = ptSt1 + dLong * vtD1 ;
-            m_ptMinDist2 = ptSt2 ;
-         }
+     // Se il primo elemento è una retta infinita
+      if ( ! bIsSegment1) {
+         Vector3d vtStSt = ptSt2 - ptSt1 ;
+         double dLong = vtStSt * vtD1 ;
+         Vector3d vtDist = vtStSt - dLong * vtD1 ;
+         m_dSqDist = vtDist.SqLen() ;
+         m_dPos1 = dLong ;
+         m_dPos2 = 0 ;
+         m_ptMinDist1 = ptSt1 + dLong * vtD1 ;
+         m_ptMinDist2 = ptSt2 ;
+      } 
+     // se altrimenti il secondo elemento è una retta infinita
+      else if ( ! bIsSegment2) {
+         Vector3d vtStSt = ptSt1 - ptSt2 ;
+         double dLong = vtStSt * vtD2 ;
+         Vector3d vtDist = vtStSt - dLong * vtD2 ;
+         m_dSqDist = vtDist.SqLen() ;
+         m_dPos1 = 0 ;
+         m_dPos2 = dLong ;
+         m_ptMinDist1 = ptSt1 ;
+         m_ptMinDist2 = ptSt2 + dLong * vtD2 ;
      }
-     // Entrambi gli elementi sono segmenti
+     // altrimenti entrambi gli elementi sono segmenti
      else {
         Point3d ptEn1 = ptSt1 + dLen1 * vtD1 ;
         Point3d ptEn2 = ptSt2 + dLen2 * vtD2 ;
@@ -140,7 +142,7 @@ DistLineLine::Calculate( const Point3d& ptSt1, const Vector3d& vtD1, double dLen
         Vector3d vtStEn = ptEn2 - ptSt1 ;
         double dStU = vtStSt * vtD1 ;
         double dEnU = vtStEn * vtD1 ;
-        // Classifico i punti del segmento segmento in base alla loro
+        // Classifico i punti del secondo segmento in base alla loro
        // coordinata rispetto all'ordinamento generato dal primo.
         double dMinPar, dMaxPar ;
         Point3d ptMinPar, ptMaxPar ;
@@ -159,70 +161,71 @@ DistLineLine::Calculate( const Point3d& ptSt1, const Vector3d& vtD1, double dLen
        // Possibili posizioni reciproche dei segmenti
         if ( dMinPar > dLen1) {
            m_dSqDist = SqDist( ptEn1, ptMinPar) ;
-            m_dDist = sqrt( m_dSqDist) ;
            m_ptMinDist1 = ptEn1 ;
            m_ptMinDist2 = ptMinPar ;
-            m_dPar1 = dLen1 ;
-            m_dPar2 = Clamp( ( m_ptMinDist2 - ptSt2) * vtD2, 0., dLen2) ;
+            m_dPos1 = dLen1 ;
+            m_dPos2 = Clamp( ( m_ptMinDist2 - ptSt2) * vtD2, 0., dLen2) ;
         }
         else if ( dMinPar > 0) {
-            m_dSqDist = std::max( vtStSt * vtStSt - dStU * dStU, 0.) ;
-            m_dDist = sqrt( m_dSqDist) ;
+            m_dSqDist = max( vtStSt * vtStSt - dStU * dStU, 0.) ;
            m_ptMinDist1 = ptSt1 + dMinPar * vtD1 ;
            m_ptMinDist2 = ptMinPar ;
-            m_dPar1 = dMinPar ;
-            m_dPar2 = Clamp( ( m_ptMinDist2 - ptSt2) * vtD2, 0., dLen2) ;
+            m_dPos1 = dMinPar ;
+            m_dPos2 = Clamp( ( m_ptMinDist2 - ptSt2) * vtD2, 0., dLen2) ;
         }
         else if ( dMaxPar > 0) {
-            m_dSqDist = std::max( vtStSt * vtStSt - dStU * dStU, 0.) ;
-            m_dDist = sqrt( m_dSqDist) ;
+            m_dSqDist = max( vtStSt * vtStSt - dStU * dStU, 0.) ;
            m_ptMinDist1 = ptSt1 ;
            m_ptMinDist2 = ptSt2 + ( ptSt1 - ptSt2) * vtD2 * vtD2 ;
-            m_dPar1 = 0 ;
-            m_dPar2 = Clamp( ( m_ptMinDist2 - ptSt2) * vtD2, 0., dLen2) ;
+            m_dPos1 = 0 ;
+            m_dPos2 = Clamp( ( m_ptMinDist2 - ptSt2) * vtD2, 0., dLen2) ;
         }
         else {
            m_dSqDist = SqDist( ptSt1, ptMaxPar) ;
-            m_dDist = sqrt( m_dSqDist) ;
            m_ptMinDist1 = ptSt1 ;
            m_ptMinDist2 = ptMaxPar ;
-            m_dPar1 = 0 ;
-            m_dPar2 = Clamp( ( m_ptMinDist2 - ptSt2) * vtD2, 0., dLen2) ;
+            m_dPos1 = 0 ;
+            m_dPos2 = Clamp( ( m_ptMinDist2 - ptSt2) * vtD2, 0., dLen2) ;
         }
      }
-      return ;
   }
  // Caso generale
-   Vector3d vtDist0 = ptSt2 - ptSt1 ;
-   double dDist01 = vtDist0 * vtD1 ;
-   double dDist02 = vtDist0 * vtD2 ;
-   double dDotD1D2 = vtD1 * vtD2 ;
-   double dT1 = dDist01 + ( ( dDist01 * dDotD1D2 - dDist02) * dDotD1D2) / ( 1 - dDotD1D2 * dDotD1D2) ;
-   double dT2 = ( dDist01 * dDotD1D2 - dDist02) / ( 1 - dDotD1D2 * dDotD1D2) ;
-   double dMin1 = - INFINITO ;
-   double dMax1 = INFINITO ;
-   double dMin2 = - INFINITO ;
-   double dMax2 = INFINITO ;
-   double dSt1On2 = ( ptSt1 - ptSt2) * vtD2 ;
-   double dEn1On2 = ( ptSt1 + dLen1 * vtD1 - ptSt2) * vtD2 ;
-   if ( bIsSegment1) {
-      dMin1 = 0 ;
-      dMax1 = dLen1 ;
-      dMin2 = std::min( dSt1On2, dEn1On2) ;
-      dMax2 = std::max( dSt1On2, dEn1On2) ;
+   else {
+     // Posizioni a distanza minima tra rette illimitate
+      Vector3d vtStSt = ptSt2 - ptSt1 ;
+      double dDist01 = vtStSt * vtD1 ;
+      double dDist02 = vtStSt * vtD2 ;
+      double dDotD1D2 = vtD1 * vtD2 ;
+      double dT1 = ( dDist01 - dDotD1D2 * dDist02) / ( 1 - dDotD1D2 * dDotD1D2) ;
+      double dT2 = ( dDotD1D2 * dDist01 - dDist02) / ( 1 - dDotD1D2 * dDotD1D2) ;
+     // Posizioni minime e massime sui segmenti
+      double dMin1 = ( bIsSegment1 ? 0 : -INFINITO) ;
+      double dMax1 = ( bIsSegment1 ? dLen1 : INFINITO) ;
+      double dMin2 = ( bIsSegment2 ? 0 : -INFINITO) ;
+      double dMax2 = ( bIsSegment2 ? dLen2 : INFINITO) ;
+     // Se entrambe le posizioni stanno nei segmenti 
+      if ( dT1 >= dMin1  &&  dT1 <= dMax1  &&  dT2 >= dMin2  &&  dT2 <= dMax2) {
+         m_dPos1 = dT1 ;
+         m_dPos2 = dT2 ;
+      }
+     // se altrimenti solo la prima sta nel segmento
+      else if ( dT1 >= dMin1  &&  dT1 <= dMax1) {
+         m_dPos2 = Clamp( dT2, dMin2, dMax2) ;
+         m_dPos1 = Clamp( (( ptSt2 + m_dPos2 * vtD2) - ptSt1) * vtD1, dMin1, dMax1) ;
+      }
+     // se altrimenti solo la seconda sta nel segmento
+      else if ( dT2 >= dMin2  &&  dT2 <= dMax2) {
+         m_dPos1 = Clamp( dT1, dMin1, dMax1) ;
+         m_dPos2 = Clamp( (( ptSt1 + m_dPos1 * vtD1) - ptSt2) * vtD2, dMin2, dMax2) ;
+      }
+     // altrimenti nessuna sta nel suo segmento
+      else {
+         m_dPos1 = Clamp( dT1, dMin1, dMax1) ;
+         m_dPos2 = Clamp( (( ptSt1 + m_dPos1 * vtD1) - ptSt2) * vtD2, dMin2, dMax2) ;
+         m_dPos1 = Clamp( (( ptSt2 + m_dPos2 * vtD2) - ptSt1) * vtD1, dMin1, dMax1) ;
+      }
+      m_ptMinDist1 = ptSt1 + m_dPos1 * vtD1 ;
+      m_ptMinDist2 = ptSt2 + m_dPos2 * vtD2 ;
+      m_dSqDist = SqDist( m_ptMinDist1, m_ptMinDist2) ;
   }
-   if ( bIsSegment2) {
-      double dSt2On1 = ( ptSt2 - ptSt1) * vtD1 ;
-      double dEn2On1 = ( ptSt2 + dLen2 * vtD2 - ptSt1) * vtD1 ;
-      dMin1 = std::max( dMin1, std::min( dSt2On1, dEn2On1)) ;
-      dMax1 = std::min( dMax1, std::max( dSt2On1, dEn2On1)) ;
-      dMin2 = std::max( dMin2, 0.) ;
-      dMax2 = std::min( dMax2, dLen2) ;
-   }
-   m_dPar1 = Clamp( dT1, dMin1, dMax1) ;
-   m_dPar2 = Clamp( dT2, dMin2, dMax2) ;
-   m_ptMinDist1 = ptSt1 + m_dPar1 * vtD1 ;
-   m_ptMinDist2 = ptSt2 + m_dPar2 * vtD2 ;
-   m_dSqDist = SqDist( m_ptMinDist1, m_ptMinDist2) ;
-   m_dDist = sqrt( m_dSqDist) ;
-}  
+}
@@ -1,53 +0,0 @@
-//----------------------------------------------------------------------------
-//  EgalTech 2020-2020
-//----------------------------------------------------------------------------
-// File : DistLineLine.h      Data : 06.11.20         Versione : 2.2k1
-// Contenuto : Dichiarazione della classe distanza fra elementi lineari.
-//
-//
-//
-// Modifiche : 06.11.20 LM Creazione modulo.
-//
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#include "/EgtDev/Include/EGkVector3d.h"
-#include "/EgtDev/Include/EGkPoint3d.h"
-
-//----------------------------------------------------------------------------
-class DistLineLine
-{
-   public :
-      DistLineLine( const Point3d& ptSt1, const Point3d& ptEn1,
-                    const Point3d& ptSt2, const Point3d& ptEn2,
-                    bool bIsSegment1 = true, bool bIsSegment2 = true) ;
-      DistLineLine( const Point3d& ptSt1, const Vector3d& vtD1, double dLen1,
-                    const Point3d& ptSt2, const Vector3d& vtD2, double dLen2,
-                    bool bIsSegment1 = true, bool bIsSegment2 = true) ;
-
-   public :
-      bool GetSqDist( double& dSqDist) ;
-      bool GetDist( double& dDist) ;
-      bool IsEpsilon( double dTol) {
-         double dSqDist ;
-         return ( GetSqDist( dSqDist)  &&  ( dSqDist < SQ_EPS_ZERO  ||  dSqDist < dTol * dTol)) ;
-      }
-      bool IsSmall( void) { return IsEpsilon( EPS_SMALL) ; }
-      bool IsZero( void) { return IsEpsilon( EPS_ZERO) ;  }
-      bool GetMinDistPoints( Point3d& ptMinDist1, Point3d& ptMinDist2) ;
-      bool GetParamsAtMinDistPoints( double& dPar1, double& dPar2) ;
-
-   private :
-      void Calculate( const Point3d& ptSt1, const Vector3d& vtD1, double dLen1,
-                      const Point3d& ptSt2, const Vector3d& vtD2, double dLen2,
-                      bool bIsSegment1 = true, bool bIsSegment2 = true) ;
-   private:
-      double  m_dSqDist ;
-      double  m_dDist ;
-      double  m_dPar1 ;
-      double  m_dPar2 ;
-      Point3d m_ptMinDist1 ;
-      Point3d m_ptMinDist2 ;
-} ;
@@ -122,14 +122,13 @@ DistPointArc::DistPointHelix( const Point3d& ptP, const ICurveArc& arArc)

  // cerco la minima distanza per la polilinea
   MDCVECTOR vApproxMin ;
-   MDCVECTOR::iterator Iter ;
   if ( ! CalcMinDistPointPolyLine( ptP, PL, dLinTol, vApproxMin))
      return ;

  // raffino i punti trovati
   double dPolishedPar ;
   Point3d ptPolishedQ ;
-   for ( Iter = vApproxMin.begin() ; Iter != vApproxMin.end() ; ++Iter) {
+   for ( auto Iter = vApproxMin.begin() ; Iter != vApproxMin.end() ; ++Iter) {
     // eseguo raffinamento
      if ( PolishMinDistPointCurve( ptP, arArc, *Iter, dPolishedPar, ptPolishedQ)) {
         (*Iter).dDist = Dist( ptP, ptPolishedQ) ;
@@ -148,7 +147,7 @@ DistPointArc::DistPointHelix( const Point3d& ptP, const ICurveArc& arArc)

 //----------------------------------------------------------------------------
 bool
-DistPointArc::GetSqDist( double& dSqDist)
+DistPointArc::GetSqDist( double& dSqDist) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -159,7 +158,7 @@ DistPointArc::GetSqDist( double& dSqDist)

 //----------------------------------------------------------------------------
 bool
-DistPointArc::GetDist( double& dDist)
+DistPointArc::GetDist( double& dDist) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -170,7 +169,7 @@ DistPointArc::GetDist( double& dDist)

 //----------------------------------------------------------------------------
 bool
-DistPointArc::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag)
+DistPointArc::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -185,7 +184,7 @@ DistPointArc::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag)

 //----------------------------------------------------------------------------
 bool
-DistPointArc::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag)
+DistPointArc::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -27,17 +27,18 @@ class DistPointArc
      DistPointArc( const Point3d& ptP, const ICurveArc& arArc) ;

   public :
-      bool GetSqDist( double& dSqDist) ;
-      bool GetDist( double& dDist) ;
-      bool IsEpsilon( double dTol)
+      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)
+      bool IsSmall( void) const
              { return IsEpsilon( EPS_SMALL) ; }
-      bool IsZero( void)
+      bool IsZero( void) const
              { return IsEpsilon( EPS_ZERO) ; }
-      int  GetNbrMinDist( void) { return (int) m_Info.size() ; }
-      bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) ;
-      bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) ;
+      int  GetNbrMinDist( void) const
+              { return (int) m_Info.size() ; }
+      bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) const ;
+      bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) const ;

   private :
      DistPointArc( void) ;
@@ -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"


 //----------------------------------------------------------------------------
@@ -156,13 +156,10 @@ bool
 FilterMinDistPointCurve( const Point3d& ptP, const ICurve& cCurve,
                         const MDCVECTOR& vApproxMin, double& dMinDist, MDPCIVECTOR& Info)
 {
-   MDCVECTOR::const_iterator Iter ;
-
-
  // determino i minimi raffinati da tenere
   bool bFound = false ;
   bool bLastOnEnd = false ;       // flag per ultimo punto su fine del suo intervallo
-   for ( Iter = vApproxMin.begin() ; Iter != vApproxMin.end() ; ++Iter) {
+   for ( auto Iter = vApproxMin.cbegin() ; Iter != vApproxMin.cend() ; ++Iter) {
     // altro punto con la stessa minima distanza
      if ( bFound  &&  abs( (*Iter).dDist - dMinDist) < EPS_SMALL) {
        // se abbastanza lontano e non su bordi intervallino lo aggiungo
@@ -44,7 +44,6 @@ DistPointCrvBezier::DistPointCrvBezier( const Point3d& ptP, const ICurveBezier&

  // cerco la minima distanza per la polilinea
   MDCVECTOR vApproxMin ;
-   MDCVECTOR::iterator Iter ;
   if ( ! CalcMinDistPointPolyLine( ptP, PL, dLinTol, vApproxMin))
      return ;

@@ -52,7 +51,7 @@ DistPointCrvBezier::DistPointCrvBezier( const Point3d& ptP, const ICurveBezier&
   double dSingP ;
   if ( CrvBez.GetSingularParam( dSingP) == 0)
      dSingP = - 1 ;
-   for ( Iter = vApproxMin.begin() ; Iter != vApproxMin.end() ; ++Iter) {
+   for ( auto Iter = vApproxMin.begin() ; Iter != vApproxMin.end() ; ++Iter) {
     // imposto flag per singolarità agli estremi
      (*Iter).bParMinSing = abs( (*Iter).dParMin - dSingP) < EPS_SMALL ; 
      (*Iter).bParMaxSing = abs( (*Iter).dParMax - dSingP) < EPS_SMALL ; 
@@ -61,7 +60,7 @@ DistPointCrvBezier::DistPointCrvBezier( const Point3d& ptP, const ICurveBezier&
  // raffino i punti trovati
   double dPolishedPar ;
   Point3d ptPolishedQ ;
-   for ( Iter = vApproxMin.begin() ; Iter != vApproxMin.end() ; ++Iter) {
+   for ( auto Iter = vApproxMin.begin() ; Iter != vApproxMin.end() ; ++Iter) {
     // eseguo raffinamento
      if ( PolishMinDistPointCurve( ptP, CrvBez, *Iter, dPolishedPar, ptPolishedQ)) {
         (*Iter).dDist = Dist( ptP, ptPolishedQ) ;
@@ -80,7 +79,7 @@ DistPointCrvBezier::DistPointCrvBezier( const Point3d& ptP, const ICurveBezier&

 //----------------------------------------------------------------------------
 bool
-DistPointCrvBezier::GetSqDist( double& dSqDist)
+DistPointCrvBezier::GetSqDist( double& dSqDist) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -91,7 +90,7 @@ DistPointCrvBezier::GetSqDist( double& dSqDist)

 //----------------------------------------------------------------------------
 bool
-DistPointCrvBezier::GetDist( double& dDist)
+DistPointCrvBezier::GetDist( double& dDist) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -102,7 +101,7 @@ DistPointCrvBezier::GetDist( double& dDist)

 //----------------------------------------------------------------------------
 bool
-DistPointCrvBezier::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag)
+DistPointCrvBezier::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -117,7 +116,7 @@ DistPointCrvBezier::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag)

 //----------------------------------------------------------------------------
 bool
-DistPointCrvBezier::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag)
+DistPointCrvBezier::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -27,17 +27,18 @@ class DistPointCrvBezier
      DistPointCrvBezier( const Point3d& ptP, const ICurveBezier& CrvBez) ;

   public :
-      bool GetSqDist( double& dSqDist) ;
-      bool GetDist( double& dDist) ;
-      bool IsEpsilon( double dTol)
+      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)
+      bool IsSmall( void) const
              { return IsEpsilon( EPS_SMALL) ; }
-      bool IsZero( void)
+      bool IsZero( void) const
              { return IsEpsilon( EPS_ZERO) ; }
-      int  GetNbrMinDist( void) { return (int) m_Info.size() ; }
-      bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) ;
-      bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) ;
+      int  GetNbrMinDist( void) const
+              { return (int) m_Info.size() ; }
+      bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) const ;
+      bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) const ;

   private :
      DistPointCrvBezier( void) ;
@@ -50,7 +50,7 @@ DistPointCrvComposite::DistPointCrvComposite( const Point3d& ptP, const ICurveCo
      }
     // altrimenti, per curve successive
      else {
-        // verifico se la distanza minima dal box è superiore al minimo già trovato
+        // verifico se la distanza minima dal box è superiore al minimo già trovato
         BBox3d b3B ;
         if ( pCrvSmpl->GetLocalBBox( b3B)  &&
              b3B.SqDistFromPoint( ptP) <= m_dDist * m_dDist) {
@@ -89,13 +89,23 @@ DistPointCrvComposite::DistPointCrvComposite( const Point3d& ptP, const ICurveCo
                     }
                  }
                 // altrimenti aggiungo
-                  else
-                     m_Info.push_back( aInfo) ;
+                  else {
+                     if ( dCurrDist < m_dDist) {
+                       // aggiorno i minimi
+                        m_dDist = dCurrDist ;
+                       // inserisco in testa
+                        m_Info.insert( m_Info.begin(), aInfo) ;                       
+                     }
+                     else {
+                       // inserisco in coda
+                        m_Info.push_back( aInfo) ;
+                     }
+                  }
                 // passo al successivo
                  ++ i ;
               }
            }
-           // con minima distanza più bassa
+           // con minima distanza più bassa
            else if ( dCurrDist < m_dDist) {
              // aggiorno i minimi
               m_dDist = dCurrDist ;
@@ -119,7 +129,7 @@ DistPointCrvComposite::DistPointCrvComposite( const Point3d& ptP, const ICurveCo

 //----------------------------------------------------------------------------
 bool
-DistPointCrvComposite::GetSqDist( double& dSqDist)
+DistPointCrvComposite::GetSqDist( double& dSqDist) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -130,7 +140,7 @@ DistPointCrvComposite::GetSqDist( double& dSqDist)

 //----------------------------------------------------------------------------
 bool
-DistPointCrvComposite::GetDist( double& dDist)
+DistPointCrvComposite::GetDist( double& dDist) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -141,7 +151,7 @@ DistPointCrvComposite::GetDist( double& dDist)

 //----------------------------------------------------------------------------
 bool
-DistPointCrvComposite::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag)
+DistPointCrvComposite::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -156,7 +166,7 @@ DistPointCrvComposite::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag

 //----------------------------------------------------------------------------
 bool
-DistPointCrvComposite::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag)
+DistPointCrvComposite::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -26,17 +26,18 @@ class DistPointCrvComposite
      DistPointCrvComposite( const Point3d& ptP, const ICurveComposite& CrvCompo) ;

   public :
-      bool GetSqDist( double& dSqDist) ;
-      bool GetDist( double& dDist) ;
-      bool IsEpsilon( double dTol)
+      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)
+      bool IsSmall( void) const
              { return IsEpsilon( EPS_SMALL) ; }
-      bool IsZero( void)
+      bool IsZero( void) const
              { return IsEpsilon( EPS_ZERO) ; }
-      int  GetNbrMinDist( void) { return (int) m_Info.size() ; }
-      bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) ;
-      bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) ;
+      int  GetNbrMinDist( void) const
+              { return (int) m_Info.size() ; }
+      bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) const ;
+      bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) const ;

   private :
      DistPointCrvComposite( void) ;
@@ -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"


@@ -47,6 +47,8 @@ DistPointCurve::DistPointCurve( const Point3d& ptP, const ICurve& Curve, bool bI
   case CRV_COMPO :
      CrvCompositeCalculate( ptP, Curve) ;
      break ;
+   default :
+      break ;
   }
  // salvo il punto
   m_ptP = ptP ;
@@ -98,7 +100,7 @@ DistPointCurve::CrvCompositeCalculate( const Point3d& ptP, const ICurve& Curve)

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetSqDist( double& dSqDist)
+DistPointCurve::GetSqDist( double& dSqDist) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -109,7 +111,7 @@ DistPointCurve::GetSqDist( double& dSqDist)

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetDist( double& dDist)
+DistPointCurve::GetDist( double& dDist) const
 {
   if ( m_dDist < 0)
      return false ;
@@ -120,7 +122,7 @@ DistPointCurve::GetDist( double& dDist)

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag)
+DistPointCurve::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) const
 {
   if ( m_dDist < 0  ||  nInd < 0  ||  nInd >= (int) m_Info.size())
      return false ;
@@ -132,7 +134,7 @@ DistPointCurve::GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag)

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetMinDistPoint( double dNearParam, Point3d& ptMinDist, int& nFlag)
+DistPointCurve::GetMinDistPoint( double dNearParam, Point3d& ptMinDist, int& nFlag) const
 {
   if ( m_dDist < 0  ||  m_Info.empty())
      return false ;
@@ -150,7 +152,7 @@ DistPointCurve::GetMinDistPoint( double dNearParam, Point3d& ptMinDist, int& nFl
      }
   }

-  // cerco punto discreto più vicino (anche estremi di zone continue)
+  // cerco punto discreto più vicino (anche estremi di zone continue)
   double dParam ;
   for ( int i = 0 ; i < (int) m_Info.size() ; ++ i) {
      if ( i == 0  ||
@@ -166,7 +168,7 @@ DistPointCurve::GetMinDistPoint( double dNearParam, Point3d& ptMinDist, int& nFl

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag)
+DistPointCurve::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) const
 {
   if ( m_dDist < 0  ||  nInd < 0  ||  nInd >= (int) m_Info.size())
      return false ;
@@ -178,7 +180,7 @@ DistPointCurve::GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag)

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetParamAtMinDistPoint( double dNearParam, double& dParam, int& nFlag)
+DistPointCurve::GetParamAtMinDistPoint( double dNearParam, double& dParam, int& nFlag) const
 {
   if ( m_dDist < 0  ||  m_Info.empty())
      return false ;
@@ -195,7 +197,7 @@ DistPointCurve::GetParamAtMinDistPoint( double dNearParam, double& dParam, int&
      }
   }

-  // cerco punto discreto più vicino (anche estremi di zone continue)
+  // cerco punto discreto più vicino (anche estremi di zone continue)
   for ( int i = 0 ; i < (int) m_Info.size() ; ++ i) {
      if ( i == 0  ||
           abs( m_Info[i].dPar - dNearParam) < abs( dParam - dNearParam)) {
@@ -209,7 +211,7 @@ DistPointCurve::GetParamAtMinDistPoint( double dNearParam, double& dParam, int&

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetSideAtMinDistPoint( int nInd, const Vector3d& vtN, int& nSide)
+DistPointCurve::GetSideAtMinDistPoint( int nInd, const Vector3d& vtN, int& nSide) const
 {
   if ( m_dDist < 0  ||  nInd < 0  ||  nInd >= (int) m_Info.size())
      return false ;
@@ -230,9 +232,20 @@ DistPointCurve::GetSideAtMinDistPoint( int nInd, const Vector3d& vtN, int& nSide
   Vector3d vtTg = 0.5 * ( vtPreTg + vtPostTg) ;
  // se tangenti opposte, si deve ricalcolare spostandosi un poco
   if ( ! vtTg.Normalize()) {
-      double dDeltaU = 1000 * EPS_PARAM ;
-      if ( ! m_pCurve->GetPointTang( m_Info[nInd].dPar - dDeltaU, ICurve::FROM_MINUS, ptQ, vtPreTg)  ||
-           ! m_pCurve->GetPointTang( m_Info[nInd].dPar + dDeltaU, ICurve::FROM_PLUS, ptQ, vtPostTg))
+      double dDeltaU = 1000 * EPS_PARAM ;    
+      double dParPre = m_Info[nInd].dPar - dDeltaU ;
+      double dParPost = m_Info[nInd].dPar + dDeltaU ;
+     // verifico se il parametro deve essere modificato per adattarsi a curva chiusa
+      if ( m_pCurve->IsClosed()) {
+         double dParS, dParE ;
+         m_pCurve->GetDomain( dParS, dParE) ;
+         if ( dParPre < dParS)
+            dParPre = dParE - dDeltaU ;
+         if ( dParPost > dParE)
+            dParPost = dParS + dDeltaU ;      
+      }
+      if ( ! m_pCurve->GetPointTang( dParPre, ICurve::FROM_MINUS, ptQ, vtPreTg)  ||
+           ! m_pCurve->GetPointTang( dParPost, ICurve::FROM_PLUS, ptQ, vtPostTg))
         return false ;
      vtTg = 0.5 * ( vtPreTg + vtPostTg) ;
      if ( ! vtTg.Normalize( EPS_ZERO))
@@ -257,12 +270,12 @@ DistPointCurve::GetSideAtMinDistPoint( int nInd, const Vector3d& vtN, int& nSide

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetSideAtMinDistPoint( double dNearParam, const Vector3d& vtN, int& nSide)
+DistPointCurve::GetSideAtMinDistPoint( double dNearParam, const Vector3d& vtN, int& nSide) const
 {
   if ( m_dDist < 0  ||  m_Info.empty())
      return false ;

-  // cerco punto discreto più vicino (anche estremi di zone continue)
+  // cerco punto discreto più vicino (anche estremi di zone continue)
   int nInd ;
   double dParam ;
   for ( int i = 0 ; i < (int) m_Info.size() ; ++ i) {
@@ -278,7 +291,7 @@ DistPointCurve::GetSideAtMinDistPoint( double dNearParam, const Vector3d& vtN, i

 //----------------------------------------------------------------------------
 bool
-DistPointCurve::GetMinDistInfo( int nInd, MinDistPCInfo& aInfo)
+DistPointCurve::GetMinDistInfo( int nInd, MinDistPCInfo& aInfo) const
 {
   if ( m_dDist < 0  ||  nInd < 0  ||  nInd >= (int) m_Info.size())
      return false ;
@@ -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"


 //----------------------------------------------------------------------------
@@ -95,7 +95,7 @@ DistPointLine::Calculate( const Point3d& ptP,

 //----------------------------------------------------------------------------
 bool
-DistPointLine::GetSqDist( double& dSqDist)
+DistPointLine::GetSqDist( double& dSqDist) const
 {
   if ( m_dSqDist < 0)
      return false ;
@@ -106,7 +106,7 @@ DistPointLine::GetSqDist( double& dSqDist)

 //----------------------------------------------------------------------------
 bool
-DistPointLine::GetDist( double& dDist)
+DistPointLine::GetDist( double& dDist) const
 {
   if ( m_dSqDist < 0)
      return false ;
@@ -119,7 +119,7 @@ DistPointLine::GetDist( double& dDist)

 //----------------------------------------------------------------------------
 bool
-DistPointLine::GetMinDistPoint( Point3d& ptMinDist)
+DistPointLine::GetMinDistPoint( Point3d& ptMinDist) const
 {
   if ( m_dSqDist < 0)
      return false ;
@@ -130,7 +130,7 @@ DistPointLine::GetMinDistPoint( Point3d& ptMinDist)

 //----------------------------------------------------------------------------
 bool
-DistPointLine::GetParamAtMinDistPoint( double& dParam)
+DistPointLine::GetParamAtMinDistPoint( double& dParam) const
 {
   if ( m_dSqDist < 0)
      return false ;
@@ -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) ;
-      bool GetDist( double& dDist) ;
-      bool IsEpsilon( double dTol)
-              { double dSqDist ; return ( GetSqDist( dSqDist) && ( dSqDist < SQ_EPS_ZERO || dSqDist < dTol * dTol)) ; }
-      bool IsSmall( void)
-              { return IsEpsilon( EPS_SMALL) ; }
-      bool IsZero( void)
-              { return IsEpsilon( EPS_ZERO) ; }
-      int  GetNbrMinDist( void)
-              { return (( m_dSqDist < 0) ? 0 : 1) ; }
-      bool GetMinDistPoint( Point3d& ptMinDist) ;
-      bool GetParamAtMinDistPoint( double& dParam) ;
-
-   private :
-      DistPointLine( void) ;
-      void Calculate( const Point3d& ptP,
-                      const Point3d& ptIni, const Vector3d& vtDir, double dLen, bool bIsSegment) ;
-
-   private :
-      double  m_dSqDist ;
-      double  m_dDist ;
-      double  m_dParam ;
-      Point3d m_ptMinDist ;
-} ;
-
@@ -0,0 +1,156 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2018-2020
+//----------------------------------------------------------------------------
+// File : DistPointSurfTm.cpp     Data : 19.12.20        Versione : 2.2l3
+// Contenuto : Implementazione della classe distanza Punto da Trimesh.
+//
+//
+//
+// Modifiche : 07.12.18 LM Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+#include "stdafx.h"
+#include "SurfFlatRegion.h"
+#include "/EgtDev/Include/EGkDistPointCurve.h"
+#include "/EgtDev/Include/EGkDistPointSurfFr.h"
+
+using namespace std ;
+
+//----------------------------------------------------------------------------
+DistPointSurfFr::DistPointSurfFr( const Point3d& ptP, const ISurfFlatRegion& frSurf)
+   : m_dDist( -1)
+{
+  // FlatRegion non valida 
+   if ( &frSurf == nullptr  ||  ! frSurf.IsValid())
+      return ;
+  // Calcolo la distanza
+   Calculate( ptP, frSurf) ;
+}
+
+//----------------------------------------------------------------------------
+void 
+DistPointSurfFr::Calculate( const Point3d& ptP, const ISurfFlatRegion& frSurf)
+{
+  // Inizializzo distanza non calcolata
+   m_dDist = -1 ;
+
+  // Converto regione in classe base
+   const SurfFlatRegion* pSfr = GetBasicSurfFlatRegion( &frSurf) ;
+   if ( pSfr == nullptr)
+      return ;
+
+  // ciclo sulle parti della regione
+   for ( int nC = 0 ; nC < pSfr->GetChunkCount() ; nC ++) {
+      // ciclo sui loop della parte di regione
+      for ( int nL = 0 ; nL < pSfr->GetLoopCount( nC) ; nL ++) {
+         PtrOwner<ICurve> pLoop( pSfr->GetLoop( nC, nL)) ;
+         if ( IsNull( pLoop)) {
+            m_dDist = -1 ;
+            return ;
+         }
+         DistPointCurve DPL( ptP, *pLoop) ;
+         double dDist ;
+         if ( DPL.GetDist( dDist)  &&  ( m_dDist < -EPS_SMALL  ||  dDist < m_dDist)) {
+            m_dDist = dDist ;
+            int nFlag ;
+            m_nMinChunk = nC ;
+            m_nMinLoop = nL ;
+            DPL.GetParamAtMinDistPoint( 0, m_dMinPar, nFlag) ;
+            DPL.GetMinDistPoint( 0, m_ptMinDistPoint, nFlag) ;
+            DPL.GetSideAtMinDistPoint( 0, pSfr->GetNormVersor(), m_nSide) ;
+         } 
+      }
+   }
+  // se trovata, aggiorno minima distanza sul piano
+   if ( m_dDist > - EPS_SMALL) {
+      Point3d ptOn = ptP - ( ptP - pSfr->GetPlanePoint()) * pSfr->GetNormVersor() * pSfr->GetNormVersor() ;
+      m_dDistOnPlane = min( Dist( ptOn, m_ptMinDistPoint), m_dDist) ;
+   }
+}
+
+//----------------------------------------------------------------------------
+bool
+DistPointSurfFr::GetDist( double& dDist) const
+{
+   if ( m_dDist < 0)
+      return false ;
+   dDist = m_dDist ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+DistPointSurfFr::GetDistOnRegionPlane( double& dDist) const
+{
+   if ( m_dDist < 0)
+      return false ;
+   dDist = m_dDistOnPlane ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+DistPointSurfFr::GetPointAtMinDist( Point3d& ptMinDist) const
+{
+   if ( m_dDist < 0)
+      return false ;
+   ptMinDist = m_ptMinDistPoint ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+DistPointSurfFr::GetParamAtMinDist( int& nMinChunk, int& nMinLoop, double& dMinPar) const
+{
+   if ( m_dDist < 0)
+      return false ;
+   nMinChunk = m_nMinChunk ;
+   nMinLoop = m_nMinLoop ;
+   dMinPar = m_dMinPar ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+DistPointSurfFr::GetSideAtMinDist( int& nSide) const
+{
+   if ( m_dDist < 0)
+      return false ;
+   nSide = m_nSide ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+IsPointInsideSurfFr( const Point3d& ptP, const ISurfFlatRegion* pSfr, double dMinDist, bool& bInside, int& nChunk)
+{
+  // default non include
+   bInside = false ;
+   nChunk = -1 ;
+  // verifica regione
+   if ( pSfr == nullptr  ||  ! pSfr->IsValid())
+      return false ;
+  // verifico se la proiezione del punto sul piano della regione sta nel suo box
+   Point3d ptOn = ptP - ( ptP - pSfr->GetPlanePoint()) * pSfr->GetNormVersor() * pSfr->GetNormVersor() ;
+   BBox3d b3Box ;
+   pSfr->GetLocalBBox( b3Box) ;
+   b3Box.Expand( dMinDist) ;
+   if ( ! b3Box.Encloses( ptOn))
+      return true ;
+  // determino dove sta il punto
+   DistPointSurfFr DPR( ptP, *pSfr) ;
+   double dDist ; int nMinCh, nMinL; double dMinPar ; int nSide ;
+   if ( DPR.GetDistOnRegionPlane( dDist)  &&  DPR.GetParamAtMinDist( nMinCh, nMinL, dMinPar)  &&  DPR.GetSideAtMinDist( nSide)) {
+      if ( abs( dMinDist) < EPS_SMALL)
+         bInside = ( nSide != PRS_OUT) ;
+      else if ( dMinDist < 0)
+         bInside = ( nSide == PRS_IN  &&  dDist > abs( dMinDist) - EPS_SMALL) ;
+      else
+         bInside = ( nSide != PRS_OUT  ||  dDist < dMinDist + EPS_SMALL) ;
+      if ( bInside)
+         nChunk = nMinCh ;
+   }
+   return true ;
+}
@@ -12,19 +12,21 @@
 //----------------------------------------------------------------------------

 #include "stdafx.h"
+#include "SurfTriMesh.h"
 #include "/EgtDev/Include/EGkDistPointTria.h"
 #include "/EgtDev/Include/EGkDistPointSurfTm.h"
+#include "/EgtDev/Include/EGkIntersLineTria.h"

 using namespace std ;

 //----------------------------------------------------------------------------
 // Calcola la differenza fra i bounding-box A e B.
-// L'insieme differenza non è un bounding-box, ma è esprimibile come unione di al più sei bounding-box.
+// L'insieme differenza non è un bounding-box, ma è esprimibile come unione di al più sei bounding-box.
 // Se l'insieme differenza fra i box non ha misura nulla viene restituito true, false altrimenti.
-// I casi in cui non vengono trovati box di misura positiva sono quelli in cui o il box A è contenuto
-// nel box B; uno di questi si verifica se il box A è vuoto.
+// I casi in cui non vengono trovati box di misura positiva sono quelli in cui o il box A è contenuto
+// nel box B; uno di questi si verifica se il box A è vuoto.
 // Nel vettore vBoxDiff vengono restituiti i box la cui unione costituisce la differenza fra A e B.
-bool 
+static bool 
 BoundingBoxDifference( const BBox3d& boxA, const BBox3d& boxB, BOXVECTOR& vBoxDiff) 
 {
  // Svuoto il risultato
@@ -32,7 +34,7 @@ BoundingBoxDifference( const BBox3d& boxA, const BBox3d& boxB, BOXVECTOR& vBoxDi
  // Se box A vuoto, risultato vuoto
   if ( boxA.IsEmpty())
      return false ;
-  // Se box B vuoto o i box non si intersecano, risultato è ancora A
+  // Se box B vuoto o i box non si intersecano, risultato è ancora A
   BBox3d boxInt ;
   if ( boxB.IsSmall()  ||  ! boxA.FindIntersection( boxB, boxInt)) {
      vBoxDiff.emplace_back( boxA) ;
@@ -92,33 +94,241 @@ DistPointSurfTm::Calculate( const Point3d& ptP, const ISurfTriMesh& tmSurf)
 {
  // Inizializzo distanza non calcolata
   m_dDist = - 1. ;
+  // Vettore di indici dei triangoli più vicini inizialmente vuoto
+   m_vnMinDistTriaIndex.clear() ;
+  // Controllo se la superficie è chiusa
+   m_bIsSurfClosed = tmSurf.IsClosed() ;
+
+  // Lavoro con l'oggetto superficie trimesh di base
+   const SurfTriMesh* pStm = GetBasicSurfTriMesh( &tmSurf) ;
+   if ( pStm == nullptr)
+      return ;  

  // Recupero e verifico il box locale della superficie
-   BBox3d b3Stm = tmSurf.GetAllTriaBox() ;
+   BBox3d b3Stm = pStm->GetAllTriaBox() ;
   if ( b3Stm.IsEmpty())
      return ;

-  // Determino i triangoli vicini e fra di essi cerco quello di minima distanza.
-  // Considero un box centrato nel punto P; finché all'interno del box non trovo un set di triangoli
-  // fra cui quello a distanza minima dal punto P ha distanza minore del minimo semi-lato del box,
-  // continuo a ingrandire il box. La condizione di terminazione garantisce di trovare il tiangolo di
-  // distanza minima della trimesh intera.
+  // Cerco triangoli in box centrati sul punto dato di ampiezza crescente ed escludendo le parti già verificate.
+  // Termino quando non trovo più triangoli che possano soddisfare la richiesta. 
   Point3d ptMin, ptMax ; b3Stm.GetMinMax( ptMin, ptMax) ;
-   double dDeltaLen = max( min( min( ptMax.x - ptMin.x, ptMax.y - ptMin.y), ptMax.z - ptMin.z) / 40., 10.) ;
+   double dDeltaLen = max( min( min( b3Stm.GetDimX(), b3Stm.GetDimY()), b3Stm.GetDimZ()) / 40., 20.) ;
   double dBoxHalfLenX = max( max( ptMin.x - ptP.x, ptP.x - ptMax.x), 0.) + dDeltaLen ;
   double dBoxHalfLenY = max( max( ptMin.y - ptP.y, ptP.y - ptMax.y), 0.) + dDeltaLen ;
   double dBoxHalfLenZ = max( max( ptMin.z - ptP.z, ptP.z - ptMax.z), 0.) + dDeltaLen ;
-  // Considero anche il box precedente per poter analizzare solo lo spazio differenza tra i due
+  // Considero anche il box precedente per poter analizzare solo il volume differenza tra i due
   BBox3d boxPPrev( ptP) ;
   BBox3d boxP( ptP, dBoxHalfLenX, dBoxHalfLenY, dBoxHalfLenZ) ;
  // Variabili distanza minima, indice del triangolo di distanza minima, punto di distanza minima 
-   double dMinSqDist = DBL_MAX ;
+   double dMinDist = DBL_MAX ;
   int nMinDistTriaIndex = SVT_NULL ;
   Point3d ptMinDistPoint ;
+  // Finché non si verifica la condizione di terminazione ingrandisco il box.
+   pStm->ResetTempInts() ;
   bool bContinue = true ;
-  // Finché non si verifica la condizione di terminazione ingrandisco il box.
+
+  // 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
+     // Calcolo il box differenza con il precedente per non esplorare parti già considerate
+      BOXVECTOR vBox ;
+      BoundingBoxDifference( boxP, boxPPrev, vBox) ;
+     // Ciclo sui box differenza
+      bool bCollide = false ;
+      for ( const auto& b3Box : vBox) {
+        // interseco il box con quello della superficie e ne verifico la distanza minima dal punto
+         BBox3d b3Int ;
+         if ( ! b3Box.FindIntersection( b3Stm, b3Int)  ||  b3Int.DistFromPoint( ptP) > dMinDist)
+            continue ;
+        // ricerca sui triangoli nel box
+         bCollide = true ;
+         INTVECTOR vnIds ;
+         if ( pStm->GetAllTriaOverlapBox( b3Int, vnIds)) {
+           // Ciclo sui triangoli del sotto-box corrente
+            for ( auto nT : vnIds) {
+               int nTriaTemp ;
+               Triangle3d trCurTria ;
+               if ( pStm->GetTempInt( nT, nTriaTemp)  &&  nTriaTemp == 0  &&  pStm->GetTriangle( nT, trCurTria)) {
+                  pStm->SetTempInt( nT, 1) ;
+                  DistPointTriangle distPT( ptP, trCurTria) ;
+                  double dCurrDist ;
+                 // Se la distanza del triangolo è valida e minore di quella attuale aggiorno
+                  if ( distPT.GetDist( dCurrDist)) {
+                    // se distanze uguali...
+                     if ( abs( dCurrDist - dMinDist) < EPS_SMALL)
+                       // aggiungo il triangolo
+                        vTria.emplace_back( make_pair( nT, trCurTria)) ;
+                    // se minore...
+                     else if ( dCurrDist < dMinDist) {
+                        // pulisco il vettore
+                        vTria.clear() ;
+                        dMinDist = dCurrDist ;
+                        nMinDistTriaIndex = nT ;
+                        distPT.GetMinDistPoint( ptMinDistPoint) ;
+                       // aggiungo il triangolo
+                        vTria.emplace_back( make_pair( nT, trCurTria)) ;
+                     }
+                  }
+               }
+            }
+         }
+      }
+     // Se si verifica la condizione di terminazione arresto il ciclo altrimenti aggiorno i box 
+      if ( ! bCollide  ||  dMinDist < EPS_SMALL)
+         bContinue = false ;
+      else {
+        boxPPrev = boxP ;
+        boxP.Expand( dDeltaLen) ;
+      }
+   }
+
+  // se non ho trovato nessun triangolo, esco
+   if ( nMinDistTriaIndex == SVT_NULL)
+      return ;
+
+  // Inizializzo il vettore dei triangoli a minima distanza
+   for ( auto& Tria : vTria)
+      m_vnMinDistTriaIndex.emplace_back( Tria.first) ;
+
+  // salvo la distanza minima
+   m_dDist = dMinDist ;
+  // salvo il punto a distanza minima
+   m_ptMinDistPoint = ptMinDistPoint ;
+  // se il punto è sulla TriMesh...
+   if ( m_dDist < EPS_SMALL) {
+      m_nMinDistTriaIndex = nMinDistTriaIndex ;
+      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 ;
+}
+
+//----------------------------------------------------------------------------
+bool
+DistPointSurfTm::GetDist( double& dDist) const
+{
+  // Distanza non valida
+   if ( m_dDist < -EPS_ZERO)
+      return false ;
+  // Distanza valida
+   dDist = m_dDist ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool 
+DistPointSurfTm::GetMinDistPoint( Point3d& ptMinDistPoint) const
+{
+  // Distanza non valida
+   if ( m_dDist < -EPS_ZERO)
+      return false ;
+  // Distanza valida
+   ptMinDistPoint = m_ptMinDistPoint ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+DistPointSurfTm::GetMinDistTriaIndex( int& nMinDistIndex) const
+{
+  // Distanza non valida
+   if ( m_dDist < -EPS_ZERO)
+      return false ;
+  // Distanza valida 
+   nMinDistIndex = m_nMinDistTriaIndex ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+DistPointSurfTm::GetMinDistTriaIndices( INTVECTOR& vMinDistTriaIndex) const
+{
+  // Distanza non valida
+   if ( m_dDist < - EPS_ZERO)
+      return false ;
+  // Distanza valida
+   vMinDistTriaIndex = m_vnMinDistTriaIndex ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+int
+GetSurfTmNearestVertex( const Point3d& ptP, const ISurfTriMesh& tmSurf)
+{
+  // Lavoro con l'oggetto superficie trimesh di base
+   const SurfTriMesh* pStm = GetBasicSurfTriMesh( &tmSurf) ;
+   if ( pStm == nullptr)
+      return SVT_NULL ;
+   
+  // Recupero e verifico il box locale della superficie
+   BBox3d b3Stm = pStm->GetAllTriaBox() ;
+   if ( b3Stm.IsEmpty())
+      return SVT_NULL ;
+
+  // Cerco triangoli in box centrati sul punto dato di ampiezza crescente ed escludendo le parti già verificate.
+  // Termino quando non trovo più triangoli che possano soddisfare la richiesta. 
+   Point3d ptMin, ptMax ; b3Stm.GetMinMax( ptMin, ptMax) ;
+   double dDeltaLen = max( min( min( b3Stm.GetDimX(), b3Stm.GetDimY()), b3Stm.GetDimZ()) / 40., 20.) ;
+   double dBoxHalfLenX = max( max( ptMin.x - ptP.x, ptP.x - ptMax.x), 0.) + dDeltaLen ;
+   double dBoxHalfLenY = max( max( ptMin.y - ptP.y, ptP.y - ptMax.y), 0.) + dDeltaLen ;
+   double dBoxHalfLenZ = max( max( ptMin.z - ptP.z, ptP.z - ptMax.z), 0.) + dDeltaLen ;
+  // Considero anche il box precedente per poter analizzare solo il volume differenza tra i due
+   BBox3d boxPPrev( ptP) ;
+   BBox3d boxP( ptP, dBoxHalfLenX, dBoxHalfLenY, dBoxHalfLenZ) ;
+  // Variabili distanza minima 
+   int nVert = SVT_NULL ;
+   double dMinSqDist = DBL_MAX ;
+  // Finché non si verifica la condizione di terminazione ingrandisco il box.
+   pStm->ResetTempInts() ;
+   bool bContinue = true ;
+   while ( bContinue) {
+     // Calcolo il box differenza con il precedente per non esplorare parti già considerate
      BOXVECTOR vBox ;
      BoundingBoxDifference( boxP, boxPPrev, vBox) ;
     // Ciclo sui box differenza
@@ -131,18 +341,23 @@ DistPointSurfTm::Calculate( const Point3d& ptP, const ISurfTriMesh& tmSurf)
        // ricerca sui triangoli nel box
         bCollide = true ;
         INTVECTOR vnIds ; 
-         if ( tmSurf.GetAllTriaOverlapBox( b3Int, vnIds)) { 
+         if ( pStm->GetAllTriaOverlapBox( b3Int, vnIds)) { 
           // Ciclo sui triangoli del sotto-box corrente
            for ( auto nT : vnIds) {
-               Triangle3d trCurTria ;
-               tmSurf.GetTriangle( nT, trCurTria) ;
-               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) ;
+               int nTriaTemp ;
+               int nIdVert[3] ;
+               if ( pStm->GetTempInt( nT, nTriaTemp)  &&  nTriaTemp == 0  &&  pStm->GetTriangle( nT, nIdVert)) {
+                  pStm->SetTempInt( nT, 1) ;
+                  for ( int i = 0 ; i < 3 ; ++ i) {
+                     Point3d ptVert ;
+                     if ( ! pStm->GetVertex( nIdVert[i], ptVert))
+                        continue ;
+                     double dCurrSqDist = SqDist( ptP, ptVert) ;
+                     if ( dCurrSqDist < dMinSqDist) {
+                        dMinSqDist = dCurrSqDist ;
+                        nVert = nIdVert[i] ;
+                     }
+                  }
               }
            }
         }
@@ -156,49 +371,5 @@ DistPointSurfTm::Calculate( const Point3d& ptP, const ISurfTriMesh& tmSurf)
      }
   }

-   if ( nMinDistTriaIndex != SVT_NULL) {
-      m_dDist = sqrt( max( dMinSqDist, 0.)) ;
-      m_nMinDistTriaIndex = nMinDistTriaIndex ;
-      m_ptMinDistPoint = ptMinDistPoint ;
-      Triangle3d trMinDistTria ;
-      tmSurf.GetTriangle( m_nMinDistTriaIndex, trMinDistTria) ;
-      trMinDistTria.Validate() ;
-      m_bIsInside = ( ( ptP - m_ptMinDistPoint) * trMinDistTria.GetN() < - EPS_SMALL)  &&  tmSurf.IsClosed() ;
-   }
-}
-
-//----------------------------------------------------------------------------
-bool
-DistPointSurfTm::GetDist( double& dDist)
-{
-  // Distanza non valida
-   if ( m_dDist < -EPS_ZERO)
-      return false ;
-  // Distanza valida
-   dDist = m_dDist ;
-   return true ;
-}
-
-//----------------------------------------------------------------------------
-bool 
-DistPointSurfTm::GetMinDistPoint( Point3d& ptMinDistPoint)
-{
-  // Distanza non valida
-   if ( m_dDist < -EPS_ZERO)
-      return false ;
-  // Distanza valida
-   ptMinDistPoint = m_ptMinDistPoint ;
-   return true ;
-}
-
-//----------------------------------------------------------------------------
-bool
-DistPointSurfTm::GetMinDistTriaIndex( int& nMinDistIndex)
-{
-  // Distanza non valida
-   if ( m_dDist < -EPS_ZERO)
-      return false ;
-  // Distanza valida 
-   nMinDistIndex = m_nMinDistTriaIndex ;
-   return true ;
+   return nVert ;
 }
@@ -14,7 +14,7 @@
 //--------------------------- Include ----------------------------------------
 #include "stdafx.h"
 #include "ProjPlane.h"
-#include "DistPointLine.h"
+#include "/EgtDev/Include/EGkDistPointLine.h"
 #include "/EgtDev/Include/EGkDistPointTria.h"


@@ -20,4 +20,5 @@
 int GetEGkDebugLev( void) ;
 ILogger* GetEGkLogger( void) ;
 const std::string& GetEGkKey( void) ;
+bool GetEGkNetHwKey( void) ;
 int ProcessEvents( int nProg, int nPause) ;
@@ -16,7 +16,7 @@
 #include "DllMain.h"
 #include "FontManager.h"
 #include "\EgtDev\Include\EGkDllMain.h"
-#include "\EgtDev\Include\EgnGetModuleVer.h"
+#include "\EgtDev\Include\EGnGetModuleVer.h"
 #include "\EgtDev\Include\EgtTrace.h"
 #include "\EgtDev\Include\SELkLockId.h"

@@ -115,6 +115,7 @@ GetEGkLogger( void)
 //-----------------------------------------------------------------------------
 static string s_sKey ;
 static int s_nKeyType = KEY_LOCK_TYPE_ANY ;
+static bool s_bNetHwKey = false ;

 //-----------------------------------------------------------------------------
 void
@@ -130,6 +131,13 @@ SetEGkKeyType( int nType)
   s_nKeyType = nType ;
 }

+//-----------------------------------------------------------------------------
+void
+SetEGkNetHwKey( bool bNetHwKey)
+{
+   s_bNetHwKey = bNetHwKey ;
+}
+
 //-----------------------------------------------------------------------------
 const string&
 GetEGkKey( void)
@@ -138,17 +146,33 @@ GetEGkKey( void)
   return s_sKey ;
 }

+//-----------------------------------------------------------------------------
+bool
+GetEGkNetHwKey( void)
+{
+   return s_bNetHwKey ;
+}
+
 //-----------------------------------------------------------------------------
 void
 InitFontManager( const string& sNfeFontDir, const string& sDefaultFont)
 {
  // recupero il font manager
   FontManager& fntMgr = FontManager::GetFontManager() ;
-
  // lo inizializzo
   fntMgr.Init( sNfeFontDir, sDefaultFont) ;
 }

+//-----------------------------------------------------------------------------
+void
+SetDefaultFont( const string& sDefaultFont)
+{
+  // recupero il font manager
+   FontManager& fntMgr = FontManager::GetFontManager() ;
+  // imposto il dato
+   fntMgr.SetDefaultFont( sDefaultFont) ;
+}
+
 //-----------------------------------------------------------------------------
 const string&
 GetNfeFontDir( void)
@@ -22,7 +22,7 @@
    <ProjectGuid>{9A98A202-2853-454A-84CA-DCD1714176C9}</ProjectGuid>
    <RootNamespace>EgtGeomKernel</RootNamespace>
    <Keyword>MFCDLLProj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -30,7 +30,7 @@
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -46,7 +46,7 @@
    <WholeProgramOptimization>false</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -116,6 +116,8 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <EnablePREfast>false</EnablePREfast>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>C:\EgtDev\Extern\abseil\Include</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -151,6 +153,7 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>-Wno-tautological-undefined-compare</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -197,6 +200,7 @@ copy $(TargetPath) \EgtProg\DllD64</Command>
      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
      <WholeProgramOptimization>false</WholeProgramOptimization>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -235,7 +239,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
      <OmitFramePointers>true</OmitFramePointers>
      <FloatingPointModel>Precise</FloatingPointModel>
      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
@@ -243,6 +247,8 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
      <WholeProgramOptimization>false</WholeProgramOptimization>
      <DebugInformationFormat>None</DebugInformationFormat>
      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>-Wno-tautological-undefined-compare</AdditionalOptions>
+      <IntelJCCErratum>true</IntelJCCErratum>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -275,11 +281,14 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClCompile Include="Attribs.cpp" />
    <ClCompile Include="BBox3d.cpp" />
    <ClCompile Include="BiArcs.cpp" />
+    <ClCompile Include="CalcPocketing.cpp" />
+    <ClCompile Include="CAvSilhouetteSurfTm.cpp" />
    <ClCompile Include="CAvSimpleSurfFrMove.cpp" />
    <ClCompile Include="CAvToolSurfTm.cpp" />
    <ClCompile Include="CAvToolTriangle.cpp" />
    <ClCompile Include="CDeBoxClosedSurfTm.cpp" />
    <ClCompile Include="CDeBoxTria.cpp" />
+    <ClCompile Include="CDeCapsTria.cpp" />
    <ClCompile Include="CDeClosedSurfTmClosedSurfTm.cpp" />
    <ClCompile Include="CDeConeFrustumClosedSurfTm.cpp" />
    <ClCompile Include="CDeConeFrustumTria.cpp" />
@@ -295,19 +304,52 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClCompile Include="CDeTriaTria.cpp" />
    <ClCompile Include="CDeUtility.cpp" />
    <ClCompile Include="ChainCurves.cpp" />
+    <ClCompile Include="Circle2P.cpp" />
    <ClCompile Include="CircleCenTgCurve.cpp" />
    <ClCompile Include="Color.cpp" />
    <ClCompile Include="CreateCurveAux.cpp" />
    <ClCompile Include="CurveByApprox.cpp" />
    <ClCompile Include="CurveByInterp.cpp" />
    <ClCompile Include="CurveCompositeOffset.cpp" />
+    <ClCompile Include="DistPointSurfFr.cpp" />
+    <ClCompile Include="IntersCurveSurfTm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="IntersLineVolZmap.cpp" />
+    <ClCompile Include="IntersPlaneVolZmap.cpp" />
+    <ClCompile Include="IntersLineSurfBez.cpp" />
+    <ClCompile Include="SurfTriMeshOffset.cpp" />
+    <ClCompile Include="VolZmapOffset.cpp" />
+    <ClCompile Include="PolygonElevation.cpp" />
+    <ClCompile Include="Quaternion.cpp" />
+    <ClCompile Include="RotationMinimizingFrame.cpp" />
+    <ClCompile Include="RotationXplaneFrame.cpp" />
+    <ClCompile Include="SbzFromCurves.cpp" />
+    <ClCompile Include="SbzStandard.cpp" />
+    <ClCompile Include="Voronoi.cpp" />
    <ClInclude Include="..\Include\EGkCDeClosedSurfTmClosedSurfTm.h" />
    <ClInclude Include="..\Include\EGkCDeConeFrustumClosedSurfTm.h" />
    <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" />
    <ClInclude Include="..\Include\EGkIntersPlaneBox.h" />
+    <ClInclude Include="..\Include\EGkIntersPlaneVolZmap.h" />
+    <ClInclude Include="..\Include\EGkPolygonElevation.h" />
+    <ClInclude Include="..\Include\EGkQuaternion.h" />
+    <ClInclude Include="..\Include\EGkRotationMinimizingFrame.h" />
+    <ClInclude Include="..\Include\EGkRotationXplaneFrame.h" />
+    <ClInclude Include="..\Include\EGkSubtractProjectedFacesOnStmFace.h" />
+    <ClInclude Include="..\Include\EGkSurfTriMeshAux.h" />
+    <ClInclude Include="CAvSilhouetteSurfTm.h" />
    <ClInclude Include="CDeBoxTria.h" />
+    <ClInclude Include="CDeCapsTria.h" />
    <ClInclude Include="CDeConeFrustumTria.h" />
    <ClInclude Include="CDeConeTria.h" />
    <ClInclude Include="CDeConvexTorusTria.h" />
@@ -321,7 +363,11 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClCompile Include="DistPointSurfTm.cpp" />
    <ClCompile Include="DistPointTria.cpp" />
    <ClCompile Include="ExtDimension.cpp" />
+    <ClCompile Include="HashGrids1d.cpp" />
    <ClCompile Include="IntersLineBox.cpp" />
+    <ClCompile Include="IntersLineCaps.cpp" />
+    <ClCompile Include="IntersLineCone.cpp" />
+    <ClCompile Include="IntersLineCyl.cpp" />
    <ClCompile Include="IntersLineSphere.cpp" />
    <ClCompile Include="IntersLineSurfStd.cpp" />
    <ClCompile Include="IntersPlaneBox.cpp" />
@@ -330,6 +376,9 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClCompile Include="IntersPlaneTria.cpp" />
    <ClCompile Include="IntersSurfTmSurfTm.cpp" />
    <ClCompile Include="IntersTriaTria.cpp" />
+    <ClCompile Include="OffsetAux.cpp" />
+    <ClCompile Include="Tree.cpp" />
+    <ClCompile Include="MedialAxis.cpp" />
    <ClCompile Include="OffsetCurve.cpp" />
    <ClCompile Include="DistPointArc.cpp" />
    <ClCompile Include="DistPointCrvAux.cpp" />
@@ -384,14 +433,18 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClCompile Include="OffsetCurveOnX.cpp" />
    <ClCompile Include="Polygon3d.cpp" />
    <ClCompile Include="AdjustLoops.cpp" />
-    <ClCompile Include="RemoveCurveSpikes.cpp" />
+    <ClCompile Include="ProjectCurveSurf.cpp" />
+    <ClCompile Include="RemoveCurveDefects.cpp" />
    <ClCompile Include="SelfIntersCurve.cpp" />
    <ClCompile Include="SfrCreate.cpp" />
+    <ClCompile Include="SubtractProjectedFacesOnStmFace.cpp" />
+    <ClCompile Include="SurfAux.cpp" />
    <ClCompile Include="SurfBezier.cpp" />
    <ClCompile Include="SurfFlatRegion.cpp" />
    <ClCompile Include="SurfFlatRegionBooleans.cpp" />
    <ClCompile Include="SurfFlatRegionOffset.cpp" />
    <ClCompile Include="SurfTriMeshBooleans.cpp" />
+    <ClCompile Include="SurfTriMeshCuts.cpp" />
    <ClCompile Include="SurfTriMeshUtilities.cpp" />
    <ClCompile Include="TextureData.cpp" />
    <ClCompile Include="Tool.cpp" />
@@ -425,6 +478,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClCompile Include="VolZmapGraphics.cpp" />
    <ClCompile Include="VolZmapVolume.cpp" />
    <ClCompile Include="VolZmap.cpp" />
+    <ClInclude Include="Voronoi.h" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\Include\EGkAngle.h" />
@@ -441,14 +495,14 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClInclude Include="..\Include\EGkChainCurves.h" />
    <ClInclude Include="..\Include\EGkCircleCenTgCurve.h" />
    <ClInclude Include="..\Include\EGkColor.h" />
-    <ClInclude Include="..\Include\EgkCurve.h" />
-    <ClInclude Include="..\Include\EgkCurveArc.h" />
-    <ClInclude Include="..\Include\EgkCurveAux.h" />
-    <ClInclude Include="..\Include\EgkCurveBezier.h" />
+    <ClInclude Include="..\Include\EGkCurve.h" />
+    <ClInclude Include="..\Include\EGkCurveArc.h" />
+    <ClInclude Include="..\Include\EGkCurveAux.h" />
+    <ClInclude Include="..\Include\EGkCurveBezier.h" />
    <ClInclude Include="..\Include\EGkCurveByApprox.h" />
-    <ClInclude Include="..\Include\EgkCurveComposite.h" />
+    <ClInclude Include="..\Include\EGkCurveComposite.h" />
    <ClInclude Include="..\Include\EGkCurveByInterp.h" />
-    <ClInclude Include="..\Include\EgkCurveLine.h" />
+    <ClInclude Include="..\Include\EGkCurveLine.h" />
    <ClInclude Include="..\Include\EGkCurveLocal.h" />
    <ClInclude Include="..\Include\EGkCurvePointDiffGeom.h" />
    <ClInclude Include="..\Include\EGkDistPointCurve.h" />
@@ -551,13 +605,12 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClInclude Include="CAvSimpleSurfFrMove.h" />
    <ClInclude Include="CAvToolSurfTm.h" />
    <ClInclude Include="CreateCurveAux.h" />
-    <ClInclude Include="DistLineLine.h" />
    <ClInclude Include="DistPointArc.h" />
    <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" />
    <ClInclude Include="ExtText.h" />
    <ClInclude Include="FontAux.h" />
@@ -586,10 +639,16 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClInclude Include="IntersArcArc.h" />
    <ClInclude Include="IntersCrvCompoCrvCompo.h" />
    <ClInclude Include="IntersLineArc.h" />
+    <ClInclude Include="IntersLineBox.h" />
+    <ClInclude Include="IntersLineCaps.h" />
+    <ClInclude Include="IntersLineCone.h" />
+    <ClInclude Include="IntersLineCyl.h" />
    <ClInclude Include="IntersLineLine.h" />
    <ClInclude Include="IntersLineSurfStd.h" />
    <ClInclude Include="IntersLineTria.h" />
    <ClInclude Include="IterManager.h" />
+    <ClInclude Include="OffsetAux.h" />
+    <ClInclude Include="Tree.h" />
    <ClInclude Include="Material.h" />
    <ClInclude Include="FontNfe.h" />
    <ClInclude Include="MC_Tables.h" />
@@ -599,7 +658,8 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
    <ClInclude Include="ObjGraphicsMgr.h" />
    <ClInclude Include="FontOs.h" />
    <ClInclude Include="AdjustLoops.h" />
-    <ClInclude Include="RemoveCurveSpikes.h" />
+    <ClInclude Include="RemoveCurveDefects.h" />
+    <ClInclude Include="SurfAux.h" />
    <ClInclude Include="SurfBezier.h" />
    <ClInclude Include="SurfFlatRegion.h" />
    <ClInclude Include="TextureData.h" />
@@ -43,7 +43,16 @@
    <Filter Include="File di origine\GeoOffset">
      <UniqueIdentifier>{f07670fd-9429-4b7e-ac6d-1c0022e756fb}</UniqueIdentifier>
    </Filter>
-    <Filter Include="File di origine\GeoCollision">
+    <Filter Include="File di origine\GeoProject">
+      <UniqueIdentifier>{d96752da-1884-4a73-ba1b-5b20b606e469}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="File di origine\GeoElevation">
+      <UniqueIdentifier>{4c6a9dc5-8fac-4ecd-bde6-3e37e056712e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="File di origine\GeoCollisionAvoid">
+      <UniqueIdentifier>{ae52e402-3063-45e3-b9f7-1710035a1f56}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="File di origine\GeoCollisionDetection">
      <UniqueIdentifier>{865b76ee-b10d-41fc-861c-b48ce52fa277}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
@@ -267,6 +276,9 @@
    <ClCompile Include="IntersLineSurfTm.cpp">
      <Filter>File di origine\GeoInters</Filter>
    </ClCompile>
+    <ClCompile Include="IntersLineSurfBez.cpp">
+      <Filter>File di origine\GeoInters</Filter>
+    </ClCompile>
    <ClCompile Include="CircleCenTgCurve.cpp">
      <Filter>File di origine\GeoCreate</Filter>
    </ClCompile>
@@ -327,7 +339,7 @@
    <ClCompile Include="OffsetCurveOnX.cpp">
      <Filter>File di origine\GeoOffset</Filter>
    </ClCompile>
-    <ClCompile Include="RemoveCurveSpikes.cpp">
+    <ClCompile Include="RemoveCurveDefects.cpp">
      <Filter>File di origine\GeoInters</Filter>
    </ClCompile>
    <ClCompile Include="Polygon3d.cpp">
@@ -366,17 +378,8 @@
    <ClCompile Include="IntersLineSurfStd.cpp">
      <Filter>File di origine\GeoInters</Filter>
    </ClCompile>
-    <ClCompile Include="CAvToolTriangle.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
-    </ClCompile>
-    <ClCompile Include="CAvToolSurfTm.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
-    </ClCompile>
    <ClCompile Include="CDeBoxTria.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
-    </ClCompile>
-    <ClCompile Include="CAvSimpleSurfFrMove.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="IntersSurfTmSurfTm.cpp">
      <Filter>File di origine\GeoInters</Filter>
@@ -394,19 +397,19 @@
      <Filter>File di origine\Geo</Filter>
    </ClCompile>
    <ClCompile Include="CDeCylTria.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeBoxClosedSurfTm.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeCylClosedSurfTm.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeSpheTria.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeSpheClosedSurfTm.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="SurfBezier.cpp">
      <Filter>File di origine\Geo</Filter>
@@ -424,38 +427,131 @@
      <Filter>File di origine\GeoDist</Filter>
    </ClCompile>
    <ClCompile Include="CDeTriaTria.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeConeTria.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeUtility.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeClosedSurfTmClosedSurfTm.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeConeFrustumClosedSurfTm.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeConeFrustumTria.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeConvexTorusClosedSurfTm.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeConvexTorusTria.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeRectPrismoidClosedSurfTm.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="CDeRectPrismoidTria.cpp">
-      <Filter>File di origine\GeoCollision</Filter>
+      <Filter>File di origine\GeoCollisionDetection</Filter>
    </ClCompile>
    <ClCompile Include="SurfTriMeshUtilities.cpp">
      <Filter>File di origine\Geo</Filter>
    </ClCompile>
+    <ClCompile Include="SurfTriMeshCuts.cpp">
+      <Filter>File di origine\Geo</Filter>
+    </ClCompile>
+    <ClCompile Include="HashGrids1d.cpp">
+      <Filter>File di origine\Base</Filter>
+    </ClCompile>
+    <ClCompile Include="CDeCapsTria.cpp">
+      <Filter>File di origine\GeoCollisionDetection</Filter>
+    </ClCompile>
+    <ClCompile Include="Circle2P.cpp">
+      <Filter>File di origine\GeoCreate</Filter>
+    </ClCompile>
+    <ClCompile Include="MedialAxis.cpp">
+      <Filter>File di origine\GeoOffset</Filter>
+    </ClCompile>
+    <ClCompile Include="Tree.cpp">
+      <Filter>File di origine\Base</Filter>
+    </ClCompile>
+    <ClCompile Include="IntersLineCyl.cpp">
+      <Filter>File di origine\GeoInters</Filter>
+    </ClCompile>
+    <ClCompile Include="IntersLineCone.cpp">
+      <Filter>File di origine\GeoInters</Filter>
+    </ClCompile>
+    <ClCompile Include="IntersLineCaps.cpp">
+      <Filter>File di origine\GeoInters</Filter>
+    </ClCompile>
+    <ClCompile Include="ProjectCurveSurf.cpp">
+      <Filter>File di origine\GeoProject</Filter>
+    </ClCompile>
+    <ClCompile Include="SubtractProjectedFacesOnStmFace.cpp">
+      <Filter>File di origine\GeoProject</Filter>
+    </ClCompile>
+    <ClCompile Include="SurfAux.cpp">
+      <Filter>File di origine\Geo</Filter>
+    </ClCompile>
+    <ClCompile Include="CalcPocketing.cpp">
+      <Filter>File di origine\GeoOffset</Filter>
+    </ClCompile>
+    <ClCompile Include="OffsetAux.cpp">
+      <Filter>File di origine\GeoOffset</Filter>
+    </ClCompile>
+    <ClCompile Include="Voronoi.cpp">
+      <Filter>File di origine\Base</Filter>
+    </ClCompile>
+    <ClCompile Include="PolygonElevation.cpp">
+      <Filter>File di origine\GeoElevation</Filter>
+    </ClCompile>
+    <ClCompile Include="IntersCurveSurfTm.cpp">
+      <Filter>File di origine\GeoInters</Filter>
+    </ClCompile>
+    <ClCompile Include="CAvSimpleSurfFrMove.cpp">
+      <Filter>File di origine\GeoCollisionAvoid</Filter>
+    </ClCompile>
+    <ClCompile Include="CAvToolSurfTm.cpp">
+      <Filter>File di origine\GeoCollisionAvoid</Filter>
+    </ClCompile>
+    <ClCompile Include="CAvToolTriangle.cpp">
+      <Filter>File di origine\GeoCollisionAvoid</Filter>
+    </ClCompile>
+    <ClCompile Include="IntersLineVolZmap.cpp">
+      <Filter>File di origine\GeoInters</Filter>
+    </ClCompile>
+    <ClCompile Include="IntersPlaneVolZmap.cpp">
+      <Filter>File di origine\GeoInters</Filter>
+    </ClCompile>
+    <ClCompile Include="SbzStandard.cpp">
+      <Filter>File di origine\GeoCreate</Filter>
+    </ClCompile>
+    <ClCompile Include="RotationMinimizingFrame.cpp">
+      <Filter>File di origine\Base</Filter>
+    </ClCompile>
+    <ClCompile Include="RotationXplaneFrame.cpp">
+      <Filter>File di origine\Base</Filter>
+    </ClCompile>
+    <ClCompile Include="Quaternion.cpp">
+      <Filter>File di origine\Base</Filter>
+    </ClCompile>
+    <ClCompile Include="CAvSilhouetteSurfTm.cpp">
+      <Filter>File di origine\GeoCollisionAvoid</Filter>
+    </ClCompile>
+    <ClCompile Include="SbzFromCurves.cpp">
+      <Filter>File di origine\GeoCreate</Filter>
+    </ClCompile>
+    <ClCompile Include="DistPointSurfFr.cpp">
+      <Filter>File di origine\GeoDist</Filter>
+    </ClCompile>
+    <ClCompile Include="VolZmapOffset.cpp">
+      <Filter>File di origine\Geo</Filter>
+    </ClCompile>
+    <ClCompile Include="SurfTriMeshOffset.cpp">
+      <Filter>File di origine\GeoOffset</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="stdafx.h">
@@ -512,9 +608,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>
@@ -626,28 +719,28 @@
    <ClInclude Include="..\Include\EGkChainCurves.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
-    <ClInclude Include="..\Include\EgkCurveBezier.h">
+    <ClInclude Include="..\Include\EGkCurveBezier.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
    <ClInclude Include="..\Include\EGkColor.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
-    <ClInclude Include="..\Include\EgkCurve.h">
+    <ClInclude Include="..\Include\EGkCurve.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
-    <ClInclude Include="..\Include\EgkCurveArc.h">
+    <ClInclude Include="..\Include\EGkCurveArc.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
-    <ClInclude Include="..\Include\EgkCurveAux.h">
+    <ClInclude Include="..\Include\EGkCurveAux.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
    <ClInclude Include="..\Include\EGkCurveByInterp.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
-    <ClInclude Include="..\Include\EgkCurveComposite.h">
+    <ClInclude Include="..\Include\EGkCurveComposite.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
-    <ClInclude Include="..\Include\EgkCurveLine.h">
+    <ClInclude Include="..\Include\EGkCurveLine.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
    <ClInclude Include="..\Include\EGkCurvePointDiffGeom.h">
@@ -842,7 +935,7 @@
    <ClInclude Include="..\Include\EGkIntersLineSurfTm.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
-    <ClInclude Include="RemoveCurveSpikes.h">
+    <ClInclude Include="RemoveCurveDefects.h">
      <Filter>File di intestazione</Filter>
    </ClInclude>
    <ClInclude Include="..\Include\EGkIntersPlanePlane.h">
@@ -1037,9 +1130,6 @@
    <ClInclude Include="..\Include\EGkIntersPlaneBox.h">
      <Filter>File di intestazione\Include</Filter>
    </ClInclude>
-    <ClInclude Include="DistLineLine.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
    <ClInclude Include="CDeUtility.h">
      <Filter>File di intestazione</Filter>
    </ClInclude>
@@ -1079,6 +1169,72 @@
    <ClInclude Include="CDeRectPrismoidTria.h">
      <Filter>File di intestazione</Filter>
    </ClInclude>
+    <ClInclude Include="earcut.hpp">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="IntersLineBox.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="CDeCapsTria.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Tree.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="IntersLineCyl.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="IntersLineCone.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="IntersLineCaps.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="SurfAux.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="OffsetAux.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkPolygonElevation.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkSubtractProjectedFacesOnStmFace.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="Voronoi.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkIntersCurveSurfTm.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkIntersPlaneVolZmap.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkIntersLineVolZmap.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkRotationMinimizingFrame.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkRotationXplaneFrame.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkQuaternion.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkDistLineLine.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkDistPointLine.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="CAvSilhouetteSurfTm.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGkSurfTriMeshAux.h">
+      <Filter>File di intestazione\Include</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="EgtGeomKernel.rc">
@@ -28,7 +28,7 @@ class ExtDimension : public IExtDimension, public IGeoObjRW
      ExtDimension* Clone( void) const override ;
      GeoObjType GetType( void) const override ;
      bool IsValid( void) const override
-        { return ( m_nType != DT_NONE) ; }
+               { return ( m_nType != DT_NONE) ; }
      const std::string& GetTitle( void) const override ;
      bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const override ;
      bool GetLocalBBox( BBox3d& b3Loc, int nFlag = BBF_STANDARD) const override ;
@@ -55,6 +55,11 @@ class ExtDimension : public IExtDimension, public IGeoObjRW
                   m_nTempProp[nPropInd] = nProp ; } 
      int  GetTempProp( int nPropInd = 0) const override
              { return (( nPropInd >= 0  &&  nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; }
+      void SetTempParam( double dParam, int nParamInd = 0) override
+              { if ( nParamInd >= 0  &&  nParamInd < 2)
+                  m_dTempParam[nParamInd] = dParam ; } 
+      double GetTempParam( int nParamInd = 0) const override
+                { return (( nParamInd >= 0  &&  nParamInd < 2) ? m_dTempParam[nParamInd] : 0.0) ; }

   public :                      // IExtDimension
      bool CopyFrom( const IGeoObj* pGObjSrc) override ;
@@ -62,6 +67,15 @@ class ExtDimension : public IExtDimension, public IGeoObjRW
                     int nDecDigit, const std::string& sFont, double dTextHeight) override ;
      bool SetLinear( const Point3d& ptP1, const Point3d& ptP2, const Point3d& ptPos,
                      const Vector3d& vtN, const Vector3d& vtDir, const std::string& sText) override ;
+      bool SetRadial( const Point3d& ptCen, const Point3d& ptPos,
+                      const Vector3d& vtN, const std::string& sText) override ;
+      bool SetDiametral( const Point3d& ptCen, const Point3d& ptPos,
+                         const Vector3d& vtN, const std::string& sText) override ;
+      bool SetAngular( const Point3d& ptV, const Point3d& ptP1, const Point3d& ptP2, const Point3d& ptPos,
+                       const Vector3d& vtN, const std::string& sText) override ;
+      bool SetAngularEx( const Point3d& ptV1, const Point3d& ptP1,
+                         const Point3d& ptV2, const Point3d& ptP2, const Point3d& ptPos,
+                         const Vector3d& vtN, const std::string& sText) override ;
      const Vector3d& GetNormVersor( void) const override
                        { return m_vtN ; } 
      const Vector3d& GetDirVersor( void) const override
@@ -94,12 +108,16 @@ class ExtDimension : public IExtDimension, public IGeoObjRW
                        { return m_dTextHeight ; }
      bool GetMidPoint( Point3d& ptMid) const override ;
      bool GetCenterPoint( Point3d& ptCen) const override ;
+      const std::string& GetSubType( void) const override ;
      bool ApproxWithLines( double dLinTol, double dAngTolDeg, POLYLINELIST& lstPL) const override ;

   public :                      // IGeoObjRW
      int GetNgeId( void) const override ;
      bool Save( NgeWriter& ngeOut) const override ;
+      bool PreSave( GdbGeo& Wrapper) const override { return true ; }
+      bool PostSave( GdbGeo& Wrapper) const override { return true ; }
      bool Load( NgeReader& ngeIn) override ;
+      bool PostLoad( GdbGeo& Wrapper) override { return true ; }

   public :
      ExtDimension( void) ;
@@ -113,12 +131,12 @@ class ExtDimension : public IExtDimension, public IGeoObjRW

   private :
      bool CopyFrom( const ExtDimension& gpSrc) ;
-      const std::string& GetSubType( void) const ;
      bool Update( void) const ;
-      double GetTextHalfDist( const Point3d& ptText) const ;
+      double GetTextHalfDist( const Point3d& ptText, bool bUseRot = true) const ;
      bool GetArrowHead( const Point3d& ptTip, const Vector3d& vtDir, PolyLine& PL) const ;
      bool SetCurrFont( FontManager& fntMgr) const ;
      bool ApproxTextWithLines( double dLinTol, double dAngTolDeg, POLYLINELIST& lstPL) const ;
+      bool GetTextMyBBox( BBox3d& b3Loc) const ;
      bool GetTextMyBBox( const Point3d& ptPos, BBox3d& b3Loc) const ;
      bool GetTextLocalBBox( BBox3d& b3Loc) const ;
      bool GetTextBBox( const Frame3d& frRef, BBox3d& b3Ref) const ;
@@ -133,13 +151,14 @@ class ExtDimension : public IExtDimension, public IGeoObjRW
      Point3d             m_ptP3 ;          // terzo punto
      Point3d             m_ptP4 ;          // quarto punto
      Point3d             m_ptP5 ;          // quinto punto
-      Point3d             m_ptP6 ;          // sesto punto
+      Point3d             m_ptP6 ;          // sesto punto; nel caso delle quotature angolari � il centro
      Point3d             m_ptPos ;         // posizione ricevuta della quota
      std::string         m_sText ;         // testo della quota
      mutable bool        m_bToCalc ;       // flag dati effettivi da ricalcolare 
      mutable std::string m_sCalcText ;     // testo effettivo della quota
      mutable Point3d     m_ptCalcPos ;     // posizione effettiva della quota
      mutable bool        m_bCalcArrowIn ;  // flag posizione effettiva delle frecce
+      mutable bool        m_bCalcTextOn ;   // flag posizione del testo sulla linea di misura
      mutable Point3d     m_ptCalcP7 ;      // settimo punto effettivo
      mutable Point3d     m_ptCalcP8 ;      // ottavo punto effettivo
      double              m_dExtLineLen ;   // lunghezza di estensione della linea
@@ -149,5 +168,22 @@ class ExtDimension : public IExtDimension, public IGeoObjRW
      int                 m_nDecDigit ;     // numero di cifre decimali
      std::string         m_sFont ;         // font del testo
      double              m_dTextHeight ;   // altezza del testo
-      int                 m_nTempProp[2] ;  // vettore proprietà temporanee 
+      int                 m_nTempProp[2] ;  // vettore propriet� temporanee
+      double              m_dTempParam[2] ; // vettore parametri temporanei
 } ;
+
+//-----------------------------------------------------------------------------
+inline ExtDimension* CreateBasicExtDimension( void)
+               { return ( static_cast<ExtDimension*>( CreateGeoObj( EXT_DIMENSION))) ; }
+inline ExtDimension* CloneBasicExtDimension( const IGeoObj* pGObj)
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != EXT_DIMENSION)
+                    return nullptr ;
+                 return ( static_cast<ExtDimension*>( pGObj->Clone())) ; }
+inline const ExtDimension* GetBasicExtDimension( const IGeoObj* pGObj)
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != EXT_DIMENSION)
+                    return nullptr ;
+                 return ( static_cast<const ExtDimension*>( pGObj)) ; }
+inline ExtDimension* GetBasicExtDimension( IGeoObj* pGObj)
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != EXT_DIMENSION)
+                    return nullptr ;
+                 return ( static_cast<ExtDimension*>( pGObj)) ; }
@@ -35,10 +35,9 @@ GEOOBJ_REGISTER( EXT_TEXT, NGE_E_TXT, ExtText) ;
 //----------------------------------------------------------------------------
 ExtText::ExtText( void)
   : m_pSTM( nullptr), m_bNoSTM( false), m_ptP(), m_vtN( 0, 0, 1), m_vtD( 1, 0, 0), m_sFont(),
-     m_nWeight( 400), m_bItalic( false), m_dHeight( 10), m_dRatio( 1), m_dAddAdvance( 0)
-{
-   m_nTempProp[0] = 0 ;
-   m_nTempProp[1] = 0 ;
+     m_nWeight( 400), m_bItalic( false), m_dHeight( 10), m_dRatio( 1), m_dAddAdvance( 0),
+     m_nTempProp{0,0}, m_dTempParam{0.0,0.0}
+{    
 }

 //----------------------------------------------------------------------------
@@ -161,7 +160,7 @@ ExtText::Clone( void) const
 bool
 ExtText::CopyFrom( const IGeoObj* pGObjSrc)
 {
-   const ExtText* pTxt = dynamic_cast<const ExtText*>( pGObjSrc) ;
+   const ExtText* pTxt = GetBasicExtText( pGObjSrc) ;
   if ( pTxt == nullptr)
      return false ;
   return CopyFrom( *pTxt) ;
@@ -188,6 +187,8 @@ ExtText::CopyFrom( const ExtText& clSrc)
   m_nInsPos = clSrc.m_nInsPos ; 
   m_nTempProp[0] = clSrc.m_nTempProp[0] ;
   m_nTempProp[1] = clSrc.m_nTempProp[1] ;
+   m_dTempParam[0] = clSrc.m_dTempParam[0] ;
+   m_dTempParam[1] = clSrc.m_dTempParam[1] ;
   return true ;
 }

@@ -399,8 +400,11 @@ ExtText::GetBBox( const Frame3d& frRef, BBox3d& b3Ref, int nFlag) const
 bool
 ExtText::Translate( const Vector3d& vtMove)
 {
+  // imposto ricalcolo della grafica
   ResetAuxSurf() ;
   m_OGrMgr.Reset() ;
+
+  // eseguo
   m_ptP.Translate( vtMove) ;
   return true ;
 }
@@ -409,8 +413,15 @@ ExtText::Translate( const Vector3d& vtMove)
 bool
 ExtText::Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng)
 {
+  // verifico validità dell'asse di rotazione
+   if ( vtAx.IsSmall())
+      return false ;
+
+  // imposto ricalcolo della grafica
   ResetAuxSurf() ;
   m_OGrMgr.Reset() ; 
+
+  // eseguo
   return ( m_ptP.Rotate( ptAx, vtAx, dCosAng, dSinAng)  &&
            m_vtN.Rotate( vtAx, dCosAng, dSinAng)  &&
            m_vtD.Rotate( vtAx, dCosAng, dSinAng)) ;
@@ -532,9 +543,18 @@ ExtText::Shear( const Point3d& ptOn, const Vector3d& vtNorm, const Vector3d& vtD
 bool
 ExtText::ToGlob( const Frame3d& frRef)
 {
+  // verifico validità del frame
+   if ( frRef.GetType() == Frame3d::ERR)
+      return false ;
+
+  // se frame identità, non devo fare alcunché
+   if ( IsGlobFrame( frRef))
+      return true ;
+
  // imposto ricalcolo della grafica
   ResetAuxSurf() ;
   m_OGrMgr.Reset() ;
+
  // trasformo punto e versori
   return ( m_ptP.ToGlob( frRef)  &&
            m_vtN.ToGlob( frRef)  &&
@@ -545,9 +565,18 @@ ExtText::ToGlob( const Frame3d& frRef)
 bool
 ExtText::ToLoc( const Frame3d& frRef)
 {
+  // verifico validità del frame
+   if ( frRef.GetType() == Frame3d::ERR)
+      return false ;
+
+  // se frame identità, non devo fare alcunché
+   if ( IsGlobFrame( frRef))
+      return true ;
+
  // imposto ricalcolo della grafica
   ResetAuxSurf() ;
   m_OGrMgr.Reset() ;
+
  // trasformo punto e versori
   return ( m_ptP.ToLoc( frRef)  &&
            m_vtN.ToLoc( frRef)  &&
@@ -561,12 +590,15 @@ ExtText::LocToLoc( const Frame3d& frOri, const Frame3d& frDest)
  // verifico validità dei frame
   if ( frOri.GetType() == Frame3d::ERR  ||  frDest.GetType() == Frame3d::ERR)
      return false ;
+
  // se i due riferimenti coincidono, non devo fare alcunché
   if ( AreSameFrame( frOri, frDest))
      return true ;
+
  // imposto ricalcolo della grafica
   ResetAuxSurf() ;
   m_OGrMgr.Reset() ;
+
  // trasformo punto e versori
   return ( m_ptP.ToGlob( frOri)  &&  m_ptP.ToLoc( frDest)  &&
            m_vtN.ToGlob( frOri)  &&  m_vtN.ToLoc( frDest)  &&
@@ -852,7 +884,7 @@ ExtText::GetAuxSurf( void) const
  // per ogni regione richiedo la superficie ausiliaria e la aggiungo a quella generale
   for ( const auto& pSfr : lstSfr) {
     // recupero la superficie trimesh
-      PtrOwner<ISurfTriMesh> pStm( GetBasicSurfFlatRegion( pSfr)->CalcAuxSurf( LIN_TOL_STD, ANG_TOL_STD_DEG)) ;
+      PtrOwner<SurfTriMesh> pStm( GetBasicSurfFlatRegion( pSfr)->CalcAuxSurf( LIN_TOL_STD, ANG_TOL_STD_DEG)) ;
      if ( pStm != nullptr) {
         Triangle3d Tria ;
         int nT = pStm->GetFirstTriangle( Tria) ;
@@ -55,6 +55,11 @@ class ExtText : public IExtText, public IGeoObjRW
                   m_nTempProp[nPropInd] = nProp ; } 
      int  GetTempProp( int nPropInd = 0) const override
              { return (( nPropInd >= 0  &&  nPropInd < 2) ? m_nTempProp[nPropInd] : 0) ; }
+      void SetTempParam( double dParam, int nParamInd = 0) override
+              { if ( nParamInd >= 0  &&  nParamInd < 2)
+                  m_dTempParam[nParamInd] = dParam ; } 
+      double GetTempParam( int nParamInd = 0) const override
+                { return (( nParamInd >= 0  &&  nParamInd < 2) ? m_dTempParam[nParamInd] : 0.0) ; }

   public :                      // IExtText
      bool CopyFrom( const IGeoObj* pGObjSrc) override ;
@@ -108,7 +113,10 @@ class ExtText : public IExtText, public IGeoObjRW
   public :                      // IGeoObjRW
      int GetNgeId( void) const override ;
      bool Save( NgeWriter& ngeOut) const override ;
+      bool PreSave( GdbGeo& Wrapper) const override { return true ; }
+      bool PostSave( GdbGeo& Wrapper) const override { return true ; }
      bool Load( NgeReader& ngeIn) override ;
+      bool PostLoad( GdbGeo& Wrapper) override { return true ; }

   public :
      ExtText( void) ;
@@ -144,5 +152,22 @@ class ExtText : public IExtText, public IGeoObjRW
      double         m_dRatio ;        // rapporto tra larghezza e altezza
      double         m_dAddAdvance ;   // avanzamento addizionale tra caratteri
      int            m_nInsPos ;       // posizione del punto di inserimento rispetto al testo
-      int            m_nTempProp[2] ;  // vettore proprietà temporanee 
+      int            m_nTempProp[2] ;  // vettore proprietà temporanee
+      double         m_dTempParam[2] ; // vettore parametri temporanei
 } ;
+
+//-----------------------------------------------------------------------------
+inline ExtText* CreateBasicExtText( void)
+               { return ( static_cast<ExtText*>( CreateGeoObj( EXT_TEXT))) ; }
+inline ExtText* CloneBasicExtText( const IGeoObj* pGObj)
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != EXT_TEXT)
+                    return nullptr ;
+                 return ( static_cast<ExtText*>( pGObj->Clone())) ; }
+inline const ExtText* GetBasicExtText( const IGeoObj* pGObj)
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != EXT_TEXT)
+                    return nullptr ;
+                 return ( static_cast<const ExtText*>( pGObj)) ; }
+inline ExtText* GetBasicExtText( IGeoObj* pGObj)
+               { if ( pGObj == nullptr  ||  pGObj->GetType() != EXT_TEXT)
+                    return nullptr ;
+                 return ( static_cast<ExtText*>( pGObj)) ; }
@@ -15,95 +15,167 @@
 #include "stdafx.h"
 #include "CurveArc.h"
 #include "CurveLine.h"
-#include "/EgtDev/Include/EgkFilletChamfer.h"
-#include "/EgtDev/Include/EgkDistPointCurve.h"
-#include "/EgtDev/Include/EgkIntersCurves.h"
+#include "/EgtDev/Include/EGkFilletChamfer.h"
+#include "/EgtDev/Include/EGkDistPointCurve.h"
+#include "/EgtDev/Include/EGkIntersCurves.h"
+#include "/EgtDev/Include/EgkOffsetCurve.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"

 using namespace std ;

+//----------------------------------------------------------------------------
+static bool
+CalcForFillet( const ICurve& cCrv1, const Point3d& ptNear1,
+               const ICurve& cCrv2, const Point3d& ptNear2,
+               const Vector3d& vtNorm, double dRadius,
+               Point3d& ptCen, Point3d& ptTg1, Point3d& ptTg2,
+               int& nSide1, int& nSide2, double& dSinA, double& dTgPar1, double& dTgPar2)
+{
+  // calcolo un riferimento sul piano perpendicolare alla normale
+   Frame3d frIntr ;
+   if ( ! frIntr.Set( ORIG, vtNorm))
+      return false ;
+
+  // determino il lato di offset della curva 1
+   DistPointCurve dPC1( ptNear2, cCrv1) ;
+   if ( ! dPC1.GetSideAtMinDistPoint( 0, vtNorm, nSide1))
+      return false ;
+   double dOffs1 = ( nSide1 == MDS_RIGHT ? dRadius : - dRadius) ;
+  // calcolo gli offset nel piano locale e dal lato opportuno di una copia della curva 1
+   PtrOwner<ICurve> pCopy1( cCrv1.Clone()) ;
+   if ( IsNull( pCopy1))
+      return false ;
+   pCopy1->ToLoc( frIntr) ;
+   pCopy1->SetExtrusion( Z_AX) ;
+   OffsetCurve OffsCrv1 ;
+   OffsCrv1.Make( pCopy1, dOffs1, ICurve::OFF_FILLET) ;
+   ICURVEPOVECTOR vOffs1 ;  
+   ICurve* pCrv = OffsCrv1.GetLongerCurve() ;
+   while ( pCrv != nullptr) {
+      vOffs1.emplace_back( pCrv) ;
+      pCrv = OffsCrv1.GetLongerCurve() ;
+   }
+   if ( vOffs1.empty())
+      return false ;
+
+  // determino il lato di offset della curva 2
+   DistPointCurve dPC2( ptNear1, cCrv2) ;
+   if ( ! dPC2.GetSideAtMinDistPoint( 0, vtNorm, nSide2))
+      return false ;
+   double dOffs2 = ( nSide2 == MDS_RIGHT ? dRadius : - dRadius) ;
+  // calcolo gli offset nel piano locale e dal lato opportuno di una copia della curva 2
+   PtrOwner<ICurve> pCopy2( cCrv2.Clone()) ;
+   if ( IsNull( pCopy2))
+      return false ;
+   pCopy2->ToLoc( frIntr) ;
+   pCopy2->SetExtrusion( Z_AX) ;
+   OffsetCurve OffsCrv2 ;
+   OffsCrv2.Make( pCopy2, dOffs2, ICurve::OFF_FILLET) ;
+   ICURVEPOVECTOR vOffs2 ;
+   pCrv = OffsCrv2.GetLongerCurve() ;
+   while ( pCrv != nullptr) {
+      vOffs2.emplace_back( pCrv) ;
+      pCrv = OffsCrv2.GetLongerCurve() ;
+   }
+   if ( vOffs2.empty())
+      return false ;
+
+  // calcolo le intersezioni tra tutte le curve di offset e seleziono quella più vicina ai punti passati
+   Point3d ptInt1 = P_INVALID, ptInt2 = P_INVALID ;
+   Point3d ptNearI = Media( ptNear1, ptNear2) ;
+   ptNearI.ToLoc( frIntr) ;
+   double dMinDist = INFINITO ;
+   for ( int i = 0 ; i < int( vOffs1.size()) ; i++) {
+      for ( int j = 0 ; j < int( vOffs2.size()) ; j ++) {
+         IntersCurveCurve intCC( *vOffs1[i], *vOffs2[j]) ;
+         if ( intCC.GetIntersCount() == 0)
+            continue ;
+         Point3d ptInt1Curr, ptInt2Curr ;
+         if ( ! intCC.GetIntersPointNearTo( 0, ptNearI, ptInt1Curr)  ||
+              ! intCC.GetIntersPointNearTo( 1, ptNearI, ptInt2Curr))
+            return false ;
+         Point3d ptCenCurr = Media( ptInt1Curr, ptInt2Curr) ;
+         double dDist = Dist( ptNearI, ptCenCurr) ;
+         if ( dDist < dMinDist - EPS_SMALL) {
+            dMinDist = dDist ;
+            ptInt1 = ptInt1Curr ;
+            ptInt2 = ptInt2Curr ;
+         }
+      }  
+   }
+  // se non sono state trovate intersezioni esco
+   if ( ! ptInt1.IsValid()  ||  ! ptInt2.IsValid())
+      return false ;   
+   
+   ptInt1.ToGlob( frIntr) ;
+   ptInt2.ToGlob( frIntr) ;
+   ptCen = Media( ptInt1, ptInt2) ;
+
+  // proiezione del punto di intersezione sulla prima curva
+   DistPointCurve dPCI1( ptInt1, cCrv1) ;
+   int nFlag1 ;
+   if ( ! dPCI1.GetParamAtMinDistPoint( 0, dTgPar1, nFlag1)  ||  nFlag1 != MDPCI_NORMAL)
+      return false ;
+   Vector3d vtTg1 ;
+   if ( ! cCrv1.GetPointTang( dTgPar1, ICurve::FROM_MINUS, ptTg1, vtTg1))
+      return false ;
+
+  // proiezione del punto di intersezione sulla seconda curva
+   DistPointCurve dPCI2( ptInt2, cCrv2) ;
+   int nFlag2 ;
+   if ( ! dPCI2.GetParamAtMinDistPoint( 0, dTgPar2, nFlag2)  ||  nFlag2 != MDPCI_NORMAL)
+      return false ;
+   Vector3d vtTg2 ;
+   if ( ! cCrv2.GetPointTang( dTgPar2, ICurve::FROM_MINUS, ptTg2, vtTg2))
+      return false ;
+
+  // determino rotazione tra le curve
+   dSinA = ( vtTg1 ^ vtTg2) * vtNorm ;
+
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 ICurveArc*
 CreateFillet( const ICurve& cCrv1, const Point3d& ptNear1,
              const ICurve& cCrv2, const Point3d& ptNear2,
              const Vector3d& vtNorm, double dRadius, double& dPar1, double& dPar2)
 {
-  // verifico validità parametri ricevuti
+  // verifico validità parametri ricevuti
   if ( &cCrv1 == nullptr  ||  &ptNear1 == nullptr  ||
        &cCrv2 == nullptr  ||  &ptNear2 == nullptr  ||
        &vtNorm == nullptr  ||  &dPar1 == nullptr  ||  &dPar2 == nullptr)
      return nullptr ;

-  // calcolo un riferimento sul piano perpendicolare alla normale
-   Frame3d frIntr ;
-   if ( ! frIntr.Set( ORIG, vtNorm))
+  // verifico il minimo raggio
+   if ( dRadius < 10 * EPS_SMALL)
      return nullptr ;

-  // determino il lato di offset della curva 1
-   DistPointCurve dPC1( ptNear2, cCrv1) ;
-   int nSide1 ;
-   if ( ! dPC1.GetSideAtMinDistPoint( 0, vtNorm, nSide1))
-      return nullptr ;
-   double dOffs1 = ( nSide1 == MDS_RIGHT ? dRadius : - dRadius) ;
-  // calcolo l'offset nel piano locale e dal lato opportuno di una copia della curva 1
-   PtrOwner<ICurve> pCopy1( cCrv1.Clone()) ;
-   if ( IsNull( pCopy1))
-      return nullptr ;
-   pCopy1->ToLoc( frIntr) ;
-   pCopy1->SetExtrusion( Z_AX) ;
-   if ( ! pCopy1->SimpleOffset( dOffs1, ICurve::OFF_FILLET))
+  // eseguo calcoli
+   Point3d ptCen, ptTg1, ptTg2 ;
+   int nSide1, nSide2 ;
+   double dSinA, dTgPar1, dTgPar2 ;
+   if ( ! CalcForFillet( cCrv1, ptNear1, cCrv2, ptNear2, vtNorm, dRadius,
+                         ptCen, ptTg1, ptTg2, nSide1, nSide2, dSinA, dTgPar1, dTgPar2))
      return nullptr ;

-  // determino il lato di offset della curva 2
-   DistPointCurve dPC2( ptNear1, cCrv2) ;
-   int nSide2 ;
-   if ( ! dPC2.GetSideAtMinDistPoint( 0, vtNorm, nSide2))
-      return nullptr ;
-   double dOffs2 = ( nSide2 == MDS_RIGHT ? dRadius : - dRadius) ;
-  // calcolo l'offset nel piano locale e dal lato opportuno di una copia della curva 2
-   PtrOwner<ICurve> pCopy2( cCrv2.Clone()) ;
-   if ( IsNull( pCopy2))
-      return nullptr ;
-   pCopy2->ToLoc( frIntr) ;
-   pCopy2->SetExtrusion( Z_AX) ;
-   if ( ! pCopy2->SimpleOffset( dOffs2, ICurve::OFF_FILLET))
+  // se tangenti parallele al contatto con fillet, ricalcolo con raggio più piccolo
+   bool bParallel = ( abs( dSinA) < EPS_SMALL) ;
+   if ( bParallel) {
+      Point3d ptQQQ, ptQQ1, ptQQ2 ;
+      double dQQQ1, dQQQ2 ;
+      if ( ! CalcForFillet( cCrv1, ptNear1, cCrv2, ptNear2, vtNorm, dRadius - 10 * EPS_SMALL,
+                            ptQQQ, ptQQ1, ptQQ2, nSide1, nSide2, dSinA, dQQQ1, dQQQ2)  ||  abs( dSinA) < EPS_SMALL)
+         return nullptr ;
+   }
+
+  // verifico dimensione minima
+   double dLen = Dist( ptTg1, ptTg2) ;
+   if ( dLen < 2 * EPS_SMALL)
      return nullptr ;

-  // calcolo l'intersezione tra le due curve
-   Point3d ptInt1, ptInt2 ;
-   Point3d ptNear1I = ptNear1 ;
-   ptNear1I.ToLoc( frIntr) ;
-   IntersCurveCurve intCC( *pCopy1, *pCopy2) ;
-   if ( ! intCC.GetIntersPointNearTo( 0, ptNear1I, ptInt1)  ||
-        ! intCC.GetIntersPointNearTo( 1, ptNear1I, ptInt2))
-      return nullptr ;
-   ptInt1.ToGlob( frIntr) ;
-   ptInt2.ToGlob( frIntr) ;
-
-  // proiezione del punto di intersezione sulla prima curva
-   DistPointCurve dPCI1( ptInt1, cCrv1) ;
-   double dTgPar1 ;
-   int nFlag1 ;
-   if ( ! dPCI1.GetParamAtMinDistPoint( 0, dTgPar1, nFlag1)  ||  nFlag1 != MDPCI_NORMAL)
-      return nullptr ;
-   Point3d ptTg1 ;
-   Vector3d vtTg1 ;
-   if ( ! cCrv1.GetPointTang( dTgPar1, ICurve::FROM_MINUS, ptTg1, vtTg1))
-      return nullptr ;
-
-  // proiezione del punto di intersezione sulla seconda curva
-   DistPointCurve dPCI2( ptInt2, cCrv2) ;
-   double dTgPar2 ;
-   int nFlag2 ;
-   if ( ! dPCI2.GetParamAtMinDistPoint( 0, dTgPar2, nFlag2)  ||  nFlag2 != MDPCI_NORMAL)
-      return nullptr ;
-   Point3d ptTg2 ;
-   Vector3d vtTg2 ;
-   if ( ! cCrv2.GetPointTang( dTgPar2, ICurve::FROM_MINUS, ptTg2, vtTg2))
-      return nullptr ;
-
-  // determino rotazione tra le curve
-   bool bCCW = (( vtTg1 ^ vtTg2) * vtNorm) > 0 ;
+  // orientamento tra le curve
+   bool bCCW = ( dSinA > 0) ;

  // assegno i valori dei parametri di trim (+ da inizio, - da fine)
   if ( bCCW) {
@@ -118,8 +190,17 @@ CreateFillet( const ICurve& cCrv1, const Point3d& ptNear1,
  // creo l'arco di fillet
   PtrOwner<CurveArc> crvFillet( CreateBasicCurveArc()) ;
   if ( IsNull( crvFillet)  ||
-        ! crvFillet->SetC2PN( ptInt1, ptTg1, ptTg2, vtNorm))
+        ! crvFillet->SetC2PN( ptCen, ptTg1, ptTg2, vtNorm))
      return nullptr ;
+  // se direzioni agli estremi praticamente parallele
+   if ( bParallel) {
+     // calcolo il verso dell'arco di fillet
+      bool bFilletCcw = ( ( bCCW  &&  nSide1 == nSide2)  ||  ( ! bCCW  &&  nSide1 != nSide2)) ;
+     // si deve verificare se va usato l'arco esplementare
+      bool bArcCcw = ( crvFillet->GetAngCenter() > 0) ;
+      if ( bFilletCcw != bArcCcw)
+         crvFillet->ToExplementary() ;
+   }
   return Release(crvFillet) ;
 }

@@ -129,12 +210,16 @@ CreateChamfer( const ICurve& cCrv1, const Point3d& ptNear1,
               const ICurve& cCrv2, const Point3d& ptNear2,
               const Vector3d& vtNorm, double dDist, double& dPar1, double& dPar2)
 {
-  // verifico validità parametri ricevuti
+  // verifico validità parametri ricevuti
   if ( &cCrv1 == nullptr  ||  &ptNear1 == nullptr  ||
        &cCrv2 == nullptr  ||  &ptNear2 == nullptr  ||
        &vtNorm == nullptr  ||  &dPar1 == nullptr  ||  &dPar2 == nullptr)
      return nullptr ;

+  // verifico lo smusso minimo
+   if ( dDist < 10 * EPS_SMALL)
+      return nullptr ;
+
  // calcolo un riferimento sul piano perpendicolare alla normale
   Frame3d frIntr ;
   if ( ! frIntr.Set( ORIG, vtNorm))
@@ -14,7 +14,7 @@
 #pragma once

 #include "/EgtDev/Include/EGkVector3d.h"
-#include "/EgtDev/Include/EGtNumCollection.h"
+#include "/EgtDev/Include/EgtNumCollection.h"

 //----------------------------------------------------------------------------
 double AdjustFontRatio( double dRatio) ;
@@ -17,9 +17,9 @@
 #include "/EgtDev/Include/EGkGeomDB.h"
 #include "/EgtDev/Include/EGkGdbIterator.h"
 #include "/EgtDev/Include/EGkCurve.h"
+#include "/EgtDev/Include/EGnStringUtils.h"
+#include "/EgtDev/Include/EGnFileUtils.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
-#include "/EgtDev/Include/EgnStringUtils.h"
-#include "/EgtDev/Include/EgnFileUtils.h"

 using namespace std ;

@@ -29,6 +29,8 @@ class FontManager

   public :
      bool Init( const std::string& sNfeFontDir, const std::string& sDefaultFont) ;
+      bool SetDefaultFont( const std::string& sDefaultFont)
+               { m_sDefaultFont = sDefaultFont ; return true ; }
      bool SetCurrFont( const std::string& sFont, int nWeight, bool bItalic,
                        double dHeight, double dRatio, double dAddAdvance) ;
      const std::string& GetNfeFontDir( void) const
@@ -54,7 +56,7 @@ class FontManager
      OsFont      m_OsFont ;

   private :
-      FontManager( void) {}
+      FontManager( void) : m_bCurrNfeFont( false)  {}
      FontManager( FontManager const& copy) = delete ;
      FontManager& operator=( FontManager const& copy) = delete ;
 } ;
@@ -16,8 +16,8 @@
 #include "FontNfe.h"
 #include "FontAux.h"
 #include "FontConst.h"
+#include "GdbIterator.h"
 #include "/EgtDev/Include/EGkGeomDB.h"
-#include "/EgtDev/Include/EGkGdbIterator.h"
 #include "/EgtDev/Include/EGkCurve.h"
 #include "/EgtDev/Include/EGkCurveAux.h"
 #include "/EgtDev/Include/EGkCurveComposite.h"
@@ -81,21 +81,19 @@ NfeFont::SetCurrFont( const string& sFont, int nWeight, bool bItalic,
      if ( ! m_pGDB->Load( sFont))
         return false ;
     // recupero i parametri generali del font (devono essere nel gruppo 1)
-      PtrOwner<IGdbIterator> pIter( CreateGdbIterator( m_pGDB)) ;
-      if ( IsNull( pIter))
+      GdbIterator iIter( m_pGDB) ;
+      if ( ! iIter.GoTo( 1))
         return false ;
-      if ( ! pIter->GoTo( 1))
-         return false ;
-      if ( ! pIter->GetInfo( NFE_H, m_dH)  ||
-           ! pIter->GetInfo( NFE_HCAP, m_dHCap)  ||
-           ! pIter->GetInfo( NFE_HX, m_dHx)  ||
-           ! pIter->GetInfo( NFE_ASC, m_dAsc)  ||
-           ! pIter->GetInfo( NFE_DESC, m_dDesc)  ||
-           ! pIter->GetInfo( NFE_ADV, m_dAdv))
+      if ( ! iIter.GetInfo( NFE_H, m_dH)  ||
+           ! iIter.GetInfo( NFE_HCAP, m_dHCap)  ||
+           ! iIter.GetInfo( NFE_HX, m_dHx)  ||
+           ! iIter.GetInfo( NFE_ASC, m_dAsc)  ||
+           ! iIter.GetInfo( NFE_DESC, m_dDesc)  ||
+           ! iIter.GetInfo( NFE_ADV, m_dAdv))
         return false ;
      if ( m_dH < EPS_SMALL  ||  m_dHCap < EPS_SMALL  ||  m_dHx < EPS_SMALL)
         return false ;
-      if ( ! pIter->GetInfo( NFE_ITALIC, m_dItalicShearCoeff))
+      if ( ! iIter.GetInfo( NFE_ITALIC, m_dItalicShearCoeff))
         m_dItalicShearCoeff = NFE_ITALIC_STD_SHEAR_COEFF ;
     // aggiorno la path del font
      m_sFont = sFontUp ;
@@ -161,11 +159,6 @@ NfeFont::GetXBox( const string& sText, int nInsPos, bool bCapOrBound, BBox3d& b3
   if ( m_pGDB == nullptr  ||  m_sFont.empty())
      return false ;

-  // creo un iteratore
-   PtrOwner<IGdbIterator> pIter( CreateGdbIterator( m_pGDB)) ;
-   if ( IsNull( pIter))
-      return false ;
-
  // calcolo i fattori di scala
   double dScaY = m_dHeight / m_dHCap ;
   double dScaX = dScaY * m_dRatio ;
@@ -229,9 +222,7 @@ NfeFont::GetOutline( const string& sText, int nInsPos, ICURVEPLIST& lstPC) const
      return false ;

  // creo un iteratore
-   PtrOwner<IGdbIterator> pIter( CreateGdbIterator( m_pGDB)) ;
-   if ( IsNull( pIter))
-      return false ;
+   GdbIterator iIter( m_pGDB) ;

  // calcolo i fattori di scala
   double dScaY = m_dHeight / m_dHCap ;
@@ -265,9 +256,9 @@ NfeFont::GetOutline( const string& sText, int nInsPos, ICURVEPLIST& lstPC) const
      if ( nGroup < NFE_MIN_CHAR  ||  m_pGDB->GetGdbType( nGroup) != GDB_TY_GROUP)
         nGroup = NFE_ERR_CHAR ;
     // ciclo sulle entità geometriche del carattere
-      bool bIter = pIter->GoToFirstInGroup( nGroup) ;
+      bool bIter = iIter.GoToFirstInGroup( nGroup) ;
      while ( bIter) {
-         const ICurve* pCrv = GetCurve( pIter->GetGeoObj()) ;
+         const ICurve* pCrv = GetCurve( iIter.GetGeoObj()) ;
         if ( pCrv != nullptr) {
           // copio la curva (trasformando eventuali archi in CurveBezier)
            ICurve* pCrvNew = CurveToNoArcsCurve( pCrv) ;
@@ -281,7 +272,7 @@ NfeFont::GetOutline( const string& sText, int nInsPos, ICURVEPLIST& lstPC) const
           // inserisco in lista la nuova curva
            lstPC.push_back( pCrvNew) ;
         }
-         bIter = pIter->GoToNext() ;
+         bIter = iIter.GoToNext() ;
      }
     // recupero lo spostamento per il prossimo carattere
      double dAdvance ;
@@ -314,9 +305,7 @@ NfeFont::ApproxWithLines( const string& sText, int nInsPos, double dLinTol, doub
      return false ;

  // creo un iteratore
-   PtrOwner<IGdbIterator> pIter( CreateGdbIterator( m_pGDB)) ;
-   if ( IsNull( pIter))
-      return false ;
+   GdbIterator iIter( m_pGDB) ;

  // controllo valore tolleranza lineare
   if ( dLinTol > FNT_MAX_LINTOL_TO_H * m_dHeight)
@@ -354,9 +343,9 @@ NfeFont::ApproxWithLines( const string& sText, int nInsPos, double dLinTol, doub
      if ( nGroup < NFE_MIN_CHAR  ||  m_pGDB->GetGdbType( nGroup) != GDB_TY_GROUP)
         nGroup = NFE_ERR_CHAR ;
     // ciclo sulle entità geometriche del carattere
-      bool bIter = pIter->GoToFirstInGroup( nGroup) ;
+      bool bIter = iIter.GoToFirstInGroup( nGroup) ;
      while ( bIter) {
-         const ICurve* pCrv = GetCurve( pIter->GetGeoObj()) ;
+         const ICurve* pCrv = GetCurve( iIter.GetGeoObj()) ;
         if ( pCrv != nullptr) {
           // copia temporanea della curva (trasformando eventuali archi in CurveBezier)
            PtrOwner<ICurve> pCrvNew( CurveToNoArcsCurve( pCrv)) ;
@@ -371,7 +360,7 @@ NfeFont::ApproxWithLines( const string& sText, int nInsPos, double dLinTol, doub
            lstPL.emplace_back() ;
            pCrvNew->ApproxWithLines( dLinTol, dAngTolDeg, ICurve::APL_STD, lstPL.back()) ;
         }
-         bIter = pIter->GoToNext() ;
+         bIter = iIter.GoToNext() ;
      }
     // recupero lo spostamento per il prossimo carattere
      double dAdvance ;
@@ -400,9 +389,7 @@ NfeFont::ApproxWithArcs( const string& sText, int nInsPos, double dLinTol, doubl
      return false ;

  // creo un iteratore
-   PtrOwner<IGdbIterator> pIter( CreateGdbIterator( m_pGDB)) ;
-   if ( IsNull( pIter))
-      return false ;
+   GdbIterator iIter(  m_pGDB) ;

  // controllo valore tolleranza lineare
   if ( dLinTol > FNT_MAX_LINTOL_TO_H * m_dHeight)
@@ -440,9 +427,9 @@ NfeFont::ApproxWithArcs( const string& sText, int nInsPos, double dLinTol, doubl
      if ( nGroup < NFE_MIN_CHAR  ||  m_pGDB->GetGdbType( nGroup) != GDB_TY_GROUP)
         nGroup = NFE_ERR_CHAR ;
     // ciclo sulle entità geometriche del carattere
-      bool bIter = pIter->GoToFirstInGroup( nGroup) ;
+      bool bIter = iIter.GoToFirstInGroup( nGroup) ;
      while ( bIter) {
-         const ICurve* pCrv = GetCurve( pIter->GetGeoObj()) ;
+         const ICurve* pCrv = GetCurve( iIter.GetGeoObj()) ;
         if ( pCrv != nullptr) {
           // copia temporanea della curva (trasformando eventuali archi in CurveBezier)
            PtrOwner<ICurve> pCrvNew( CurveToNoArcsCurve( pCrv)) ;
@@ -457,7 +444,7 @@ NfeFont::ApproxWithArcs( const string& sText, int nInsPos, double dLinTol, doubl
            lstPA.emplace_back() ;
            pCrv->ApproxWithArcs( dLinTol, dAngTolDeg, lstPA.back()) ;
         }
-         bIter = pIter->GoToNext() ;
+         bIter = iIter.GoToNext() ;
      }
     // recupero lo spostamento per il prossimo carattere
      double dAdvance ;
@@ -484,11 +471,6 @@ NfeFont::GetTextLines( const string& sText, int nInsPos, PNTVECTOR& vPt, STRVECT
   if ( m_pGDB == nullptr  ||  m_sFont.empty())
      return false ;

-  // creo un iteratore
-   PtrOwner<IGdbIterator> pIter( CreateGdbIterator( m_pGDB)) ;
-   if ( IsNull( pIter))
-      return false ;
-
  // calcolo i fattori di scala
   double dScaY = m_dHeight / m_dHCap ;
   double dScaX = dScaY * m_dRatio ;
@@ -511,7 +493,7 @@ NfeFont::GetTextLines( const string& sText, int nInsPos, PNTVECTOR& vPt, STRVECT
      int nLbLen ;
      if ( IsLineBreak( vCode, i, nLbLen)) {
        // salvo la linea, se contiene qualcosa
-         if ( vTmpCode.size() > 0) {
+         if ( ! vTmpCode.empty()) {
            string sLine ;
            SetCodePoints( vTmpCode, sLine) ;
            vLine.push_back( sLine) ;
@@ -541,7 +523,7 @@ NfeFont::GetTextLines( const string& sText, int nInsPos, PNTVECTOR& vPt, STRVECT
         dMaxW = vtMove.x ;
   }
  // salvo eventuale ultima linea
-   if ( vTmpCode.size() > 0) {
+   if ( ! vTmpCode.empty()) {
      string sLine ;
      SetCodePoints( vTmpCode, sLine) ;
      vLine.push_back( sLine) ;
@@ -16,15 +16,15 @@
 #include "FontOs.h"
 #include "FontAux.h"
 #include "FontConst.h"
+#include "CurveLine.h"
+#include "CurveBezier.h"
+#include "CurveComposite.h"
 #include "SurfFlatRegion.h"
 #include "GeoConst.h"
 #include "/EgtDev/Include/EGkGeomDB.h"
 #include "/EgtDev/Include/EGkGdbIterator.h"
 #include "/EgtDev/Include/EGkCurve.h"
 #include "/EgtDev/Include/EGkCurveAux.h"
-#include "/EgtDev/Include/EGkCurveComposite.h"
-#include "/EgtDev/Include/EGkCurveLine.h"
-#include "/EgtDev/Include/EGkCurveBezier.h"
 #include "/EgtDev/Include/EGkSfrCreate.h"
 #include "/EgtDev/Include/EGnStringUtils.h"
 #include "/EgtDev/Include/EGnFileUtils.h"
@@ -298,8 +298,7 @@ OsFont::GetOutline( const string& sText, int nInsPos, ICURVEPLIST& lstPC) const
      if ( ! GetCharOutline( vCode[i], dAdvance, lstTmpPC))
         return false ;
     // lo trasformo opportunamente
-      ICURVEPLIST::iterator iIter ;
-      for ( iIter = lstTmpPC.begin() ; iIter != lstTmpPC.end() ; ++ iIter) {
+      for ( auto iIter = lstTmpPC.begin() ; iIter != lstTmpPC.end() ; ++ iIter) {
        // trasformazioni
         (*iIter)->Scale( GLOB_FRM, dScaX, dScaY, dScaZ) ;  
         (*iIter)->Translate( vtMove) ;
@@ -378,8 +377,7 @@ OsFont::GetRegion( const string& sText, int nInsPos, ISURFFRPLIST& lstSFR) const
      if ( ! GetCharOutline( vCode[i], dAdvance, lstPC))
         return false ;
     // lo trasformo opportunamente
-      ICURVEPLIST::iterator iIter ;
-      for ( iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter) {
+      for ( auto iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter) {
        // inverto i percorsi per avere gli esterni CCW
         (*iIter)->Invert() ;
        // la trasformo per avere solo archi e rette
@@ -465,8 +463,7 @@ OsFont::ApproxWithLines( const string& sText, int nInsPos, double dLinTol, doubl
      if ( ! GetCharOutline( vCode[i], dAdvance, lstPC))
         return false ;
     // lo approssimo con segmenti di retta
-      ICURVEPLIST::iterator iIter ;
-      for ( iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter) {
+      for ( auto iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter) {
        // trasformazioni
         (*iIter)->Scale( GLOB_FRM, dScaX, dScaY, dScaZ) ;  
         (*iIter)->Translate( vtMove) ;
@@ -479,7 +476,7 @@ OsFont::ApproxWithLines( const string& sText, int nInsPos, double dLinTol, doubl
      if ( vtMove.x > dMaxW)
         dMaxW = vtMove.x ;
     // ciclo di pulizia
-      for ( iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter)
+      for ( auto iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter)
         delete (*iIter) ;
      lstPC.clear() ;
   }
@@ -550,8 +547,7 @@ OsFont::ApproxWithArcs( const string& sText, int nInsPos, double dLinTol, double
      if ( ! GetCharOutline( vCode[i], dAdvance, lstPC))
         return false ;
     // lo approssimo con segmenti di arco e retta
-      ICURVEPLIST::iterator iIter ;
-      for ( iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter) {
+      for ( auto iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter) {
        // trasformazioni
         (*iIter)->Scale( GLOB_FRM, dScaX, dScaY, dScaZ) ;
         (*iIter)->Translate( vtMove) ;
@@ -564,7 +560,7 @@ OsFont::ApproxWithArcs( const string& sText, int nInsPos, double dLinTol, double
      if ( vtMove.x > dMaxW)
         dMaxW = vtMove.x ;
     // ciclo di pulizia
-      for ( iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter)
+      for ( auto iIter = lstPC.begin() ; iIter != lstPC.end() ; ++ iIter)
         delete (*iIter) ;
      lstPC.clear() ;
   }
@@ -623,7 +619,7 @@ OsFont::GetTextLines( const string& sText, int nInsPos, PNTVECTOR& vPt, STRVECTO
      int nLbLen ;
      if ( IsLineBreak( vCode, i, nLbLen)) {
        // salvo la linea, se contiene qualcosa
-         if ( vTmpCode.size() > 0) {
+         if ( ! vTmpCode.empty()) {
            string sLine ;
            SetCodePoints( vTmpCode, sLine) ;
            vLine.push_back( sLine) ;
@@ -650,7 +646,7 @@ OsFont::GetTextLines( const string& sText, int nInsPos, PNTVECTOR& vPt, STRVECTO
         dMaxW = vtMove.x ;
   }
  // salvo eventuale ultima linea
-   if ( vTmpCode.size() > 0) {
+   if ( ! vTmpCode.empty()) {
      string sLine ;
      SetCodePoints( vTmpCode, sLine) ;
      vLine.push_back( sLine) ;
@@ -731,7 +727,7 @@ OsFont::GetCharOutline( unsigned int nChar, double& dAdvance, ICURVEPLIST& lstPC
      if ( pHeader->dwType == TT_POLYGON_TYPE) {

        // creo curva composita
-         PtrOwner<ICurveComposite> pCCompo( CreateCurveComposite()) ;
+         PtrOwner<CurveComposite> pCCompo( CreateBasicCurveComposite()) ;
         if ( IsNull( pCCompo))
            return false ;

@@ -824,7 +820,7 @@ OsFont::AddLineToCompo( ICurveComposite* pCCompo, const Point3d& ptStart, const
      return false ;

  // creo retta, la imposto e la inserisco nella curva composita
-   PtrOwner<ICurveLine> pCLine( CreateCurveLine()) ;
+   PtrOwner<CurveLine> pCLine( CreateBasicCurveLine()) ;
   if ( IsNull( pCLine))
      return false ;
   if ( ! pCLine->Set( ptStart, ptEnd))
@@ -845,7 +841,7 @@ OsFont::AddCBezierQuadToCompo( ICurveComposite* pCCompo,
      return false ;

  // creo curva di Bezier quadratica, la imposto e la inserisco nella curva composita
-   PtrOwner<ICurveBezier> pCBezier( CreateCurveBezier()) ;
+   PtrOwner<CurveBezier> pCBezier( CreateBasicCurveBezier()) ;
   if ( IsNull( pCBezier))
      return false ;
   if ( ! pCBezier->Init( 2, false)  ||
@@ -37,6 +37,23 @@ Frame3d::Set( const Point3d& ptOrig, const Vector3d& vtDirX,
        ! m_vtVersZ.Normalize())
      return false ;

+  // se ci sono errori molto piccoli di ortogonalità, li correggo
+   double dOrtXZ = m_vtVersX * m_vtVersZ ;
+   if ( dOrtXZ > EPS_ZERO  &&  dOrtXZ < 10 * EPS_ZERO) {
+      m_vtVersX = OrthoCompo( m_vtVersX, m_vtVersZ) ;
+      m_vtVersX.Normalize() ;
+   }
+   double dOrtYX = m_vtVersY * m_vtVersX ;
+   if ( dOrtYX > EPS_ZERO  &&  dOrtYX < 10 * EPS_ZERO) {
+      m_vtVersY = OrthoCompo( m_vtVersY, m_vtVersX) ;
+      m_vtVersY.Normalize() ;
+   }
+   double dOrtYZ = m_vtVersY * m_vtVersZ ;
+   if ( dOrtYZ > EPS_ZERO  &&  dOrtYZ < 10 * EPS_ZERO) {
+      m_vtVersY = OrthoCompo( m_vtVersY, m_vtVersZ) ;
+      m_vtVersY.Normalize() ;
+   }
+
  // verifica della ortogonalità dei versori e del senso destrorso
   if ( ! Verify())
      return false ;
@@ -224,10 +241,10 @@ Frame3d::Set( const Point3d& ptOrig, double dAngCDeg, double dAngADeg, double dA

 //----------------------------------------------------------------------------
 bool
-Frame3d::Reset( void) 
+Frame3d::Reset( bool bGlob) 
 {
-   m_nType = TOP ;
-   m_nZType = TOP ;
+   m_nType = ( bGlob ? TOP : ERR) ;
+   m_nZType = ( bGlob ? TOP : ERR) ;
   m_ptOrig = ORIG ;
   m_vtVersX = X_AX ;
   m_vtVersY = Y_AX ;
@@ -456,6 +473,9 @@ Frame3d::LocToLoc( const Frame3d& frOri, const Frame3d& frDest)
 bool
 Frame3d::Verify( void)
 {
+  // verifica origine
+   if ( ! m_ptOrig.IsValid())
+      return false ;
  // verifica della ortogonalità dei versori e del senso destrorso
   double dOrtXY = m_vtVersX * m_vtVersY ;
   double dOrtYZ = m_vtVersY * m_vtVersZ ;
@@ -1423,8 +1423,7 @@ GdbExecutor::CurveArcChangeRadius( const STRVECTOR& vsParams)
   if ( ! GetLengthParam( vsParams[1], dNewRad))
      return false ;
  // esecuzione
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
     // recupero l'arco
      ICurveArc* pCrvArc = GetCurveArc( m_pGDB->GetGeoObj( *Iter)) ; 
      if ( pCrvArc == nullptr)
@@ -1452,8 +1451,7 @@ GdbExecutor::CurveArcChangeDeltaN( const STRVECTOR& vsParams)
   if ( ! GetLengthParam( vsParams[1], dNewDeltaN))
      return false ;
  // esecuzione
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
     // recupero l'arco
      ICurveArc* pCrvArc = GetCurveArc( m_pGDB->GetGeoObj( *Iter)) ; 
      if ( pCrvArc == nullptr)
@@ -1686,8 +1684,7 @@ GdbExecutor::CurveCompoMake( const STRVECTOR& vsParams)
   if ( ! m_pGDB->GetGroupGlobFrame( GetIdParam( vsParams[1]), frDest))
      return false ;
  // esecuzione
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
     // recupero la curva
      int nIdCrv = *Iter ;
      const ICurve* pCrv = GetCurve( m_pGDB->GetGeoObj( nIdCrv)) ; 
@@ -1722,7 +1719,7 @@ GdbExecutor::CurveCompoMake( const STRVECTOR& vsParams)
   if ( AddGeoObj( vsParams[0], vsParams[1], Release( pCrvCompo))) {
     // se richiesto, cancello le curve originali
      if ( bErase) {
-         for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+         for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
            if ( ! m_pGDB->Erase( *Iter))
               return false ;
         }
@@ -2270,7 +2267,7 @@ bool
 GdbExecutor::SurfTriMeshEnd( const STRVECTOR& vsParams) 
 {
  // nessun parametro
-   if ( vsParams.size() != 0)
+   if ( ! vsParams.empty())
      return false ;
  // recupero la superficie
   ISurfTriMesh* pSTM = GetSurfTriMesh( m_pGeoObj) ;
@@ -2309,8 +2306,7 @@ GdbExecutor::SurfTriMeshByTriangleSoup( const STRVECTOR& vsParams)
   if ( ! StmFts.Start())
      return false ;
  // Recupero tutti i triangoli delle superfici sorgenti e li inserisco nella nuova
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
     // recupero la superficie sorgente
      const ISurfTriMesh* pStmS = GetSurfTriMesh( m_pGDB->GetGeoObj( *Iter)) ;
      if ( pStmS == nullptr)
@@ -2340,7 +2336,7 @@ GdbExecutor::SurfTriMeshByTriangleSoup( const STRVECTOR& vsParams)
   if ( AddGeoObj( vsParams[0], vsParams[1], pSTM)) {
     // se richiesto, cancello le curve originali
      if ( bErase) {
-         for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+         for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
            if ( ! m_pGDB->Erase( *Iter))
               return false ;
         }
@@ -2534,8 +2530,7 @@ GdbExecutor::SurfTriMeshDoCompacting( const STRVECTOR& vsParams)
   if ( ! GetNamesParam( vsParams[0], vnNames))
      return false ;
  // opero sui diversi oggetti
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
     // recupero la superficie
      ISurfTriMesh* pStm = GetSurfTriMesh( m_pGDB->GetGeoObj( *Iter)) ;
      if ( pStm == nullptr)
@@ -2572,8 +2567,7 @@ GdbExecutor::SurfTriMeshDoSewing( const STRVECTOR& vsParams)
   if ( ! GetNamesParam( vsParams[1], vnNames))
      return false ;
  // esecuzione
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
     // recupero la superficie da cucire
      const ISurfTriMesh* pStmS = GetSurfTriMesh( m_pGDB->GetGeoObj( *Iter)) ;
      if ( pStmS == nullptr)
@@ -2590,7 +2584,7 @@ GdbExecutor::SurfTriMeshDoSewing( const STRVECTOR& vsParams)
   }
  // se richiesto, cancello le superfici cucite alla prima
   if ( bErase) {
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter)
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter)
         m_pGDB->Erase( *Iter) ;
   }
   return true ;
@@ -3079,7 +3073,7 @@ GdbExecutor::VolZmapBBoxZmapIntersection( const STRVECTOR& vsParams)
      return false ;
   bool bInt ;

-   bInt = ! pZmap->AvoidBox( frBBoxFrame, ptEnd - ORIG) ; 
+   bInt = pZmap->CDeBox( frBBoxFrame, ptEnd - ORIG) ; 

   return true ;
 }*/
@@ -5432,8 +5426,7 @@ GdbExecutor::TextOutline( const STRVECTOR& vsParams)
   pTXT->GetOutline( lstPCRV) ;
  // inserisco le curve nel gruppo destinazione dopo aver sistemato il cambio di riferimento
   bool bOk = true ;
-   ICURVEPLIST::iterator iIter ;
-   for ( iIter = lstPCRV.begin() ; iIter != lstPCRV.end() ; ++ iIter) {
+   for ( auto iIter = lstPCRV.begin() ; iIter != lstPCRV.end() ; ++ iIter) {
      (*iIter)->LocToLoc( frTXT, frDest) ;
      if ( m_pGDB->AddGeoObj( GDB_ID_NULL, nIdDest, (*iIter)) == GDB_ID_NULL) {
         delete (*iIter) ;
@@ -5510,8 +5503,7 @@ GdbExecutor::GetNamesParam( const string& sParam, INTVECTOR& vnNames)
  // converto in interi
   vnNames.clear() ;
   vnNames.reserve( vsNames.size()) ;
-   STRVECTOR::iterator Iter ;
-   for ( Iter = vsNames.begin() ; Iter != vsNames.end() ; ++Iter) {
+   for ( auto Iter = vsNames.begin() ; Iter != vsNames.end() ; ++Iter) {
      Trim( (*Iter), " \t\r\n()") ;
      int nId = GetIdParam( *Iter) ;
      if ( nId != GDB_ID_SEL) {
@@ -5538,8 +5530,7 @@ GdbExecutor::GetVectorParam( const string& sParam, const Frame3d& frVect, Vector
     // divido in parti
      STRVECTOR vsParams ;
      Tokenize( sParam, ",", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n()") ;
     // se 2 parti, allora Z = 0
      if ( vsParams.size() == 2) {
@@ -5594,8 +5585,7 @@ GdbExecutor::GetVectorParam( const string& sParam, const Frame3d& frVect, Vector
     // recupero i parametri associati
      STRVECTOR vsParams ;
      Tokenize( sParam.substr( 3, sParam.length()-4), ",", "(", ")", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n") ;
     // ci deve essere almeno un parametro
      if ( vsParams.size() < 1)
@@ -5747,8 +5737,7 @@ GdbExecutor::GetPointParam( const string& sParam, const Frame3d& frPnt, Point3d&
     // divido in parti
      STRVECTOR vsParams ;
      Tokenize( sParam, ",", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n()") ;
     // se 2 parti, allora Z = 0
      if ( vsParams.size() == 2) {
@@ -5778,8 +5767,7 @@ GdbExecutor::GetPointParam( const string& sParam, const Frame3d& frPnt, Point3d&
     // recupero i parametri associati
      STRVECTOR vsParams ;
      Tokenize( sParam.substr( 3, sParam.length()-4), ",", "(", ")", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n") ;
     // ci deve essere almeno un parametro
      if ( vsParams.size() < 1)
@@ -5962,8 +5950,7 @@ GdbExecutor::GetPointsParam( const string& sParam, const Frame3d& frPnt, PolyLin
   Tokenize( sParam.substr( 1, sParam.length()-2), ",", "(", ")", vsPoints) ;
  // converto in punti
   PL.Clear() ;
-   STRVECTOR::iterator Iter ;
-   for ( Iter = vsPoints.begin() ; Iter != vsPoints.end() ; ++Iter) {
+   for ( auto Iter = vsPoints.begin() ; Iter != vsPoints.end() ; ++Iter) {
      Trim( (*Iter), " \t\r\n") ;
      if ( GetIdParam( *Iter) == GDB_ID_SEL) {
         int nId = m_pGDB->GetFirstSelectedObj() ;
@@ -5997,8 +5984,7 @@ GdbExecutor::GetPointWParam( const string& sParam, const Frame3d& frPnt, Point3d
  // divido in parti
   STRVECTOR vsParams ;
   Tokenize( sParam.substr( 1, sParam.length()-2), ",", "(", ")", vsParams) ;
-   STRVECTOR::iterator Iter ;
-   for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+   for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
      Trim( (*Iter), " \t\r\n") ;

  // se 4 parti, sono 3 coordinate e un peso
@@ -6037,8 +6023,7 @@ GdbExecutor::GetPointWsParam( const string& sParam, const Frame3d& frPnt, PolyAr
   Tokenize( sParam.substr( 1, sParam.length()-2), ",", "(", ")", vsPointWs) ;
  // converto in punti
   PA.Clear() ;
-   STRVECTOR::iterator Iter ;
-   for ( Iter = vsPointWs.begin() ; Iter != vsPointWs.end() ; ++Iter) {
+   for ( auto Iter = vsPointWs.begin() ; Iter != vsPointWs.end() ; ++Iter) {
      Trim( (*Iter), " \t\r\n") ;
      Point3d ptP ;
      double  dBulge ;
@@ -6059,8 +6044,7 @@ GdbExecutor::GetLengthParam( const string& sParam, double& dLen)
     // recupero i parametri associati
      STRVECTOR vsParams ;
      Tokenize( sParam.substr( 1), ",", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n()") ;
     // ci deve essere almeno un parametro
      if ( vsParams.size() < 1)
@@ -6082,8 +6066,7 @@ GdbExecutor::GetLengthParam( const string& sParam, double& dLen)
     // recupero i parametri associati
      STRVECTOR vsParams ;
      Tokenize( sParam.substr( 1), ",", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n()") ;
     // ci deve essere almeno un parametro
      if ( vsParams.size() < 1)
@@ -6118,8 +6101,7 @@ GdbExecutor::GetDirParam( const string& sParam, const Frame3d& frDir, double& dD
     // recupero i parametri associati
      STRVECTOR vsParams ;
      Tokenize( sParam.substr( 3, sParam.length()-4), ",", "(", ")", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n") ;
     // ci deve essere almeno un parametro
      if ( vsParams.size() < 1)
@@ -6263,8 +6245,7 @@ GdbExecutor::GetFrameParam( const string& sParam, const Frame3d& frRef, Frame3d&
     // divido in parti ed elimino spazi iniziali/finali
      STRVECTOR vsParams ;
      Tokenize( sTmp, ",", "(", ")", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n") ;
     // verifico siano 4 parti e le converto
      if ( vsParams.size() != 4)
@@ -6291,8 +6272,7 @@ GdbExecutor::GetFrameParam( const string& sParam, const Frame3d& frRef, Frame3d&
      // divido in parti ed elimino spazi iniziali/finali
      STRVECTOR vsParams ;
      Tokenize( sTmp, ",", "(", ")", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n") ;
     // se c'è un parametro è l'origine
      Point3d ptOrig ;
@@ -6358,8 +6338,7 @@ GdbExecutor::GetColorParam( const string& sParam, bool& bByParent, Color& cCol)
     // divido in parti
      STRVECTOR vsParams ;
      Tokenize( sParam, ",", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n()") ;
     // devono essere 3 o 4 parametri ( Red, Green, Blue [, Alpha])
      if ( vsParams.size() != 3  &&  vsParams.size() != 4)
@@ -6387,8 +6366,7 @@ GdbExecutor::GetColorParam( const string& sParam, bool& bByParent, Color& cCol)
     // recupero i parametri associati
      STRVECTOR vsParams ;
      Tokenize( sParam.substr( 1), ",", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n()") ;
     // ci deve essere un parametro
      if ( vsParams.size() != 1)
@@ -6421,8 +6399,7 @@ GdbExecutor::GetMaterialParam( const string& sParam, bool& bByParent, int& nMat)
     // recupero i parametri associati
      STRVECTOR vsParams ;
      Tokenize( sParam.substr( 1), ",", vsParams) ;
-      STRVECTOR::iterator Iter ;
-      for ( Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
+      for ( auto Iter = vsParams.begin() ; Iter != vsParams.end() ; ++Iter)
         Trim( (*Iter), " \t\r\n()") ;
     // ci deve essere un parametro
      if ( vsParams.size() != 1)
@@ -6479,8 +6456,7 @@ GdbExecutor::ExecuteLevel( const string& sCmd2, const STRVECTOR& vsParams)
   else
      return false ;
  // esecuzione impostazione livello
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      if ( ! m_pGDB->SetLevel( *Iter, nLevel))
         return false ;
   }
@@ -6511,8 +6487,7 @@ GdbExecutor::ExecuteMode( const string& sCmd2, const STRVECTOR& vsParams)
   else
      return false ;
  // esecuzione impostazione modo
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      if ( ! m_pGDB->SetMode( *Iter, nMode))
         return false ;
   }
@@ -6543,8 +6518,7 @@ GdbExecutor::ExecuteStatus( const string& sCmd2, const STRVECTOR& vsParams)
   else
      return false ;
  // esecuzione impostazione stato
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      if ( ! m_pGDB->SetStatus( *Iter, nStat))
         return false ;
   }
@@ -6565,8 +6539,7 @@ GdbExecutor::ExecuteSelect( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetNamesParam( vsParams[0], vnNames))
         return false ;
     // esecuzione selezione
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
         if ( ! m_pGDB->SelectObj( *Iter))
            return false ;
      }
@@ -6610,8 +6583,7 @@ GdbExecutor::ExecuteSelect( const string& sCmd2, const STRVECTOR& vsParams)
            nFilter = EXT_TEXT ; 
      }
     // esecuzione selezione di tutti gli oggetti di ogni gruppo
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
         if ( ! m_pGDB->SelectGroupObjs( *Iter, nFilter))
            return false ;
      }
@@ -6635,8 +6607,7 @@ GdbExecutor::ExecuteDeselect( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetNamesParam( vsParams[0], vnNames))
         return false ;
     // esecuzione deselezione
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
         if ( ! m_pGDB->DeselectObj( *Iter))
            return false ;
      }
@@ -6652,8 +6623,7 @@ GdbExecutor::ExecuteDeselect( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetNamesParam( vsParams[0], vnNames))
         return false ;
     // esecuzione deselezione di tutti gli oggetti di ogni gruppo
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
         if ( ! m_pGDB->DeselectGroupObjs( *Iter))
            return false ;
      }
@@ -6662,7 +6632,7 @@ GdbExecutor::ExecuteDeselect( const string& sCmd2, const STRVECTOR& vsParams)
  // deselezione di tutto
   else if ( sCmd2 == "ALL") {
     // nessun parametro
-      if ( vsParams.size() != 0)
+      if ( ! vsParams.empty())
         return false ;
     // cancello selezione oggetti
      if ( ! m_pGDB->ClearSelection())
@@ -6710,8 +6680,7 @@ GdbExecutor::MaterialColor( const STRVECTOR& vsParams)
   if ( ! GetColorParam( vsParams[1], bByParent, cCol))
      return false ;
  // esecuzione impostazione colore
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      if ( bByParent) {
         if ( ! m_pGDB->SetMaterial( *Iter, GDB_MT_PARENT))
            return false ;
@@ -6741,8 +6710,7 @@ GdbExecutor::MaterialMaterial( const STRVECTOR& vsParams)
   if ( ! GetMaterialParam( vsParams[1], bByParent, nMat))
      return false ;
  // esecuzione impostazione colore
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      if ( bByParent) {
         if ( ! m_pGDB->SetMaterial( *Iter, GDB_MT_PARENT))
            return false ;
@@ -6789,8 +6757,7 @@ GdbExecutor::ExecuteName( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetStringParam( vsParams[1], sName))
         return false ;
     // eseguo assegnazione nome
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
         if ( ! m_pGDB->SetName( *Iter, sName))
            return false ;
      }
@@ -6806,8 +6773,7 @@ GdbExecutor::ExecuteName( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetNamesParam( vsParams[0], vnNames))
         return false ;
     // eseguo rimozione nome
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
         if ( ! m_pGDB->RemoveName( *Iter))
            return false ;
      }
@@ -6839,8 +6805,7 @@ GdbExecutor::ExecuteInfo( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetStringParam( vsParams[2], sInfo))
         return false ;
     // eseguo assegnazione Info di data Key
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
         if ( ! m_pGDB->SetInfo( *Iter, sKey, sInfo))
            return false ;
      }
@@ -6860,8 +6825,7 @@ GdbExecutor::ExecuteInfo( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetStringParam( vsParams[1], sKey))
         return false ;
     // eseguo rimozione nome Info di data Key
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
         if ( ! m_pGDB->RemoveInfo( *Iter, sKey))
            return false ;
      }
@@ -7010,8 +6974,7 @@ GdbExecutor::ExecuteRelocate( const string& sCmd2, const STRVECTOR& vsParams)
  // recupero flag per globale
   bool bGlob = ( sCmd2 == "GLOB"  ||  sCmd2 == "G") ;
  // esecuzione rilocazioni
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      if ( bGlob) {
         if ( ! m_pGDB->RelocateGlob( *Iter, GetIdParam( vsParams[1]), nSonBeforeAfter))
            return false ;
@@ -7036,8 +6999,7 @@ GdbExecutor::ExecuteErase( const string& sCmd2, const STRVECTOR& vsParams)
   if ( ! GetNamesParam( vsParams[0], vnNames))
      return false ;
  // esecuzione cancellazioni
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      if ( ! m_pGDB->Erase( *Iter))
         return false ;
   }
@@ -7079,8 +7041,7 @@ GdbExecutor::ExecuteTranslate( const string& sCmd2, const STRVECTOR& vsParams)
   if ( ! GetVectorParam( vsParams[1], frRef, vtVN))
      return false ;
  // esecuzione traslazioni
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      switch ( nTraType) {
      case TRA_LOC :
         if ( ! m_pGDB->Translate( *Iter, vtVN))
@@ -7144,8 +7105,7 @@ GdbExecutor::ExecuteRotate( const string& sCmd2, const STRVECTOR& vsParams)
   if ( ! FromString( vsParams[3], dAngDeg))
      return false ;
  // esecuzione rotazioni
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      switch ( nRotType) {
      case ROT_LOC :
         if ( ! m_pGDB->Rotate( *Iter, ptPC, vtVN, dAngDeg))
@@ -7214,8 +7174,7 @@ GdbExecutor::ExecuteScale( const string& sCmd2, const STRVECTOR& vsParams)
        ! FromString( vsParams[4], dCoeffZ))
      return false ;
  // esecuzione scalature
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      switch ( nScaType) {
      case SCA_LOC :
         if ( ! m_pGDB->Scale( *Iter, frFrame, dCoeffX, dCoeffY, dCoeffZ))
@@ -7273,8 +7232,7 @@ GdbExecutor::ExecuteMirror( const string& sCmd2, const STRVECTOR& vsParams)
   if ( ! GetVectorParam( vsParams[2], frRef, vtVN))
      return false ;
  // esecuzione specchiature
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      switch ( nMirType) {
      case MIR_LOC :
         if ( ! m_pGDB->Mirror( *Iter, ptPC, vtVN))
@@ -7340,8 +7298,7 @@ GdbExecutor::ExecuteShear( const string& sCmd2, const STRVECTOR& vsParams)
   if ( ! FromString( vsParams[4], dCoeff))
      return false ;
  // esecuzione scorrimenti
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      switch ( nMirType) {
      case MIR_LOC :
         if ( ! m_pGDB->Shear( *Iter, ptPC, vtNorm, vtDir, dCoeff))
@@ -7400,8 +7357,7 @@ GdbExecutor::CurveModifyInvert( const STRVECTOR& vsParams)
   if ( ! GetNamesParam( vsParams[0], vnNames))
      return false ;
  // esecuzione inversione curve
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      ICurve* pCurve = GetCurve( m_pGDB->GetGeoObj( *Iter)) ;
      if ( pCurve == nullptr  ||  ! pCurve->Invert())
         return false ;
@@ -7518,8 +7474,7 @@ GdbExecutor::CurveModifyTrim( const STRVECTOR& vsParams, int nTrimType)
   if ( ! FromString( vsParams[1], dPar))
      return false ;
  // esecuzione trim
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      ICurve* pCurve ;
      if ( ( pCurve = GetCurve( m_pGDB->GetGeoObj( *Iter))) != nullptr) {
         switch ( nTrimType) {
@@ -7718,8 +7673,7 @@ GdbExecutor::CurveCopyByChain( const STRVECTOR& vsParams)
  // preparo i dati per il concatenamento
   ChainCurves chainC ;
   chainC.Init( bAllowInvert, dToler, int( vnNames.size())) ;
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
     // recupero la curva e il suo riferimento
      ICurve* pCrv = GetCurve( m_pGDB->GetGeoObj( *Iter)) ;
      if ( pCrv == nullptr)
@@ -7748,10 +7702,9 @@ GdbExecutor::CurveCopyByChain( const STRVECTOR& vsParams)
      if ( IsNull( pCrvCompo))
         return false ;
     // recupero le curve semplici e le inserisco nella curva composita
-      INTVECTOR::iterator Iter2 ;
-      for ( Iter2 = vIds.begin() ; Iter2 != vIds.end() ; ++Iter2) {
-         int nId = abs( *Iter2) ;
-         bool bInvert = ( *Iter2 < 0) ;
+      for ( auto Iter = vIds.cbegin() ; Iter != vIds.cend() ; ++Iter) {
+         int nId = abs( *Iter) ;
+         bool bInvert = ( *Iter < 0) ;
        // recupero la curva e il suo riferimento
         ICurve* pCrv = GetCurve( m_pGDB->GetGeoObj( nId)) ;
         if ( pCrv == nullptr)
@@ -7806,8 +7759,7 @@ GdbExecutor::SurfModifyInvert( const STRVECTOR& vsParams)
   if ( ! GetNamesParam( vsParams[0], vnNames))
      return false ;
  // esecuzione inversione normale superficie 
-   INTVECTOR::iterator Iter ;
-   for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+   for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
      ISurf* pSurf = GetSurf( m_pGDB->GetGeoObj( *Iter)) ;
      if ( pSurf == nullptr  ||  ! pSurf->Invert())
         return false ;
@@ -7821,7 +7773,7 @@ bool
 GdbExecutor::ExecuteNew( const string& sCmd2, const STRVECTOR& vsParams) 
 {
  // nessun parametro
-   if ( vsParams.size() != 0)
+   if ( ! vsParams.empty())
      return false ;
  // pulizia e reinizializzazione del DB geometrico
   m_pGDB->Clear() ;
@@ -7921,7 +7873,7 @@ GdbExecutor::ExecuteOutTextIcci( const string& sCmd2, const STRVECTOR& vsParams)
            sText += "<br/>   " ;
         sText += " U=" + ToString( aInfo.IciA[j].dU,7) + " P=(" + ToString( aInfo.IciA[j].ptI,4) + ")" ;
         switch( aInfo.IciA[j].nPrevTy) {
-         case ICCT_NULL : sText += " ??-" ; break ;
+         case ICCT_NULL : sText += " ?" "?-" ; break ;
         case ICCT_IN : sText += " IN-" ; break ;
         case ICCT_OUT : sText += " OUT-" ; break ;
         case ICCT_ON : sText += " ON-" ; break ;
@@ -7940,7 +7892,7 @@ GdbExecutor::ExecuteOutTextIcci( const string& sCmd2, const STRVECTOR& vsParams)
            sText += string( "<br/>") + ( aInfo.bCBOverEq ? " + " : " - ") ;
         sText += " U=" + ToString( aInfo.IciB[j].dU,7) + " P=(" + ToString( aInfo.IciB[j].ptI,4) + ")" ;
         switch( aInfo.IciB[j].nPrevTy) {
-         case ICCT_NULL : sText += " ??-" ; break ;
+         case ICCT_NULL : sText += " ?" "?-" ; break ;
         case ICCT_IN : sText += " IN-" ; break ;
         case ICCT_OUT : sText += " OUT-" ; break ;
         case ICCT_ON : sText += " ON-" ; break ;
@@ -7994,7 +7946,7 @@ GdbExecutor::ExecuteOutTsc( const string& sCmd2, const STRVECTOR& vsParams)
  // chiudo il file di uscita Tsc
   else if ( sCmd2 == "CLOSE") {
     // nessun parametro
-      if ( vsParams.size() != 0)
+      if ( ! vsParams.empty())
         return false ;
     // scrivo terminazioni e chiudo il file
      return m_OutTsc.Close() ;
@@ -8017,7 +7969,7 @@ GdbExecutor::ExecuteOutTsc( const string& sCmd2, const STRVECTOR& vsParams)
   else if ( sCmd2 == "SETGR") {
      Frame3d frF ;
     // nessun parametro
-      if ( vsParams.size() == 0)
+      if ( vsParams.empty())
         frF.Reset() ;
     // un parametro ( Id del gruppo)
      else if ( vsParams.size() == 1) {
@@ -8049,8 +8001,7 @@ GdbExecutor::ExecuteOutTsc( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetNamesParam( vsParams[0], vnNames))
         return false ;
     // esecuzione
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
        // recupero l'oggetto ed eseguo l'output
         if ( ! OutGroupTsc( *Iter, nFlag))
            return false ;
@@ -8073,8 +8024,7 @@ GdbExecutor::ExecuteOutTsc( const string& sCmd2, const STRVECTOR& vsParams)
      if ( ! GetNamesParam( vsParams[0], vnNames))
         return false ;
     // esecuzione
-      INTVECTOR::iterator Iter ;
-      for ( Iter = vnNames.begin() ; Iter != vnNames.end() ; ++Iter) {
+      for ( auto Iter = vnNames.cbegin() ; Iter != vnNames.cend() ; ++Iter) {
        // recupero l'oggetto ed eseguo l'output
         if ( ! m_OutTsc.PutGeoObj( m_pGDB->GetGeoObj( *Iter), nFlag))
            return false ;
@@ -14,10 +14,10 @@
 #pragma once

 #include "OutTsc.h"
-#include "/EgtDev/Include/EgkGdbExecutor.h"
+#include "/EgtDev/Include/EGkGdbExecutor.h"
 #include "/EgtDev/Include/EgtPerfCounter.h"
 #include "/EgtDev/Include/EgtExecMgr.h"
-#include "/EgtDev/Include/EgkGeoCollection.h"
+#include "/EgtDev/Include/EGkGeoCollection.h"
 #include "Tool.h"

 class PolyLine ;
@@ -101,6 +101,10 @@ GdbGeo::Save( int nBaseId, NgeWriter& ngeOut, INTUNORDSET* pSavedIds) const
   if ( pGObjRW == nullptr)
      return false ;

+  // eventuali modifiche prima del salvataggio
+   if ( ! pGObjRW->PreSave( * const_cast<GdbGeo*>( this)))
+      return false ;
+
  // tipo entità e identificativi
   if ( ! ngeOut.WriteKey( pGObjRW->GetNgeId()))
      return false ;
@@ -124,7 +128,11 @@ GdbGeo::Save( int nBaseId, NgeWriter& ngeOut, INTUNORDSET* pSavedIds) const
  // parametri geometrici
   if ( ! ngeOut.WriteKey( NGE_G))
      return false ;
-   return pGObjRW->Save( ngeOut) ;
+   if ( ! pGObjRW->Save( ngeOut))
+      return false ;
+
+  // eventuali ripristini dopo il salvataggio
+   return pGObjRW->PostSave( * const_cast<GdbGeo*>( this)) ;
 }

 //----------------------------------------------------------------------------
@@ -181,7 +189,7 @@ GdbGeo::Load( int nNgeId, NgeReader& ngeIn, int nBaseGdbId, int& nParentId)

  // parametri geometrici
   IGeoObjRW* pGObjRW = dynamic_cast<IGeoObjRW*>( m_pGeoObj) ;
-   return ( pGObjRW != nullptr  &&  pGObjRW->Load( ngeIn)) ;
+   return ( pGObjRW != nullptr  &&  pGObjRW->Load( ngeIn)  &&  pGObjRW->PostLoad( *this)) ;
 }

 //----------------------------------------------------------------------------
@@ -328,7 +336,7 @@ GdbGeo::Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dCoe
        // curva originale
         ICurve* pCrv = GetCurve( m_pGeoObj) ;
        // trasformo in curva di Bezier (semplice o composta)
-         ICurve* pCrvNew = ArcToBezierCurve( pCrv) ;
+         ICurve* pCrvNew = ArcToBezierCurve( GetCurveArc( pCrv)) ;
         if ( pCrvNew == nullptr)
            return false ;
        // assegno alla nuova curva estrusione e spessore di quella originale
@@ -381,7 +389,7 @@ GdbGeo::Shear( const Point3d& ptOn, const Vector3d& vtNorm, const Vector3d& vtDi
      if ( ! pArc->IsPlane()  ||
           ! AreSameOrOppositeVectorExact( pArc->GetNormVersor(), vtNorm)) {
        // trasformo in curva di Bezier (semplice o composta)
-         ICurve* pCrvNew = ArcToBezierCurve( GetCurve( m_pGeoObj)) ;
+         ICurve* pCrvNew = ArcToBezierCurve( GetCurveArc( m_pGeoObj)) ;
         if ( pCrvNew == nullptr)
            return false ;
        // assegno alla nuova curva estrusione e spessore di quella originale
@@ -54,6 +54,10 @@ class GdbGeo : public GdbObj

 //----------------------------------------------------------------------------
 inline const GdbGeo* GetGdbGeo( const GdbObj* pGObj)
-               { return dynamic_cast<const GdbGeo*>(pGObj) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetGdbType() != GDB_TY_GEO)
+                    return nullptr ;
+                 return static_cast<const GdbGeo*>( pGObj) ; }
 inline GdbGeo* GetGdbGeo( GdbObj* pGObj)
-               { return dynamic_cast<GdbGeo*>(pGObj) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetGdbType() != GDB_TY_GEO)
+                    return nullptr ;
+                 return static_cast<GdbGeo*>( pGObj) ; }
@@ -44,7 +44,7 @@ GdbGroup::~GdbGroup( void)
   // nel sorgente aggiorno lista dei riferimenti
   INTVECTOR vnList ;
   pGdbObj->GetInfo( GDB_SI_LIST, vnList) ;
-   INTVECTOR::const_iterator iFind = find( vnList.begin(), vnList.end(), m_nId) ;
+   const auto iFind = find( vnList.begin(), vnList.end(), m_nId) ;
   if ( iFind != vnList.end())
      vnList.erase( iFind) ;
   if ( vnList.empty())
@@ -91,6 +91,10 @@ class GdbGroup : public GdbObj

 //----------------------------------------------------------------------------
 inline const GdbGroup* GetGdbGroup( const GdbObj* pGObj)
-               { return dynamic_cast<const GdbGroup*>(pGObj) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetGdbType() != GDB_TY_GROUP)
+                    return nullptr ;
+                 return static_cast<const GdbGroup*>( pGObj) ; }
 inline GdbGroup* GetGdbGroup( GdbObj* pGObj)
-               { return dynamic_cast<GdbGroup*>(pGObj) ; }
+               { if ( pGObj == nullptr  ||  pGObj->GetGdbType() != GDB_TY_GROUP)
+                    return nullptr ;
+                 return static_cast<GdbGroup*>( pGObj) ; }
@@ -24,7 +24,7 @@ using namespace std ;
 IGdbIterator*
 CreateGdbIterator( IGeomDB* pGDB)
 {
-   if ( dynamic_cast<GeomDB*>( pGDB) == nullptr)
+   if ( static_cast<GeomDB*>( pGDB) == nullptr)
      return nullptr ;
   return static_cast<IGdbIterator*> ( new( nothrow) GdbIterator( pGDB)) ;
 }
@@ -53,7 +53,7 @@ GdbIterator::~GdbIterator( void)
 bool
 GdbIterator::SetGDB( IGeomDB* pGDB)
 {
-   m_pGDB = dynamic_cast<GeomDB*>( pGDB) ;
+   m_pGDB = static_cast<GeomDB*>( pGDB) ;
   if ( m_pGDB == nullptr)
      return false ;

@@ -105,7 +105,7 @@ GdbIterator::GoToFirstInGroup( const IGdbIterator& iIter)
      return false ;
   }

-   const GdbIterator* pIter = dynamic_cast<const GdbIterator*> (&iIter) ;
+   const GdbIterator* pIter = static_cast<const GdbIterator*> (&iIter) ;
   if ( pIter == nullptr  ||  pIter->m_pGDB != m_pGDB) {
      m_pCurrObj = nullptr ;
      return false ;
@@ -167,7 +167,7 @@ GdbIterator::GoToLastInGroup( const IGdbIterator& iIter)
      return false ;
   }

-   const GdbIterator* pIter = dynamic_cast<const GdbIterator*> (&iIter) ;
+   const GdbIterator* pIter = static_cast<const GdbIterator*> (&iIter) ;
   if ( pIter == nullptr  ||  pIter->m_pGDB != m_pGDB) {
      m_pCurrObj = nullptr ;
      return false ;
@@ -263,7 +263,7 @@ GdbIterator::GoToFirstNameInGroup( const IGdbIterator& iIter, const string& sNam
      return false ;
   }
  // converto in oggetto iteratore di base
-   const GdbIterator* pIter = dynamic_cast<const GdbIterator*> (&iIter) ;
+   const GdbIterator* pIter = static_cast<const GdbIterator*> (&iIter) ;
   if ( pIter == nullptr  ||  pIter->m_pGDB != m_pGDB) {
      m_pCurrObj = nullptr ;
      return false ;
@@ -345,7 +345,7 @@ GdbIterator::GoToLastNameInGroup( const IGdbIterator& iIter, const string& sName
      return false ;
   }
  // converto in oggetto iteratore di base
-   const GdbIterator* pIter = dynamic_cast<const GdbIterator*> (&iIter) ;
+   const GdbIterator* pIter = static_cast<const GdbIterator*> (&iIter) ;
   if ( pIter == nullptr  ||  pIter->m_pGDB != m_pGDB) {
      m_pCurrObj = nullptr ;
      return false ;
@@ -474,7 +474,7 @@ GdbIterator::GoToFirstGroupInGroup( const IGdbIterator& iIter)
      return false ;
   }
  // converto in oggetto iteratore di base
-   const GdbIterator* pIter = dynamic_cast<const GdbIterator*> (&iIter) ;
+   const GdbIterator* pIter = static_cast<const GdbIterator*> (&iIter) ;
   if ( pIter == nullptr  ||  pIter->m_pGDB != m_pGDB) {
      m_pCurrObj = nullptr ;
      return false ;
@@ -553,7 +553,7 @@ GdbIterator::GoToLastGroupInGroup( const IGdbIterator& iIter)
      return false ;
   }
  // converto in oggetto iteratore di base
-   const GdbIterator* pIter = dynamic_cast<const GdbIterator*> (&iIter) ;
+   const GdbIterator* pIter = static_cast<const GdbIterator*> (&iIter) ;
   if ( pIter == nullptr  ||  pIter->m_pGDB != m_pGDB) {
      m_pCurrObj = nullptr ;
      return false ;
@@ -1254,13 +1254,13 @@ GdbIterator::GetCalcStatus( int& nStat) const

 //----------------------------------------------------------------------------
 bool
-GdbIterator::SetMark( void)
+GdbIterator::SetMark( int nMark)
 {
   if ( m_pGDB == nullptr  ||  m_pCurrObj == nullptr)
      return false ;

  // imposto la marcatura
-   return m_pCurrObj->SetMark() ;
+   return m_pCurrObj->SetMark( nMark) ;
 }

 //----------------------------------------------------------------------------
@@ -1468,7 +1468,8 @@ GdbIterator::SetInfo( const string& sKey, int nInfo)
 bool
 GdbIterator::SetInfo( const string& sKey, double dInfo)
 {
-   return SetInfo( sKey, ToString( dInfo)) ;
+   int nErr ;
+   return ( SetInfo( sKey, ToString( dInfo, 6, &nErr)) && nErr == 0) ;
 }

 //----------------------------------------------------------------------------
@@ -1618,6 +1619,62 @@ GdbIterator::RemoveInfo( const string& sKey)
   return m_pCurrObj->RemoveInfo( sKey) ;
 }

+//----------------------------------------------------------------------------
+bool
+GdbIterator::GetAllInfo( STRVECTOR& vsInfo) const
+{
+   if ( m_pGDB == nullptr  ||  m_pCurrObj == nullptr)
+      return false ;
+
+  // recupero tutte le Info
+   return m_pCurrObj->GetAllInfo( vsInfo) ;
+}
+
+//----------------------------------------------------------------------------
+bool
+GdbIterator::CopyAllInfoFrom( const IGdbIterator& iIter)
+{
+   if ( m_pGDB == nullptr  ||  m_pCurrObj == nullptr)
+      return false ;
+
+  // recupero l'oggetto sorgente
+   const GdbIterator* pIter = static_cast<const GdbIterator*> (&iIter) ;
+   if ( pIter == nullptr  ||  pIter->m_pGDB != m_pGDB  ||  pIter->m_pCurrObj == nullptr)
+      return false ;
+   const GdbObj* pGdbObjSou = pIter->m_pCurrObj ;
+
+  // copio tutte le Info
+   if ( m_pCurrObj != pGdbObjSou  &&  pGdbObjSou->m_pAttribs != nullptr) {
+      m_pCurrObj->GetSafeAttribs() ;
+      return ( m_pCurrObj->m_pAttribs != nullptr  &&  m_pCurrObj->m_pAttribs->CopyAllInfoFrom( *(pGdbObjSou->m_pAttribs))) ;
+   }
+   else
+      return true ;
+}
+
+//----------------------------------------------------------------------------
+// Stipple (significativo solo per curve)
+
+//----------------------------------------------------------------------------
+bool
+GdbIterator::SetStipple( int nFactor, int nPattern)
+{
+   if ( m_pGDB == nullptr  ||  m_pCurrObj == nullptr)
+      return false ;
+  // imposto lo stipple
+   return m_pCurrObj->SetStipple( nFactor, nPattern) ;
+}
+
+//----------------------------------------------------------------------------
+bool
+GdbIterator::GetStipple( int& nFactor, int& nPattern) const
+{
+   if ( m_pGDB == nullptr  ||  m_pCurrObj == nullptr)
+      return false ;
+  // recupero lo stipple
+   return m_pCurrObj->GetStipple( nFactor, nPattern) ;
+}
+
 //----------------------------------------------------------------------------
 // TextureData
 //----------------------------------------------------------------------------
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2013-2013
+//  EgalTech 2013-2023
 //----------------------------------------------------------------------------
-// File : GdbIterator.h         Data : 04.12.13          Versione : 1.4a3
+// File : GdbIterator.h         Data : 09.07.23          Versione : 2.5g1
 // Contenuto : Dichiarazione della classe GdbIterator.
 //
 //
@@ -103,7 +103,7 @@ class GdbIterator : public IGdbIterator
      bool RevertStatus( void) override ;
      bool GetStatus( int& nStat) const override ;
      bool GetCalcStatus( int& nStat) const override ;
-      bool SetMark( void) override ;
+      bool SetMark( int nMark = GDB_MK_ON) override ;
      bool ResetMark( void) override ;
      bool GetMark( int& nMark) const override ;
      bool GetCalcMark( int& nMark) const override ;
@@ -142,6 +142,11 @@ class GdbIterator : public IGdbIterator
      bool GetInfo( const std::string& sKey, STRVECTOR& vsInfo) const override ;
      bool ExistsInfo( const std::string& sKey) const override ;
      bool RemoveInfo( const std::string& sKey) override ;
+      bool GetAllInfo( STRVECTOR& vsInfo) const override ;
+      bool CopyAllInfoFrom( const IGdbIterator& iIter) override ;
+     // Stipple
+      bool SetStipple( int nFactor, int nPattern) override ;
+      bool GetStipple( int& nFactor, int& nPattern) const override ;
     // TextureData
      bool SetTextureName( const std::string& sTxrName) override ;
      bool SetTextureFrame( const Frame3d& frTxrRef) override ;
@@ -31,10 +31,9 @@ using namespace std ;

 //----------------------------------------------------------------------------
 GdbObj::GdbObj( void)
-   : m_nId( GDB_ID_NULL), m_pAttribs( nullptr), m_pTxrData( nullptr), m_pUserObj( nullptr),
-     m_pGDB( nullptr), m_pNext( nullptr), m_pPrev( nullptr), m_pParent( nullptr),
+   : m_nId( GDB_ID_NULL), m_pAttribs( nullptr), m_nStpFactor( 0), m_nStpPattern( 0), m_pTxrData( nullptr),
+     m_pUserObj( nullptr), m_pGDB( nullptr), m_pNext( nullptr), m_pPrev( nullptr), m_pParent( nullptr),
     m_pSelNext( nullptr), m_pSelPrev( nullptr)
-     
 {
 }

@@ -73,6 +72,9 @@ GdbObj::CopyFrom( const GdbObj* pSou)
   if ( m_pAttribs != nullptr)
      delete m_pAttribs ;
   m_pAttribs = nullptr ;
+  // reset stipple
+   m_nStpFactor = 0 ;
+   m_nStpPattern = 0 ;
  // elimino eventuali dati della texture pre-esistenti
   if ( m_pTxrData != nullptr)
      delete m_pTxrData ;
@@ -91,6 +93,10 @@ GdbObj::CopyFrom( const GdbObj* pSou)
  // copio Id
   m_nId = pSou->m_nId ;

+  // copio stipple
+   m_nStpFactor = pSou->m_nStpFactor ;
+   m_nStpPattern = pSou->m_nStpPattern ;
+
  // copio gli attributi, i dati della texture e UserObj
   return ( CopyAttribsFrom( pSou) && CopyTextureDataFrom( pSou) && CopyUserObjFrom( pSou)) ;
 }
@@ -606,14 +612,14 @@ GdbObj::GetCalcStatus( int& nStat, int nLev) const

 //----------------------------------------------------------------------------
 bool
-GdbObj::SetMark( void)
+GdbObj::SetMark( int nMark)
 {
  // verifico esistenza (con eventuale creazione) degli attributi
   if ( GetSafeAttribs() == nullptr)
      return false ;

  // assegno la marcatura
-   m_pAttribs->SetMark() ;
+   m_pAttribs->SetMark( nMark) ;
   return true ;
 }

@@ -653,8 +659,8 @@ GdbObj::GetCalcMark( int& nMark) const
      nObjMark = m_pAttribs->GetMark() ;

  // se la marcatura è ON, non ho bisogno di sapere altro
-   if ( nObjMark == GDB_MK_ON) {
-      nMark = GDB_MK_ON ;
+   if ( nObjMark == GDB_MK_ON  ||  nObjMark == GDB_MK_ON_2) {
+      nMark = nObjMark ;
      return true ;
   }

@@ -856,7 +862,8 @@ GdbObj::SetInfo( const string& sKey, int nInfo)
 bool
 GdbObj::SetInfo( const string& sKey, double dInfo)
 {
-   return SetInfo( sKey, ToString( dInfo)) ;
+   int nErr ; 
+   return ( SetInfo( sKey, ToString( dInfo, 6, &nErr)) && nErr == 0) ;
 }

 //----------------------------------------------------------------------------
@@ -1024,6 +1031,39 @@ GdbObj::RemoveInfo( const string& sKey)
   return m_pAttribs->RemoveInfo( sKey) ;
 }

+//----------------------------------------------------------------------------
+bool
+GdbObj::GetAllInfo( STRVECTOR& vsInfo) const
+{
+  // se non ci sono attributi
+   if ( m_pAttribs == nullptr) {
+      vsInfo.clear() ;
+      return true ;
+   }
+  // recupero tutte le Info
+   return m_pAttribs->GetAllInfo( vsInfo) ;
+}
+
+//----------------------------------------------------------------------------
+// Stipple (significativo solo per curve, per ora non viene salvato)
+//----------------------------------------------------------------------------
+bool
+GdbObj::SetStipple( int nFactor, int nPattern)
+{
+   m_nStpFactor = nFactor ;
+   m_nStpPattern = nPattern ;
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+GdbObj::GetStipple( int& nFactor, int& nPattern) const
+{
+   nFactor = m_nStpFactor ;
+   nPattern = m_nStpPattern ;
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 // TextureData
 //----------------------------------------------------------------------------
@@ -81,7 +81,7 @@ class GdbObj
      bool IsSelected( void) const ;
      bool GetStatus( int& nStat) const ;
      bool GetCalcStatus( int& nStat, int nLev = 0) const ;
-      bool SetMark( void) ;
+      bool SetMark( int nMark) ;
      bool ResetMark( void) ;
      bool GetMark( int& nMark) const ;
      bool GetCalcMark( int& nMark) const ;
@@ -119,6 +119,9 @@ class GdbObj
      bool GetInfo( const std::string& sKey, STRVECTOR& vsInfo) const ;
      bool ExistsInfo( const std::string& sKey) const ;
      bool RemoveInfo( const std::string& sKey) ;
+      bool GetAllInfo( STRVECTOR& vsInfo) const ;
+      bool SetStipple( int nFactor, int nPattern) ;
+      bool GetStipple( int& nFactor, int& nPattern) const ;
      bool SaveTextureData( NgeWriter& ngeOut) const ;
      bool LoadTextureData( NgeReader& ngeIn) ;
      TextureData* GetTextureData( void)
@@ -160,6 +163,8 @@ class GdbObj
   public :
      int          m_nId ;
      Attribs*     m_pAttribs ;
+      int          m_nStpFactor ;
+      int          m_nStpPattern ;
      TextureData* m_pTxrData ;
      IUserObj*    m_pUserObj ;

--- a/Show More
+++ b/Show More