This commit is contained in:
parent
1966aa6f60
commit
2b171295b5
44 changed files with 588 additions and 603 deletions
|
@ -234,8 +234,7 @@ void CPlayer::init()
|
|||
// m_onPlatform = false;
|
||||
// m_prevOnPlatform = false;
|
||||
|
||||
m_skel.Init(ACTORS_SPONGEBOB_A3D);
|
||||
TPLoadTex(ACTORS_ACTOR_SPONGEBOB_TEX);
|
||||
m_actorGfx=CActorPool::GetActor(ACTORS_SPONGEBOB_SBK);
|
||||
|
||||
for(int i=0;i<NUM_PLAYERMODES;i++)
|
||||
{
|
||||
|
@ -259,8 +258,8 @@ m_animFrame=0;
|
|||
|
||||
s_screenPos=128;
|
||||
|
||||
m_skel.setAng(512);
|
||||
//m_skel.setAngInc(678);
|
||||
//!! m_actorGfx.setAng(512);
|
||||
//m_actorGfx.setAngInc(678);
|
||||
|
||||
setCollisionSize(25,50);
|
||||
setCollisionCentreOffset(0,-25);
|
||||
|
@ -348,11 +347,6 @@ else if(Pos.vy>m_mapEdge.vy-64)Pos.vy=m_mapEdge.vy-64;
|
|||
|
||||
// Look around
|
||||
int pad=getPadInputHeld();
|
||||
if(PadGetDown(0)&PAD_CIRCLE)
|
||||
{
|
||||
m_skel.blink();
|
||||
}
|
||||
|
||||
|
||||
// Camera scroll..
|
||||
if(m_cameraScrollDir==-1)
|
||||
|
@ -454,33 +448,24 @@ m_fontBank->print(40,40,posBuf);
|
|||
// Render
|
||||
if(m_invincibleFrameCount==0||m_invincibleFrameCount&2)
|
||||
{
|
||||
#ifdef __USER_paul__
|
||||
if(mouth!=-1)
|
||||
{
|
||||
m_skel.setMouthTex(mouth);
|
||||
mouth=-1;
|
||||
}
|
||||
if(eyes!=-1)
|
||||
{
|
||||
m_skel.setEyeTex(eyes);
|
||||
eyes=-1;
|
||||
}
|
||||
#endif
|
||||
|
||||
//int xval=(255-(MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPos.vx>>8)));
|
||||
//DrawLine(xval-7,0,xval-7,255,0,128,255,0);
|
||||
//DrawLine(xval+7,0,xval+7,255,0,128,255,0);
|
||||
|
||||
SetGeomOffset(SCREEN_GEOM_CENTRE_X+m_playerScreenGeomPos.vx,SCREEN_GEOM_CENTRE_Y+m_playerScreenGeomPos.vy);
|
||||
if(panim!=-1)
|
||||
m_skel.setAnimNo(panim);
|
||||
else
|
||||
m_skel.setAnimNo(m_animNo);
|
||||
m_skel.setFrame(m_animFrame);
|
||||
m_skel.Animate(this);
|
||||
m_skel.Render(this);
|
||||
//!! SetGeomOffset(SCREEN_GEOM_CENTRE_X+m_playerScreenGeomPos.vx,SCREEN_GEOM_CENTRE_Y+m_playerScreenGeomPos.vy);
|
||||
// if(panim!=-1)
|
||||
// m_actorGfx.setAnimNo(panim);
|
||||
// else
|
||||
// m_actorGfx.setAnimNo(m_animNo);
|
||||
//!! m_actorGfx.setFrame(m_animFrame);
|
||||
//!! m_actorGfx.Animate(this);
|
||||
//!! m_actorGfx.Render(this);
|
||||
//!! m_currentPlayerModeClass->render();
|
||||
//!! SetGeomOffset(SCREEN_GEOM_CENTRE_X,SCREEN_GEOM_CENTRE_Y);
|
||||
DVECTOR Pos={256,128};
|
||||
m_actorGfx->Render(Pos,m_animNo,m_animFrame,0);
|
||||
m_currentPlayerModeClass->render();
|
||||
SetGeomOffset(SCREEN_GEOM_CENTRE_X,SCREEN_GEOM_CENTRE_Y);
|
||||
}
|
||||
|
||||
|
||||
|
@ -634,7 +619,7 @@ void CPlayer::setFacing(int _facing)
|
|||
if(m_facing!=_facing)
|
||||
{
|
||||
m_facing=_facing;
|
||||
m_skel.setDir(_facing);
|
||||
//!! m_actorGfx.setDir(_facing);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -687,7 +672,7 @@ void CPlayer::setAnimFrame(int _animFrame)
|
|||
}
|
||||
int CPlayer::getAnimFrameCount()
|
||||
{
|
||||
return m_skel.getFrameCount(m_animNo);
|
||||
return m_actorGfx->getFrameCount(m_animNo);
|
||||
}
|
||||
int CPlayer::getAnimNo()
|
||||
{
|
||||
|
|
|
@ -22,9 +22,8 @@
|
|||
#include "thing/thing.h"
|
||||
#endif
|
||||
|
||||
#ifndef __GFX_SKELSPNG_H__
|
||||
#include "gfx/skelspng.h"
|
||||
#endif
|
||||
#include "gfx/actor.h"
|
||||
|
||||
|
||||
#ifndef __DATA_STRUCTS_HEADER__
|
||||
#include <dstructs.h>
|
||||
|
@ -189,7 +188,7 @@ private:
|
|||
static const AnimSfx s_animSfx[];
|
||||
int m_animFrame;
|
||||
int m_animNo;
|
||||
CSkelSpongeBob m_skel;
|
||||
CActorGfx *m_actorGfx;
|
||||
|
||||
DVECTOR m_playerScreenGeomPos;
|
||||
DVECTOR m_cameraPos;
|
||||
|
|
|
@ -123,7 +123,8 @@ void CPlayerModeBubbleMixture::think()
|
|||
// Blowing?
|
||||
if(m_blowing)
|
||||
{
|
||||
m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
|
||||
//!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
|
||||
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE);
|
||||
m_player->setAnimFrame(m_blowFrame);
|
||||
m_blowFrame++;
|
||||
if(m_blowFrame>=m_player->getAnimFrameCount())
|
||||
|
|
|
@ -84,7 +84,8 @@ void CPlayerModeChop::think()
|
|||
// Chopping?
|
||||
if(m_chopping)
|
||||
{
|
||||
m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
|
||||
//!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
|
||||
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE);
|
||||
m_player->setAnimFrame(m_chopFrame);
|
||||
m_chopFrame++;
|
||||
if(m_chopFrame>=m_player->getAnimFrameCount())
|
||||
|
|
|
@ -103,7 +103,8 @@ void CPlayerModeNet::think()
|
|||
// Netting?
|
||||
if(m_netting)
|
||||
{
|
||||
m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
|
||||
//!!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
|
||||
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE);
|
||||
m_player->setAnimFrame(m_netFrame);
|
||||
m_netFrame++;
|
||||
if(m_netFrame>=m_player->getAnimFrameCount())
|
||||
|
|
|
@ -62,7 +62,8 @@
|
|||
---------------------------------------------------------------------- */
|
||||
void CPlayerStateFall::enter(CPlayerModeBase *_playerMode)
|
||||
{
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_HOVER);
|
||||
// _playerMode->setAnimNo(ANIM_SPONGEBOB_HOVER);
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_FIRE);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -257,12 +257,14 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode)
|
|||
static IdleAnims s_unarmedIdleAnims[]=
|
||||
{
|
||||
// start frame loop frame end frame loop count
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
|
||||
{ ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEHOOLA, ANIM_SPONGEBOB_FACEBACK, 5 },
|
||||
{ ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEWIGGLEARM, ANIM_SPONGEBOB_FACEBACK, 5 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEWIND, -1, 1 },
|
||||
//!! { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
|
||||
//!! { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
|
||||
//!! { ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEHOOLA, ANIM_SPONGEBOB_FACEBACK, 5 },
|
||||
//!! { ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEWIGGLEARM, ANIM_SPONGEBOB_FACEBACK, 5 },
|
||||
//!! { -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
|
||||
//!! { -1, ANIM_SPONGEBOB_IDLEWIND, -1, 1 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEHOOLA, -1, 4 }, // default
|
||||
|
||||
};
|
||||
static int s_numUnarmedIdleAnims=sizeof(s_unarmedIdleAnims)/sizeof(IdleAnims);
|
||||
IdleAnims *CPlayerStateUnarmedIdle::getIdleAnimsDb(int _animNo)
|
||||
|
@ -285,9 +287,10 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims()
|
|||
static IdleAnims s_coralBlowerIdleAnims[]=
|
||||
{
|
||||
// start frame loop frame end frame loop count
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
|
||||
//!! { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
|
||||
//!! { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
|
||||
//!! { -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEHOOLA, -1, 1 },
|
||||
};
|
||||
static int s_numCoralBlowerIdleAnims=sizeof(s_coralBlowerIdleAnims)/sizeof(IdleAnims);
|
||||
IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo)
|
||||
|
|
|
@ -67,7 +67,8 @@
|
|||
---------------------------------------------------------------------- */
|
||||
void CPlayerStateJump::enter(CPlayerModeBase *_playerMode)
|
||||
{
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_HOVER);
|
||||
//!! _playerMode->setAnimNo(ANIM_SPONGEBOB_HOVER);
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_FIRE);
|
||||
m_jumpFrames=0;
|
||||
|
||||
_playerMode->jump();
|
||||
|
|
|
@ -71,7 +71,8 @@ void CPlayerStateRun::enter(CPlayerModeBase *_playerMode)
|
|||
}
|
||||
else
|
||||
{
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_RUNSTART);
|
||||
//!! _playerMode->setAnimNo(ANIM_SPONGEBOB_RUNSTART);
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_FIRE);
|
||||
}
|
||||
|
||||
if(controlHeld&PI_LEFT)
|
||||
|
@ -126,7 +127,8 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode)
|
|||
_playerMode->setState(STATE_IDLE);
|
||||
if(m_numberOfTimeAnimHasLooped>=4)
|
||||
{
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_RUNSTOP);
|
||||
//!! _playerMode->setAnimNo(ANIM_SPONGEBOB_RUNSTOP);
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_FIRE);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue