X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FScene.hh;h=8c60cc50bb0f533b9e3fa1c83b24b0fbc153b30b;hp=f9963e85dd0ea1e7567a5fd7e63f08daec01e47f;hb=6f1b787a10d8ab1a3117a4b8c004dd2d90599608;hpb=8a1acac01b444dccf8b57cedf08392ada2e473c1

diff --git a/src/Scene.hh b/src/Scene.hh
index f9963e8..8c60cc5 100644
--- a/src/Scene.hh
+++ b/src/Scene.hh
@@ -1,54 +1,41 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _SCENE_HH_
 #define _SCENE_HH_
 
+#include <list>
 #include <string>
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Cullable.hh>
-#include <Moof/Drawable.hh>
-#include <Moof/Resource.hh>
-#include <Moof/Script.hh>
+#include <moof/cullable.hh>
+#include <moof/drawable.hh>
+#include <moof/script.hh>
 
 
 class Character;
 
 
+namespace moof {
+class settings;
+}
+
 class Scene;
 typedef boost::shared_ptr<Scene> SceneP;
 
-class Scene : public Mf::Cullable, public Mf::Drawable, public Mf::Resource
+class Scene : public moof::cullable, public moof::drawable
 {
-	class Impl;
-	boost::shared_ptr<Impl> mImpl;
+	class impl;
+	boost::shared_ptr<impl> impl_;
 
 public:
 
@@ -59,20 +46,18 @@ public:
 		return SceneP(new Scene(name));
 	}
 
-	Mf::Script::Status load(Mf::Script& script);
+	moof::script::status load(moof::settings& settings, moof::script& script);
 
-	void draw(Mf::Scalar alpha) const;
-	void drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const;
+	void draw(moof::scalar alpha) const;
+	void draw_if_visible(moof::scalar alpha, const moof::frustum& frustum) const;
 
-	Mf::Scalar getZCoord(const Mf::Vector2& position) const;
+	moof::scalar getZCoord(const moof::vector2& position) const;
 
+	bool castRay(const moof::ray<2>& ray,
+			std::list<moof::ray<2>::contact>& hits) const;
 	bool checkForCollision(Character& character);
-
-	static std::string getPath(const std::string& name);
 };
 
 
 #endif // _SCENE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-