From 3466eb44dd58fe6802c45c683872187586c04dc7 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 8 Apr 2024 09:42:26 +0200 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkProjectCurveSurfTm.h | 9 +++++++-- EXeExecutor.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/EGkProjectCurveSurfTm.h b/EGkProjectCurveSurfTm.h index 2d2320b..cbf8319 100644 --- a/EGkProjectCurveSurfTm.h +++ b/EGkProjectCurveSurfTm.h @@ -29,11 +29,14 @@ struct Point5ax { Point3d ptP ; Vector3d vtDir ; + Vector3d vtDir2 ; double dPar ; int nFlag ; - Point5ax( void) : ptP(), vtDir(), dPar(), nFlag() {} ; + Point5ax( void) : ptP(), vtDir(), vtDir2(), dPar(), nFlag() {} ; Point5ax( const Point3d& ptBase, const Vector3d& vtTool, double dU, int nData) - : ptP( ptBase), vtDir( vtTool), dPar( dU), nFlag( nData) {} ; + : ptP( ptBase), vtDir( vtTool), vtDir2(), dPar( dU), nFlag( nData) {} ; + Point5ax( const Point3d& ptBase, const Vector3d& vtTool, const Vector3d& vtTool2, double dU, int nData) + : ptP( ptBase), vtDir( vtTool), vtDir2( vtTool2), dPar( dU), nFlag( nData) {} ; } ; typedef std::vector PNT5AXVECTOR ; // vettore di Punti 5assi @@ -41,3 +44,5 @@ typedef std::vector PNT5AXVECTOR ; // vettore di Punti 5assi // Proiezione di una curva su una superficie TriMesh lungo la direzione data. EGK_EXPORT bool ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const Vector3d& vtDir, double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; +EGK_EXPORT bool ProjectCurveOnSurfTm( const ICurve& crCrv, const ISurfTriMesh& tmSurf, const ICurve& crRef, + double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index cc88e0c..8c60832 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -601,6 +601,8 @@ EXE_EXPORT bool ExeChainCurvesInGroup( int nGroupId, const Point3d& ptNear, int EXE_EXPORT bool ExeReorderCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType) ; EXE_EXPORT bool ExeProjectCurveOnSurfTm( int nCurveId, int nSurfTmId, const Vector3d& vtDir, int nDestGrpId, double dLinTol, double dMaxSegmLen, int nRefType) ; +EXE_EXPORT bool ExeProjectCurveOnSurfTmExt( int nCurveId, int nSurfTmId, int nGuideId, int nDestGrpId, + double dLinTol, double dMaxSegmLen, bool bDirFromGuide) ; EXE_EXPORT int ExeCurveGetVoronoi( int nId, int nDestGrpId, int nBound, int* pnCount) ; EXE_EXPORT int ExeCurveGetMedialAxis( int nId, int nDestGrpId, int nSide, int* pnCount) ; EXE_EXPORT int ExeCurveGetFatCurve( int nId, int nDestGrpId, double dRad, bool bSquareEnds, bool bSquareMids, int* pnCount) ;