This commit is contained in:
parent
1d8d01e1c0
commit
1539f40ee6
4 changed files with 53 additions and 44 deletions
|
@ -81,7 +81,7 @@ DATA_BIN_DIR := $(DATA_TOOL_DIR)/bin
|
||||||
DATA_INC_DIR := $(DATA_TOOL_DIR)/include
|
DATA_INC_DIR := $(DATA_TOOL_DIR)/include
|
||||||
|
|
||||||
MKLEVEL := $(DATA_BIN_DIR)/MkLevel
|
MKLEVEL := $(DATA_BIN_DIR)/MkLevel
|
||||||
MKACTOR3D := $(DATA_BIN_DIR)/MkActor3d
|
MKACTOR := $(DATA_BIN_DIR)/MkActor
|
||||||
|
|
||||||
# Cygwin
|
# Cygwin
|
||||||
# ------
|
# ------
|
||||||
|
|
|
@ -409,13 +409,29 @@ levels/CHAPTER06_LEVEL0505.Lvl
|
||||||
|
|
||||||
collision/colltab.dat
|
collision/colltab.dat
|
||||||
|
|
||||||
actors/actor_spongebob.tex
|
actors/SPONGEBOB.SBK
|
||||||
actors/spongebob.a3d
|
|
||||||
|
|
||||||
actors/actor_enemy.tex
|
actors/ANENOMELVL1.SBK
|
||||||
|
actors/BABYOCTOPUS.SBK
|
||||||
actors/clam.a3d
|
actors/BALLBLOB.SBK
|
||||||
actors/SHARKSUB.A3d
|
actors/CATERPILLAR.SBK
|
||||||
|
actors/CLAM.SBK
|
||||||
|
actors/DUSTDEVIL.SBK
|
||||||
|
actors/EYEBALL.SBK
|
||||||
|
actors/FLAMINGSKULL.SBK
|
||||||
|
actors/FLYINGDUTCHMAN.SBK
|
||||||
|
actors/GHOST.SBK
|
||||||
|
actors/HERMITCRAB.SBK
|
||||||
|
actors/IRONDOGFISH.SBK
|
||||||
|
actors/JELLYFISH1.SBK
|
||||||
|
actors/LRGJELLYFISH.SBK
|
||||||
|
actors/PUFFAFISH.SBK
|
||||||
|
actors/SHARKMAN.SBK
|
||||||
|
actors/SKELETALFISH.SBK
|
||||||
|
actors/SPIDERCRAB.SBK
|
||||||
|
actors/SPIKEYANENOME.SBK
|
||||||
|
actors/SQUIDDART.SBK
|
||||||
|
actors/STOMPER.SBK
|
||||||
|
|
||||||
{ SYSTEM_CACHE 4
|
{ SYSTEM_CACHE 4
|
||||||
}
|
}
|
||||||
|
|
16
makefile.gaz
16
makefile.gaz
|
@ -104,15 +104,7 @@ gfx_src := prim \
|
||||||
fdata \
|
fdata \
|
||||||
font \
|
font \
|
||||||
bubicles \
|
bubicles \
|
||||||
skel \
|
actor
|
||||||
skelspng \
|
|
||||||
actorpool
|
|
||||||
|
|
||||||
# camera \
|
|
||||||
# basemod \
|
|
||||||
# skel \
|
|
||||||
# anim \
|
|
||||||
# bilboard
|
|
||||||
|
|
||||||
gui_src := gbubbles \
|
gui_src := gbubbles \
|
||||||
gbutton \
|
gbutton \
|
||||||
|
@ -195,10 +187,10 @@ thing_src := thing
|
||||||
triggers_src := tlevexit
|
triggers_src := tlevexit
|
||||||
|
|
||||||
utils_src := utils \
|
utils_src := utils \
|
||||||
sincos
|
sincos \
|
||||||
|
pak
|
||||||
|
|
||||||
utils_src_mip := quatmip \
|
utils_src_mip := mathmip \
|
||||||
mathmip \
|
|
||||||
replace
|
replace
|
||||||
|
|
||||||
system_src_mip := except_a \
|
system_src_mip := except_a \
|
||||||
|
|
51
makefile.gfx
51
makefile.gfx
|
@ -141,38 +141,39 @@ GFX_DATA_OUT += $(COLLISION_OUT)
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
# Anims and extra textures are held within script files in the character dirs
|
# Anims and extra textures are held within script files in the character dirs
|
||||||
ACTOR_IN_DIR := $(GRAF_DIR)/Characters
|
ACTOR_IN_DIR := $(GRAF_DIR)/Characters
|
||||||
|
ACTOR_SPRITE_DIR := Render/Psx
|
||||||
ACTOR_OUT_DIR := $(DATA_OUT)/Actors
|
ACTOR_OUT_DIR := $(DATA_OUT)/Actors
|
||||||
ACTOR_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/Actors
|
ACTORS_DIRS_TO_MAKE := $(ACTOR_OUT_DIR)
|
||||||
ACTORS_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR)
|
|
||||||
|
|
||||||
ACTOR_SPONGEBOB := SPONGEBOB
|
ACTOR_SPONGEBOB := SPONGEBOB
|
||||||
ACTOR_SPONGEBOB_OPTS := -t:24,1,1 -s:256
|
ACTOR_NPC :=
|
||||||
|
# BarnacleBoy Gary Krusty MermaidMan Patrick Plankton Sandy Squidward
|
||||||
ACTOR_NPC :=
|
ACTOR_ENEMY := AnenomeLvl1 BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
|
||||||
ACTOR_NPC_OPTS := -t:25,1,1 -s:256
|
Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Jellyfish1 Lrgjellyfish \
|
||||||
|
PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Squiddart Stomper
|
||||||
ACTOR_ENEMY := SHARKSUB CLAM
|
# Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub
|
||||||
ACTOR_ENEMY_OPTS := -t:12,4,1 -s:256
|
#--- AnenomeLvl3
|
||||||
|
|
||||||
ACTORS_LIST := ACTOR_SPONGEBOB ACTOR_NPC ACTOR_ENEMY
|
ACTORS_LIST := ACTOR_SPONGEBOB ACTOR_NPC ACTOR_ENEMY
|
||||||
|
|
||||||
ACTORS_MAKEFILES := $(foreach ACTOR,$(ACTORS_LIST),$(ACTOR_MAKEFILE_DIR)/$(ACTOR).mak)
|
ACTOR_LIST := $(ACTOR_SPONGEBOB) $(ACTOR_NPC) $(ACTOR_ENEMY)
|
||||||
|
ACTOR_IN := *
|
||||||
|
# $(foreach ACTOR,$(ACTOR_LIST),$(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/bmp)
|
||||||
|
ACTOR_OUT := $(foreach ACTOR,$(ACTOR_LIST),$(ACTOR_OUT_DIR)/$(ACTOR).Sbk)
|
||||||
|
|
||||||
$(ACTORS_MAKEFILES): $(ACTORS_DIRS_TO_MAKE) makefile.gfx $(BUILD_DIR)/mkactor.pl
|
UI_GFX_TEX_OUT := $(UI_GFX_OUT_DIR)/UIGfx.Spr
|
||||||
@$(PL) $(BUILD_DIR)/mkactor.pl $@ $(notdir $(basename $@))
|
UI_GFX_REP_FILE := $(REPORT_DIR)/UIGfx.rep
|
||||||
|
UI_GFX_HDR_FILE := $(INC_DIR)/UIGfx.h
|
||||||
|
|
||||||
include $(ACTORS_MAKEFILES)
|
cleanactors :
|
||||||
|
@$(RM) -f $(ACTOR_OUT)
|
||||||
|
@$(ECHO) Actors Cleaned
|
||||||
|
|
||||||
ACTORS_ALL_OUT := $(foreach ACTOR,$(ACTORS_LIST),$($(ACTOR)_OUT))
|
actors: $(ACTOR_IN)
|
||||||
|
|
||||||
GFX_DATA_OUT += $(ACTORS_ALL_OUT)
|
$(ACTOR_OUT) : $(ACTOR_IN)
|
||||||
|
$(MKACTOR) -r:$(ACTOR_IN_DIR) -s:$(ACTOR_SPRITE_DIR) -o:$(ACTOR_OUT_DIR) -i:$(INC_DIR) $(ACTOR_LIST)
|
||||||
|
|
||||||
actors : $(ACTORS_ALL_OUT)
|
GFX_DATA_OUT += $(ACTOR_OUT)
|
||||||
@$(ECHO) Actors made
|
|
||||||
|
|
||||||
cleanactors :
|
|
||||||
@$(RM) -f $(ACTORS_ALL_OUT)
|
|
||||||
@$(ECHO) Actors cleaned
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
@ -284,7 +285,7 @@ cleanui :
|
||||||
ui: $(UI_GFX_TEX_IN)
|
ui: $(UI_GFX_TEX_IN)
|
||||||
|
|
||||||
$(UI_GFX_TEX_OUT) : $(UI_GFX_TEX_IN)
|
$(UI_GFX_TEX_OUT) : $(UI_GFX_TEX_IN)
|
||||||
@parkgrab -c+ -z+ $(UI_GFX_FONT_IN) ${UI_GFX_TRANS_IN} -c- -z- ${UI_GFX_NONTRANS_IN} -b+ -t:31,1,1 -l:$(REPORT_DIR)/ui.lbm -o:$(UI_GFX_TEX_OUT) -k:$(UI_GFX_REP_FILE)
|
@parkgrab -c+ -z+ $(UI_GFX_FONT_IN) ${UI_GFX_TRANS_IN} -c- -z- ${UI_GFX_NONTRANS_IN} -b+ -t:15,1,1 -l:$(REPORT_DIR)/ui.lbm -o:$(UI_GFX_TEX_OUT) -k:$(UI_GFX_REP_FILE)
|
||||||
@$(MV) -f $(UI_GFX_OUT_DIR)/uigfx.h $(UI_GFX_HDR_FILE)
|
@$(MV) -f $(UI_GFX_OUT_DIR)/uigfx.h $(UI_GFX_HDR_FILE)
|
||||||
|
|
||||||
GFX_DATA_OUT += $(UI_GFX_TEX_OUT)
|
GFX_DATA_OUT += $(UI_GFX_TEX_OUT)
|
||||||
|
@ -320,7 +321,7 @@ cleaningamefx :
|
||||||
ingamefx: $(INGAMEFX_GFX_TEX_IN)
|
ingamefx: $(INGAMEFX_GFX_TEX_IN)
|
||||||
|
|
||||||
$(INGAMEFX_GFX_TEX_OUT) : $(INGAMEFX_GFX_TEX_IN)
|
$(INGAMEFX_GFX_TEX_OUT) : $(INGAMEFX_GFX_TEX_IN)
|
||||||
@parkgrab -z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} -z- ${INGAMEFX_GFX_NONTRANS_IN} -b+ -t:29,1,1 -l:$(REPORT_DIR)/ingamefx.lbm -o:$(INGAMEFX_GFX_TEX_OUT) -k:$(INGAMEFX_GFX_REP_FILE)
|
@parkgrab -z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} -z- ${INGAMEFX_GFX_NONTRANS_IN} -b+ -t:13,1,1 -l:$(REPORT_DIR)/ingamefx.lbm -o:$(INGAMEFX_GFX_TEX_OUT) -k:$(INGAMEFX_GFX_REP_FILE)
|
||||||
@$(MV) -f $(INGAMEFX_GFX_OUT_DIR)/ingamefx.h $(INGAMEFX_GFX_HDR_FILE)
|
@$(MV) -f $(INGAMEFX_GFX_OUT_DIR)/ingamefx.h $(INGAMEFX_GFX_HDR_FILE)
|
||||||
|
|
||||||
GRAF_DIRS_TO_MAKE += $(INGAMEFX_GFX_OUT_DIR)
|
GRAF_DIRS_TO_MAKE += $(INGAMEFX_GFX_OUT_DIR)
|
||||||
|
@ -354,7 +355,7 @@ cleanfrontend :
|
||||||
frontend: $(FRONTEND_GFX_TEX_IN)
|
frontend: $(FRONTEND_GFX_TEX_IN)
|
||||||
|
|
||||||
$(FRONTEND_GFX_TEX_OUT) : $(FRONTEND_GFX_TEX_IN)
|
$(FRONTEND_GFX_TEX_OUT) : $(FRONTEND_GFX_TEX_IN)
|
||||||
@parkgrab -r- -z+ ${FRONTEND_GFX_TRANS_NO_ROT_IN} -r+ ${FRONTEND_GFX_TRANS_IN} -z- ${FRONTEND_GFX_NONTRANS_IN} -b+ -t:30,1,1 -l:$(REPORT_DIR)/frontend.lbm -o:$(FRONTEND_GFX_TEX_OUT) -k:$(FRONTEND_GFX_REP_FILE)
|
@parkgrab -r- -z+ ${FRONTEND_GFX_TRANS_NO_ROT_IN} -r+ ${FRONTEND_GFX_TRANS_IN} -z- ${FRONTEND_GFX_NONTRANS_IN} -b+ -t:14,1,1 -l:$(REPORT_DIR)/frontend.lbm -o:$(FRONTEND_GFX_TEX_OUT) -k:$(FRONTEND_GFX_REP_FILE)
|
||||||
@$(MV) -f $(FRONTEND_GFX_OUT_DIR)/frontend.h $(FRONTEND_GFX_HDR_FILE)
|
@$(MV) -f $(FRONTEND_GFX_OUT_DIR)/frontend.h $(FRONTEND_GFX_HDR_FILE)
|
||||||
|
|
||||||
GRAF_DIRS_TO_MAKE += $(FRONTEND_GFX_OUT_DIR)
|
GRAF_DIRS_TO_MAKE += $(FRONTEND_GFX_OUT_DIR)
|
||||||
|
|
Loading…
Add table
Reference in a new issue