X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=4140d17249e2b8d822a31c8e8893e09737ef78b4;hp=b1965ce7dd129076ff82b3af3484ae3599157270;hb=ed5fcf5f1357fc42749408f705e9ec55531ff006;hpb=c2321281bf12a7efaedde930422c7ddbc92080d4

diff --git a/src/Character.hh b/src/Character.hh
index b1965ce..4140d17 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -1,69 +1,60 @@
 
-/*******************************************************************************
-
- 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 _CHARACTER_HH_
 #define _CHARACTER_HH_
 
-#include <Moof/Animation.hh>
-#include <Moof/Drawable.hh>
-#include <Moof/Resource.hh>
-#include <Moof/Tilemap.hh>
+#include <string>
+
+#include <boost/shared_ptr.hpp>
+
+#include <Moof/Aabb.hh>
+#include <Moof/Entity.hh>
+#include <Moof/Math.hh>
+#include <Moof/RigidBody.hh>
+#include <Moof/Sphere.hh>
+#include <Moof/Texture.hh>
+
+#include "Animation.hh"
+
+
+class Character;
+typedef boost::shared_ptr<Character> CharacterP;
 
 
 /**
- * Parent class of animate objects with "personalities."
+ * Parent class of animate objects with "personalities."  This basically
+ * includes the heroine herself and the bad guys.
  */
 
-class Character : public Mf::Drawable
+class Character : public Mf::RigidBody2
 {
 public:
-	Character(const std::string& name);
-	~Character();
 
-	void draw(Mf::Scalar alpha);
+	Character(const std::string& name);
+	virtual ~Character() {}
 
-	Mf::Tilemap& getTilemap();
-	Mf::Animation& getAnimation();
+	virtual void update(Mf::Scalar t, Mf::Scalar dt);
+	virtual void draw(Mf::Scalar alpha) const;
 
+	void addImpulse(Mf::Vector2 impulse);
+	void addForce(Mf::Vector2 force);
+	void setPosition(Mf::Vector2 position);
 
-	struct Exception : public std::runtime_error
-	{
-		explicit Exception(const std::string& what_arg) :
-			std::runtime_error(what_arg) {}
-	};
+	//virtual int getOctant(const Mf::Aabb<3>& aabb) const;
 
-private:
-	Mf::Tilemap tilemap;
-	Mf::Animation animation;
+	Mf::Texture	tilemap;
+	Animation	animation;
 };
 
 
 #endif // _CHARACTER_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-