void init(const std::string& name) {}
- void importSceneBindings(Mf::Script& script)
+ void importSceneBindings(Mf::Settings& settings, Mf::Script& script)
{
script.importFunction("SetBounds",
boost::bind(&Impl::setBounds, this, _1));
boost::bind(&Impl::drawTile, this, _1));
int detail = 3;
- Mf::settings.get("detail", detail);
+ settings.get("detail", detail);
script.push(detail); script.set("detail");
script.push(1); script.set("LOW");
}
- Mf::Script::Result load(Mf::Script& script)
+ Mf::Script::Result load(Mf::Settings& settings, Mf::Script& script)
{
std::string filePath = Scene::getPath(getName());
if (filePath == "")
return Mf::Script::FILE_ERROR;
}
- importSceneBindings(script);
+ importSceneBindings(settings, script);
return script.doFile(filePath);
}
mImpl(Scene::Impl::getInstance(name)) {}
-Mf::Script::Result Scene::load(Mf::Script& script)
+Mf::Script::Result Scene::load(Mf::Settings& settings, Mf::Script& script)
{
// pass through
- return mImpl->load(script);
+ return mImpl->load(settings, script);
}
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)
{