EgtInterface 1.6n8 :

- aggiornamento interfacce per nesting.
This commit is contained in:
Dario Sassi
2016-02-24 08:21:19 +00:00
parent dc8743aa6c
commit 7636882e38
2 changed files with 6 additions and 7 deletions
+6 -7
View File
@@ -103,15 +103,15 @@ __stdcall EgtMoveBoxCluster( int nId[], int nCount, double vtMove[3],
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtCreateOutRegion( int nParentId,
double dXmin, double dYmin, double dXmax, double dYmax, double dZ)
__stdcall EgtCreateOutRegionRectangle( int nParentId,
double dXmin, double dYmin, double dXmax, double dYmax, double dZ)
{
return ( ExeCreateOutRegion( nParentId, dXmin, dYmin, dXmax, dYmax, dZ) ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtCreateOutRegion2( int nParentId, int nOutCrvId)
__stdcall EgtCreateOutRegion( int nParentId, int nOutCrvId)
{
return ( ExeCreateOutRegion( nParentId, nOutCrvId) ? TRUE : FALSE) ;
}
@@ -136,8 +136,7 @@ __stdcall EgtVerifyPartCluster( int nId[], int nCount, BOOL bReducedCut)
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut,
double dXmin, double dYmin, double dXmax, double dYmax, BOOL bBottomUp)
__stdcall EgtPackPartClusterInRectangle( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp)
{
// verifico
if ( nId == nullptr || nCount <= 0)
@@ -148,14 +147,14 @@ __stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut,
for ( int i = 0 ; i < nCount ; ++ i)
vIds.push_back( nId[i]) ;
// eseguo
if ( ! ExePackPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax, ( bBottomUp != FALSE)))
if ( ! ExePackPartClusterInRectangle( vIds, ( bReducedCut != FALSE), ( bBottomUp != FALSE)))
return FALSE ;
return TRUE ;
}
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtPackPartCluster2( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp)
__stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp)
{
// verifico
if ( nId == nullptr || nCount <= 0)