EgtGeomKernel 1.5d2 :

- creazione di superfici trimesh da piani contornati e per estrusione
- migliorie a PolyLine
- migliorie a FromString
- modifiche a Vector3d e Point3d.
This commit is contained in:
Dario Sassi
2014-04-09 13:00:17 +00:00
parent d509417136
commit 9b564445cd
15 changed files with 771 additions and 119 deletions
+24 -78
View File
@@ -17,89 +17,44 @@
using namespace std ;
//----------------------------------------------------------------------------
bool
FromString( const string& sVal, Vector3d& vtVal)
{
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 3 parametri : x, y, z
if ( vsParams.size() != 3)
return false ;
// recupero il punto
return ( FromString( vsParams[0], vtVal.x) &&
FromString( vsParams[1], vtVal.y) &&
FromString( vsParams[2], vtVal.z)) ;
}
//----------------------------------------------------------------------------
bool
FromString( const string& sVal, Point3d& ptVal)
{
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 3 parametri : x, y, z
if ( vsParams.size() != 3)
return false ;
// recupero il punto
return ( FromString( vsParams[0], ptVal.x) &&
FromString( vsParams[1], ptVal.y) &&
FromString( vsParams[2], ptVal.z)) ;
}
//----------------------------------------------------------------------------
bool
FromString( const string& sVal, Point3d& ptVal, double& dW)
{
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 4 parametri : x, y, z, w
if ( vsParams.size() != 4)
double vdVal[4] ;
if ( ! FromString( sVal, vdVal))
return false ;
// recupero il punto
return ( FromString( vsParams[0], ptVal.x) &&
FromString( vsParams[1], ptVal.y) &&
FromString( vsParams[2], ptVal.z) &&
FromString( vsParams[3], dW)) ;
ptVal.x = vdVal[0] ;
ptVal.y = vdVal[1] ;
ptVal.z = vdVal[2] ;
dW = vdVal[3] ;
return true ;
}
//----------------------------------------------------------------------------
bool
FromString( const string& sVal, Frame3d& frFrame)
{
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 12 parametri : Ox, Oy, Oz, Xx, Xy, Xz, Yx, Yy, Yz, Zx, Zy, Zz
if ( vsParams.size() != 12)
double vdVal[12] ;
if ( ! FromString( sVal, vdVal))
return false ;
// recupero l'origine
Point3d ptOrig ;
if ( ! FromString( vsParams[0], ptOrig.x) ||
! FromString( vsParams[1], ptOrig.y) ||
! FromString( vsParams[2], ptOrig.z))
return false ;
// recupero il versore X
ptOrig.x = vdVal[0] ;
ptOrig.y = vdVal[1] ;
ptOrig.z = vdVal[2] ;
Vector3d vtDirX ;
if ( ! FromString( vsParams[3], vtDirX.x) ||
! FromString( vsParams[4], vtDirX.y) ||
! FromString( vsParams[5], vtDirX.z))
return false ;
// recupero il versore Y
vtDirX.x = vdVal[3] ;
vtDirX.y = vdVal[4] ;
vtDirX.z = vdVal[5] ;
Vector3d vtDirY ;
if ( ! FromString( vsParams[6], vtDirY.x) ||
! FromString( vsParams[7], vtDirY.y) ||
! FromString( vsParams[8], vtDirY.z))
return false ;
// recupero il versore Z
vtDirY.x = vdVal[6] ;
vtDirY.y = vdVal[7] ;
vtDirY.z = vdVal[8] ;
Vector3d vtDirZ ;
if ( ! FromString( vsParams[9], vtDirZ.x) ||
! FromString( vsParams[10], vtDirZ.y) ||
! FromString( vsParams[11], vtDirZ.z))
return false ;
vtDirZ.x = vdVal[9] ;
vtDirZ.y = vdVal[10] ;
vtDirZ.z = vdVal[11] ;
// imposto il riferimento
return frFrame.Set( ptOrig, vtDirX, vtDirY, vtDirZ) ;
}
@@ -108,20 +63,11 @@ FromString( const string& sVal, Frame3d& frFrame)
bool
FromString( const string& sVal, Color& cCol)
{
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 4 parametri : Red, Green, Blue, Alpha
if ( vsParams.size() != 4)
return false ;
// recupero i parametri
int nRed, nGreen, nBlue, nAlpha ;
if ( ! FromString( vsParams[0], nRed) ||
! FromString( vsParams[1], nGreen) ||
! FromString( vsParams[2], nBlue) ||
! FromString( vsParams[3], nAlpha))
int vnVal[4] ;
if ( ! FromString( sVal, vnVal))
return false ;
// assegno il colore
cCol.Set( nRed, nGreen, nBlue, nAlpha) ;
cCol.Set( vnVal[0], vnVal[1], vnVal[2], vnVal[3]) ;
return true ;
}