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

EgtGeomKernel 1.8e3 :

Browse Source 
- miglioramenti a Zmap (aggiunto blocco per triangoli di frontiera blocchi con possibilità di flip).
This commit is contained in:
Dario Sassi
2017-05-20 10:02:35 +00:00
parent 6faae39afd
commit 0a98461e3e
5 changed files with 1655 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VolTriZmapVolume.cpp
+18 -18
View File
@@ -157,17 +157,17 @@ VolZmap::SubtractIntervals( unsigned int nGrid, unsigned int nI, unsigned int nJ
int nMaxZBlock = min( int( m_nFracLin[2] - 1), nMaxK / int( m_nDexNumPBlock)) ;
for ( int k = nMinZBlock ; k <= nMaxZBlock ; ++ k) {
for ( int nIndX = nXBlock - 1 ; nIndX <= nXBlock + 1 ; nIndX ++) {
for ( int nIndY = nYBlock - 1 ; nIndY <= nYBlock + 1 ; nIndY ++) {
/* for ( int nIndX = nXBlock - 1 ; nIndX <= nXBlock + 1 ; nIndX ++) {
for ( int nIndY = nYBlock - 1 ; nIndY <= nYBlock + 1 ; nIndY ++) {*/
if ( nIndX >= 0 && nIndX < int( m_nFracLin[0]) &&
nIndY >= 0 && nIndY < int( m_nFracLin[1])) {
/*if ( nIndX >= 0 && nIndX < int( m_nFracLin[0]) &&
nIndY >= 0 && nIndY < int( m_nFracLin[1])) {*/
int nBlockNum = k * nLayerBlock + nIndY * m_nFracLin[0] + nIndX ;
m_BlockToUpdate[nBlockNum] = true ;
}
int nBlockNum = k * nLayerBlock + nYBlock * m_nFracLin[0] + nXBlock ;
m_BlockToUpdate[nBlockNum] = true ;
/* }
}
}
}*/
}
}
else if ( nGrid == 1) {
@@ -182,17 +182,17 @@ VolZmap::SubtractIntervals( unsigned int nGrid, unsigned int nI, unsigned int nJ
int nMaxXBlock = min( int( m_nFracLin[0] - 1), nMaxI / int( m_nDexNumPBlock)) ;
for ( int k = nMinXBlock ; k <= nMaxXBlock ; ++ k) {
for( int nIndY = nYBlock - 1 ; nIndY <= nYBlock + 1 ; ++ nIndY) {
/* for( int nIndY = nYBlock - 1 ; nIndY <= nYBlock + 1 ; ++ nIndY) {
for ( int nIndZ = nZBlock - 1 ; nIndZ <= nZBlock + 1 ; ++ nIndZ) {
if ( nIndY >= 0 && nIndY < int( m_nFracLin[1]) &&
nIndZ >= 0 && nIndZ < int( m_nFracLin[2])) {
nIndZ >= 0 && nIndZ < int( m_nFracLin[2])) {*/
int nBlockNum = nIndZ * nLayerBlock + nIndY * m_nFracLin[0] + k ;
int nBlockNum = nZBlock * nLayerBlock + nYBlock * m_nFracLin[0] + k ;
m_BlockToUpdate[nBlockNum] = true ;
}
/* }
}
}
}*/
}
}
else if ( nGrid == 2) {
@@ -207,17 +207,17 @@ VolZmap::SubtractIntervals( unsigned int nGrid, unsigned int nI, unsigned int nJ
int nMaxYBlock = min( int( m_nFracLin[1] - 1), nMaxJ / int( m_nDexNumPBlock)) ;
for ( int k = nMinYBlock ; k <= nMaxYBlock ; ++ k) {
for ( int nIndX = nXBlock - 1 ; nIndX <= nXBlock + 1 ; ++ nIndX) {
/* for ( int nIndX = nXBlock - 1 ; nIndX <= nXBlock + 1 ; ++ nIndX) {
for ( int nIndZ = nZBlock - 1 ; nIndZ <= nZBlock + 1 ; ++ nIndZ) {
if ( nIndX >= 0 && nIndX < int( m_nFracLin[0]) &&
nIndZ >= 0 && nIndZ < int( m_nFracLin[2])) {
int nBlockNum = nIndZ * nLayerBlock + k * m_nFracLin[0] + nIndX ;
*/
int nBlockNum = nZBlock * nLayerBlock + k * m_nFracLin[0] + nXBlock ;
m_BlockToUpdate[nBlockNum] = true ;
}
/* }
}
}
}*/
}
}