diff --git a/EGkCDeClosedSurfTmClosedSurfTm.h b/EGkCDeClosedSurfTmClosedSurfTm.h index 011d3f6..f84a1fe 100644 --- a/EGkCDeClosedSurfTmClosedSurfTm.h +++ b/EGkCDeClosedSurfTmClosedSurfTm.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2020-2020 +// EgalTech 2020-2023 //---------------------------------------------------------------------------- -// File : EGkCDeSurfTmSurfTm.h Data : 13.11.20 Versione : +// File : EGkCDeClosedSurfTmClosedSurfTm.h Data : 14.06.23 Versione : 2.5f3 // Contenuto : Dichiarazione funzione verifica collisione tra // SurfTm e SurfTm. // @@ -27,4 +27,4 @@ // 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. -EGK_EXPORT bool CDeClosedSurfTmClosedSurfTm( const SurfTriMesh& SurfA, const SurfTriMesh& SurfB, double dSafeDist) ; \ No newline at end of file +EGK_EXPORT bool CDeClosedSurfTmClosedSurfTm( const ISurfTriMesh& SurfA, const ISurfTriMesh& SurfB, double dSafeDist) ; diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h index 049acbd..50fe8c3 100644 --- a/EMkSimuGenConst.h +++ b/EMkSimuGenConst.h @@ -35,7 +35,8 @@ enum SimCollObjType { MCH_SIM_COB_NULL = 0, MCH_SIM_COB_BOX = 1, MCH_SIM_COB_CYL = 2, MCH_SIM_COB_SPHE = 3, - MCH_SIM_COB_CONE = 4} ; + MCH_SIM_COB_CONE = 4, + MCH_SIM_COB_POLY = 101} ; //------------------------ Stato di visualizzazione della macchina ------------ enum MachLook { MCH_LOOK_NONE = -1, diff --git a/EXeExecutor.h b/EXeExecutor.h index c88c7a0..d82c2f4 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -792,6 +792,7 @@ EXE_EXPORT int ExeCDeRectPrismoidSolid( const Frame3d& frPrismoid, double dBase EXE_EXPORT int ExeCDeCylSolid( const Frame3d& frCyl, double dR, double dH, int nSolidId, double dSafeDist, int nRefType) ; EXE_EXPORT int ExeCDeConeSolid( const Frame3d& frCone, double dR1, double dR2, double dH, int nSolidId, double dSafeDist, int nRefType) ; EXE_EXPORT int ExeCDeSpheSolid( const Point3d& ptCen, double dR, int nSolidId, double dSafeDist, int nRefType) ; +EXE_EXPORT int ExeCDeSolidSolid( int nSolid1Id, int nSolid2Id, double dSafeDist) ; // Maximum Filler EXE_EXPORT bool ExeMaxFillerStart( void) ;