manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some minor bugs

This commit is contained in:
Federico Ponchio 2004-05-14 03:14:29 +00:00
parent 62bba63f19
commit 99b51766f6
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vcg/space/intersection3.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.6 2004/05/13 23:43:54 ponchio
minor bug
Revision 1.5 2004/05/05 08:21:55 cignoni Revision 1.5 2004/05/05 08:21:55 cignoni
syntax errors in inersection plane line. syntax errors in inersection plane line.
@ -76,16 +79,16 @@ namespace vcg {
// fino a portare il centro della sfera nell'origine // fino a portare il centro della sfera nell'origine
Point3<T> neworig=li.Origin()-sp.Center(); Point3<T> neworig=li.Origin()-sp.Center();
// poi si risolve il sistema di secondo grado (con maple...) // poi si risolve il sistema di secondo grado (con maple...)
T t1 = li.Direction().x()*li.Direction().x(); T t1 = li.Direction().X()*li.Direction().X();
T t2 = li.Direction().y()*li.Direction().y(); T t2 = li.Direction().Y()*li.Direction().Y();
T t3 = li.Direction().z()*li.Direction().z(); T t3 = li.Direction().Z()*li.Direction().Z();
T t6 = neworig.y()*li.Direction().y(); T t6 = neworig.Y()*li.Direction().Y();
T t7 = neworig.x()*li.Direction().x(); T t7 = neworig.X()*li.Direction().X();
T t8 = neworig.z()*li.Direction().z(); T t8 = neworig.Z()*li.Direction().Z();
T t15 = sp.Radius()*sp.Radius(); T t15 = sp.Radius()*sp.Radius();
T t17 = neworig.z()*neworig.z(); T t17 = neworig.Z()*neworig.Z();
T t19 = neworig.y()*neworig.y(); T t19 = neworig.Y()*neworig.Y();
T t21 = neworig.x()*neworig.x(); T t21 = neworig.X()*neworig.X();
T t28 = 2.0*t7*t6+2.0*t6*t8+2.0*t7*t8+t1*t15-t1*t17-t1*t19-t2*t21+t2*t15-t2*t17-t3*t21+t3*t15-t3*t19; T t28 = 2.0*t7*t6+2.0*t6*t8+2.0*t7*t8+t1*t15-t1*t17-t1*t19-t2*t21+t2*t15-t2*t17-t3*t21+t3*t15-t3*t19;
if(t28<0) return false; if(t28<0) return false;
T t29 = sqrt(t28); T t29 = sqrt(t28);