From 130d508286b63343e35388d180ce764b9af67f57 Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 2 Nov 2021 08:24:15 +0100 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkPolyLine.h | 19 +++++-------------- EgtKeyCodes.h | 4 ++-- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/EGkPolyLine.h b/EGkPolyLine.h index 25c9b76..72bc146 100644 --- a/EGkPolyLine.h +++ b/EGkPolyLine.h @@ -13,7 +13,6 @@ #pragma once -#include "EgtNumUtils.h" #include "/EgtDev/Include/EGkPoint3d.h" #include "/EgtDev/Include/EGkBBox3d.h" #include "/EgtDev/Include/EGkPlane3d.h" @@ -135,16 +134,8 @@ typedef std::vector POLYLINEVECTOR ; // vettore di PolyLine typedef std::list POLYLINELIST ; // lista di PolyLine //---------------------------------------------------------------------------- -// Funzioni statiche di manipolazione di poliline e calcoli su dei esse -bool ChangeStart( const Point3d& ptNewStart, PNTVECTOR& Loop) ; -bool SplitAtPoint( const Point3d& ptStop, const PNTVECTOR& Loop, PNTVECTOR& Loop1, PNTVECTOR& Loop2) ; -bool ChangePolyLineStart( const Point3d& ptNewStart, PolyLine& Loop) ; -// nSegNum 0-based -bool PointPositionOnPolyLine( const Point3d& ptPoint, /*const*/ PolyLine& Loop, int& nSegNum, double& dParOnSeg) ; -bool IsPointInsidePolyLine( const Point3d& ptP, /*const*/ PolyLine& plPoly) ; -bool DistPointPolyLine( const Point3d& ptP, const PolyLine& plPoly, double& dPointPolyLineDist) ; -// Una faccia di una trimesh ha una sola componente connessa. -// Si assume che i loop siano corretti e rispettino tale proprietà. -bool DistPointFacet( const Point3d& ptP, /*const*/ POLYLINEVECTOR& vPolyVec, double& dPointFacetDist) ; -bool SplitPolyLineAtPoint( const Point3d& ptPoint, /*const*/ PolyLine& Loop, PolyLine& Loop1, PolyLine& Loop2) ; -bool AddPolyLineToPolyLine( PolyLine& Poly, PolyLine& PolyToAdd) ; +bool DistPointPolyLine( const Point3d& ptP, const PolyLine& plPoly, double& dDist) ; +bool IsPointInsidePolyLine( const Point3d& ptP, const PolyLine& plPoly, double dToler) ; +bool GetPointParamOnPolyLine( const Point3d& ptP, const PolyLine& plPoly, double dToler, double& dPar) ; +bool ChangePolyLineStart( PolyLine& plPoly, const Point3d& ptNewStart, double dToler) ; +bool SplitPolyLineAtPoint( const PolyLine& plPoly, const Point3d& ptP, double dToler, PolyLine& plPoly1, PolyLine& plPoly2) ; diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index f07faa5..fa03a7c 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2021 //---------------------------------------------------------------------------- -// File : EgtKeyCodes.h Data : 03.10.21 Versione : 2.3j1 +// File : EgtKeyCodes.h Data : 01.11.21 Versione : 2.3k1 // Contenuto : Costanti per codici di protezione librerie di base. // // @@ -22,7 +22,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2310 ; +const int KEY_BASELIB_VER = 2311 ; const int KEY_BASELIB_LEV = 1 ; //----------------------------------------------------------------------------