From a06cb564161dad2432206a38e3cc0df6d3f1cce5 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sun, 14 Jun 2020 09:55:05 +0000
Subject: [PATCH] Include : - aggiornamento prototipi.

---
 EGkSurfTriMesh.h | 9 ++++++---
 EInAPI.h         | 7 ++++---
 EXeExecutor.h    | 7 ++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h
index 2ff3a36..a703cf3 100644
--- a/EGkSurfTriMesh.h
+++ b/EGkSurfTriMesh.h
@@ -40,7 +40,7 @@ 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 int  AddTriangle( const int nIdVert[3]) = 0 ;
+      virtual int  AddTriangle( const int nIdVert[3], int nTFlag = 0) = 0 ;
       virtual bool RemoveTriangle( int nId) = 0 ;
       virtual bool AdjustTopology( void) = 0 ;
       virtual bool CreateByFlatContour( const PolyLine& PL) = 0 ;
@@ -56,10 +56,11 @@ class __declspec( novtable) ISurfTriMesh : public ISurf
       virtual bool DoSewing( const ISurfTriMesh& stmOther, const Frame3d& frOther = GLOB_FRM) = 0 ;
       virtual int  GetVertexCount( void) const = 0 ;
       virtual int  GetTriangleCount( void) const = 0 ;
+      virtual int  GetTriangleCount( int nTFlag) const = 0 ;
       virtual int  GetVertexSize( void) const = 0 ;
       virtual int  GetTriangleSize( void) const = 0 ;
-      virtual double GetLinearTolerance( void) = 0 ;
-      virtual double GetSmoothAngle( void) = 0 ;
+      virtual double GetLinearTolerance( void) const = 0 ;
+      virtual double GetSmoothAngle( void) const = 0 ;
       virtual bool GetVertex( int nId, Point3d& ptP) const = 0 ;
       virtual int  GetFirstVertex( Point3d& ptP) const = 0 ;
       virtual int  GetNextVertex( int nId, Point3d& ptP) const = 0 ;
@@ -107,6 +108,8 @@ class __declspec( novtable) ISurfTriMesh : public ISurf
       virtual int  GetPartCount( void) const = 0 ;
       virtual bool RemovePart( int nPart) = 0 ;
       virtual ISurfTriMesh* ClonePart( int nPart) const = 0 ;
+      virtual int  GetMaxTFlag( void) const = 0 ;
+      virtual bool ResetTFlags( void) = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------
diff --git a/EInAPI.h b/EInAPI.h
index 93b232a..dd183f3 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -453,9 +453,10 @@ EIN_EXPORT BOOL __stdcall EgtSurfFrSubtract( int nId1, int nId2) ;
 EIN_EXPORT BOOL __stdcall EgtSurfFrIntersect( int nId1, int nId2) ;
 EIN_EXPORT BOOL __stdcall EgtSurfFrOffset( int nId, double dDist, int nType) ;
 EIN_EXPORT BOOL __stdcall EgtSurfTmRemoveFacet( int nId, int nFacet) ;
-EIN_EXPORT BOOL __stdcall EgtSurfTmAdd( int nId1, int nId2) ;
-EIN_EXPORT BOOL __stdcall EgtSurfTmSubtract( int nId1, int nId2) ;
-EIN_EXPORT BOOL __stdcall EgtSurfTmIntersect( int nId1, int nId2) ;
+EIN_EXPORT BOOL __stdcall EgtSurfTmAdd( int nId1, int nId2, bool bTwoColors) ;
+EIN_EXPORT BOOL __stdcall EgtSurfTmSubtract( int nId1, int nId2, bool bTwoColors) ;
+EIN_EXPORT BOOL __stdcall EgtSurfTmIntersect( int nId1, int nId2, bool bTwoColors) ;
+EIN_EXPORT BOOL __stdcall EgtSurfTmResetTwoColors( int nId) ;
 
 // GeomDb Get
 EIN_EXPORT BOOL __stdcall EgtTextNormVersor( int nId, int nRefId, double vtNorm[3]) ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 97b5abd..7fe4a83 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -506,9 +506,10 @@ EXE_EXPORT bool ExeSurfTmSwapFacets( int nId, int nFacet1, int nFacet2) ;
 EXE_EXPORT bool ExeSurfTmRemovePart( int nId, int nPart) ;
 EXE_EXPORT bool ExeCutSurfTmPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, bool bSaveOnEq, int nRefType) ;
 EXE_EXPORT bool ExeCutSurfTmClosedCurve( int nSurfId, int nCurveId, bool bSaveOnEq) ;
-EXE_EXPORT bool ExeSurfTmAdd( int nId1, int nId2) ;
-EXE_EXPORT bool ExeSurfTmSubtract( int nId1, int nId2) ;
-EXE_EXPORT bool ExeSurfTmIntersect( int nId1, int nId2) ;
+EXE_EXPORT bool ExeSurfTmAdd( int nId1, int nId2, bool bTwoColors = false) ;
+EXE_EXPORT bool ExeSurfTmSubtract( int nId1, int nId2, bool bTwoColors = false) ;
+EXE_EXPORT bool ExeSurfTmIntersect( int nId1, int nId2, bool bTwoColors = false) ;
+EXE_EXPORT bool ExeSurfTmResetTwoColors( int nId) ;
 EXE_EXPORT int  ExeSurfTmSplit( int nId, int nSplitterId, int* pnCount) ;
 
 // GeomDb Volume Modify