From ebedf43bd437cad50fffdf2a85dc1fac334db1e7 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 18 Dec 2023 09:31:54 +0100 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkPolygon3d.h | 6 +++--- EGkPolygonElevation.h | 32 ++++++++++++++++++++++++++++++++ EXeExecutor.h | 1 + 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 EGkPolygonElevation.h diff --git a/EGkPolygon3d.h b/EGkPolygon3d.h index 02c9541..a859ab8 100644 --- a/EGkPolygon3d.h +++ b/EGkPolygon3d.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2020 +// EgalTech 2015-2023 //---------------------------------------------------------------------------- -// File : Polygon3d.h Data : 02.10.20 Versione : 2.2j1 +// File : EGkPolygon3d.h Data : 17.12.23 Versione : 2.5l3 // Contenuto : Dichiarazione della classe Polygon3d (poligono nello spazio). // // @@ -58,7 +58,7 @@ class Polygon3d EGK_EXPORT bool ToGlob( const Frame3d& frRef) ; EGK_EXPORT bool ToLoc( const Frame3d& frRef) ; EGK_EXPORT bool LocToLoc( const Frame3d& frOri, const Frame3d& frDest) ; - + EGK_EXPORT bool GetLocalBBox( BBox3d& b3Loc) const ; EGK_EXPORT bool IsValid( void) const { return ! m_Plane.GetVersN().IsSmall() ; } EGK_EXPORT const Plane3d& GetPlane( void) const diff --git a/EGkPolygonElevation.h b/EGkPolygonElevation.h new file mode 100644 index 0000000..dfa0c18 --- /dev/null +++ b/EGkPolygonElevation.h @@ -0,0 +1,32 @@ +//---------------------------------------------------------------------------- +// EgalTech 2023-2023 +//---------------------------------------------------------------------------- +// File : EGkPolygonElevation.h Data : 02.10.20 Versione : 2.2j1 +// Contenuto : Dichiarazione della classe Polygon3d (poligono nello spazio). +// +// +// +// Modifiche : 30.08.15 DS Creazione modulo. +// 19.06.19 DS Aggiunta GetVertices. +// 23.07.19 DS Aggiunte Offset e Invert. +// 02.10.20 DS A FromPlaneTrimmedWithBox aggiunto parametro dToler. +// +//---------------------------------------------------------------------------- + +#pragma once + +#include "/EgtDev/Include/EGkPolygon3d.h" +#include "/EgtDev/Include/EGkSurfTriMesh.h" + +//----------------------- Macro per import/export ---------------------------- +#undef EGK_EXPORT +#if defined( I_AM_EGK) // da definirsi solo nella DLL + #define EGK_EXPORT __declspec( dllexport) +#else + #define EGK_EXPORT __declspec( dllimport) +#endif + + +//---------------------------------------------------------------------------- +EGK_EXPORT bool PolygonElevationInBBox( const Polygon3d& pgFacet, const BBox3d& b3Box, bool bAcceptOutFacet, double& dElev) ; +EGK_EXPORT bool PolygonElevationInClosedSurfTm( const Polygon3d& pgFacet, const ISurfTriMesh& CldStm, bool bAcceptOutFacet, double& dElev) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 632fdce..2f42b44 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -714,6 +714,7 @@ EXE_EXPORT bool ExeSurfTmFacetCenter( int nId, int nFacet, int nRefId, Point3d& EXE_EXPORT bool ExeSurfTmFacetNormVersor( int nId, int nFacet, int nRefId, Vector3d& vtNorm) ; EXE_EXPORT bool ExeSurfTmFacetMinAreaRectangle( int nId, int nFacet, int nRefId, Frame3d& frRect, double& dDimX, double& dDimY) ; EXE_EXPORT bool ExeSurfTmFacetElevationInBBox( int nId, int nFacet, const BBox3d& b3Box, bool bAcceptOutFacet, int nRefId, double& dElev) ; +EXE_EXPORT bool ExeSurfTmFacetElevationInClosedSurfTm( int nFacetStmId, int nFacet, int nClosedStmId, bool bAcceptOutFacet, double& dElev) ; EXE_EXPORT bool ExeSurfTmFacetOppositeSide( int nId, int nFacet, const Vector3d& vtDir, int nRefId, Point3d& ptP1, Point3d& ptP2) ; EXE_EXPORT bool ExeSurfTmFacetOppositeSideEx( int nId, int nFacet, const Vector3d& vtDir, int nRefId,