add geometric test for 3D topo
This commit is contained in:
parent
06ecb0db4e
commit
f360eb1ecb
@ -127,7 +127,7 @@ int main(int argc, char **argv)
|
|||||||
//..............................................................................
|
//..............................................................................
|
||||||
if (x <= 0 || y<=0) {
|
if (x <= 0 || y<=0) {
|
||||||
// Single torus
|
// Single torus
|
||||||
Object.distance(i,j,k) = sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z) - R2;
|
Object.distance(i,j,k) = R2 - sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
double d1 = R2-sqrt(x*x +(y-R1)*(y-R1) + z*z);
|
double d1 = R2-sqrt(x*x +(y-R1)*(y-R1) + z*z);
|
||||||
@ -201,7 +201,7 @@ int main(int argc, char **argv)
|
|||||||
//..............................................................................
|
//..............................................................................
|
||||||
// Bowl
|
// Bowl
|
||||||
if (z > 0 ){
|
if (z > 0 ){
|
||||||
Object.distance(i,j,k) = sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z) - R2;
|
Object.distance(i,j,k) = R2-sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user