diff --git a/wrap/gui/trackmode.cpp b/wrap/gui/trackmode.cpp index 34906363..f9f7625e 100644 --- a/wrap/gui/trackmode.cpp +++ b/wrap/gui/trackmode.cpp @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.12 2005/02/11 11:44:07 tommyfranken +Trackball translation corrected + Revision 1.11 2005/02/02 16:46:41 pietroni some warning corrected @@ -64,6 +67,7 @@ Adding copyright. #include #include + using namespace std; using namespace vcg; @@ -99,7 +103,7 @@ Point3f TrackMode::HitViewPlane(Trackball *tb, const Point3f &p) { Line3fN ln= tb->camera.ViewLineFromWindow(Point3f(p[0],p[1],0)); Point3f PonVP; - /*bool res = */Intersection(vp,ln,PonVP); + /*bool res = */IntersectionLinePlane(vp,ln,PonVP); return PonVP; } @@ -216,12 +220,12 @@ Point3f SphereMode::Hit(Trackball *tb, const Point3f &p) { Line3fN vn = tb->camera.ViewLineFromModel(tb->center); Line3fN ln = tb->camera.ViewLineFromWindow(Point3f(p[0],p[1],0)); Point3f viewpoint = tb->camera.ViewPoint(); - Plane3f vp = GetViewPlane(tb->camera, tb->center); + Plane3f vp = GetViewPlane(tb->camera, tb->center); Point3f hit,hitPlane,hitSphere,hitSphere1,hitSphere2,hitHyper; - Intersection(vp, ln, hitPlane); + IntersectionLinePlane(vp, ln, hitPlane); Sphere3f sphere(tb->center,tb->radius); - bool resSp = Intersection(sphere, ln, hitSphere1, hitSphere2); - if(Distance(viewpoint,hitSphere1)(sphere, ln, hitSphere1, hitSphere2); + if(Distance(viewpoint,hitSphere1)