diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc index c9fb331..ba18446 100644 Binary files a/EgtGeomKernel.rc and b/EgtGeomKernel.rc differ diff --git a/SfrCreate.cpp b/SfrCreate.cpp index 957dc03..d21c5ac 100644 --- a/SfrCreate.cpp +++ b/SfrCreate.cpp @@ -279,13 +279,34 @@ GetSurfFlatRegionFromFatCurve( ICurve* pCrv, double dRadius, bool bSquareEnds, b //---------------------------------------------------------------------------- ISurfFlatRegion* -GetSurfFlatRegionFromPolyLine( const PolyLine& ContourPolyLine) +GetSurfFlatRegionFromTriangle( const Triangle3d& Tria) { // Creo la regione. PtrOwner pSfr( CreateBasicSurfFlatRegion()) ; if ( IsNull( pSfr)) return nullptr ; - // Creo curva composita. + // Creo curva composita. + PtrOwner pLoop( CreateBasicCurveComposite()) ; + if ( IsNull( pLoop)) + return nullptr ; + if ( ! pLoop->AddPoint( Tria.GetP( 0)) || + ! pLoop->AddLine( Tria.GetP( 1)) || + ! pLoop->AddLine( Tria.GetP( 2)) || + ! pLoop->Close()) + return nullptr ; + pSfr->AddExtLoop( Release( pLoop)) ; + return Release( pSfr) ; +} + +//---------------------------------------------------------------------------- +ISurfFlatRegion* +GetSurfFlatRegionFromPolyLine( const PolyLine& ContourPolyLine) +{ + // Creo la regione. + PtrOwner pSfr( CreateBasicSurfFlatRegion()) ; + if ( IsNull( pSfr)) + return nullptr ; + // Creo curva composita. PtrOwner pLoop( CreateBasicCurveComposite()) ; if ( IsNull( pLoop)) return nullptr ; @@ -307,13 +328,13 @@ GetSurfFlatRegionFromPolyLine( const PolyLine& ContourPolyLine) ISurfFlatRegion* GetSurfFlatRegionFromPolyLineVector( const POLYLINEVECTOR& vContoursPolyLineVec) { - // Creo la regione. + // Creo la regione. PtrOwner pSfr( CreateBasicSurfFlatRegion()) ; if ( IsNull( pSfr)) return nullptr ; - // Ciclo sulle PolyLine. + // Ciclo sulle PolyLine. for ( int nL = 0 ; nL < int( vContoursPolyLineVec.size()) ; ++ nL) { - // Creo curva composita. + // Creo curva composita. PtrOwner pLoop( CreateBasicCurveComposite()) ; if ( IsNull( pLoop)) return nullptr ; @@ -327,11 +348,11 @@ GetSurfFlatRegionFromPolyLineVector( const POLYLINEVECTOR& vContoursPolyLineVec) ptSt = ptEn ; bContinue = vContoursPolyLineVec[nL].GetNextPoint( ptEn) ; } - // Loop esterno + // Loop esterno if ( nL == 0) { pSfr->AddExtLoop( Release( pLoop)) ; } - // Loop interno + // Loop interno else { pSfr->AddIntLoop( Release( pLoop)) ; } diff --git a/SurfFlatRegionOffset.cpp b/SurfFlatRegionOffset.cpp index be335b2..18fb77c 100644 --- a/SurfFlatRegionOffset.cpp +++ b/SurfFlatRegionOffset.cpp @@ -27,6 +27,9 @@ SurfFlatRegion::Offset( double dDist, int nType) int nChunk = GetChunkCount() ; if ( nChunk == 0) return false ; + // se offset nullo, non devo fare alcunché + if ( abs( dDist) < 10 * EPS_SMALL) + return true ; // creo una nuova regione PtrOwner pSfr( new( nothrow) SurfFlatRegion) ; if ( IsNull( pSfr)) diff --git a/SurfTriMesh.cpp b/SurfTriMesh.cpp index f7b8755..044465c 100644 --- a/SurfTriMesh.cpp +++ b/SurfTriMesh.cpp @@ -1005,7 +1005,7 @@ SurfTriMesh::MarchOneTria( int& nT, int& nV, int nTimeStamp, //---------------------------------------------------------------------------- bool -SurfTriMesh::GetSilhouette( const Vector3d& vtDir, POLYLINEVECTOR& vPL) const +SurfTriMesh::GetSilhouette( const Vector3d& vtDir, double dTol, POLYLINEVECTOR& vPL) const { // Verifico lo stato if ( m_nStatus != OK) @@ -1016,6 +1016,19 @@ SurfTriMesh::GetSilhouette( const Vector3d& vtDir, POLYLINEVECTOR& vPL) const if ( ! vtVers.Normalize()) return false ; + // Controlli su tolleranza + dTol = max( dTol, 100 * EPS_SMALL) ; + + // Determino il riferimento di proiezione + Frame3d frOCS ; frOCS.Set( ORIG, vtVers) ; + Frame3d frBox = frOCS ; frBox.Invert() ; + BBox3d b3Box ; + GetBBox( frBox, b3Box) ; + frOCS.Translate( b3Box.GetMin().z * frOCS.VersZ()) ; + +#if 0 + // *** 1° Sfruttando le adiacenze *** + // Non funziona perchè genera loop con anelli // Copio la superficie PtrOwner pStm( Clone()) ; if ( IsNull( pStm)) @@ -1027,14 +1040,100 @@ SurfTriMesh::GetSilhouette( const Vector3d& vtDir, POLYLINEVECTOR& vPL) const if ( pStm->m_vTria[i].nIdVert[0] == SVT_DEL) continue ; // verifico la normale - if ( pStm->m_vTria[i].vtN * vtVers < - EPS_ZERO) + if ( pStm->m_vTria[i].vtN * vtVers < EPS_ZERO) pStm->RemoveTriangle( i) ; } // dichiaro facce non calcolate pStm->m_bFaceted = false ; + // Proietto la superficie + pStm->Scale( frOCS, 1, 1, 0) ; + // Recupero i loop della nuova superficie - return pStm->GetLoops( vPL) ; + POLYLINEVECTOR vMyPL ; + if ( pStm->GetLoops( vMyPL)) { + // calcolo la regione della superficie proiettata + bool bOk = true ; + PtrOwner pSfr ; + for ( int i = 0 ; i < int( vMyPL.size()) && bOk ; ++ i) { + // Regione di un loop + PtrOwner pSfrPart( GetSurfFlatRegionFromPolyLine( vMyPL[i])) ; + if ( ! IsNull( pSfrPart)) { + pSfrPart->Offset( dTol, ICurve::OFF_FILLET) ; + if ( IsNull( pSfr)) + if ( pSfrPart->GetNormVersor() * vtVers > 0) + bOk = pSfr.Set( Release( pSfrPart)) ; + else + bOk = false ; + else { + if ( pSfrPart->GetNormVersor() * vtVers > 0) + bOk = pSfr->Add( *pSfrPart) ; + else { + pSfrPart->Invert() ; + bOk = pSfr->Subtract( *pSfrPart) ; + } + } + } + else + bOk = false ; + } + // Verifico esistenza della regione + if ( bOk && ! IsNull( pSfr)) { + // Effettuo contro-offset + pSfr->Offset( -dTol, ICurve::OFF_EXTEND) ; + // Recupero i contorni della regione + for ( int i = 0 ; i < pSfr->GetChunkCount() ; ++ i) { + for ( int j = 0 ; j < pSfr->GetLoopCount( i) ; ++ j) { + PolyLine PL ; + if ( pSfr->ApproxLoopWithLines( i, j, LIN_TOL_STD, ANG_TOL_STD_DEG, ICurve::APL_STD, PL)) + vPL.emplace_back( PL) ; + } + } + return true ; + } + } + vPL.clear() ; +#endif + + // *** 2° Mediante unione delle regioni dei triangoli proiettati *** + // calcolo la regione dei triangoli proiettati + PtrOwner pSfr ; + Triangle3d Tria ; + int nT = GetFirstTriangle( Tria) ; + while ( nT != SVT_NULL) { + // verifico la normale e il triangolo proiettato + if ( Tria.GetN() * vtVers > EPS_ZERO && + Tria.Scale( frOCS, 1, 1, 0) && Tria.GetSqMinHeight() > SQ_EPS_SMALL) { + PtrOwner pSfrTria( GetSurfFlatRegionFromTriangle( Tria)) ; + if ( ! IsNull( pSfrTria)) { + pSfrTria->Offset( dTol, ICurve::OFF_FILLET) ; + if ( IsNull( pSfr)) + pSfr.Set( Release( pSfrTria)) ; + else + pSfr->Add( *pSfrTria) ; + } + } + // passo al successivo + nT = GetNextTriangle( nT, Tria) ; + } + + // Se non esiste la regione + if ( IsNull( pSfr)) + return false ; + + // Effettuo contro-offset + pSfr->Offset( -dTol, ICurve::OFF_EXTEND) ; + + // Recupero i contorni della regione + for ( int i = 0 ; i < pSfr->GetChunkCount() ; ++ i) { + for ( int j = 0 ; j < pSfr->GetLoopCount( i) ; ++ j) { + PolyLine PL ; + if ( pSfr->ApproxLoopWithLines( i, j, LIN_TOL_STD, ANG_TOL_STD_DEG, ICurve::APL_STD, PL)) + vPL.emplace_back( PL) ; + } + } + + return true ; } //---------------------------------------------------------------------------- diff --git a/SurfTriMesh.h b/SurfTriMesh.h index 41ea278..a0c7830 100644 --- a/SurfTriMesh.h +++ b/SurfTriMesh.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2019 +// EgalTech 2014-2021 //---------------------------------------------------------------------------- -// File : SurfTriMesh.h Data : 12.02.19 Versione : 2.1b2 +// File : SurfTriMesh.h Data : 26.09.21 Versione : 2.3i2 // Contenuto : Dichiarazione della classe Superficie TriMesh. // // @@ -283,7 +283,7 @@ class SurfTriMesh : public ISurfTriMesh, public IGeoObjRW bool GetTriangleBoundaryEdges( int nId, TriFlags3d& TFlags) const override ; bool GetTriangleSmoothNormals( int nId, TriNormals3d& TNrms) const override ; bool GetLoops( POLYLINEVECTOR& vPL) const override ; - bool GetSilhouette( const Vector3d& vtDir, POLYLINEVECTOR& vPL) const override ; + bool GetSilhouette( const Vector3d& vtDir, double dTol, POLYLINEVECTOR& vPL) const override ; int GetFacetCount( void) const override ; int GetFacetSize( void) const override { return int( m_vFacet.size()) ; } diff --git a/VolZmapGraphics.cpp b/VolZmapGraphics.cpp index f9ee92b..24aedb1 100644 --- a/VolZmapGraphics.cpp +++ b/VolZmapGraphics.cpp @@ -1,13 +1,13 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2019 +// EgalTech 2015-2021 //---------------------------------------------------------------------------- -// File : VolZmap.cpp Data : 07.03.19 Versione : 2.1c2 +// File : VolZmap.cpp Data : 13.09.21 Versione : 2.3i1 // Contenuto : Implementazione della classe Volume Zmap (tre griglie) // // // // Modifiche : 22.01.15 DS Creazione modulo. -// +// 13.09.21 LM Correzione funzione che determina se voxel su frontiera di un blocco. // //----------------------------------------------------------------------------