Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f813db1bc772df731ed9179b1ec60fcd82141dd4'

Browse Source
This commit is contained in:
Dario Sassi
2025-05-22 13:08:30 +02:00
parent ddfa249469 f813db1bc7
commit 7e36ba12ec
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pocketing.cpp
+1 -1
View File
@@ -1558,7 +1558,7 @@ Pocketing::ProcessPath( int nPathId, int nPvId, int nClId)
// sposto l'inizio a metà del tratto più lungo ( o aperto più lungo)
if ( bMidOpen) {
const double LEN_OUT = 5 ;
const double LEN_OUT = 5. + ( m_TParams.m_dDiam / 2.) ;
double dPar ; int nFlag ;
bMidOpen = ( DistPointCurve( ptMidOpen + LEN_OUT * vtMidOut, *pCompo).GetParamAtMinDistPoint( 0, dPar, nFlag) && pCompo->ChangeStartPoint( dPar)) ;
}
PocketingNT.cpp
-14
View File
@@ -1857,16 +1857,6 @@ PocketingNT::GetSfrRawProjection( const ISurfTriMesh* pStmRaw, const ISurfFlatRe
if ( ! plProj.Set( ptCen, vtTool))
return nullptr ;
/*int a = m_pGeomDB->AddGeoObj( GDB_ID_NULL, GDB_ID_ROOT, pSfr->Clone()) ;
m_pGeomDB->SetMaterial( a, Color( 0., 1., 0., .5)) ;
a = m_pGeomDB->AddGeoObj( GDB_ID_NULL, GDB_ID_ROOT, pStmRaw->Clone()) ;
m_pGeomDB->SetMaterial( a, Color( 5., 1., 0., .5)) ;
PtrOwner<IGeoFrame3d> fr( CreateGeoFrame3d()) ;
Frame3d frr ; frr.Set( ptCen, vtTool) ;
fr->Set( frr) ;
m_pGeomDB->AddGeoObj( GDB_ID_NULL, GDB_ID_ROOT, fr->Clone()) ;*/
// recupero la Silhouette al piano trovato
POLYLINEVECTOR vPL ;
if ( ! pStmRaw->GetSilhouette( plProj, EPS_SMALL, vPL))
@@ -1881,8 +1871,6 @@ PocketingNT::GetSfrRawProjection( const ISurfTriMesh* pStmRaw, const ISurfFlatRe
PtrOwner<ICurveComposite> pCrvLoop( CreateCurveComposite()) ;
if ( IsNull( pCrvLoop) || ! pCrvLoop->FromPolyLine( PL))
return nullptr ;
/*a = m_pGeomDB->AddGeoObj( GDB_ID_NULL, GDB_ID_ROOT, pCrvLoop->Clone()) ;
m_pGeomDB->SetMaterial( a, RED) ;*/
SfrByC.AddCurve( Release( pCrvLoop)) ;
}
PtrOwner<ISurfFlatRegion> pSfrRaw( SfrByC.GetSurf()) ;
@@ -1890,8 +1878,6 @@ PocketingNT::GetSfrRawProjection( const ISurfTriMesh* pStmRaw, const ISurfFlatRe
return nullptr ;
if ( AreOppositeVectorApprox( pSfrRaw->GetNormVersor(), vtTool))
pSfrRaw->Invert() ;
/* a = m_pGeomDB->AddGeoObj( GDB_ID_NULL, GDB_ID_ROOT, pSfrRaw->Clone()) ;
m_pGeomDB->SetMaterial( a, ORANGE) ;*/
return Release( pSfrRaw) ;
}