Merge commit 'df1d21356f1bb9e7822327ef4b74ed176aa33cc0'

This commit is contained in:
Dario Sassi
2024-10-03 10:16:21 +02:00
+2 -11
View File
@@ -2168,13 +2168,6 @@ SurfRoughing::AddPocket( const INTINTVECTOR& vPocket, const Vector3d& vtTool, co
dCurrElev = dSafeZ ;
double dNextElev = dSafeZ ;
if ( bSafe) {
/* Questo controllo serve se passando da un chunk all'altro si interseca un ulteriore
Chunk non ancora svuotato; per ora non capita mai...
*/
//if ( bSamePlane) {
// dCurrElev -= currStep.dRelativeDepth ;
// dNextElev = dCurrElev ;
//}
if ( bSamePlane) {
if ( ( ( currStep.nSubType == SURFROU_SUB_SPIRALIN || currStep.nSubType == SURFROU_SUB_SPIRALOUT) &&
! vStepInfo[i].vPaths[j+1].bOutStart) ||
@@ -2186,10 +2179,8 @@ SurfRoughing::AddPocket( const INTINTVECTOR& vPocket, const Vector3d& vtTool, co
else if ( bNextIsBelow)
dNextElev += ( ptEnd - ptDest) * vtTool ;
else {
if ( vStepInfo[i+1].vPaths.front().bOutStart)
dCurrElev += ( ptDest - ptEnd) * vtTool ;
else
dCurrElev -= currStep.dRelativeDepth ;
dCurrElev += ( ptDest - ptEnd) * vtTool - currStep.dRelativeDepth ;
dNextElev -= currStep.dRelativeDepth ;
}
}
else {