From 36ad815d7d7bdd772e9e9f0b3860ba69f7ec245b Mon Sep 17 00:00:00 2001 From: DarioS Date: Sun, 26 Sep 2021 16:28:30 +0200 Subject: [PATCH] EgtExecutor 2.3i3 : - aggiunto parametro dToler a Exe e Lua GetSurfTmSilhouette. --- EXE_GdbGetSurf.cpp | 4 ++-- EgtExecutor.rc | Bin 16176 -> 16176 bytes LUA_GdbGetSurf.cpp | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/EXE_GdbGetSurf.cpp b/EXE_GdbGetSurf.cpp index 34db40b..a3f3d49 100644 --- a/EXE_GdbGetSurf.cpp +++ b/EXE_GdbGetSurf.cpp @@ -660,7 +660,7 @@ ExeExtractSurfTmLoops( int nId, int nDestGrpId, int* pnCount) //---------------------------------------------------------------------------- int -ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, int nDestGrpId, int nRefType, int* pnCount) +ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, double dToler, int nDestGrpId, int nRefType, int* pnCount) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) @@ -677,7 +677,7 @@ ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, int nDestGrpId, int nRef Vector3d vtDirL = GetVectorLocal( pGeomDB, vtDir, nRefType, frSurf) ; // recupero i loop come polilinee POLYLINEVECTOR vPL ; - bOk = bOk && pStm->GetSilhouette( vtDirL, vPL) ; + bOk = bOk && pStm->GetSilhouette( vtDirL, dToler, vPL) ; // dalle polilinee creo le curve e le inserisco nel DB int nFirstId = GDB_ID_NULL ; int nCount = 0 ; diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 910d73c1f48462503f3a94de79d1322bdcdd3811..55803ec6bdb5a011e6eee92d0e99a1f199ecf24f 100644 GIT binary patch delta 79 zcmdl`x1nysFE&Qw&A-`PnSqoe*K!sx?>N)s4T4pS#*-bnk~jAW*?>e(i-FY$N+HxV MD8kglDP58Q0D5;DV*mgE delta 79 zcmdl`x1nysFE&P_&A-`PnSqoe*K!sx?>N)s4T4pSMw1=6k~jAW*?>e(i-FY$N+HxV MD8kglDP58Q0C_7LTL1t6 diff --git a/LUA_GdbGetSurf.cpp b/LUA_GdbGetSurf.cpp index 6fae536..d4bd25a 100644 --- a/LUA_GdbGetSurf.cpp +++ b/LUA_GdbGetSurf.cpp @@ -577,19 +577,21 @@ LuaExtractSurfTmLoops( lua_State* L) static int LuaGetSurfTmSilhouette( lua_State* L) { - // 3 o 4 parametri : nId, vtDir, nDestGrpId [, nRefType] + // 4 o 5 parametri : nId, vtDir, dToler, nDestGrpId [, nRefType] int nId ; LuaCheckParam( L, 1, nId) Vector3d vtDir ; LuaCheckParam( L, 2, vtDir) + double dToler ; + LuaCheckParam( L, 3, dToler) int nDestGrpId ; - LuaCheckParam( L, 3, nDestGrpId) + LuaCheckParam( L, 4, nDestGrpId) int nRefType = RTY_DEFAULT ; - LuaGetParam( L, 4, nRefType) ; + LuaGetParam( L, 5, nRefType) ; LuaClearStack( L) ; // recupero i contorni della superficie int nCount = 0 ; - int nNewId = ExeGetSurfTmSilhouette( nId, vtDir, nDestGrpId, nRefType, &nCount) ; + int nNewId = ExeGetSurfTmSilhouette( nId, vtDir, dToler, nDestGrpId, nRefType, &nCount) ; // restituisco il risultato if ( nNewId != GDB_ID_NULL) LuaSetParam( L, nNewId) ;