From 8b8cc36ebdb2243a7db46f29086306f775f82525 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Mon, 10 Jul 2023 11:10:46 +0200 Subject: [PATCH] Revert "Merge commit '880f586861f34191c711bc6e3c18069a3b399f7f' into Cube" This reverts commit c0c9772dfa00422fefb10c6b03579674f3015278, reversing changes made to c4f4e33d1fecec0225a5a85de297648879fb65c1. --- EGkChainCurves.h | 4 +++- EGkDistPointSurfTm.h | 18 +++--------------- EGkSurfTriMesh.h | 6 ++---- EXeExecutor.h | 7 +------ EgtKeyCodes.h | 2 +- 5 files changed, 10 insertions(+), 27 deletions(-) diff --git a/EGkChainCurves.h b/EGkChainCurves.h index 19451ef..1019f7c 100644 --- a/EGkChainCurves.h +++ b/EGkChainCurves.h @@ -16,6 +16,7 @@ #include "/EgtDev/Include/EGkPointGrid3d.h" #include "/EgtDev/Include/EGkGeoCollection.h" +#include class IGeomDB ; @@ -58,6 +59,7 @@ class ChainCurves EGK_EXPORT bool GetForkIds( INTVECTOR& vForkIds) ; private : + typedef std::unordered_set INTUSET ; struct CrvData { int nId ; Point3d ptStart ; @@ -90,7 +92,7 @@ class ChainCurves private : bool m_bAllowInvert ; double m_dToler ; - INTUNORDSET m_sCrvId ; + INTUSET m_sCrvId ; CRVDATAVECTOR m_vCrvData ; PointGrid3d m_PointGrid ; bool m_bFromNear ; diff --git a/EGkDistPointSurfTm.h b/EGkDistPointSurfTm.h index 49b5d46..f9112e1 100644 --- a/EGkDistPointSurfTm.h +++ b/EGkDistPointSurfTm.h @@ -1,13 +1,13 @@ //---------------------------------------------------------------------------- -// EgalTech 2018-2023 +// EgalTech 2018-2018 //---------------------------------------------------------------------------- -// File : EGkDistPointTria.h Data : 06.07.23 Versione : 2.5g1 +// File : EGkDistPointTria.h Data : 11.12.18 Versione : 1.9l2 // Contenuto : Dichiarazione della classe distanza Punto da Trimesh. // // // // Modifiche : 06.12.18 LM Creazione modulo. -// 06.07.23 DS Aggiunta GetSurfTmNearestVertex. +// // //---------------------------------------------------------------------------- @@ -23,13 +23,6 @@ #define EGK_EXPORT __declspec( dllimport) #endif -//---------------------------------------------------------------------------- -// Calcola la distanza tra punto e superficie trimesh. -// Risultati : -// - distanza -// - punto sulla superficie a minima distanza -// - indice del triangolo su cui giace il punto -// - indicazione se il punto di riferimento è dalla parte interna o esterna della superficie. //---------------------------------------------------------------------------- class DistPointSurfTm { @@ -58,8 +51,3 @@ class DistPointSurfTm int m_nMinDistTriaIndex ; bool m_bIsInside ; } ; - -//---------------------------------------------------------------------------- -// Calcola l'indice del vertice della superficie a minima distanza dal punto di riferimento. -//---------------------------------------------------------------------------- -EGK_EXPORT int GetSurfTmNearestVertex( const Point3d& ptP, const ISurfTriMesh& tmSurf) ; diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index e37521a..0f20b31 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2023 +// EgalTech 2014-2022 //---------------------------------------------------------------------------- -// File : EGkSurfTriMesh.h Data : 07.07.23 Versione : 2.5g1 +// File : EGkSurfTriMesh.h Data : 10.10.22 Versione : 2.4i4 // Contenuto : Dichiarazione della interfaccia ISurfTriMesh. // // @@ -44,7 +44,6 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual void SetBoundaryAngle( double dBoundaryAngDeg) = 0 ; virtual void SetSmoothAngle( double dSmoothAngDeg) = 0 ; virtual int AddVertex( const Point3d& ptVert) = 0 ; - virtual bool MoveVertex( int nInd, const Point3d& ptNewVert) = 0 ; virtual int AddTriangle( const int nIdVert[3], int nTFlag = 0) = 0 ; virtual bool RemoveTriangle( int nId) = 0 ; virtual bool AdjustTopology( void) = 0 ; @@ -90,7 +89,6 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual int GetFacetSize( void) const = 0 ; virtual int GetFacetFromTria( int nT) const = 0 ; virtual bool GetAllTriaInFacet( int nF, INTVECTOR& vT) const = 0 ; - virtual bool GetAllVertInFacet( int nF, INTVECTOR& vVert) const = 0 ; virtual bool GetFacetLoops( int nF, POLYLINEVECTOR& vPL) const = 0 ; virtual bool GetFacetAdjacencies( int nF, INTMATRIX& vAdj) const = 0 ; virtual bool GetFacetNearestEndPoint( int nF, const Point3d& ptNear, Point3d& ptEnd, Vector3d& vtN) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 93fe0cc..d82c2f4 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -590,7 +590,6 @@ EXE_EXPORT bool ExeSurfFrIntersect( int nId1, int nId2) ; EXE_EXPORT bool ExeSurfFrOffset( int nId, double dDist, int nType) ; EXE_EXPORT bool ExeSurfFrMoveSimpleNoCollision( int nId1, int nId2, const Vector3d& vtDir, double& dLen, int nRefType) ; EXE_EXPORT bool ExeSurfFrRotateSimpleNoCollision( int nId1, int nId2, const Point3d& ptCen, double& dAngDeg, int nRefType) ; -EXE_EXPORT bool ExeSurfTmMoveVertex( int nId, int nVert, const Point3d& ptNewVert, int nRefType, bool bUpdate) ; EXE_EXPORT int ExeSurfTmToTriangles( int nId, int* pnCount) ; EXE_EXPORT bool ExeSurfTmRemoveFacet( int nId, int nFacet) ; EXE_EXPORT bool ExeSurfTmSwapFacets( int nId, int nFacet1, int nFacet2) ; @@ -676,11 +675,8 @@ EXE_EXPORT int ExeSurfFrChunkSimpleClassify( int nId1, int nChunk1, int nId2, i EXE_EXPORT int ExeExtractSurfFrChunkLoops( int nId, int nChunk, int nDestGrpId, int* pnCount) ; EXE_EXPORT int ExeSurfFrGetZigZagInfill( int nId, int nDestGrpId, double dStep, double dAng, bool bStepCorrection, bool bInvert, int* pnCount) ; -EXE_EXPORT int ExeSurfTmVertexCount( int nId) ; -EXE_EXPORT int ExeSurfTmFacetCount( int nId) ; EXE_EXPORT int ExeSurfTmPartCount( int nId) ; -EXE_EXPORT bool ExeSurfTmGetVertex( int nId, int nVert, int nRefId, Point3d& ptVert) ; -EXE_EXPORT bool ExeSurfTmGetNearestVertex( int nId, const Point3d& ptNear, int nRefId, int& nVert, Point3d& ptVert) ; +EXE_EXPORT int ExeSurfTmFacetCount( int nId) ; EXE_EXPORT int ExeSurfTmFacetFromTria( int nId, int nT) ; EXE_EXPORT bool ExeSurfTmFacetAdjacencies( int nId, int nFacet, INTMATRIX& vAdj) ; EXE_EXPORT bool ExeSurfTmFacetNearestEndPoint( int nId, int nFacet, const Point3d& ptNear, int nRefId, @@ -699,7 +695,6 @@ EXE_EXPORT int ExeExtractSurfTmLoops( int nId, int nDestGrpId, int* pnCount) ; EXE_EXPORT int ExeGetSurfTmSilhouette( int nId, const Vector3d& vtDir, double dToler, 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 bool ExeSurfTmGetAllVertInFacet( int nId, int nFacet, INTVECTOR& vVert) ; EXE_EXPORT bool ExeSurfTmGetFacetBBox( int nId, int nFacet, int nFlag, BBox3d& b3Box) ; EXE_EXPORT bool ExeSurfTmGetFacetBBoxGlob( int nId, int nFacet, int nFlag, BBox3d& b3Box) ; EXE_EXPORT bool ExeSurfTmGetFacetBBoxRef( int nId, int nFacet, int nFlag, const Frame3d& frRef, BBox3d& b3Box) ; diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index 8a7f9a0..5184ef5 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -24,7 +24,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2507 ; +const int KEY_BASELIB_VER = 2506 ; const int KEY_BASELIB_LEV = 1 ; //----------------------------------------------------------------------------