X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=651cc885c4f239f10a6779c94481e1060d5b335a;hp=50c3da51a6418582569a88145be462acc5b017d6;hb=831f04d4bc19a390415ac0bbac4331c7a65509bc;hpb=64bd443538f57ad1bdff6c6b35953e72141129b2

diff --git a/src/Character.hh b/src/Character.hh
index 50c3da5..651cc88 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -1,49 +1,32 @@
 
-/*******************************************************************************
-
- 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 <string>
+
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Aabb.hh>
-#include <Moof/Entity.hh>
-#include <Moof/Math.hh>
-#include <Moof/Octree.hh>
-#include <Moof/Physics.hh>
-#include <Moof/Sphere.hh>
+#include <moof/aabb.hh>
+#include <moof/entity.hh>
+#include <moof/math.hh>
+#include <moof/rigid_body.hh>
+#include <moof/sphere.hh>
+#include <moof/texture.hh>
 
 #include "Animation.hh"
-#include "Tilemap.hh"
-
 
 
-struct Character;
+class Character;
 typedef boost::shared_ptr<Character> CharacterP;
 
 
@@ -52,39 +35,26 @@ typedef boost::shared_ptr<Character> CharacterP;
  * includes the heroine herself and the bad guys.
  */
 
-struct Character : public Mf::Entity, public Mf::OctreeInsertable
+class Character : public moof::rigid_body2
 {
-protected:
-
-	Mf::Vector2 userForce;
-
 public:
 
 	Character(const std::string& name);
 	virtual ~Character() {}
 
-	virtual void update(Mf::Scalar t, Mf::Scalar dt);
-	virtual void draw(Mf::Scalar alpha) const;
+	virtual void update(moof::scalar t, moof::scalar dt);
+	virtual void draw(moof::scalar alpha) const;
 
-	virtual bool isInsideAabb(const Mf::Aabb& aabb) const;
-	virtual int getOctant(const Mf::Aabb& aabb) const;
+	void addImpulse(moof::vector2 impulse);
+	void addForce(moof::vector2 force);
+	void setPosition(moof::vector2 position);
 
-	Mf::State2		previous;
-	Mf::State2		current;
+	//virtual int getOctant(const moof::Aabb<3>& aabb) const;
 
-	Tilemap			tilemap;
-	Animation		animation;
-
-	Mf::Aabb		aabb_;
-	Mf::Sphere		sphere_;
-
-private:
-
-	static const Mf::Scalar z = 96.0;
+	moof::texture	tilemap;
+	Animation	animation;
 };
 
 
 #endif // _CHARACTER_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-