game loop tweaks; shapes hierarchy defined

[chaz/yoink] / src / Scene.cc

diff --git a/src/Scene.cc b/src/Scene.cc
index 7b23ab6431e7a88da48ae3a5fdd38fc7e41a6b3d..8b155e7dd96bf991df058a41806fe5d760214c99 100644 (file)
--- a/src/Scene.cc
+++ b/src/Scene.cc
@@ -526,14 +526,14 @@ void Scene::drawIfVisible(Mf::Scalar alpha,
 
 
 bool Scene::castRay(const Mf::Ray<2>& ray,
-                                       std::list<Mf::Ray<2>::Intersection>& hits) const
+                                       std::list<Mf::Ray<2>::Contact>& hits) const
 {
        std::list< Mf::Line<2> >& lines = mImpl->mLines;
        std::list< Mf::Line<2> >::const_iterator it;
 
        for (it = lines.begin(); it != lines.end(); ++it)
        {
-               Mf::Ray<2>::Intersection hit;
+               Mf::Ray<2>::Contact hit;
                Mf::Scalar d = (*it).intersectRay(ray, hit);
                if (d > 0.0)
                {