diff --git a/EInAPI.h b/EInAPI.h index dab894b..af7ca60 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -464,13 +464,12 @@ EIN_EXPORT BOOL __stdcall EgtPackBoxCluster( int nId[], int nCount, double dXmin EIN_EXPORT BOOL __stdcall EgtMoveBoxCluster( int nId[], int nCount, double vtMove[3], double dXmin, double dYmin, double dXmax, double dYmax, double dOffs) ; EIN_EXPORT BOOL __stdcall EgtGetClusterBBoxGlob( int nId[], int nCount, double ptMin[3], double ptMax[3]) ; -EIN_EXPORT BOOL __stdcall EgtCreateOutRegion( int nParentId, +EIN_EXPORT BOOL __stdcall EgtCreateOutRegionRectangle( int nParentId, double dXmin, double dYmin, double dXmax, double dYmax, double dZ) ; -EIN_EXPORT BOOL __stdcall EgtCreateOutRegion2( int nParentId, int nOutCrvId) ; +EIN_EXPORT BOOL __stdcall EgtCreateOutRegion( int nParentId, int nOutCrvId) ; EIN_EXPORT BOOL __stdcall EgtVerifyPartCluster( int nId[], int nCount, BOOL bReducedCut) ; -EIN_EXPORT BOOL __stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut, - double dXmin, double dYmin, double dXmax, double dYmax, BOOL bBottomUp) ; -EIN_EXPORT BOOL __stdcall EgtPackPartCluster2( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp) ; +EIN_EXPORT BOOL __stdcall EgtPackPartClusterInRectangle( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp) ; +EIN_EXPORT BOOL __stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp) ; EIN_EXPORT BOOL __stdcall EgtMovePartCluster( int nId[], int nCount, BOOL bReducedCut, double vtMove[3]) ; EIN_EXPORT BOOL __stdcall EgtRotatePartCluster( int nId[], int nCount, BOOL bReducedCut, const double ptCen[3], double* pdRotAngDeg) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 374c4e4..ae02c77 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -503,8 +503,7 @@ EXE_EXPORT bool ExeGetClusterBBoxGlob( const INTVECTOR& vIds, BBox3d& b3Box) ; EXE_EXPORT bool ExeCreateOutRegion( int nParentId, double dXmin, double dYmin, double dXmax, double dYmax, double dZ) ; EXE_EXPORT bool ExeCreateOutRegion( int nParentId, int nOutCrvId) ; EXE_EXPORT bool ExeVerifyPartCluster( const INTVECTOR& vIds, bool bReducedCut) ; -EXE_EXPORT bool ExePackPartCluster( const INTVECTOR& vIds, bool bReducedCut, - double dXmin, double dYmin, double dXmax, double dYmax, bool bBottomUp) ; +EXE_EXPORT bool ExePackPartClusterInRectangle( const INTVECTOR& vIds, bool bReducedCut, bool bBottomUp) ; EXE_EXPORT bool ExePackPartCluster( const INTVECTOR& vIds, bool bReducedCut, bool bBottomUp) ; EXE_EXPORT bool ExeMovePartCluster( const INTVECTOR& vIds, bool bReducedCut, Vector3d& vtMove) ; EXE_EXPORT bool ExeRotatePartCluster( const INTVECTOR& vIds, bool bReducedCut, const Point3d& ptCen, double& dRotAngDeg) ;