From 410b6aa2b5e52b117ee021f7e6c33ae8edafe240 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Tue, 27 May 2025 08:29:44 +0200 Subject: [PATCH] Include : - Modifica prototipi alle funzioni per generare la FatCurve. --- EGkCurveAux.h | 3 ++- EGkSfrCreate.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/EGkCurveAux.h b/EGkCurveAux.h index 7fd4e5b..d4936ec 100644 --- a/EGkCurveAux.h +++ b/EGkCurveAux.h @@ -141,7 +141,8 @@ EGK_EXPORT bool CalcCurvesMedialAxis( const CICURVEPVECTOR& vCrvC, ICURVEPOVECTO //---------------------------------------------------------------------------- //! Calcola l'offset completo di una curva -EGK_EXPORT bool CalcCurveFatCurve( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, double dRadius, bool bSquareEnds, bool bSquareMids) ; +EGK_EXPORT bool CalcCurveFatCurve( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, double dRadius, bool bSquareEnds, bool bSquareMids, + bool bMergeOnlySameProps = true) ; //---------------------------------------------------------------------------- //! Calcola, nel caso di curve chiuse, il valore limite di offset ( in valore assoluto) che fa sparire la curva diff --git a/EGkSfrCreate.h b/EGkSfrCreate.h index 67fcf7b..77dfe55 100644 --- a/EGkSfrCreate.h +++ b/EGkSfrCreate.h @@ -30,7 +30,8 @@ EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionRectangle( double dWidth, double dL EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionStadium( double dWidth, double dLen) ; EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionDisk( double dRadius) ; EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionFromFatCurve( ICurve* pCrv, double dRadius, - bool bSquareEnds, bool bSquareMids, double dOffsLinTol = 10 * EPS_SMALL) ; + bool bSquareEnds, bool bSquareMids, double dOffsLinTol = 10 * EPS_SMALL, + bool bMergeOnlySameProps = true) ; // NB : la curva ingrassata non deve autointersecarsi EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionFromTriangle( const Triangle3d& Tria) ; EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionFromPolyLine( const PolyLine& ContourPolyLine) ;