diff options
author | Norbert Preining <norbert@preining.info> | 2020-01-16 03:01:19 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-01-16 03:01:19 +0000 |
commit | 4c0e3e7fa86ecd3794204d362c7e17b3d9433415 (patch) | |
tree | 0f27a1c7c8f6fe12dc9eead93bd098b1266b62e6 /graphics/asymptote/path3.cc | |
parent | 3bd863734612dc2fe9c5c7c1405358ffb1228afb (diff) |
CTAN sync 202001160301
Diffstat (limited to 'graphics/asymptote/path3.cc')
-rw-r--r-- | graphics/asymptote/path3.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/asymptote/path3.cc b/graphics/asymptote/path3.cc index 32a5604a29..d43513ebc2 100644 --- a/graphics/asymptote/path3.cc +++ b/graphics/asymptote/path3.cc @@ -612,7 +612,7 @@ bool intersections(double &s, double &t, std::vector<double>& S, // Overlapping bounding boxes --depth; - fuzz *= 2; +// fuzz *= 2; if((maxp-minp).length()+(maxq-minq).length() <= fuzz || depth == 0) { if(single) { @@ -630,7 +630,7 @@ bool intersections(double &s, double &t, std::vector<double>& S, std::vector<double> S1,T1; - fuzz2=max(fuzzFactor*fuzz*fuzz,Fuzz2); +// fuzz2=max(fuzzFactor*fuzz*fuzz,Fuzz2); if(lp <= 1) { if(lp == 1) p.halve(p1,p2); @@ -1191,7 +1191,7 @@ bool intersections(double& U, double& V, const triple& v, triple *P, v.getz()+fuzz >= z) { // Overlapping bounding boxes --depth; - fuzz *= 2; +// fuzz *= 2; if(abs2(X-x,Y-y,Z-z) <= fuzz*fuzz || depth == 0) { U=0.5; @@ -1258,6 +1258,8 @@ bool intersections(std::vector<double>& T, std::vector<double>& U, { if(errorstream::interrupt) throw interrupted(); + double fuzz2=max(fuzzFactor*fuzz*fuzz,Fuzz2); + triple pmin=p.min(); triple pmax=p.max(); @@ -1286,7 +1288,7 @@ bool intersections(std::vector<double>& T, std::vector<double>& U, pmax.getz()+fuzz >= z) { // Overlapping bounding boxes --depth; - fuzz *= 2; +// fuzz *= 2; if(((pmax-pmin).length()+sqrt(abs2(X-x,Y-y,Z-z)) <= fuzz) || depth == 0) { T.push_back(0.5); @@ -1303,8 +1305,6 @@ bool intersections(std::vector<double>& T, std::vector<double>& U, std::vector<double> T1,U1,V1; double tscale,toffset; - double fuzz2=max(fuzzFactor*fuzz*fuzz,Fuzz2); - if(lp <= 1) { if(lp == 1) p.halve(p0,p1); if(lp == 0 || p0 == p || p1 == p) { |