From 84ae21db774f83d7018afbb04531965430c4440b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 13 Mar 2026 13:36:31 +0100 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkCurveLocal.h | 4 ++-- EGkCurvePointDiffGeom.h | 3 ++- EGkIntersCurves.h | 2 +- EGkSurfLocal.h | 6 +++--- EInAPI.h | 4 +++- EXeExecutor.h | 14 +++++++------- EgtPointerOwner.h | 2 +- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/EGkCurveLocal.h b/EGkCurveLocal.h index 2d39f34..acae9cb 100644 --- a/EGkCurveLocal.h +++ b/EGkCurveLocal.h @@ -23,7 +23,7 @@ class CurveLocal CurveLocal( IGeomDB* pGeomDB, int nCrvId, const Frame3d& frLoc) : m_pCrv( nullptr), m_pCopy( nullptr) { // verifica dei parametri - if ( pGeomDB == nullptr || &frLoc == nullptr) + if ( pGeomDB == nullptr) return ; // recupero riferimento della curva Frame3d frCrv ; @@ -76,7 +76,7 @@ class CurveLocal return ; m_pCrv = m_pCopy ; } - CurveLocal( CurveLocal&& Other) + CurveLocal( CurveLocal&& Other) noexcept : m_pCrv( Other.m_pCrv), m_pCopy( Other.m_pCopy) { // annullo gli originali Other.m_pCrv = nullptr ; diff --git a/EGkCurvePointDiffGeom.h b/EGkCurvePointDiffGeom.h index 14b5532..f473ece 100644 --- a/EGkCurvePointDiffGeom.h +++ b/EGkCurvePointDiffGeom.h @@ -40,7 +40,8 @@ class CrvPointDiffGeom double dCurv ; public : - CrvPointDiffGeom( void) { nStatus = NONE ; nFlag = STD ; } + CrvPointDiffGeom( void) + : nStatus( NONE), nFlag( STD), dU( -1), dCurv( -1) {} } ; //---------------------------------------------------------------------------- diff --git a/EGkIntersCurves.h b/EGkIntersCurves.h index c811066..3c8d65b 100644 --- a/EGkIntersCurves.h +++ b/EGkIntersCurves.h @@ -44,7 +44,7 @@ struct IntCrvCrvInfo { IntCrvInfo IciB[2] ; //!< IciB[0] intersez. isolata o inizio overlap, IciB[1] fine overlap // costruttore IntCrvCrvInfo( void) - : bOverlap( false) {} + : bOverlap( false), bCBOverEq( false) {} } ; //! vettore di IntCrvCrvInfo typedef std::vector ICCIVECTOR ; diff --git a/EGkSurfLocal.h b/EGkSurfLocal.h index 42a76d5..c92837f 100644 --- a/EGkSurfLocal.h +++ b/EGkSurfLocal.h @@ -23,7 +23,7 @@ class SurfLocal SurfLocal( IGeomDB* pGeomDB, int nSrfId, const Frame3d& frLoc) : m_pSrf( nullptr), m_pCopy( nullptr) { // verifica dei parametri - if ( pGeomDB == nullptr || &frLoc == nullptr) + if ( pGeomDB == nullptr) return ; // recupero riferimento della superficie Frame3d frSrf ; @@ -48,7 +48,7 @@ class SurfLocal SurfLocal( const ISurf* pSurf, const Frame3d& frSrf, const Frame3d& frLoc) : m_pSrf( nullptr), m_pCopy( nullptr) { // verifica dei parametri - if ( pSurf == nullptr || &frSrf == nullptr || &frLoc == nullptr) + if ( pSurf == nullptr) return ; // assegno la superficie originale m_pSrf = pSurf ; @@ -76,7 +76,7 @@ class SurfLocal return ; m_pSrf = m_pCopy ; } - SurfLocal( SurfLocal&& Other) + SurfLocal( SurfLocal&& Other) noexcept : m_pSrf( Other.m_pSrf), m_pCopy( Other.m_pCopy) { // annullo gli originali Other.m_pSrf = nullptr ; diff --git a/EInAPI.h b/EInAPI.h index e49318d..e5a2ea7 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -636,8 +636,10 @@ EIN_EXPORT int __stdcall EgtExtractSurfTmLoops( int nId, int nDestGrpId, int* p EIN_EXPORT int __stdcall EgtExtractSurfTmFacetLoops( int nId, int nFacet, int nDestGrpId, int* pnCount) ; EIN_EXPORT int __stdcall EgtCopySurfTmFacet( int nId, int nFacet, int nDestGrpId) ; EIN_EXPORT int __stdcall EgtExtractSurfTmTriaLoop( int nId, int nT, int nDestGrpId) ; +EIN_EXPORT BOOL __stdcall EgtSurfBezierParamsFromPoint( int nSurfId, const double ptOnSurf[3], int nRefId, double* pdU, double* pdV) ; +EIN_EXPORT BOOL __stdcall EgtSurfBezierGetPointNrmD1( int nSurfId, double dU, double dV, int nUsd, int nVsd, int nRefId, + double ptP[3], double vtNorm[3], double vtDerU[3], double vtDerV[3]) ; EIN_EXPORT int __stdcall EgtExtractSurfBezierLoops( int nId, int nDestGrpId, int* pnCount) ; -EIN_EXPORT BOOL __stdcall EgtSurfBezParamsFromPoint( int nIdSurf, double ptPBez[3], int nDestGroup, double& dU, double& dV) ; // Geo Snap Vector/Point/Frame EIN_EXPORT BOOL __stdcall EgtStartPoint( int nId, int nRefId, double ptP[3]) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 24164f8..7776196 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -757,7 +757,7 @@ EXE_EXPORT bool ExeTextGetHeight( int nId, double& dH) ; EXE_EXPORT bool ExeTextGetItalic( int nId, bool& bItl) ; // GeomDb Get Pocketing -EXE_EXPORT bool ExePocketing( const int nId, double dRad, double dStep, double dAngle, int nType, bool bSmooth, int nDestGrpId, int& nFirstId, int& nCrvCount) ; +EXE_EXPORT bool ExePocketing( int nId, double dRad, double dStep, double dAngle, int nType, bool bSmooth, int nDestGrpId, int& nFirstId, int& nCrvCount) ; EXE_EXPORT int ExeSurfFrGetZigZagInfill( int nId, int nDestGrpId, double dStep, double dAng, bool bSmooth, bool bRemoveOverlapLink,int* pnCount) ; // GeomDb Curve Get @@ -854,10 +854,10 @@ EXE_EXPORT bool ExeSurfBezierGetPointD1( int nSurfId, double dU, double dV, int Point3d& ptP, Vector3d& vtDerU, Vector3d& vtDerV) ; EXE_EXPORT bool ExeSurfBezierGetPointNrmD1( int nSurfId, double dU, double dV, int nUsd, int nVsd, int nRefId, Point3d& ptP, Vector3d& vtN, Vector3d& vtDerU, Vector3d& vtDerV) ; +EXE_EXPORT bool ExeSurfBezierParamsFromPoint( int nSurfId, const Point3d& ptOnSurf, int nRefId, double& dU, double& dV) ; +EXE_EXPORT bool ExeSurfBezierGetInfo( int nSurfId, int& nDegU, int& nDegV, int& nSpanU, int& nSpanV, bool& bIsRat, bool& bTrimmed) ; EXE_EXPORT int ExeSurfBezierGetCurveU( int nSurfId, double dV, int nDestGrpId) ; EXE_EXPORT int ExeSurfBezierGetCurveV( int nSurfId, double dU, int nDestGrpId) ; -EXE_EXPORT bool ExeSurfBezParamsFromPoint( int nSurfId, const Point3d& ptOnSurf, int nDestGrpId, double& dU, double& dV) ; -EXE_EXPORT bool ExeSurfBezierGetInfo( int nSurfId, int& nDegU, int& nDegV, int& nSpanU, int& nSpanV, bool& bIsRat, bool& bTrimmed) ; EXE_EXPORT int ExeSurfBezierGetControlCurveU( int nSurfId, int nIndV, int nDestGrpId) ; EXE_EXPORT int ExeSurfBezierGetControlCurveV( int nSurfId, int nIndU, int nDestGrpId) ; EXE_EXPORT int ExeExtractSurfBezierLoops( int nId, int nDestGrpId, int* pnCount) ; @@ -923,7 +923,7 @@ EXE_EXPORT bool ExePointSurfBzDist( const Point3d& ptP, int nSbzId, int nRefType double* pdDist, Point3d& ptMin, Vector3d& vtN) ; // Geo Intersect -EXE_EXPORT bool ExeLineCurveInters( const Point3d& ptP, const Vector3d& vtDir, const int nId, const int nRefType, +EXE_EXPORT bool ExeLineCurveInters( const Point3d& ptP, const Vector3d& vtDir, int nId, int nRefType, INTDBLVECTOR& vInters) ; EXE_EXPORT bool ExeLineBoxInters( const Point3d& ptP, const Vector3d& vtDir, const BBox3d& b3Box, INTDBLVECTOR& vInters) ; @@ -933,7 +933,7 @@ EXE_EXPORT bool ExeLineSurfBzInters( const Point3d& ptP, const Vector3d& vtDir, INTDBLVECTOR& vInters) ; EXE_EXPORT bool ExeLineVolZmapInters( const Point3d& ptP, const Vector3d& vtDir, int nId, int nRefType, INTDBLVECTOR& vInters) ; -EXE_EXPORT int ExePlaneCurveInters( const Point3d& ptOn, const Vector3d& vtN, const int nId, const int nDestGrpId, const int nRefType, +EXE_EXPORT int ExePlaneCurveInters( const Point3d& ptOn, const Vector3d& vtN, int nId, int nDestGrpId, int nRefType, int* pnCount) ; EXE_EXPORT int ExePlaneBoxInters( const Point3d& ptOn, const Vector3d& vtN, const BBox3d& b3Box, int nDestGrpId, int nRefType, int* pnPntCount, int* pnCrvCount, int* pnSrfCount) ; @@ -943,9 +943,9 @@ EXE_EXPORT int ExeParPlanesSurfTmInters( const Point3d& ptOn, const Vector3d& v int* pnGrpCount) ; EXE_EXPORT int ExePlaneVolZmapInters( const Point3d& ptOn, const Vector3d& vtN, int nId, int nDestGrpId, int nRefType, int* pnCount) ; -EXE_EXPORT int ExeCurveCurveInters( const int nId1, const int nId2, const int nDestGrpId, +EXE_EXPORT int ExeCurveCurveInters( int nId1, int nId2, int nDestGrpId, int* pnPntCount, int* pnCrvCount, bool bOnly3D = false) ; -EXE_EXPORT int ExeCurveSurfTmInters( const int nCrvId, const int nStmId, const int nDestGrpId, +EXE_EXPORT int ExeCurveSurfTmInters( int nCrvId, int nStmId, int nDestGrpId, int* pnPntCount, int* pnCrvCount) ; EXE_EXPORT int ExeSurfTmSurfTmInters( int nId1, int nId2, int nDestGrpId, double dToler, int* pnPntCount, int* pnCrvCount, int* pnSrfCount) ; diff --git a/EgtPointerOwner.h b/EgtPointerOwner.h index 10a7178..67f8560 100644 --- a/EgtPointerOwner.h +++ b/EgtPointerOwner.h @@ -21,7 +21,7 @@ class PtrOwner public : explicit PtrOwner( void) : m_pT( nullptr) {} explicit PtrOwner( T* pT) : m_pT( pT) {} - PtrOwner( PtrOwner&& RPT) : m_pT( Release( RPT)) {} + PtrOwner( PtrOwner&& RPT) noexcept : m_pT( Release( RPT)) {} PtrOwner( const PtrOwner& RPT) = delete ; ~PtrOwner( void) { Reset() ; } bool Set( T* pT) { Reset() ; m_pT = pT ; return ( m_pT != nullptr) ; }