From 7eae7b1771324ceddf10a74ecceda4246db1f907 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 13 Apr 2024 17:45:12 +0200 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkSurfBezier.h | 3 ++- EXeExecutor.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EGkSurfBezier.h b/EGkSurfBezier.h index 7c8a3d0..8ba5447 100644 --- a/EGkSurfBezier.h +++ b/EGkSurfBezier.h @@ -58,7 +58,8 @@ class __declspec( novtable) ISurfBezier : public ISurf virtual ICurveComposite* GetLoop( int nLoop) const = 0 ; // nLoop 0-based (1°esterno, successivi interni) virtual bool GetControlCurveOnU( int nIndV, PolyLine& plCtrlU) const = 0 ; virtual bool GetControlCurveOnV( int nIndU, PolyLine& plCtrlV) const = 0 ; - virtual const ISurfTriMesh* GetAuxSurf( double dTol = 50 * EPS_SMALL, double dSideMin = 100 * EPS_SMALL) const = 0 ; + virtual const ISurfTriMesh* GetAuxSurf( void) const = 0 ; + virtual ISurfTriMesh* GetApproxSurf( double dTol, double dSideMin = 100 * EPS_SMALL) const = 0 ; virtual bool GetLeaves ( std::vector>& vLeaves) const = 0 ; virtual bool GetTriangles2D( std::vector>& vTria2D) const = 0 ; virtual bool UnprojectPointFromStm( int nT, const Point3d& ptI, Point3d& ptSP, int nIL) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index bf94e50..bfe7c8e 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -364,7 +364,6 @@ EXE_EXPORT int ExeCreateSurfTmTransSwept( int nParentId, int nSectId, int nGuid EXE_EXPORT int ExeCreateSurfTmRuled( int nParentId, int nPtOrCrvId1, int nPtOrCrvId2, int nType, double dLinTol) ; EXE_EXPORT int ExeCreateSurfTmByTriangles( int nParentId, const INTVECTOR& vIds, bool bErase) ; EXE_EXPORT int ExeCreateSurfTmBySewing( int nParentId, const INTVECTOR& vIds, bool bErase) ; -EXE_EXPORT int ExeCreateSurfTmBySurfBezier( int nParentId, int nSbezId, double dTol = 50 * EPS_SMALL, double dSideMin = 100 * EPS_SMALL) ; EXE_EXPORT int ExeCreateSurfTmByVolZmap( int nParentId, int nZmapId, int nPart) ; EXE_EXPORT int ExeCreateSurfBezier( int nParentId, int nDegU, int nDegV, int nSpanU, int nSpanV, const PNTVECTOR& vPnt, int nRefType) ; EXE_EXPORT int ExeCreateSurfBezierRational( int nParentId, int nDegU, int nDegV, int nSpanU, int nSpanV, const PNTUVECTOR& vPntW, int nRefType) ; @@ -611,7 +610,7 @@ EXE_EXPORT int ExeCurveGetFatCurve( int nId, int nDestGrpId, double dRad, bool // GeomDb Surf Modify EXE_EXPORT bool ExeInvertSurface( const INTVECTOR& vIds) ; EXE_EXPORT int ExeExplodeSurface( int nId, int* pnCount) ; -EXE_EXPORT bool ExeApproxSurface( int nId, double dLinTol) ; +EXE_EXPORT bool ExeApproxSurface( int nId, double dLinTol, double dTriaMinSide = 100 * EPS_SMALL) ; EXE_EXPORT bool ExeSurfFrAdd( int nId1, int nId2) ; EXE_EXPORT bool ExeSurfFrSubtract( int nId1, int nId2) ; EXE_EXPORT bool ExeSurfFrIntersect( int nId1, int nId2) ;