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

Dirty fix for #16

This commit is contained in:
ABelliqueux 2021-08-17 16:44:42 +02:00
parent da2eac1d48
commit 43dea98d63
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/defines.h
View File

@ -1,5 +1,5 @@
#define VMODE 0 // 0 == NTSC, 1 == PAL #define VMODE 0 // 0 == NTSC, 1 == PAL
#define VSYNC 0 #define VSYNC 1
#define SCREENXRES 320 #define SCREENXRES 320
#define SCREENYRES 240 #define SCREENYRES 240
#define CENTERX SCREENXRES/2 #define CENTERX SCREENXRES/2

3
include/sound.h
View File

@ -4,7 +4,8 @@
// XA // XA
// Sector offset for XA data 4: simple speed, 8: double speed // Sector offset for XA data 4: simple speed, 8: double speed
#define XA_CHANNELS 8 #define XA_CHANNELS 8
#define XA_CDSPEED (XA_CHANNELS >> VSYNC) #define XA_CDSPEED (XA_CHANNELS >> VSYNC) * ONE
#define XA_RATE 380
// Number of XA samples ( != # of XA files ) // Number of XA samples ( != # of XA files )
#define XA_TRACKS 2 #define XA_TRACKS 2
// VAG // VAG

15
src/main.c
View File

@ -211,13 +211,13 @@ int main() {
sample = 0; sample = 0;
setXAsample(&curLvl.XA->samples[sample], &filter); setXAsample(&curLvl.XA->samples[sample], &filter);
// Main loop // Main loop
while ( VSync(VSYNC) ) { //~ while ( VSync(VSYNC) ) {
while ( 1 ) {
dt = GetRCnt(RCntCNT1) - oldTime; dt = GetRCnt(RCntCNT1) - oldTime;
oldTime = GetRCnt(RCntCNT1); oldTime = GetRCnt(RCntCNT1);
// XA playback // XA playback
// if sample is set // if sample is set
if (sample != -1 ){ if (sample != -1 ){
// TODO : Fix XA playback with VSYNC = 1
// Begin XA file playback... // Begin XA file playback...
// if sample's cursor is 0 // if sample's cursor is 0
if (curLvl.XA->samples[sample].cursor == 0){ if (curLvl.XA->samples[sample].cursor == 0){
@ -229,7 +229,10 @@ int main() {
// Set playing flag // Set playing flag
} }
// if sample's cursor is close to sample's end position, stop playback // if sample's cursor is close to sample's end position, stop playback
if ((curLvl.XA->samples[sample].cursor += XA_CDSPEED) >= curLvl.XA->samples[sample].end - curLvl.XA->samples[sample].start ){ //~ if ((curLvl.XA->samples[sample].cursor += XA_CDSPEED) >= curLvl.XA->samples[sample].end - curLvl.XA->samples[sample].start ){
//~ if ((curLvl.XA->samples[sample].cursor += (XA_CDSPEED*4096)/((400/(dt+1)+1)) ) >= (curLvl.XA->samples[sample].end - curLvl.XA->samples[sample].start)*4096 ){
// XA playback has fixed rate
if ((curLvl.XA->samples[sample].cursor += XA_CDSPEED / ((XA_RATE/(dt+1)+1)) ) >= (curLvl.XA->samples[sample].end - curLvl.XA->samples[sample].start) * ONE ){
//~ CdControlF(CdlStop,0); //~ CdControlF(CdlStop,0);
curLvl.XA->samples[sample].cursor = -1; curLvl.XA->samples[sample].cursor = -1;
//~ sample = !sample; //~ sample = !sample;
@ -423,10 +426,14 @@ int main() {
AddPrims(otdisc[db], ot[db] + OTLEN - 1, ot[db]); AddPrims(otdisc[db], ot[db] + OTLEN - 1, ot[db]);
FntPrint("\n#Tri : %d\n", triCount); FntPrint("\n#Tri : %d\n", triCount);
FntPrint("#RCnt : %d %d %d\n", VSync(-1), dt); FntPrint("#RCnt : %d %d\n", VSync(-1), dt);
//~ FntPrint("Dt : %d %d %d\n", 400/(dt+1), (XA_CDSPEED)/((400/(dt+1))+1), (curLvl.XA->samples[sample].end - curLvl.XA->samples[sample].start)<<12);
//~ FntPrint("XA : %d\n", (XA_CDSPEED)/((400/(dt+1))+1) );
//~ FntPrint("XA : %d\n", curLvl.XA->samples[sample].cursor );
FntPrint("CamAngle : %d\n", curCamAngle); FntPrint("CamAngle : %d\n", curCamAngle);
FntFlush(-1); FntFlush(-1);
display( &disp[db], &draw[db], otdisc[db], primbuff[db], &nextpri, &db); display( &disp[db], &draw[db], otdisc[db], primbuff[db], &nextpri, &db);
} }
return 0; return 0;
} }