X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FScene.hh;h=7558e3a6fce7af7a09587dffd15860a04b34996f;hp=f9963e85dd0ea1e7567a5fd7e63f08daec01e47f;hb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e;hpb=8a1acac01b444dccf8b57cedf08392ada2e473c1 diff --git a/src/Scene.hh b/src/Scene.hh index f9963e8..7558e3a 100644 --- a/src/Scene.hh +++ b/src/Scene.hh @@ -29,6 +29,7 @@ #ifndef _SCENE_HH_ #define _SCENE_HH_ +#include #include #include @@ -59,13 +60,15 @@ public: return SceneP(new Scene(name)); } - Mf::Script::Status load(Mf::Script& script); + Mf::Script::Result load(Mf::Script& script); void draw(Mf::Scalar alpha) const; void drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const; Mf::Scalar getZCoord(const Mf::Vector2& position) const; + bool castRay(const Mf::Ray<2>& ray, + std::list::Intersection>& hits) const; bool checkForCollision(Character& character); static std::string getPath(const std::string& name);