From a1fcd34a2651e2d00878a90d2c1c228da3119297 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 17 Dec 2018 11:31:52 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EInAPI.h | 17 ++++++++++++----- EXeExecutor.h | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index b8760c1..7837acc 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -462,9 +462,6 @@ EIN_EXPORT BOOL __stdcall EgtCurveSelfIntersCount( int nId, int* pnCount) ; EIN_EXPORT BOOL __stdcall EgtCurveMinAreaRectangleXY( int nId, int nRefId, double ptOrig[3], double vtX[3], double vtY[3], double vtZ[3], double* pdDimX, double* pdDimY) ; EIN_EXPORT int __stdcall EgtClosedCurveClassify( int nId1, int nId2) ; -EIN_EXPORT BOOL __stdcall EgtGetMinDistPointCurve( const double ptP[3], int nId, double* pdDist, double* pdU) ; -EIN_EXPORT BOOL __stdcall EgtGetMinDistPntSidePointCurve( const double ptP[3], int nId, const double vtN[3], - double* pdDist, double ptMin[3], int* pnSide) ; EIN_EXPORT BOOL __stdcall EgtArcRadius( int nId, double* pdRad) ; EIN_EXPORT BOOL __stdcall EgtArcAngCenter( int nId, double* pdAngDeg) ; EIN_EXPORT BOOL __stdcall EgtArcDeltaN( int nId, double* pdDeltaN) ; @@ -485,8 +482,6 @@ EIN_EXPORT BOOL __stdcall EgtSurfTmFacetOppositeSide( int nId, int nFacet, const double ptP1[3], double ptP2[3]) ; EIN_EXPORT BOOL __stdcall EgtSurfTmFacetAdjacencies( int nId, int nFacet, int*& vAdj, int* pnCount) ; EIN_EXPORT BOOL __stdcall EgtSurfTmFacetsContact( int nId, int nF1, int nF2, int nRefId, bool* pbAdjac, double ptP1[3], double ptP2[3], double* pdAng) ; -EIN_EXPORT BOOL __stdcall EgtSurfTmLineInters( int nId, const double ptP[3], const double vtDir[3], int nRefType, - int*& vFlagInters, double*& vParInters, int* pnCount) ; EIN_EXPORT BOOL __stdcall EgtTextNormVersor( int nId, int nRefId, double vtNorm[3]) ; EIN_EXPORT BOOL __stdcall EgtTextGetContent( int nId, wchar_t*& wsText) ; EIN_EXPORT BOOL __stdcall EgtTextGetFont( int nId, wchar_t*& wsFont) ; @@ -513,6 +508,18 @@ EIN_EXPORT BOOL __stdcall EgtMirrorGroup( int nId, const double vPnt[3], const d EIN_EXPORT BOOL __stdcall EgtShearGroup( int nId, const double vPnt[3], const double vN[3], const double vDir[3], double dCoeff) ; +// Geo Dist +EIN_EXPORT BOOL __stdcall EgtPointCurveDist( const double ptP[3], int nId, int nRefType, + double* pdDist, double* pdU) ; +EIN_EXPORT BOOL __stdcall EgtPointCurveDistSide( const double ptP[3], int nId, const double vtN[3], int nRefType, + double* pdDist, double ptMin[3], int* pnSide) ; +EIN_EXPORT BOOL __stdcall EgtPointSurfTmDist( const double ptP[3], int nId, int nRefType, + double* pdDist, double ptMin[3], int* pnTria) ; + +// Geo Inters +EIN_EXPORT BOOL __stdcall EgtLineSurfTmInters( const double ptP[3], const double vtDir[3], int nId, int nRefType, + int*& vFlagInters, double*& vParInters, int* pnCount) ; + // Nesting EIN_EXPORT BOOL __stdcall EgtCreateFlatParts( int nType) ; EIN_EXPORT BOOL __stdcall EgtAdjustFlatPartLayer( int nLayerId) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 7433d28..b1432ae 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -527,9 +527,6 @@ EXE_EXPORT bool ExeCurveThickness( int nId, double* pdThick) ; EXE_EXPORT bool ExeCurveSelfIntersCount( int nId, int* pnCount) ; EXE_EXPORT bool ExeCurveMinAreaRectangleXY( int nId, int nRefId, Frame3d& frRect, double& dDimX, double& dDimY) ; EXE_EXPORT int ExeClosedCurveClassify( int nId1, int nId2) ; -EXE_EXPORT bool ExeGetMinDistPointCurve( const Point3d& ptP, int nId, double* pdDist, double* pdU) ; -EXE_EXPORT bool ExeGetMinDistPntSidePointCurve( const Point3d& ptP, int nId, const Vector3d& vtN, - double* pdDist, Point3d& ptMin, int* pnSide) ; EXE_EXPORT bool ExeArcRadius( int nId, double* pdRad) ; EXE_EXPORT bool ExeArcAngCenter( int nId, double* pdAngDeg) ; EXE_EXPORT bool ExeArcDeltaN( int nId, double* pdDeltaN) ; @@ -583,14 +580,22 @@ EXE_EXPORT bool ExeMirrorGroup( int nId, const Point3d& ptP, const Vector3d& vtN EXE_EXPORT bool ExeShearGroup( int nId, const Point3d& ptP, const Vector3d& vtN, const Vector3d& vtDir, double dCoeff) ; +// Geo Dist +EXE_EXPORT bool ExePointCurveDist( const Point3d& ptP, int nCurveId, int nRefType, + double* pdDist, Point3d& ptMin, double* pdU) ; +EXE_EXPORT bool ExePointCurveDistSide( const Point3d& ptP, int nCurveId, const Vector3d& vtN, int nRefType, + double* pdDist, Point3d& ptMin, int* pnSide) ; +EXE_EXPORT bool ExePointSurfTmDist( const Point3d& ptP, int nStmId, int nRefType, + double* pdDist, Point3d& ptMin, int* pnTria) ; + // Geo Intersect -EXE_EXPORT bool ExeBoxLineInters( const BBox3d& b3Box, const Point3d& ptP, const Vector3d& vtDir, INTDBLVECTOR& vInters) ; -EXE_EXPORT bool ExeSurfTmLineInters( int nId, const Point3d& ptP, const Vector3d& vtDir, int nRefType, INTDBLVECTOR& vInters) ; -EXE_EXPORT int ExeSurfTmPlaneInters( int nId, const Point3d& ptOn, const Vector3d& vtN, int nDestGrpId, int nRefType, +EXE_EXPORT bool ExeLineBoxInters( const Point3d& ptP, const Vector3d& vtDir, const BBox3d& b3Box, INTDBLVECTOR& vInters) ; +EXE_EXPORT bool ExeLineSurfTmInters( const Point3d& ptP, const Vector3d& vtDir, int nId, int nRefType, INTDBLVECTOR& vInters) ; +EXE_EXPORT int ExePlaneSurfTmInters( const Point3d& ptOn, const Vector3d& vtN, int nId, int nDestGrpId, int nRefType, int* pnPntCount, int* pnCrvCount, int* pnSrfCount) ; EXE_EXPORT int ExeSurfTmSurfTmInters( int nId1, int nId2, int nDestGrpId, int* pnPntCount, int* pnCrvCount, int* pnSrfCount) ; -EXE_EXPORT int ExeVolZmapPlaneInters( int nId, const Point3d& ptOn, const Vector3d& vtN, int nDestGrpId, int nRefType, +EXE_EXPORT int ExePlaneVolZmapInters( const Point3d& ptOn, const Vector3d& vtN, int nId, int nDestGrpId, int nRefType, int* pnCount) ; // Nesting