EgtExecutor:

- aggiunte funzioni Exe e Lua CDeBoxClosedSurfTm, ExeCDeCylClosedSurfTm e ExeCDeSpheClosedSurfTm - modificate funzioni Exe e Lua VolZmapAvoid* in CDe*VolZmap.
2020-01-10 10:37:49 +00:00
parent bcdcc46deb
commit fb6bb48d14
9 changed files with 498 additions and 166 deletions
@@ -579,97 +579,6 @@ ExeVolZmapGetEdges( int nId, int nDestGrpId, int* pnCount)
   return nFirstId ;
 }

-//----------------------------------------------------------------------------
-bool
-ExeVolZmapAvoidBox( int nId, const Frame3d& frBox, const Vector3d& vtDiag, double dSafeDist, int nRefType)
-{
-   IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, false)
-  // recupero il riferimento locale
-   Frame3d frLoc ;
-   bool bOk = pGeomDB->GetGlobFrame( nId, frLoc) ;
-  // porto in locale il riferimento (il vettore è già in locale a questo stesso riferimento)
-   Frame3d frBoxL = GetFrameLocal( pGeomDB, frBox, nRefType, frLoc) ;
-  // recupero lo Zmap e calcolo collisione
-   const IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
-   bOk = bOk && ( pVZM != nullptr  &&  pVZM->AvoidBox( frBoxL, vtDiag, dSafeDist)) ;
-  // se richiesto, salvo il comando Lua equivalente
-   if ( IsCmdLog()) {
-      string sLua = "EgtVolZmapAvoidBox(" + IdToString( nId) + ",{" +
-                                            ToString( frBox.Orig()) + "},{" +
-                                            ToString( frBox.VersX()) + "},{" +
-                                            ToString( frBox.VersY()) + "},{" +
-                                            ToString( frBox.VersZ()) + "}},{" +
-                                            ToString( vtDiag) + "}," +
-                                            ToString( dSafeDist) + "," +
-                                            RefTypeToString( nRefType) + ")" +
-                    " -- Ok=" + ToString( bOk) ;
-      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
-   }
-  // restituisco risultato
-   return bOk ;
-}
-
-//----------------------------------------------------------------------------
-bool
-ExeVolZmapAvoidCylinder( int nId, const Frame3d& frCyl, double dL, double dR, double dSafeDist, int nRefType)
-{
-   IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, false)
-  // recupero il riferimento locale
-   Frame3d frLoc ;
-   bool bOk = pGeomDB->GetGlobFrame( nId, frLoc) ;
-  // porto in locale il riferimento
-   Frame3d frBoxL = GetFrameLocal( pGeomDB, frCyl, nRefType, frLoc) ;
-  // recupero lo Zmap e calcolo collisione
-   const IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
-   bOk = bOk && ( pVZM != nullptr  &&  pVZM->AvoidCylinder( frBoxL, dL, dR, dSafeDist)) ;
-  // se richiesto, salvo il comando Lua equivalente
-   if ( IsCmdLog()) {
-      string sLua = "EgtVolZmapAvoidCylinder(" + IdToString( nId) + ",{" +
-                                                 ToString( frCyl.Orig()) + "},{" +
-                                                 ToString( frCyl.VersX()) + "},{" +
-                                                 ToString( frCyl.VersY()) + "},{" +
-                                                 ToString( frCyl.VersZ()) + "}}," +
-                                                 ToString( dL) + "," +
-                                                 ToString( dR) + "," +
-                                                 ToString( dSafeDist) + "," +
-                                                 RefTypeToString( nRefType) + ")" +
-                    " -- Ok=" + ToString( bOk) ;
-      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
-   }
-  // restituisco risultato
-   return bOk ;
-}
-
-//----------------------------------------------------------------------------
-bool
-ExeVolZmapAvoidSphere( int nId, const Point3d& ptCen, double dRad, double dSafeDist, int nRefType)
-{
-   IGeomDB* pGeomDB = GetCurrGeomDB() ;
-   VERIFY_GEOMDB( pGeomDB, false)
-  // recupero il riferimento locale
-   Frame3d frLoc ;
-   bool bOk = pGeomDB->GetGlobFrame( nId, frLoc) ;
-  // porto in locale il centro della sfera
-   Point3d ptCenL = GetPointLocal( pGeomDB, ptCen, nRefType, frLoc) ;
-  // recupero lo Zmap e calcolo collisione
-   const IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
-   bOk = bOk && ( pVZM != nullptr  &&  pVZM->AvoidSphere( ptCenL, dRad, dSafeDist)) ;
-  // se richiesto, salvo il comando Lua equivalente
-   if ( IsCmdLog()) {
-      string sLua = "EgtVolZmapAvoidSphere(" + IdToString( nId) + ",{" +
-                                               ToString( ptCen) + "}," +
-                                               ToString( dRad) + "," +
-                                               ToString( dSafeDist) + "," +
-                                               RefTypeToString( nRefType) + ")" +
-                    " -- Ok=" + ToString( bOk) ;
-      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
-   }
-  // restituisco risultato
-   return bOk ;
-}
-
 //-------------------------------------------------------------------------------
 bool
 ExeCutVolZmapPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, int nRefType)