From 9d714ac27471ecf07f91fa9073eb3a46cc3e7a00 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 1 Oct 2018 07:30:15 +0000 Subject: [PATCH] Include : - aggiornamento. --- EInAPI.h | 3 ++- EXeExecutor.h | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index d8a6ee9..2e0529f 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -481,7 +481,8 @@ EIN_EXPORT BOOL __stdcall EgtSurfTmFacetNearestMidPoint( int nId, int nFacet, co double ptMid[3], double vtNorm[3]) ; EIN_EXPORT BOOL __stdcall EgtSurfTmFacetCenter( int nId, int nFacet, int nRefId, double ptCen[3], double vtNorm[3]) ; EIN_EXPORT BOOL __stdcall EgtSurfTmFacetNormVersor( int nId, int nFacet, int nRefId, double vtNorm[3]) ; -EIN_EXPORT BOOL __stdcall EgtSurfTmFacetOppositeSide( int nId, int nFacet, const double vtDir[3], int nRefId, double ptP1[3], double ptP2[3]) ; +EIN_EXPORT BOOL __stdcall EgtSurfTmFacetOppositeSide( int nId, int nFacet, const double vtDir[3], int nRefId, + double ptP1[3], double ptP2[3], double vtIn1[3], double vtOut2[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, diff --git a/EXeExecutor.h b/EXeExecutor.h index 117c514..6182078 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -474,10 +474,6 @@ EXE_EXPORT int ExeExtractSurfTmLoops( int nId, int nDestGrpId, int* pnCount) ; EXE_EXPORT int ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, int nDestGrpId, int nRefType, int* pnCount) ; EXE_EXPORT int ExeExtractSurfTmFacetLoops( int nId, int nFacet, int nDestGrpId, int* pnCount) ; EXE_EXPORT int ExeCopySurfTmFacet( int nId, int nFacet, int nDestGrpId) ; -EXE_EXPORT int ExeGetSurfTmPlaneInters( int nId, const Point3d& ptOn, const Vector3d& vtN, int nDestGrpId, int nRefType, - int* pnPntCount, int* pnCrvCount, int* pnSrfCount) ; -EXE_EXPORT int ExeGetSurfTmSurfTmInters( int nId1, int nId2, int nDestGrpId, - int* pnPntCount, int* pnCrvCount, int* pnSrfCount) ; EXE_EXPORT bool ExeCutSurfTmPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, bool bSaveOnEq, int nRefType) ; // GeomDb Volume Modify @@ -500,7 +496,6 @@ EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vecto const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe, int nRefType) ; EXE_EXPORT bool ExeVolZmapGetDepth( int nId, const Point3d& ptP, const Vector3d& vtDir, int nRefType, bool bExact, double& dInLen, double& dOutLen) ; -EXE_EXPORT int ExeVolZmapIntersPlane( int nId, const Plane3d& plPlane, int nDestGrpId, int nRefType, int* pnCount) ; EXE_EXPORT bool ExeVolZmapAvoidBox( int nId, const Frame3d& frBox, const Vector3d& vtDiag, int nRefType) ; EXE_EXPORT bool ExeVolZmapAvoidSphere( int nId, const Point3d& ptCen, double dRad, int nRefType) ; @@ -554,9 +549,9 @@ EXE_EXPORT bool ExeSurfTmFacetNearestMidPoint( int nId, int nFacet, const Point3 Point3d& ptMid, Vector3d& vtN) ; EXE_EXPORT bool ExeSurfTmFacetCenter( int nId, int nFacet, int nRefId, Point3d& ptCen, Vector3d& vtN) ; EXE_EXPORT bool ExeSurfTmFacetNormVersor( int nId, int nFacet, int nRefId, Vector3d& vtNorm) ; -EXE_EXPORT bool ExeSurfTmFacetOppositeSide( int nId, int nFacet, const Vector3d& vtDir, int nRefId, Point3d& ptP1, Point3d& ptP2) ; +EXE_EXPORT bool ExeSurfTmFacetOppositeSide( int nId, int nFacet, const Vector3d& vtDir, int nRefId, + Point3d& ptP1, Point3d& ptP2, Vector3d& vtIn1, Vector3d& vtOut2) ; EXE_EXPORT bool ExeSurfTmFacetsContact( int nId, int nF1, int nF2, int nRefId, bool& bAdjac, Point3d& ptP1, Point3d& ptP2, double& dAng) ; -EXE_EXPORT bool ExeSurfTmLineInters( int nId, const Point3d& ptP, const Vector3d& vtDir, int nRefType, INTDBLVECTOR& vInters) ; EXE_EXPORT bool ExeVolZmapVolume( int nId, double& dVol) ; EXE_EXPORT int ExeVolZmapPartCount( int nId) ; EXE_EXPORT bool ExeVolZmapPartVolume( int nId, int nPart, double& dVol) ; @@ -585,6 +580,16 @@ 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 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, + 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, + int* pnCount) ; + // Nesting // CreateFlatParts EXE_EXPORT bool ExeCreateFlatParts( int nType) ;