diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h index 36a6fd2..2ea3dbd 100644 --- a/EMkSimuGenConst.h +++ b/EMkSimuGenConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2019 //---------------------------------------------------------------------------- -// File : EmkSimuGenConst.h Data : 04.04.19 Versione : 2.1d1 +// File : EmkSimuGenConst.h Data : 05.08.19 Versione : 2.1h1 // Contenuto : Costanti per simulazione e generazione. // // @@ -30,6 +30,12 @@ enum SimUiStat { MCH_UISIM_NULL = 0, MCH_UISIM_STEP = 3, MCH_UISIM_PAUSE = 4} ; +//------------------------ Tipi di oggetti per test collisione ---------------- +enum SimCollObjType { MCH_SIM_COB_NULL = 0, + MCH_SIM_COB_BOX = 1, + MCH_SIM_COB_CYL = 2, + MCH_SIM_COB_SPHE = 3} ; + //------------------------ Stato di visualizzazione della macchina ------------ enum MachLook { MCH_LOOK_NONE = -1, MCH_LOOK_TAB = 0, diff --git a/EXeExecutor.h b/EXeExecutor.h index 54402cf..869607b 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -516,8 +516,8 @@ EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vecto EXE_EXPORT bool ExeVolZmapGetDepth( int nId, const Point3d& ptP, const Vector3d& vtDir, int nRefType, bool bExact, double& dInLen, double& dOutLen) ; EXE_EXPORT bool ExeVolZmapAvoidBox( int nId, const Frame3d& frBox, const Vector3d& vtDiag, double dSafeDist, int nRefType) ; -EXE_EXPORT bool ExeVolZmapAvoidSphere( int nId, const Point3d& ptCen, double dRad, double dSafeDist, int nRefType) ; EXE_EXPORT bool ExeVolZmapAvoidCylinder( int nId, const Frame3d& frCyl, double dL, double dR, double dSafeDist, int nRefType) ; +EXE_EXPORT bool ExeVolZmapAvoidSphere( int nId, const Point3d& ptCen, double dRad, double dSafeDist, int nRefType) ; EXE_EXPORT bool ExeCutVolZmapPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, int nRefType) ; // Geo Snap Vector/Point/Frame