Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Cleanup audio

Browse Source
This commit is contained in:
Filip Gawin 2019-10-12 22:21:44 +02:00
parent 8c52cdbedd
commit c27dbcfe6d
2 changed files with 44 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/audio/AudioManager.cpp
View File

@ -31,9 +31,9 @@
#include "Vehicle.h" #include "Vehicle.h"
#include "WaterCannon.h" #include "WaterCannon.h"
#include "Weather.h" #include "Weather.h"
#include "Zones.h"
#include "World.h" #include "World.h"
#include "ZoneCull.h" #include "ZoneCull.h"
#include "Zones.h"
#include "sampman.h" #include "sampman.h"
cAudioManager &AudioManager = *(cAudioManager *)0x880FC0; cAudioManager &AudioManager = *(cAudioManager *)0x880FC0;
@ -47,16 +47,15 @@ bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E; bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E;
uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828; uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828;
uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D; uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D;
//uint32 *gOneShotCol = (uint32 *)0x604BD0;
bool *somethingWithHorns = (bool *)0x606AB8; bool *somethingWithHorns = (bool *)0x606AB8;
constexpr int totalAudioEntitiesSlots = 200; constexpr int totalAudioEntitiesSlots = 200;
constexpr int maxVolume = 127; constexpr int maxVolume = 127;
constexpr int policeChannel = 28; constexpr int policeChannel = 28;
constexpr uint8 panTable[64]{ constexpr uint8 panTable[64]{0, 3, 8, 12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37,
0, 3, 8, 12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37, 39, 40, 41, 42, 44, 45, 39, 40, 41, 42, 44, 45, 46, 47, 48, 49, 49, 50, 51, 52, 53, 53,
46, 47, 48, 49, 49, 50, 51, 52, 53, 53, 54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59, 54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59, 59, 60, 60, 61,
59, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63}; 61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
// TODO: where is this used? Is this the right file? // TODO: where is this used? Is this the right file?
enum eVehicleModel { enum eVehicleModel {
@ -3162,8 +3161,7 @@ cAudioManager::InitialisePoliceRadio()
for(int32 i = 0; i < 18; i++) { gMinTimeToNextReport[i] = m_nTimeOfRecentCrime; } for(int32 i = 0; i < 18; i++) { gMinTimeToNextReport[i] = m_nTimeOfRecentCrime; }
} }
struct tPoliceRadioZone struct tPoliceRadioZone {
{
char m_aName[8]; char m_aName[8];
uint32 m_nSampleIndex; uint32 m_nSampleIndex;
int32 field_12; int32 field_12;
@ -3318,24 +3316,12 @@ void
cAudioManager::PlayOneShot(int32 index, int16 sound, float vol) cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
{ {
static constexpr uint8 byte_60ABD0[168] = { static constexpr uint8 byte_60ABD0[168] = {
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 3, 5, 2, 2, 1, 1, 3, 1, 3, 3, 1, 1,
3, 3, 3, 5, 5, 5, 3, 5, 2, 2, 1, 4, 4, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 3, 2, 2, 2, 2, 0, 0, 6,
1, 1, 3, 1, 3, 3, 1, 1, 1, 4, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
4, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 3, 1, 1, 1, 9, 2, 2, 0, 0, 0, 0, 3, 3, 5, 1,
1, 1, 1, 1, 1, 6, 1, 1, 3, 2, 1, 1, 1, 3, 4, 7, 6, 6, 6, 6, 1, 3, 4, 3, 4, 2, 1, 3, 5, 4, 6, 6, 1, 3, 1, 1, 1, 0,
2, 2, 2, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
0, 0, 0, 0, 0, 0, 0, 0, 1, 2,
1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 1, 0, 0, 0, 3, 1, 1,
1, 9, 2, 2, 0, 0, 0, 0, 3, 3,
5, 1, 1, 1, 1, 3, 4, 7, 6, 6,
6, 6, 1, 3, 4, 3, 4, 2, 1, 3,
5, 4, 6, 6, 1, 3, 1, 1, 1, 0,
0, 0, 0, 0, 0, 3, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0
};
if(m_bIsInitialised) { if(m_bIsInitialised) {
if(index >= 0 && index < totalAudioEntitiesSlots) { if(index >= 0 && index < totalAudioEntitiesSlots) {
@ -4580,8 +4566,7 @@ cAudioManager::ProcessFrontEnd()
for(uint32 i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_Loops; i++) { for(uint32 i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_Loops; i++) {
processed = 0; processed = 0;
switch( switch(m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i]) {
m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i]) {
case SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM: case SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM:
m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SNIPER_NO_ZOOM; m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SNIPER_NO_ZOOM;
break; break;
@ -4686,13 +4671,11 @@ cAudioManager::ProcessFrontEnd()
default: continue; default: continue;
} }
sample = sample = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
if(sample == AUDIO_SAMPLE_COLLISION_LOOPING_GRASS) { if(sample == AUDIO_SAMPLE_COLLISION_LOOPING_GRASS) {
m_sQueueSample.m_nFrequency = 28509; m_sQueueSample.m_nFrequency = 28509;
} else if(sample == AUDIO_SAMPLE_PICKUP_NEUTRAL_1) { } else if(sample == AUDIO_SAMPLE_PICKUP_NEUTRAL_1) {
if(1.f == if(1.f == m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i])
m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i])
m_sQueueSample.m_nFrequency = 32000; m_sQueueSample.m_nFrequency = 32000;
else else
m_sQueueSample.m_nFrequency = 48000; m_sQueueSample.m_nFrequency = 48000;
@ -4747,7 +4730,8 @@ cAudioManager::ProcessHelicopter(cVehicleParams *params)
float dist; float dist;
float baseDist; float baseDist;
int32 emittingVol; int32 emittingVol;
static constexpr tHelicopterSampleData gHeliSfxRanges[3] = { {400.f, 380.f, 100}, {100.f, 70.f, maxVolume}, {60.f, 30.f, maxVolume} }; static constexpr tHelicopterSampleData gHeliSfxRanges[3] = {
{400.f, 380.f, 100}, {100.f, 70.f, maxVolume}, {60.f, 30.f, maxVolume}};
if(gHeliSfxRanges[0].m_fMaxDistance * gHeliSfxRanges[0].m_fMaxDistance <= if(gHeliSfxRanges[0].m_fMaxDistance * gHeliSfxRanges[0].m_fMaxDistance <=
params->m_fDistance) params->m_fDistance)
@ -7732,8 +7716,7 @@ cAudioManager::ProcessProjectiles()
} }
m_sQueueSample.field_48 = 4.0; m_sQueueSample.field_48 = 4.0;
m_sQueueSample.field_76 = 3; m_sQueueSample.field_76 = 3;
m_sQueueSample.m_vecPos = m_sQueueSample.m_vecPos = CProjectileInfo::ms_apProjectile[i].GetPosition();
CProjectileInfo::ms_apProjectile[i].GetPosition();
float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos); float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
if(distSquared < maxDist) { if(distSquared < maxDist) {
m_sQueueSample.m_fDistance = Sqrt(distSquared); m_sQueueSample.m_fDistance = Sqrt(distSquared);
@ -8111,7 +8094,6 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
return 1; return 1;
} }
void void
cAudioManager::ProcessVehicle(CVehicle *veh) cAudioManager::ProcessVehicle(CVehicle *veh)
{ {
@ -8142,8 +8124,7 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
if(params.m_nIndex == RCBANDIT) { if(params.m_nIndex == RCBANDIT) {
ProcessModelCarEngine(&params); ProcessModelCarEngine(&params);
ProcessVehicleOneShots(&params); ProcessVehicleOneShots(&params);
((CAutomobile *)veh)->m_fVelocityChangeForAudio = ((CAutomobile *)veh)->m_fVelocityChangeForAudio = params.m_fVelocityChange;
params.m_fVelocityChange;
ProcessRainOnVehicle(&params); ProcessRainOnVehicle(&params);
break; break;
} }
@ -8259,7 +8240,8 @@ cAudioManager::ProcessVehicleDoors(cVehicleParams *params)
} }
WRAPPER WRAPPER
bool cAudioManager::ProcessVehicleEngine(cVehicleParams *params) bool
cAudioManager::ProcessVehicleEngine(cVehicleParams *params)
{ {
EAXJMP(0x56A610); EAXJMP(0x56A610);
} }
@ -8349,7 +8331,8 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
} }
WRAPPER WRAPPER
void cAudioManager::ProcessVehicleOneShots(void*) void
cAudioManager::ProcessVehicleOneShots(void *)
{ {
EAXJMP(0x56CD40); EAXJMP(0x56CD40);
} }
@ -8457,7 +8440,8 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams *params)
} }
WRAPPER WRAPPER
void cAudioManager::ProcessVehicleSirenOrAlarm(void*) void
cAudioManager::ProcessVehicleSirenOrAlarm(void *)
{ {
EAXJMP(0x56C420); EAXJMP(0x56C420);
} }

9
src/audio/AudioManager.h
View File

@ -4,8 +4,7 @@
#include "DMAudio.h" #include "DMAudio.h"
#include "common.h" #include "common.h"
struct tActiveSample struct tActiveSample {
{
int32 m_nEntityIndex; int32 m_nEntityIndex;
int32 m_counter; int32 m_counter;
int32 m_nSampleIndex; int32 m_nSampleIndex;
@ -75,8 +74,7 @@ enum eAudioType : int32 {
class CPhysical; class CPhysical;
class CAutomobile; class CAutomobile;
struct tAudioEntity struct tAudioEntity {
{
eAudioType m_nType; eAudioType m_nType;
void *m_pEntity; void *m_pEntity;
bool m_bIsUsed; bool m_bIsUsed;
@ -92,8 +90,7 @@ struct tAudioEntity
static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error"); static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
struct tPedComment struct tPedComment {
{
int32 m_nSampleIndex; int32 m_nSampleIndex;
int32 m_entityIndex; int32 m_entityIndex;
CVector m_vecPos; CVector m_vecPos;