ABelliqueux/3dcam-headers
1
0
Fork 0
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

Change VAGbank struc

Browse Source
This commit is contained in:
ABelliqueux 2021-08-16 12:13:33 +02:00
parent 6bbbe541d7
commit 95eb0ff24e
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sound.h
View File

@ -17,6 +17,10 @@ typedef struct VAGsound {
u_long spu_channel; // SPU voice to playback to u_long spu_channel; // SPU voice to playback to
u_long spu_address; // SPU address for memory freeing spu mem u_long spu_address; // SPU address for memory freeing spu mem
} VAGsound; } VAGsound;
typedef struct VAGbank {
u_int index;
VAGsound samples[];
} VAGbank;
// VAG header struct (see fileformat47.pdf, p.209) // VAG header struct (see fileformat47.pdf, p.209)
typedef struct VAGhdr { // All the values in this header must be big endian typedef struct VAGhdr { // All the values in this header must be big endian
char id[4]; // VAGp 4 bytes -> 1 char * 4 char id[4]; // VAGp 4 bytes -> 1 char * 4

43
src/main.c
View File

@ -123,23 +123,18 @@ extern u_char _binary_VAG_5_punc_vag_start;
extern u_char _binary_VAG_7_wron_vag_start; extern u_char _binary_VAG_7_wron_vag_start;
extern u_char _binary_VAG_8_yooo_vag_start; extern u_char _binary_VAG_8_yooo_vag_start;
// soundBank // soundBank
VAGsound VAGBank[VAG_NBR] = { VAGbank VAGBank = {
{ &_binary_VAG_0_come_vag_start, 8,
SPU_00CH, 0 }, {
{ &_binary_VAG_1_cuek_vag_start, { &_binary_VAG_0_come_vag_start, SPU_00CH, 0 },
SPU_01CH, 0 }, { &_binary_VAG_1_cuek_vag_start, SPU_01CH, 0 },
{ &_binary_VAG_2_erro_vag_start, { &_binary_VAG_2_erro_vag_start, SPU_02CH, 0 },
SPU_02CH, 0 }, { &_binary_VAG_3_hehe_vag_start, SPU_03CH, 0 },
{ &_binary_VAG_3_hehe_vag_start, { &_binary_VAG_4_m4a1_vag_start, SPU_04CH, 0 },
SPU_03CH, 0 }, { &_binary_VAG_5_punc_vag_start, SPU_05CH, 0 },
{ &_binary_VAG_4_m4a1_vag_start, { &_binary_VAG_7_wron_vag_start, SPU_06CH, 0 },
SPU_04CH, 0 }, { &_binary_VAG_8_yooo_vag_start, SPU_07CH, 0 }
{ &_binary_VAG_5_punc_vag_start, }
SPU_05CH, 0 },
{ &_binary_VAG_7_wron_vag_start,
SPU_06CH, 0 },
{ &_binary_VAG_8_yooo_vag_start,
SPU_07CH, 0 }
}; };
// XA playback // XA playback
XAbank XABank = { XAbank XABank = {
@ -257,7 +252,7 @@ int main() {
//~ spuCDsetup(&spuSettings); //~ spuCDsetup(&spuSettings);
XAsetup(); XAsetup();
for (u_short vag = 0; vag < VAG_NBR; vag++ ){ for (u_short vag = 0; vag < VAG_NBR; vag++ ){
VAGBank[vag].spu_address = setSPUtransfer(&voiceAttributes, &VAGBank[vag]); VAGBank.samples[vag].spu_address = setSPUtransfer(&voiceAttributes, &VAGBank.samples[vag]);
} }
sample = 0; sample = 0;
setXAsample(&XABank.samples[sample], &filter); setXAsample(&XABank.samples[sample], &filter);
@ -344,14 +339,14 @@ int main() {
// TODO : put in a function // TODO : put in a function
// Reset player/prop pos // Reset player/prop pos
if(curLvl.actorPtr->pos.vy >= 200){ if(curLvl.actorPtr->pos.vy >= 200){
playSFX(&voiceAttributes, &VAGBank[6]); playSFX(&voiceAttributes, &VAGBank.samples[6]);
copyVector(&curLvl.actorPtr->body->position, &actorStartPos ); copyVector(&curLvl.actorPtr->body->position, &actorStartPos );
copyVector(&curLvl.actorPtr->rot, &actorStartRot ); copyVector(&curLvl.actorPtr->rot, &actorStartRot );
curLvl.curNode = actorStartNode; curLvl.curNode = actorStartNode;
curLvl.levelPtr = curLvl.curNode->plane; curLvl.levelPtr = curLvl.curNode->plane;
} }
if(curLvl.propPtr->pos.vy >= 200){ if(curLvl.propPtr->pos.vy >= 200){
playSFX(&voiceAttributes, &VAGBank[3]); playSFX(&voiceAttributes, &VAGBank.samples[3]);
copyVector(&curLvl.propPtr->body->position, &propStartPos ); copyVector(&curLvl.propPtr->body->position, &propStartPos );
copyVector(&curLvl.propPtr->rot, &propStartRot ); copyVector(&curLvl.propPtr->rot, &propStartRot );
curLvl.propPtr->node = propStartNode; curLvl.propPtr->node = propStartNode;
@ -553,7 +548,7 @@ void callback() {
} else { } else {
curLvl.actorPtr->isPrism = 1; curLvl.actorPtr->isPrism = 1;
} }
playSFX(&voiceAttributes, &VAGBank[0]); playSFX(&voiceAttributes, &VAGBank.samples[0]);
//~ timer = 10; //~ timer = 10;
lastPad = PAD; lastPad = PAD;
} }
@ -561,7 +556,7 @@ void callback() {
lastPad = PAD; lastPad = PAD;
} }
if ( PAD & Square && !( lastPad & Square ) ){ if ( PAD & Square && !( lastPad & Square ) ){
playSFX(&voiceAttributes, &VAGBank[7]); playSFX(&voiceAttributes, &VAGBank.samples[7]);
//~ sample = 0; //~ sample = 0;
//~ setXAsample(&XABank.samples[sample], &filter); //~ setXAsample(&XABank.samples[sample], &filter);
lastPad = PAD; lastPad = PAD;
@ -576,14 +571,14 @@ void callback() {
curLvl.actorPtr->body->gForce.vy = -200; curLvl.actorPtr->body->gForce.vy = -200;
} }
timer = 10; timer = 10;
playSFX(&voiceAttributes, &VAGBank[4]); playSFX(&voiceAttributes, &VAGBank.samples[4]);
lastPad = PAD; lastPad = PAD;
} }
if ( !(PAD & Cross) && lastPad & Cross ) { if ( !(PAD & Cross) && lastPad & Cross ) {
lastPad = PAD; lastPad = PAD;
} }
if ( PAD & Circle && !(PAD & lastPad) ){ if ( PAD & Circle && !(PAD & lastPad) ){
playSFX(&voiceAttributes, &VAGBank[5]); playSFX(&voiceAttributes, &VAGBank.samples[5]);
lastPad = PAD; lastPad = PAD;
} }
if ( !(PAD & Circle) && lastPad & Circle ) { if ( !(PAD & Circle) && lastPad & Circle ) {