immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Changed AdjustFrequency formula 

* Changed SetVolume to match orginal game formula
dev-ui
erihel 2013-02-24 18:04:38 +01:00
parent ba2df2cb42
commit 3a594dc3a8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sound/oalsound/alsound.cpp
View File

@ -386,7 +386,8 @@ bool ALSound::Frequency(int channel, float frequency)
return false;
}
mChannels[channel]->SetFrequency(frequency);
mChannels[channel]->SetFrequency(frequency * mChannels[channel]->GetInitFrequency());
mChannels[channel]->SetChangeFrequency(frequency);
return true;
}
@ -461,11 +462,13 @@ void ALSound::FrameMove(float delta)
// setting volume
volume = progress * (oper.finalAmplitude - it.second->GetStartAmplitude());
it.second->SetVolume((volume + it.second->GetStartAmplitude()) * mAudioVolume);
volume = (volume + it.second->GetStartAmplitude()) * mAudioVolume;
it.second->SetVolume(volume);
// setting frequency
frequency = progress * (oper.finalFrequency - it.second->GetStartFrequency()) * it.second->GetStartFrequency() * it.second->GetChangeFrequency() * it.second->GetInitFrequency();
it.second->AdjustFrequency(frequency);
GetLogger()->Error("%f\n", frequency);
if (oper.totalTime <= oper.currentTime) {
if (oper.nextOper == SOPER_LOOP) {

4
src/sound/oalsound/channel.cpp
View File

@ -94,7 +94,7 @@ bool Channel::AdjustFrequency(float freq)
if (!mReady || mBuffer == nullptr)
return false;
return SetFrequency(mInitFrequency - freq);
return SetFrequency(mInitFrequency + freq);
}
@ -119,7 +119,7 @@ bool Channel::SetVolume(float vol)
if (!mReady || vol < 0 || mBuffer == nullptr)
return false;
alSourcef(mSource, AL_GAIN, MIN(vol, 1.0f));
alSourcef(mSource, AL_GAIN, MIN(powf(vol, 0.2f), 1.0f));
if (alCheck()) {
GetLogger()->Warn("Could not set sound volume to '%f'. Code: %d\n", vol, alGetCode());
return false;