Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit bc5a1b38 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

update the separation criteria control

parent 2ad103ba
...@@ -968,7 +968,7 @@ public: ...@@ -968,7 +968,7 @@ public:
for(int idxY = startY ; idxY <= endY ; ++idxY){ for(int idxY = startY ; idxY <= endY ; ++idxY){
for(int idxZ = startZ ; idxZ <= endZ ; ++idxZ){ for(int idxZ = startZ ; idxZ <= endZ ; ++idxZ){
// if we are not on the current cell // if we are not on the current cell
if( idxX || idxY || idxZ ){ if(neighSeparation<1 || idxX || idxY || idxZ ){
const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ); const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ);
FTreeCoordinate otherParentInBox(otherParent); FTreeCoordinate otherParentInBox(otherParent);
......
...@@ -363,7 +363,7 @@ public: ...@@ -363,7 +363,7 @@ public:
if(!FMath::Between(parentCell.getZ() + idxZ,0,limite)) continue; if(!FMath::Between(parentCell.getZ() + idxZ,0,limite)) continue;
// if we are not on the current cell // if we are not on the current cell
if( idxX || idxY || idxZ ){ if(neighSeparation<1 || idxX || idxY || idxZ ){
const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ); const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ);
const MortonIndex mortonOther = otherParent.getMortonIndex(inLevel-1); const MortonIndex mortonOther = otherParent.getMortonIndex(inLevel-1);
...@@ -408,7 +408,7 @@ public: ...@@ -408,7 +408,7 @@ public:
if(!FMath::Between(parentCell.getZ() + idxZ,0,limite)) continue; if(!FMath::Between(parentCell.getZ() + idxZ,0,limite)) continue;
// if we are not on the current cell // if we are not on the current cell
if( idxX || idxY || idxZ ){ if(neighSeparation<1 || idxX || idxY || idxZ ){
const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ); const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ);
const MortonIndex mortonOther = otherParent.getMortonIndex(inLevel-1); const MortonIndex mortonOther = otherParent.getMortonIndex(inLevel-1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment