Egalware/EgtGeomKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtGeomKernel 2.3g1 :

Browse Source 
- versione x64 compilata con Clang-cl/LLVM
- modifiche varie per eliminare warning più gravi di questo compilatore.
This commit is contained in:
DarioS
2021-07-20 12:53:04 +02:00
parent 54e9903850
commit 73f5b382c9
32 changed files with 88 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IntersLineSurfStd.cpp
+5 -13
View File
@@ -299,7 +299,7 @@ SegmentSphere( const Point3d& ptPLine, const Vector3d& vtVLine, double dLen,
nIntType = S_NO_INTERS ;
}
// La retta associata al segmento è secante
else if ( nIntType = S_TWO_INT) {
else if ( nIntType == S_TWO_INT) {
// Segmento esterno
if ( dU1 > dLen + EPS_SMALL)
nIntType = S_NO_INTERS ;
@@ -558,12 +558,9 @@ IntersLineInfiniteCylinder( const Point3d& ptPLine, const Vector3d& vtVLine,
DBLVECTOR vdRoots ;
int nRoot = PolynomialRoots( 2, vdCoef, vdRoots) ;
// Studio delle soluzioni
int nIntType ;
// Non ci sono intersezioni
if ( nRoot == 0)
nIntType = CC_NO_INTERS ;
int nIntType = CC_NO_INTERS ;
// C'è un punto di tangenza
else if ( nRoot == 1) {
if ( nRoot == 1) {
dU1 = vdRoots[0] ;
nIntType = CC_ONE_INT_TAN ;
}
@@ -1085,10 +1082,8 @@ LineInfiniteCone( const Point3d& ptPLine, const Vector3d& vtDLine,
int nRoot = PolynomialRoots( 2, vdCoef, vdRoots) ;
// Studio le soluzioni
int nIntType ;
if ( nRoot == 0)
nIntType = CC_NO_INTERS ;
else if ( nRoot == 1) {
int nIntType = CC_NO_INTERS ;
if ( nRoot == 1) {
dU1 = vdRoots[0] ;
Point3d ptInt = ptPLine + dU1 * vtDLine ;
// Soluzione sul cono negativo
@@ -1748,9 +1743,6 @@ LineTorus( const Point3d& ptLine, const Vector3d& vtLine,
}
else if ( vdPar.size() == 3) {
nIntType = T_THREE_ONE_TAN_TWO_SEC ;
Point3d ptInt1 = ptLn + vdPar[0] * vtLn ;
Point3d ptInt2 = ptLn + vdPar[1] * vtLn ;
Point3d ptInt3 = ptLn + vdPar[2] * vtLn ;
}
else if ( vdPar.size() == 4) {
// Prime due soluzioni distinte