Modifiche varie

This commit is contained in:
LorenzoM
2021-07-21 09:31:46 +02:00
parent c6768c8efe
commit 6b6b30437f
9 changed files with 112 additions and 23 deletions
+15 -13
View File
@@ -33,6 +33,7 @@
#include "/EgtDev/Include/EGkGeoCollection.h"
#include "/EgtDev/Include/EGkPolygon3d.h"
#include "/EgtDev/Include/EgtPerfCounter.h"
#include "/EgtDev/Include/EgtNumUtils.h"
#include "/EgtDev/Include/EgnStringUtils.h"
#include <algorithm>
@@ -3418,17 +3419,17 @@ AddPolyLineToPolyLine( PolyLine& Poly, PolyLine& PolyToAdd)
return true ;
}
//----------------------------------------------------------------------------
struct PositionOnPolyLine {
int nIndexInVec ;
int nSegNum ;
double dParOnSeg ;
PositionOnPolyLine( int nIndex, int nSeg, double dPar) {
nIndexInVec = nIndex ;
nSegNum = nSeg ;
dParOnSeg = dPar ;
}
} ;
////----------------------------------------------------------------------------
//struct PositionOnPolyLine {
// int nIndexInVec ;
// int nSegNum ;
// double dParOnSeg ;
// PositionOnPolyLine( int nIndex, int nSeg, double dPar) {
// nIndexInVec = nIndex ;
// nSegNum = nSeg ;
// dParOnSeg = dPar ;
// }
//} ;
//----------------------------------------------------------------------------
bool
@@ -3931,8 +3932,9 @@ SurfTriMesh::SplitFacet( const INTERSCHAINMAP& IntersLineMap, PieceMap& NewFacet
if ( vNewPieces[nPieceN].vPieceLoop[0].IsPointInsidePolyLine( ptInnP) || ( itInnNext != LoopList.end() &&
vNewPieces[nPieceN].vPieceLoop[0].IsPointInsidePolyLine( 0.5 * ( ptInnP + ptInnNextP)))) {
double dPieceArea ;
vNewPieces[nPieceN].vPieceLoop[0].IsClosedAndFlat( Plane3d(), dPieceArea) ;
if ( vNewPieces[nPieceN].vPieceLoop[0].IsClosedAndFlat( Plane3d(), dPieceArea) && dPieceArea < dIncluderPieceArea) {
Plane3d plMyFictitiousPlane ;
vNewPieces[nPieceN].vPieceLoop[0].IsClosedAndFlat( plMyFictitiousPlane, dPieceArea) ;
if ( vNewPieces[nPieceN].vPieceLoop[0].IsClosedAndFlat( plMyFictitiousPlane, dPieceArea) && dPieceArea < dIncluderPieceArea) {
nIncluderPiece = nPieceN ;
Polygon3d AuxPolygon ;
AuxPolygon.FromPolyLine( CurInnerLoop) ;