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

Updating after the change 

IntersectionPlaneLine -> IntersectionLinePlane
This commit is contained in:
Paolo Cignoni 2012-01-18 16:49:18 +00:00
parent fbe0b23839
commit f64b175b13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wrap/gui/trackutils.h
View File

@ -133,7 +133,7 @@ Point3f HitViewPlane (Trackball * tb, const Point3f & p)
Plane3f vp = GetViewPlane (tb->camera, tb->center); Plane3f vp = GetViewPlane (tb->camera, tb->center);
Line3fN ln = tb->camera.ViewLineFromWindow (Point3f (p[0], p[1], 0)); Line3fN ln = tb->camera.ViewLineFromWindow (Point3f (p[0], p[1], 0));
Point3f PonVP; Point3f PonVP;
IntersectionLinePlane < float >(vp, ln, PonVP); IntersectionPlaneLine < float >(vp, ln, PonVP);
return PonVP; return PonVP;
} }
@ -242,7 +242,7 @@ Point3f HitSphere (Trackball * tb, const Point3f & p)
hitSphere1(0,0,0), hitSphere1(0,0,0),
hitSphere2(0,0,0), hitSphere2(0,0,0),
hitHyper(0,0,0); hitHyper(0,0,0);
IntersectionLinePlane < float >(vp, ln, hitPlane); IntersectionPlaneLine < float >(vp, ln, hitPlane);
Sphere3f sphere (center, tb->radius);//trackball sphere Sphere3f sphere (center, tb->radius);//trackball sphere
bool resSp = IntersectionLineSphere < float >(sphere, ln, hitSphere1, hitSphere2); bool resSp = IntersectionLineSphere < float >(sphere, ln, hitSphere1, hitSphere2);