source/gfx/prim.h

@@ -16,7 +16,7 @@
 #endif
 
 #define	MAX_OT				(1024/2)
-#define	MAX_PRIMS			(1024*1)
+#define	MAX_PRIMS			(1024*3)
 
 #define	USE_NTAGS			1
 

source/player/player.cpp

@@ -8,18 +8,31 @@
 #include "gfx\anim.h"
 #include "Player\Player.h"
 
+#include "pad\pads.h"
+
 // to be removed
 #include "fileio\fileio.h"
 #include "utils\utils.h"
 #include "gfx\tpage.h"
 #include "gfx\prim.h"
 
+
+
+#define ANIM_IDLE_SHORT		15
+#define ANIM_IDLE_LONG		16
+#define ANIM_RUNSTART		29
+#define ANIM_RUN			26
+#define ANIM_RUNSTOP		30
+
+
+
 /*****************************************************************************/
 /*****************************************************************************/
 /*****************************************************************************/
 CPlayer::CPlayer()
 {
-		SetRenderObj(&Skel);
+//		SetControlObj(&m_playerControl);
+//		SetRenderObj(&m_skel);
 };
 
 /*****************************************************************************/
@@ -30,11 +43,13 @@ CPlayer::~CPlayer()
 /*****************************************************************************/
 void	CPlayer::init()
 {
-sActor3dHdr	*Hdr=Skel.Load(ACTORS_SPONGEBOB_A3D);		
-		Skel.Init(Hdr);
+sActor3dHdr	*Hdr=m_skel.Load(ACTORS_SPONGEBOB_A3D);		
+		m_skel.Init(Hdr);
 		TPLoadTex(ACTORS_SPONGEBOB_TEX);
-		Skel.setAnimDatabase(CAnimDB::GetPlayerAnimBank());
+		m_skel.setAnimDatabase(CAnimDB::GetPlayerAnimBank());
 
+		setState(STATE_IDLE);
+		m_facing=-1;
 }
 
 /*****************************************************************************/
@@ -42,8 +57,195 @@ void	CPlayer::shutdown()
 {
 }
 
+
 /*****************************************************************************/
-void	CPlayer::Animate()
+void	CPlayer::think(int _frames)
 {
-		Skel.Animate(this);
+	int	padInput;
+
+if(_frames>=3)_frames=2;
+
+	// PKG - Needs to come from somewhere local rather than direct from pad handler..
+	padInput=PadGetHeld(0);
+
+	switch(m_state)
+	{
+		case STATE_IDLE:
+			if(padInput&(PAD_LEFT|PAD_RIGHT))
+			{
+				if(padInput&PAD_LEFT)
+				{
+					m_facing=FACING_LEFT;
+					m_skel.setAng(512);
 				}
+				else
+				{
+					m_facing=FACING_RIGHT;
+					m_skel.setAng(3096+512);
+				}
+				setState(STATE_RUNSTART);
+				m_runVel=RUN_SPEEDUP;
+			}
+			break;
+
+		case STATE_RUNSTART:
+		case STATE_RUN:
+			if(padInput&(PAD_LEFT|PAD_RIGHT))
+			{
+				if(m_facing==FACING_LEFT)
+				{
+					// Running left
+					if(padInput&PAD_LEFT)
+					{
+						m_runVel+=RUN_SPEEDUP;
+						if(m_runVel>MAX_RUN_VELOCITY)
+						{
+							m_runVel=MAX_RUN_VELOCITY;
+						}
+					}	
+					else
+					{
+						m_runVel-=RUN_REVERSESLOWDOWN;
+						if(m_runVel<1)
+						{
+							m_runVel=0;
+							m_facing=FACING_RIGHT;
+							m_skel.setAng(3096+512);
+						}
+					}
+				}
+				else
+				{
+					// Running right
+					if(padInput&PAD_RIGHT)
+					{
+						m_runVel+=RUN_SPEEDUP;
+						if(m_runVel>MAX_RUN_VELOCITY)
+						{
+							m_runVel=MAX_RUN_VELOCITY;
+						}
+					}	
+					else
+					{
+						m_runVel-=RUN_REVERSESLOWDOWN;
+						if(m_runVel<1)
+						{
+							m_runVel=0;
+							m_facing=FACING_LEFT;
+							m_skel.setAng(512);
+						}
+					}
+				}
+			}
+			else
+			{
+				m_runVel-=RUN_SLOWDOWN;
+				if(m_runVel<1)
+				{
+					m_runVel=0;
+					setState(STATE_RUNSTOP);
+				}
+			}
+			break;
+
+		case STATE_RUNSTOP:
+			break;
+
+		case NUM_STATES:
+			break;
+	}
+
+	Pos.vx-=m_runVel*m_facing*_frames;
+	if(Pos.vx<0)Pos.vx=0;
+
+
+	// Animate
+	m_frame+=_frames;
+	if(m_frame>=m_skel.getFrameCount())
+	{
+		// PKG - Overlap..!?
+		m_frame=0;
+		finishedAnim();
+	}
+
+
+
+
+
+
+
+
+
+
+
+	if(padInput&PAD_UP)
+	{
+		Pos.vy-=5;
+	}
+	else if(padInput&PAD_DOWN)
+	{
+		Pos.vy+=5;
+	}
+	if(Pos.vy<0)Pos.vy=0;
+}
+
+
+/*****************************************************************************/
+void	CPlayer::render()
+{
+	// Render
+	m_skel.setFrame(m_frame);
+	m_skel.setAnimNo(m_animNo);
+	m_skel.Animate(this);
+	m_skel.Render(this);
+}
+
+
+/*****************************************************************************/
+int	CPlayer::s_stateAnims[NUM_STATES]=
+{
+	ANIM_IDLE_SHORT,			// STATE_IDLE
+	ANIM_RUNSTART,				// STATE_RUNSTART
+	ANIM_RUN,					// STATE_RUN
+	ANIM_RUNSTOP,				// STATE_RUNSTOP
+};
+
+int panim=-1;
+void	CPlayer::setState(PLAYER_STATE _state)
+{
+PAUL_DBGMSG("set state %d",_state);	
+	m_state=_state;
+	m_animNo=s_stateAnims[_state];
+if(panim!=-1)m_animNo=panim;
+	m_frame=0;	
+}
+
+
+
+/*****************************************************************************/
+void CPlayer::finishedAnim()
+{
+	switch(m_state)
+	{
+		case STATE_IDLE:
+			if(getRndRange(100)<95)
+				m_animNo=ANIM_IDLE_SHORT;
+			else
+				m_animNo=ANIM_IDLE_LONG;
+			break;
+		case STATE_RUNSTART:
+			setState(STATE_RUN);
+			break;
+		case STATE_RUN:
+			break;
+		case STATE_RUNSTOP:
+			setState(STATE_IDLE);
+			break;
+		case NUM_STATES:
+			break;
+	}
+}
+
+
+
+

source/player/player.h

@@ -9,6 +9,7 @@
 #include "Game/Thing.h"
 #include "Gfx/Skel.h"
 
+
 /*****************************************************************************/
 
 class	CPlayer : public CThing
@@ -19,13 +20,50 @@ public:
 
 	void			init();
 	void			shutdown();
+	void			think(int _frames);
+	void			render();
 
-		void		Animate();
 
-protected:
+private:		
+	typedef enum
+	{
+		STATE_IDLE,
+		STATE_RUNSTART,
+		STATE_RUN,
+		STATE_RUNSTOP,
 			
-		CSkel		Skel;
+		NUM_STATES,
+	}PLAYER_STATE;
+
+	void			setState(PLAYER_STATE _state);
+	void			finishedAnim();
+
+	int				m_frame;
+	int				m_animNo;
+	PLAYER_STATE	m_state;
+	CSkel			m_skel;
+
+
+	enum
+	{
+		MAX_RUN_VELOCITY=8,
+		RUN_SPEEDUP=4,
+		RUN_REVERSESLOWDOWN=2,
+		RUN_SLOWDOWN=1,
 	};
+	int				m_runVel;
+	
+	enum
+	{
+		FACING_LEFT=+1,
+		FACING_RIGHT=-1,
+	};
+	int				m_facing;
+
+	static int		s_stateAnims[NUM_STATES];
+
+};
+
 
 /*****************************************************************************/
 #endif