diff --git a/API_Nesting.cpp b/API_Nesting.cpp index 332e28b..e24f412 100644 --- a/API_Nesting.cpp +++ b/API_Nesting.cpp @@ -88,10 +88,10 @@ __stdcall EgtMoveBoxCluster( int nId[], int nCount, double vtMove[3], vIds.push_back( nId[i]) ; // eseguo Vector3d vtM = vtMove ; - bool bOk = ExeMoveBoxCluster( vIds, vtM, dXmin, dYmin, dXmax, dYmax, dOffs) ; + if ( ! ExeMoveBoxCluster( vIds, vtM, dXmin, dYmin, dXmax, dYmax, dOffs)) + return FALSE ; VEC_FROM_3D( vtMove, vtM) - - return ( bOk ? TRUE : FALSE) ; + return TRUE ; } //----------------------------------------------------------------------------- @@ -108,9 +108,9 @@ __stdcall EgtVerifyPartCluster( int nId[], int nCount, BOOL bReducedCut, for ( int i = 0 ; i < nCount ; ++ i) vIds.push_back( nId[i]) ; // eseguo - bool bOk = ExeVerifyPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax) ; - - return ( bOk ? TRUE : FALSE) ; + if ( ! ExeVerifyPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax)) + return FALSE ; + return TRUE ; } //----------------------------------------------------------------------------- @@ -127,9 +127,9 @@ __stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut, for ( int i = 0 ; i < nCount ; ++ i) vIds.push_back( nId[i]) ; // eseguo - bool bOk = ExePackPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax, ( bBottomUp != FALSE)) ; - - return ( bOk ? TRUE : FALSE) ; + if ( ! ExePackPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax, ( bBottomUp != FALSE))) + return FALSE ; + return TRUE ; } //----------------------------------------------------------------------------- @@ -147,10 +147,32 @@ __stdcall EgtMovePartCluster( int nId[], int nCount, BOOL bReducedCut, double vt vIds.push_back( nId[i]) ; // eseguo Vector3d vtM = vtMove ; - bool bOk = ExeMovePartCluster( vIds, ( bReducedCut != FALSE), vtM, dXmin, dYmin, dXmax, dYmax) ; + if ( ! ExeMovePartCluster( vIds, ( bReducedCut != FALSE), vtM, dXmin, dYmin, dXmax, dYmax)) + return FALSE ; VEC_FROM_3D( vtMove, vtM) + return TRUE ; +} - return ( bOk ? TRUE : FALSE) ; +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtGetObstacleTangent( double vtTang[3]) +{ + Vector3d vtT ; + if ( ! ExeGetObstacleTangent( vtT)) + return FALSE ; + VEC_FROM_3D( vtTang, vtT) + return TRUE ; +} + +//----------------------------------------------------------------------------- +BOOL +__stdcall EgtGetMovingTangent( double vtTang[3]) +{ + Vector3d vtT ; + if ( ! ExeGetMovingTangent( vtT)) + return FALSE ; + VEC_FROM_3D( vtTang, vtT) + return TRUE ; } //----------------------------------------------------------------------------- @@ -167,9 +189,9 @@ __stdcall EgtRotatePartCluster( int nId[], int nCount, BOOL bReducedCut, const d for ( int i = 0 ; i < nCount ; ++ i) vIds.push_back( nId[i]) ; // eseguo - bool bOk = ExeRotatePartCluster( vIds, ( bReducedCut != FALSE), ptCen, *pdRotAngDeg, dXmin, dYmin, dXmax, dYmax) ; - - return ( bOk ? TRUE : FALSE) ; + if ( ! ExeRotatePartCluster( vIds, ( bReducedCut != FALSE), ptCen, *pdRotAngDeg, dXmin, dYmin, dXmax, dYmax)) + return FALSE ; + return TRUE ; } //----------------------------------------------------------------------------- diff --git a/EgtInterface.rc b/EgtInterface.rc index 57ae7bd..6a93099 100644 Binary files a/EgtInterface.rc and b/EgtInterface.rc differ