diff --git a/EGkCAvSilhouetteSurfTm.h b/EGkCAvSilhouetteSurfTm.h index 6168150..bc11541 100644 --- a/EGkCAvSilhouetteSurfTm.h +++ b/EGkCAvSilhouetteSurfTm.h @@ -31,14 +31,11 @@ class __declspec( novtable) ICAvParSilhouettesSurfTm { public : virtual ~ICAvParSilhouettesSurfTm( void) {} - // generica virtual bool SetData( const CISURFTMPVECTOR& vpStm, const Frame3d& frPlanes, double dTol) = 0 ; + virtual bool SetData( const CISURFTMPVECTOR& vpStm, const Frame3d& frPlanes, double dTol, + double dSideAng, double dDiam, double dCornRad, double dMaxMat, double dOffsR, + double dMaxDepth) = 0 ; virtual bool GetSilhouette( double dLevel, POLYLINEVECTOR& vPL) = 0 ; - // con regione piana - virtual bool SetDataForRegion( const CISURFTMPVECTOR& vpStm, const ISurfFlatRegion* pSfr, double dSideAng, - double dDiam, double dCornRad, double dMaxMat, double dOffsR, - double dSampleTol = 10 * EPS_SMALL, double dSharpedAngTol = 15.) = 0 ; - virtual bool GetSilhouetteInsideRegion( double dLevel, POLYLINEVECTOR& vPL) = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EGkCAvToolSurfTm.h b/EGkCAvToolSurfTm.h index 140dcbe..71113d0 100644 --- a/EGkCAvToolSurfTm.h +++ b/EGkCAvToolSurfTm.h @@ -43,11 +43,11 @@ class __declspec( novtable) ICAvToolSurfTm { virtual const ICurveComposite& GetToolOutline( bool bApprox = false) const = 0 ; virtual bool TestPosition( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, double& dTotDist, Vector3d* pvtTriaN = nullptr) const = 0 ; - virtual bool TestPointAdv( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, + virtual bool TestPositionAdv( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, double& dTotDist, VCT3DVECTOR& vVtN) const = 0 ; virtual bool TestSeries( PNTUVECTOR& vPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dProgCoeff = 1) = 0 ; + virtual bool TestSeriesAdv( PNTUVVECTVECTOR& vPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dProgCoeff = 1) = 0 ; virtual bool TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dLinTol, double dProgCoeff = 1) = 0 ; - virtual bool TestPointsAdv( PNTUVVECTLIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dProgCoeff = 1) = 0 ; } ; //-----------------------------------------------------------------------------