diff --git a/data/DataCache.scr b/data/DataCache.scr index 5b463814d..a2464de39 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -117,7 +117,8 @@ collision/colltab.dat actors/spongebob.a3d actors/spongebob.tex -anims/player.abk + +actors/spongebob.abk { SYSTEM_CACHE 4 } diff --git a/makefile.gfx b/makefile.gfx index 5fad03a93..6b82d3693 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -148,7 +148,6 @@ cleanactors: cleanplayer PLAYER_FILE := Spongebob PLAYER_IN_DIR:= $(ACTOR_IN_DIR)/$(PLAYER_FILE) PLAYER_OUT_DIR := $(ACTOR_OUT_DIR) -PLAYER_INC_FILE := $(INC_DIR)/Actor_$(PLAYER_FILE).h PLAYER_MOD_IN := $(PLAYER_IN_DIR)/$(PLAYER_FILE).Gin PLAYER_MOD_OUT := $(PLAYER_OUT_DIR)/$(PLAYER_FILE).a3d @@ -156,6 +155,14 @@ PLAYER_TEX_DIR := $(PLAYER_IN_DIR)/textures PLAYER_TEX_IN := $(PLAYER_TEX_DIR)/*.bmp PLAYER_TEX_OUT := $(PLAYER_OUT_DIR)/$(PLAYER_FILE).Tex +PLAYER_ANIM := buttbounceend buttbouncestart deathbackwards deathdry deathforwards deathspin deathtar electricshock electricshockend electricshockstart faceback facefront \ + fall getup getuprun hitground hover hoverend hoverstart idlebreathe idlehoola idlelook idlewigglearm jumpend karate run \ + runstart runstop soakup talk01 teeterback teeterfront \ + idlewind + +PLAYER_ANIM_LIST := $(foreach FILE, $(PLAYER_ANIM),-a:$(PLAYER_IN_DIR)/$(FILE).gin) +PLAYER_ANIM_DEP_IN := $(foreach FILE, $(PLAYER_ANIM),$(PLAYER_IN_DIR)/$(FILE).gin) +PLAYER_ANIM_DEP_OUT := $(ANIM_OUT_DIR)/SpongeBob.Abk PLAYER_EXTRA_TEX := SBBackNormal \ SBEyesAngry SBEyesBlink SBEyesDown SBEyesfiece SBEyesLeft SBEyesNormal SBEyesRight SBEyesSheepish SBEyesUp SBEyesWorried \ @@ -168,10 +175,10 @@ PLAYER_EXTRA_TEX := SBBackNormal \ SBSoleNormal \ SBTopNormal -PLAYER_EXTRA_TEX_LIST := $(foreach FILE, $(PLAYER_EXTRA_TEX),-a:textures/$(FILE).bmp) +PLAYER_EXTRA_TEX_LIST := $(foreach FILE, $(PLAYER_EXTRA_TEX),-x:textures/$(FILE).bmp) -PLAYER_DEP_IN := $(PLAYER_MOD_IN) $(PLAYER_TEX_IN) -PLAYER_DEP_OUT := $(PLAYER_MOD_OUT) $(PLAYER_TEX_OUT) +PLAYER_DEP_IN := $(PLAYER_MOD_IN) $(PLAYER_TEX_IN) $(PLAYER_ANIM_IN) +PLAYER_DEP_OUT := $(PLAYER_MOD_OUT) $(PLAYER_TEX_OUT) $(PLAYER_ANIM_OUT) player: $(PLAYER_DEP_OUT) @@ -180,41 +187,10 @@ cleanplayer: @$(ECHO) Player Cleaned $(PLAYER_DEP_OUT) : $(PLAYER_DEP_IN) - @$(MKACTOR3D) $(PLAYER_MOD_IN) -o:$(PLAYER_OUT_DIR) -t:24,1,1 -s:256 -i:$(PLAYER_INC_FILE) $(PLAYER_EXTRA_TEX_LIST) + @$(MKACTOR3D) $(PLAYER_MOD_IN) -o:$(PLAYER_OUT_DIR) -t:24,1,1 -s:256 -i:$(INC_DIR) $(PLAYER_EXTRA_TEX_LIST) $(PLAYER_ANIM_LIST) GFX_DATA_OUT += $(PLAYER_DEP_OUT) - - -#---------------------------------------------------------------------------- -# Animations -#---------------------------------------------------------------------------- -anims: playeranims -cleananims: cleanplayeranims - -ANIM_OUT_DIR := $(DATA_OUT)/anims -PLAYER_ANIM_IN_DIR := $(ACTOR_IN_DIR)/SpongeBob - -# DUFF_ANIMS deathfall runjumpend runjumpstart -PLAYER_ANIM_LIST := buttbounceend buttbouncestart deathbackwards deathdry deathforwards deathspin deathtar electricshock electricshockend electricshockstart faceback facefront \ - fall getup getuprun hitground hover hoverend hoverstart idlebreathe idlehoola idlelook idlewigglearm jumpend karate run \ - runstart runstop soakup talk01 teeterback teeterfront \ - idlewind - -PLAYER_ANIM_IN := $(foreach FILE, $(PLAYER_ANIM_LIST),$(PLAYER_ANIM_IN_DIR)/$(FILE).gin) -PLAYER_ANIM_OUT := $(ANIM_OUT_DIR)/Player.Abk -PLAYER_ANIM_INC := $(INC_DIR)/Player_Anim.h - -playeranims: $(PLAYER_ANIM_IN) - -cleanplayeranims: - @$(RM) -f $(PLAYER_ANIM_OUT) - @$(ECHO) Player Anims Cleaned - -$(PLAYER_ANIM_OUT) : $(PLAYER_ANIM_IN) - @$(MKANIM3D) $(PLAYER_ANIM_IN) -o:$(PLAYER_ANIM_OUT) -i:$(PLAYER_ANIM_INC) -s:256 -GFX_DATA_OUT += $(PLAYER_ANIM_OUT) - #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- # Text translations @@ -554,7 +530,6 @@ GFX_DATA_OUT += $(DEMO_ALL_OUT) GRAF_DIRS_TO_MAKE += $(TRANS_OUT_DIR) \ $(UI_GFX_OUT_DIR) \ $(ACTORS_DIRS_TO_MAKE) \ - $(ANIM_OUT_DIR) \ $(LEVELS_DIRS_TO_MAKE) gdirs : $(GRAF_DIRS_TO_MAKE) @@ -595,7 +570,6 @@ $(BIGLUMP_OUT) : $(BIGLUMP_IN) all : dirs gdirs \ actors \ - anims \ levels \ biglump @$(ECHO) Graphics made diff --git a/source/player/psbutt.cpp b/source/player/psbutt.cpp index bec05d9c4..7aaea29dc 100644 --- a/source/player/psbutt.cpp +++ b/source/player/psbutt.cpp @@ -38,8 +38,8 @@ /* Data ---- */ -#ifndef __ANIM_PLAYER_ANIM_HEADER__ -#include +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -67,7 +67,7 @@ ---------------------------------------------------------------------- */ void CPlayerStateButtBounce::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCESTART); + setAnimNo(_player,ANIM_SPONGEBOB_BUTTBOUNCESTART); } @@ -94,7 +94,7 @@ void CPlayerStateButtBounce::think(CPlayer *_player) ---------------------------------------------------------------------- */ void CPlayerStateButtBounceFall::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCEEND); + setAnimNo(_player,ANIM_SPONGEBOB_BUTTBOUNCEEND); } diff --git a/source/player/pschop.cpp b/source/player/pschop.cpp index 903f0c312..aac2ec04a 100644 --- a/source/player/pschop.cpp +++ b/source/player/pschop.cpp @@ -34,8 +34,8 @@ /* Data ---- */ -#ifndef __ANIM_PLAYER_ANIM_HEADER__ -#include +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -63,7 +63,7 @@ ---------------------------------------------------------------------- */ void CPlayerStateChop::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_KARATE); + setAnimNo(_player,ANIM_SPONGEBOB_KARATE); } diff --git a/source/player/psdead.cpp b/source/player/psdead.cpp index 1450348ba..f2fa6a2ca 100644 --- a/source/player/psdead.cpp +++ b/source/player/psdead.cpp @@ -33,8 +33,8 @@ /* Data ---- */ -#ifndef __ANIM_PLAYER_ANIM_HEADER__ -#include +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -62,7 +62,7 @@ ---------------------------------------------------------------------- */ void CPlayerStateDead::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_DEATHSPIN); + setAnimNo(_player,ANIM_SPONGEBOB_DEATHSPIN); m_deadCounter=0; } diff --git a/source/player/psduck.cpp b/source/player/psduck.cpp index 7245092c5..f7f86ff03 100644 --- a/source/player/psduck.cpp +++ b/source/player/psduck.cpp @@ -36,8 +36,8 @@ /* Data ---- */ -#ifndef __ANIM_PLAYER_ANIM_HEADER__ -#include +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -65,7 +65,7 @@ ---------------------------------------------------------------------- */ void CPlayerStateDuck::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_SOAKUP); + setAnimNo(_player,ANIM_SPONGEBOB_SOAKUP); } @@ -99,7 +99,7 @@ void CPlayerStateSoakUp::enter(CPlayer *_player) move.vx=0; setMoveVelocity(_player,&move); - setAnimNo(_player,ANIM_PLAYER_ANIM_GETUP); + setAnimNo(_player,ANIM_SPONGEBOB_GETUP); } @@ -129,7 +129,7 @@ void CPlayerStateSoakUp::think(CPlayer *_player) ---------------------------------------------------------------------- */ void CPlayerStateGetUp::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_GETUP); + setAnimNo(_player,ANIM_SPONGEBOB_GETUP); } diff --git a/source/player/psfall.cpp b/source/player/psfall.cpp index 2499fb2f3..742f090bf 100644 --- a/source/player/psfall.cpp +++ b/source/player/psfall.cpp @@ -35,8 +35,8 @@ /* Data ---- */ -#ifndef __ANIM_PLAYER_ANIM_HEADER__ -#include +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -64,7 +64,7 @@ ---------------------------------------------------------------------- */ void CPlayerStateFall::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_HOVER); + setAnimNo(_player,ANIM_SPONGEBOB_HOVER); } @@ -126,7 +126,7 @@ void CPlayerStateFall::think(CPlayer *_player) ---------------------------------------------------------------------- */ void CPlayerStateFallFar::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_FALL); + setAnimNo(_player,ANIM_SPONGEBOB_FALL); } diff --git a/source/player/psfly.cpp b/source/player/psfly.cpp index def9d5256..e18257e33 100644 --- a/source/player/psfly.cpp +++ b/source/player/psfly.cpp @@ -35,8 +35,8 @@ /* Data ---- */ -#ifndef __ANIM_PLAYER_ANIM_HEADER__ -#include +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -69,7 +69,7 @@ void CPlayerStateFly::enter(CPlayer *_player) move.vx=0; move.vy=0; setMoveVelocity(_player,&move); - setAnimNo(_player,ANIM_PLAYER_ANIM_IDLEHOOLA); + setAnimNo(_player,ANIM_SPONGEBOB_IDLEHOOLA); } diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp index d008ed0e4..7266500f6 100644 --- a/source/player/psidle.cpp +++ b/source/player/psidle.cpp @@ -37,8 +37,8 @@ /* Data ---- */ -#ifndef __ANIM_PLAYER_ANIM_HEADER__ -#include +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -111,11 +111,11 @@ void CPlayerStateTeeterIdle::enter(CPlayer *_player) dir=getFacing(_player); if(edgeType==FACING_LEFT) { - anim=dir==FACING_LEFT?ANIM_PLAYER_ANIM_TEETERFRONT:ANIM_PLAYER_ANIM_TEETERBACK; + anim=dir==FACING_LEFT?ANIM_SPONGEBOB_TEETERFRONT:ANIM_SPONGEBOB_TEETERBACK; } else { - anim=dir==FACING_RIGHT?ANIM_PLAYER_ANIM_TEETERFRONT:ANIM_PLAYER_ANIM_TEETERBACK; + anim=dir==FACING_RIGHT?ANIM_SPONGEBOB_TEETERFRONT:ANIM_SPONGEBOB_TEETERBACK; } setAnimNo(_player,anim); @@ -262,12 +262,12 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayer *_player) static IdleAnims s_unarmedIdleAnims[]= { // start frame loop frame end frame loop count - { -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 4 }, // default - { -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 10 }, - { ANIM_PLAYER_ANIM_FACEFRONT, ANIM_PLAYER_ANIM_IDLEHOOLA, ANIM_PLAYER_ANIM_FACEBACK, 5 }, - { ANIM_PLAYER_ANIM_FACEFRONT, ANIM_PLAYER_ANIM_IDLEWIGGLEARM, ANIM_PLAYER_ANIM_FACEBACK, 5 }, - { -1, ANIM_PLAYER_ANIM_IDLELOOK, -1, 1 }, - { -1, ANIM_PLAYER_ANIM_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 }, }; //idlekick //idlescratch @@ -295,9 +295,9 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims() static IdleAnims s_coralBlowerIdleAnims[]= { // start frame loop frame end frame loop count - { -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 4 }, // default - { -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 10 }, - { -1, ANIM_PLAYER_ANIM_IDLELOOK, -1, 1 }, + { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default + { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 }, + { -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 }, }; static int s_numCoralBlowerIdleAnims=sizeof(s_coralBlowerIdleAnims)/sizeof(IdleAnims); IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo) diff --git a/source/player/psjump.cpp b/source/player/psjump.cpp index 0691c9d2b..7d9e357e1 100644 --- a/source/player/psjump.cpp +++ b/source/player/psjump.cpp @@ -38,8 +38,8 @@ /* Data ---- */ -#ifndef __ANIM_PLAYER_ANIM_HEADER__ -#include +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -71,7 +71,7 @@ void CPlayerStateJump::enter(CPlayer *_player) metrics=getPlayerMetrics(_player); - setAnimNo(_player,ANIM_PLAYER_ANIM_HOVER); + setAnimNo(_player,ANIM_SPONGEBOB_HOVER); m_jumpFrames=0; DVECTOR move=getMoveVelocity(_player); move.vy=-metrics->m_metric[PM__JUMP_VELOCITY]< +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include #endif @@ -71,11 +71,11 @@ void CPlayerStateRun::enter(CPlayer *_player) if(getMoveVelocity(_player).vx) { - setAnimNo(_player,ANIM_PLAYER_ANIM_RUN); + setAnimNo(_player,ANIM_SPONGEBOB_RUN); } else { - setAnimNo(_player,ANIM_PLAYER_ANIM_RUNSTART); + setAnimNo(_player,ANIM_SPONGEBOB_RUNSTART); } if(controlHeld&PI_LEFT) @@ -131,7 +131,7 @@ void CPlayerStateRun::think(CPlayer *_player) setState(_player,STATE_IDLE); if(m_numberOfTimeAnimHasLooped>=4) { - setAnimNo(_player,ANIM_PLAYER_ANIM_RUNSTOP); + setAnimNo(_player,ANIM_SPONGEBOB_RUNSTOP); } } else @@ -142,7 +142,7 @@ void CPlayerStateRun::think(CPlayer *_player) if(advanceAnimFrameAndCheckForEndOfAnim(_player)) { - setAnimNo(_player,ANIM_PLAYER_ANIM_RUN); + setAnimNo(_player,ANIM_SPONGEBOB_RUN); m_numberOfTimeAnimHasLooped++; } } diff --git a/source/system/main.cpp b/source/system/main.cpp index 4b5a24a7f..aa401a46d 100644 --- a/source/system/main.cpp +++ b/source/system/main.cpp @@ -118,7 +118,7 @@ void InitSystem() // reordered to reduce black screen (hope all is well CBubicleFactory::init(); CAnimDB::Init(); - CAnimDB::Load(ANIMS_PLAYER_ABK); + CAnimDB::Load(ACTORS_SPONGEBOB_ABK); #if defined(__DEBUG_MEM__) DebugMemFontInit();