diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index fe52ccf..2cd362b 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -114,9 +114,7 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual bool GetEdge( int nInd, Point3d& ptP1, Point3d& ptP2, double& dAng) const = 0 ; virtual bool GetEdges( ICURVEPOVECTOR& vpCurve) const = 0 ; virtual bool GetCurvature( int nV, - double& dMinK, Vector3d& vtMinK, double& dMaxK, Vector3d& vtMaxK, bool& bPlanar, Vector3d& vtNorm, - double* dGaussK = nullptr, double* dMeanK = nullptr, - double* dMaxNormK = nullptr, double* dMinNormK = nullptr) const = 0 ; + double& dMinK, Vector3d& vtMinK, double& dMaxK, Vector3d& vtMaxK, bool& bPlanar, Vector3d& vtNorm) const = 0 ; virtual bool Cut( const Plane3d& plPlane, bool bSaveOnEq) = 0 ; virtual bool GeneralizedCut( const ICurve& cvCurve, bool bSaveOnEq) = 0 ; virtual bool Add( const ISurfTriMesh& Other) = 0 ; diff --git a/EXeConst.h b/EXeConst.h index 4e0a12f..2d138e5 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -154,12 +154,6 @@ enum VolZmapOffset { FILLET = 0 , // come in VolZmap CHAMFER = 1, // come in VolZmap EXTEND = 2 } ; // come in VolZmap -//----------------- Costanti Curvature per SurfTm ------------------------------ -enum StmCurvature { STM_CURVATURE_STD = 0, // Curvatura minima e massima - STM_CURVATURE_GAUSS = 1, // Curvature Gaussiana - STM_CURVATURE_MEAN = 2, // Curvature Media - STM_CURVATURE_NORM = 3 } ; // Curvature Normale - //----------------- Costanti per sostituzione direttorio e nome progetto -------------------- const std::string SUB_PROJECT_DIR = "%PRJDIR%" ; const std::string SUB_PROJECT_TITLE = "%PRJTITLE%" ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 532e49b..595f4c6 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -838,7 +838,7 @@ EXE_EXPORT bool ExeSurfTmGetFacetOutlineInfo( int nId, int nFacet, int nRefId, int& nStatus, BOOLVECTOR& vbOpen, INTVECTOR& vnAdj, DBLVECTOR& vdLen, PNTVECTOR& vptStart, VCT3DVECTOR& vvtNorm, DBLVECTOR& vdElev) ; EXE_EXPORT int ExeSurfTmGetEdges( int nId, int nDestGrpId, bool bSmoothAng, int* pnCount) ; -EXE_EXPORT bool ExeSurfTmGetCurvatures( int nId, int nV, int nType, double& dK1, Vector3d& vtK1, double& dK2, Vector3d& vtK2) ; +EXE_EXPORT bool ExeSurfTmGetCurvatures( int nId, int nV, double& dK1, Vector3d& vtK1, double& dK2, Vector3d& vtK2) ; EXE_EXPORT bool ExeSurfBezierGetPoint( int nSurfId, double dU, double dV, int nRefId, Point3d& ptP) ; EXE_EXPORT bool ExeSurfBezierGetPointD1( int nSurfId, double dU, double dV, int nUsd, int nVsd, int nRefId, Point3d& ptP, Vector3d& vtDerU, Vector3d& vtDerV) ;