diff --git a/EGkVolZmap.h b/EGkVolZmap.h index 3a3fc07..4e9f9ac 100644 --- a/EGkVolZmap.h +++ b/EGkVolZmap.h @@ -52,9 +52,9 @@ class __declspec( novtable) IVolZmap : public IGeoObj const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe) = 0 ; virtual bool GetDepth( const Point3d& ptP, const Vector3d& vtDir, double& dInLength, double& dOutLength, bool bExact) const = 0 ; virtual bool GetPlaneIntersection( const Plane3d& plPlane, ICURVEPOVECTOR& vpLoop) const = 0 ; - virtual bool AvoidBox( const Frame3d& frBox, const Vector3d& vtDiag) const = 0 ; - virtual bool AvoidSphere( const Point3d& ptCenter, double dRad) const = 0 ; - virtual bool AvoidCylinder( const Frame3d& frCyl, double dL, double dR) const = 0 ; + virtual bool AvoidBox( const Frame3d& frBox, const Vector3d& vtDiag, double dSafeDist) const = 0 ; + virtual bool AvoidSphere( const Point3d& ptCenter, double dRad, double dSafeDist) const = 0 ; + virtual bool AvoidCylinder( const Frame3d& frCyl, double dH, double dR, double dSafeDist) const = 0 ; virtual IVolZmap* ClonePart( int nPart) const = 0 ; virtual bool RemovePart( int nPart) = 0 ; virtual bool Cut( const Plane3d& plPlane) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 9210b73..c597695 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -507,8 +507,9 @@ EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vecto const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe, int nRefType) ; 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, int nRefType) ; -EXE_EXPORT bool ExeVolZmapAvoidSphere( int nId, const Point3d& ptCen, double dRad, int nRefType) ; +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 ExeCutVolZmapPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, int nRefType) ; // Geo Snap Vector/Point/Frame