diff --git a/LuaLibs/CalcToolPath.lua b/LuaLibs/CalcToolPath.lua index c3d5454..48a26f4 100644 --- a/LuaLibs/CalcToolPath.lua +++ b/LuaLibs/CalcToolPath.lua @@ -1024,18 +1024,46 @@ end -------------------------------------------------------------------- --------------------------- RIBS ----------------------------------- -------------------------------------------------------------------- -local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, bCheckLinked) +local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) - local dStrand = EgtGetInfo( nLinkId, KEY_CRV_STRAND, 'd') local dOverlap1 = EgtGetInfo( nCurr, KEY_RIBS_OVERLAP, 'd') local dOverlap2 = EgtGetInfo( nNext, KEY_RIBS_OVERLAP, 'd') local dOverlap = max( dOverlap1, dOverlap2) local dLen = EgtCurveLength( nLinkId) - -- porto il link nel gruppo locale - local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp) + -- verifico che non entri nella tavola + local b3Box = EgtGetBBoxGlob( nLinkId, GDB_BB.STANDARD) + if b3Box:getMin():getZ() < - GEO.EPS_SMALL then + return false + end + + -- eventuale verifica con setti coinvolti dal link + -- verifico non passi per estremo errato + if nCurr ~= nNext then + local dParTest1 = EgtCurveParamAtPoint( nLinkId, EgtSP( nCurr, GDB_ID.ROOT), 100 * GEO.EPS_SMALL, GDB_RT.GLOB) + local dParTest2 = EgtCurveParamAtPoint( nLinkId, EgtEP( nNext, GDB_ID.ROOT), 100 * GEO.EPS_SMALL, GDB_RT.GLOB) + if dParTest1 or dParTest2 then + return false + end + end + + if bCheckLinked and dLen > 3 * dStrand then + -- regione occupata dai setti + local nSrfRibs = EgtSurfFrFatCurve( nGrpTmp, nCurr, dStrand, false) or GDB_ID.NULL + local nSrfRibs2 = EgtSurfFrFatCurve( nGrpTmp, nNext, dStrand, false) or GDB_ID.NULL + EgtSurfFrAdd( nSrfRibs, nSrfRibs2) + -- verifico che i tratti fuori abbiano lunghezza maggiore di quelli dentro + local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp) + local nRes, nCnt = EgtTrimCurveWithRegion( nLinkLoc, nSrfRibs, false, false) + if nCnt == 0 then return false end + local dResLen = EgtCurveLength( nRes) + if dResLen < ( dLen - dResLen) - GEO.EPS_SMALL then + return false + end + end -- verifico se interseca altri setti ( considerando anche le tipologie del PathGrp non ancora realizzate) + local nLinkLoc = EgtCopyGlob( nLinkId, nGrpTmp) local nOrigCurr = EgtGetInfo( nCurr, KEY_ORIGINAL_RIB, 'i') local nOrigNext = EgtGetInfo( nNext, KEY_ORIGINAL_RIB, 'i') local vRibsIds = EgtGetNameInGroup( EgtGetParent( nCurr), RIBS_CRV .. '*') @@ -1077,28 +1105,6 @@ local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, bCheckLinked) end end - -- eventuale verifica con setti coinvolti dal link ( da fare solo se collegamento fra passate di setti diversi) - if bCheckLinked and dLen > 3 * dStrand then - -- regione occupata dai setti - local nSrfRibs = EgtSurfFrFatCurve( nGrpTmp, nCurr, dStrand, false) or GDB_ID.NULL - local nSrfRibs2 = EgtSurfFrFatCurve( nGrpTmp, nNext, dStrand, false) or GDB_ID.NULL - EgtSurfFrAdd( nSrfRibs, nSrfRibs2) - -- verifico che i tratti fuori abbiano lunghezza maggiore di quelli dentro - local nRes, nCnt = EgtTrimCurveWithRegion( nLinkLoc, nSrfRibs, false, false) - if nCnt == 0 then return false end - local dResLen = EgtCurveLength( nRes) - if dResLen < ( dLen - dResLen) - GEO.EPS_SMALL then - return false - end - - -- verifico non passi per estremo errato - local dParTest1 = EgtCurveParamAtPoint( nLinkId, EgtSP( nCurr, GDB_ID.ROOT), 100 * GEO.EPS_SMALL, GDB_RT.GLOB) - local dParTest2 = EgtCurveParamAtPoint( nLinkId, EgtEP( nNext, GDB_ID.ROOT), 100 * GEO.EPS_SMALL, GDB_RT.GLOB) - if dParTest1 or dParTest2 then - return false - end - end - -- verifico se si trova almeno in una regione ammissibile ( per caso ForcedLink) local nType = EgtGetInfo( nCurr, KEY_RIBS_TYPE, 'i') local nOut = 0 @@ -1127,24 +1133,68 @@ local function VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, bCheckLinked) end -------------------------------------------------------------------- -local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE) +local function ComputeRibsLinkOnSameCrv( nCrvId, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) - -- recupero il tratto interessato sulla curva1 - local _, _, dParFinal = EgtPointCurveDist( EgtUP( nCrvE, dParE, GDB_ID.ROOT), nCrvS, GDB_ID.ROOT) - local nCrv1 = ComputeShortestCrv( nCrvS, dParS, dParFinal) + local nParentId = EgtGetParent( nCrvId) - -- recupero il tratto interessato sulla curva2 - local _, _, dParStart = EgtPointCurveDist( EgtUP( nCrvS, dParS, GDB_ID.ROOT), nCrvE, GDB_ID.ROOT) - local nCrv2 = ComputeShortestCrv( nCrvE, dParStart, dParE) - - -- modifico nCrv2 per avere una transizione uniforme da nCrv1 - if EgtSpiralizeCurveAlongGuide( nCrv2, nCrv1) then - EgtErase( nCrv1) - return nCrv2 + -- verifico il percorso dParS->dParE + local nCopyId = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER) + EgtTrimCurveStartEndAtParam( nCopyId, dParS, dParE) + if VerifyRibsLink( nCopyId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then + return nCopyId else - EgtErase( nCrv1) + -- se non valido tento con il percorso dParE->dParS + EgtErase( nCopyId) + nCopyId = EgtCopyGlob( nCrvId, nParentId, GDB_IN.AFTER) + EgtTrimCurveStartEndAtParam( nCopyId, dParE, dParS) + EgtInvertCurve( nCopyId) + if VerifyRibsLink( nCopyId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then + return nCopyId + else + return + end + end +end + +-------------------------------------------------------------------- +local function ComputeRibsLinkOnDiffCrvs( nCrvS, nCrvE, dParS, dParE, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) + + local nParentId = EgtGetParent( nCrvS) + + local _, _, dParFinal = EgtPointCurveDist( EgtUP( nCrvE, dParE, GDB_ID.ROOT), nCrvS, GDB_ID.ROOT) + local _, _, dParStart = EgtPointCurveDist( EgtUP( nCrvS, dParS, GDB_ID.ROOT), nCrvE, GDB_ID.ROOT) + + -- tento con il tratto dParS->dParE + -- recupero il tratto interessato sulla curva1 + local nCrv1 = EgtCopyGlob( nCrvS, nParentId, GDB_IN.AFTER) + EgtTrimCurveStartEndAtParam( nCrv1, dParS, dParFinal) + -- recupero il tratto interessato sulla curva2 + local nCrv2 = EgtCopyGlob( nCrvE, nParentId, GDB_IN.AFTER) + EgtTrimCurveStartEndAtParam( nCrv2, dParStart, dParE) + -- modifico nCrv2 per avere una transizione uniforme da nCrv1 + EgtSpiralizeCurveAlongGuide( nCrv2, nCrv1) + EgtErase( nCrv1) + -- verifico se valida + if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then + return nCrv2 + + else + -- tento con il tratto dParE->dParS EgtErase( nCrv2) - return nil + nCrv1 = EgtCopyGlob( nCrvS, nParentId, GDB_IN.AFTER) -- tratto interessato sulla curva1 + EgtTrimCurveStartEndAtParam( nCrv1, dParFinal, dParS) + EgtInvertCurve( nCrv1) + nCrv2 = EgtCopyGlob( nCrvE, nParentId, GDB_IN.AFTER) -- tratto interessato sulla curva2 + EgtTrimCurveStartEndAtParam( nCrv2, dParE, dParStart) + EgtInvertCurve( nCrv2) + EgtSpiralizeCurveAlongGuide( nCrv2, nCrv1) -- transizione uniforme da nCrv1 + EgtErase( nCrv1) + if VerifyRibsLink( nCrv2, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) then + return nCrv2 + else + EgtErase( nCrv2) + return + end end end @@ -1182,10 +1232,10 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v local nLinkId if vIdsS[i] == vIdsE[j] then -- link su una sola curva - nLinkId = ComputeShortestCrv( vCrvIds[vIdsS[i]], vParS[i], vParE[j]) + nLinkId = ComputeRibsLinkOnSameCrv( vCrvIds[vIdsS[i]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) else -- link tra due curve distinte - nLinkId = ComputeRibsLinkOnDiffCrvs( vCrvIds[vIdsS[i]], vCrvIds[vIdsE[j]], vParS[i], vParE[j]) + nLinkId = ComputeRibsLinkOnDiffCrvs( vCrvIds[vIdsS[i]], vCrvIds[vIdsE[j]], vParS[i], vParE[j], nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) end if nLinkId then @@ -1194,13 +1244,7 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v EgtSetName( nLinkId, LINK_CRV) EgtModifyCurveExtrusion( nLinkId, vtSlicing, GDB_RT.GLOB) EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand) - -- verifico se valido - local bValid = VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, bCheckLinked) - if bValid then - return nLinkId - else - EgtErase( nLinkId) - end + return nLinkId end end end @@ -1213,7 +1257,7 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v EgtModifyCurveExtrusion( nLinkId, vtSlicing, GDB_RT.GLOB) EgtRelocateGlob( nLinkId, nCurr, GDB_IN.AFTER) EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand) - local bValid = VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, bCheckLinked) + local bValid = VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, bCheckLinked) if bValid then return nLinkId else @@ -1225,6 +1269,38 @@ local function CalcRibsLink( nCurr, nNext, nLoopGrp, bForceLink, bCheckLinked, v return end +-------------------------------------------------------------------- +local function CalcLoopRibLink( nCurr, nNext, nLoopGrp, vtSlicing, nGrpTmp) + + local ptS = EgtEP( nCurr) + local ptE = EgtSP( nNext) + if AreSamePointApprox( ptS, ptE) then return end + local dStrand = EgtGetInfo( nCurr, KEY_CRV_STRAND, 'd') + + local vCrvIds = EgtGetAllInGroup( nLoopGrp) + -- scorro le curve di bordo e verifico se posso creare il link + for i = 1, #vCrvIds do + local dParS = EgtCurveParamAtPoint( vCrvIds[i], ptS, 10 * GEO.EPS_SMALL) + local dParE = EgtCurveParamAtPoint( vCrvIds[i], ptE, 10 * GEO.EPS_SMALL) + if dParS and dParE then + local nLinkId = ComputeShortestCrv( vCrvIds[i], dParS, dParE) + if nLinkId then + EgtRelocateGlob( nLinkId, nCurr, GDB_IN.AFTER) + EgtSetInfo( nLinkId, KEY_TYPE, TYPE.RIB) + EgtSetName( nLinkId, LINK_CRV) + EgtModifyCurveExtrusion( nLinkId, vtSlicing, GDB_RT.GLOB) + EgtSetInfo( nLinkId, KEY_CRV_STRAND, dStrand) + if VerifyRibsLink( nLinkId, nCurr, nNext, nGrpTmp, dStrand, false) then + return nLinkId + else + EgtErase( nLinkId) + end + end + end + end + return +end + -------------------------------------------------------------------- local function VerifyRibsLead( nId, nRibId, bInVsOut, nGrpTmp) @@ -1633,13 +1709,16 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams) local bCheckLinkedRibs = not bForceLink and not bUserLink if ( nOrig1 ~= nOrig2 and bUserLink) or ( nSplitId1 == nSplitId2 and nOrig1 == nOrig2) then - local nLinkId = CalcRibsLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, bForceLink, bCheckLinkedRibs, LayerParams.vtSlicing, nGrpTmp) - - -- se LoopRib congiungo i setti in unico percorso - if bLoopRib and nLinkId then - EgtAddCurveCompoCurve( tabRibs[i][j], nLinkId) - EgtAddCurveCompoCurve( tabRibs[i][j], tabRibs[i][j + 1]) - tabRibs[i][j+1] = tabRibs[i][j] -- aggiorno id nel vettore dei setti per gestire correttamente la curva allo step successivo + if not bLoopRib then + CalcRibsLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, bForceLink, bCheckLinkedRibs, LayerParams.vtSlicing, nGrpTmp) + else + local nLinkId = CalcLoopRibLink( tabRibs[i][j], tabRibs[i][j + 1], nLoopGrp, LayerParams.vtSlicing, nGrpTmp) + -- se collegamento congiungo i setti in unico percorso + if nLinkId then + EgtAddCurveCompoCurve( tabRibs[i][j], nLinkId) + EgtAddCurveCompoCurve( tabRibs[i][j], tabRibs[i][j + 1]) + tabRibs[i][j+1] = tabRibs[i][j] -- aggiorno id nel vettore dei setti per gestire correttamente la curva allo step successivo + end end end end @@ -1647,7 +1726,7 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams) -- se LoopRib aggiungo collegamento tra primo e ultimo setto del gruppo if bLoopRib then local nTotCrv = #tabRibs[i] - local nLinkId = CalcRibsLink( tabRibs[i][nTotCrv], tabRibs[i][1], nLoopGrp, false, false, LayerParams.vtSlicing, nGrpTmp) + local nLinkId = CalcLoopRibLink( tabRibs[i][nTotCrv], tabRibs[i][1], nLoopGrp, LayerParams.vtSlicing, nGrpTmp) if nLinkId then -- se curva unica if tabRibs[i][nTotCrv] == tabRibs[i][1] then @@ -1678,7 +1757,9 @@ local function CalcRibsToolPath( vEntIds, nRibsGrp, nTpathGrpId, LayerParams) for i = 1, #tabRibs - 1 do local bLink1 = EgtGetInfo( tabRibs[i][1], KEY_RIBS_LINK, 'b') local bLink2 = EgtGetInfo( tabRibs[i + 1][1], KEY_RIBS_LINK, 'b') - if bLink1 and bLink2 then + local bLoop1 = EgtGetInfo( tabRibs[i][1], KEY_LOOP_RIB, 'b') or false + local bLoop2 = EgtGetInfo( tabRibs[i + 1][1], KEY_LOOP_RIB, 'b') or false + if bLink1 and bLink2 and not bLoop1 and not bLoop2 then local nCnt = #tabRibs[i] CalcRibsLink( tabRibs[i][nCnt], tabRibs[i + 1][1], nLoopGrp, false, true, LayerParams.vtSlicing, nGrpTmp) end