mirror of
https://github.com/open-goal/jak-project
synced 2026-08-30 01:20:38 -04:00
water111
c08118509b
Two changes that fix some Jak 3 audio bugs. In some areas, sound effects would seem to cut off randomly. This was caused by the sound code reusing IDs, but overlord didn't realize. It would try to kill a sound effect by ID that had already died, and the ID was reassigned to a new sound. To fix this, I made the handle IDs always increment. I also tested starting the ID at large numbers and confirmed that worked. I also added support for the BRANCH grain. This makes the `wastelander-shot` and possibly other sound effects work. It doesn't support all the features, but this is probably enough. Fun fact: the wastelander shot is supposed to have 7 variations, but you always get the same one because they set the sound mask wrong. I added a line you can uncomment if you want to experience the other 6 variations. --------- Co-authored-by: water111 <awaterford1111445@gmail.com>
102 lines
2.3 KiB
C++
102 lines
2.3 KiB
C++
#pragma once
|
|
#include "sound_handler.h"
|
|
#include "vagvoice.h"
|
|
|
|
#include "common/common_types.h"
|
|
|
|
#include "game/sound/989snd/lfo.h"
|
|
#include "game/sound/989snd/sfxblock.h"
|
|
|
|
namespace snd {
|
|
|
|
extern std::array<s8, 32> g_block_reg;
|
|
|
|
class BlockSoundVoice : public VagVoice {
|
|
public:
|
|
BlockSoundVoice(Tone& t) : VagVoice(t) {}
|
|
s32 g_vol;
|
|
s32 g_pan;
|
|
};
|
|
|
|
class BlockSoundHandler : public SoundHandler {
|
|
public:
|
|
BlockSoundHandler(SoundBank& bank,
|
|
SFXBlock::SFX& sfx,
|
|
VoiceManager& vm,
|
|
s32 sfx_vol,
|
|
s32 sfx_pan,
|
|
SndPlayParams& params,
|
|
u32 sound_id,
|
|
s32 start_tick);
|
|
|
|
~BlockSoundHandler() override;
|
|
bool Tick() override;
|
|
SoundBank& Bank() override { return m_bank; };
|
|
|
|
void Pause() override;
|
|
void Unpause() override;
|
|
void Stop() override;
|
|
u8 Group() override { return m_group; };
|
|
void SetVolPan(s32 vol, s32 pan) override;
|
|
void SetPMod(s32 mod) override;
|
|
void SetRegister(u8 reg, u8 value) override { m_registers.at(reg) = value; };
|
|
void SetPBend(s32 bend) override;
|
|
u32 SoundID() const override { return m_sound_id; }
|
|
|
|
void DoGrain();
|
|
|
|
void UpdatePitch();
|
|
|
|
SoundHandler* CheckInstanceLimit(const std::map<u32, std::unique_ptr<SoundHandler>>& handlers,
|
|
s32 vol,
|
|
bool parent) override;
|
|
|
|
bool m_paused{false};
|
|
|
|
u8 m_group{0};
|
|
bool m_done{false};
|
|
|
|
u32 m_grains_to_play{0};
|
|
u32 m_grains_to_skip{0};
|
|
bool m_skip_grains{false};
|
|
|
|
SFXBlock::SFX* m_sfx = nullptr;
|
|
SFXBlock::SFX* m_orig_sfx = nullptr;
|
|
VoiceManager& m_vm;
|
|
|
|
std::list<std::weak_ptr<BlockSoundVoice>> m_voices;
|
|
|
|
std::list<std::unique_ptr<SoundHandler>> m_children;
|
|
|
|
s32 m_orig_volume{0};
|
|
s32 m_orig_pan{0};
|
|
s32 m_cur_volume{0};
|
|
s32 m_cur_pan{0};
|
|
s32 m_cur_pm{0};
|
|
s32 m_cur_pb{0};
|
|
s32 m_app_volume{0};
|
|
s32 m_app_pan{0};
|
|
s32 m_app_pm{0};
|
|
s32 m_app_pb{0};
|
|
|
|
s32 m_lfo_volume{0};
|
|
s32 m_lfo_pan{0};
|
|
s32 m_lfo_pm{0};
|
|
s32 m_lfo_pb{0};
|
|
|
|
SoundBank& m_bank;
|
|
|
|
u8 m_note{60};
|
|
u8 m_fine{0};
|
|
|
|
std::array<s8, 4> m_registers{};
|
|
std::array<LFOTracker, 4> m_lfo{{*this, *this, *this, *this}};
|
|
|
|
s32 m_countdown{0};
|
|
u32 m_next_grain{0};
|
|
|
|
u32 m_sound_id{0};
|
|
s32 m_start_tick{0};
|
|
};
|
|
} // namespace snd
|