diff --git a/API_Scene.cpp b/API_Scene.cpp index 411843f..841d113 100644 --- a/API_Scene.cpp +++ b/API_Scene.cpp @@ -254,23 +254,14 @@ __stdcall EgtSelect( int nWinX, int nWinY, int nSelW, int nSelH, int* pnSel) } //----------------------------------------------------------------------------- -int -__stdcall EgtGetFirstObjInSelWin( void) +BOOL +__stdcall EgtSetObjFilterForSelect( BOOL bZerodim, BOOL bCurve, BOOL bSurf, BOOL bVolume, BOOL bExtra) { GseContext* pGseCtx = GetCurrGseContext() ; VERIFY_CTX_SCENE( pGseCtx, FALSE) - // restituisco il primo oggetto selezionato - return pGseCtx->m_pScene->GetFirstSelectedObj() ; -} - -//----------------------------------------------------------------------------- -int -__stdcall EgtGetNextObjInSelWin( void) -{ - GseContext* pGseCtx = GetCurrGseContext() ; - VERIFY_CTX_SCENE( pGseCtx, FALSE) - // restituisco il successivo oggetto selezionato - return pGseCtx->m_pScene->GetNextSelectedObj() ; + // imposto il filtro + return ( pGseCtx->m_pScene->SetObjFilterForSelect( ( bZerodim != FALSE), ( bCurve != FALSE), ( bSurf != FALSE), + ( bVolume != FALSE), ( bExtra != FALSE)) ? TRUE : FALSE) ; } //----------------------------------------------------------------------------- @@ -303,6 +294,26 @@ __stdcall EgtUnselectableClearAll( void) return pGseCtx->m_pScene->UnselectableClearAll() ; } +//----------------------------------------------------------------------------- +int +__stdcall EgtGetFirstObjInSelWin( void) +{ + GseContext* pGseCtx = GetCurrGseContext() ; + VERIFY_CTX_SCENE( pGseCtx, FALSE) + // restituisco il primo oggetto selezionato + return pGseCtx->m_pScene->GetFirstSelectedObj() ; +} + +//----------------------------------------------------------------------------- +int +__stdcall EgtGetNextObjInSelWin( void) +{ + GseContext* pGseCtx = GetCurrGseContext() ; + VERIFY_CTX_SCENE( pGseCtx, FALSE) + // restituisco il successivo oggetto selezionato + return pGseCtx->m_pScene->GetNextSelectedObj() ; +} + //----------------------------------------------------------------------------- BOOL __stdcall EgtGetPointFromSelect( int nSelId, int nWinX, int nWinY, double ptSel[3], int* pnAux) @@ -373,17 +384,6 @@ __stdcall EgtGetLastSnapDir( double vtV[3]) return FALSE ; } -//----------------------------------------------------------------------------- -BOOL -__stdcall EgtSetObjFilterForSnap( BOOL bZerodim, BOOL bCurve, BOOL bSurf, BOOL bVolume, BOOL bExtra) -{ - GseContext* pGseCtx = GetCurrGseContext() ; - VERIFY_CTX_SCENE( pGseCtx, FALSE) - // imposto il filtro - return ( pGseCtx->m_pScene->SetObjFilterForSnap( ( bZerodim != FALSE), ( bCurve != FALSE), ( bSurf != FALSE), - ( bVolume != FALSE), ( bExtra != FALSE)) ? TRUE : FALSE) ; -} - //----------------------------------------------------------------------------- BOOL __stdcall EgtSetShowMode( int nShowMode, BOOL bRedraw) diff --git a/EgtInterface.rc b/EgtInterface.rc index c120f4c..47233dd 100644 Binary files a/EgtInterface.rc and b/EgtInterface.rc differ