sigonasr2
/
olcPixelGameEngine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge e5a46836d3 into b7fdab1576

Browse Source
pull/137/merge
scripticuk 3 years ago committed by GitHub
parent b7fdab1576 e5a46836d3
commit e7ed7f165d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      Extensions/olcPGEX_Sound.h

14
Extensions/olcPGEX_Sound.h
Unescape View File

@ -64,7 +64,7 @@
Author Author
~~~~~~ ~~~~~~
David Barr, aka javidx9, ©OneLoneCoder 2019 David Barr, aka javidx9, ©OneLoneCoder 2019
*/ */
@ -696,7 +696,7 @@ namespace olc
// User Process // User Process
for (unsigned int c = 0; c < m_nChannels; c++) for (unsigned int c = 0; c < m_nChannels; c++)
{ {
nNewSample = (short)(GetMixerOutput(c, m_fGlobalTime + fTimeStep * (float)n, fTimeStep), 1.0) * fMaxSample; nNewSample = (short)(clip(GetMixerOutput(c, m_fGlobalTime + fTimeStep * (float)n, fTimeStep), 1.0) * fMaxSample);
m_pBlockMemory[n + c] = nNewSample; m_pBlockMemory[n + c] = nNewSample;
nPreviousSample = nNewSample; nPreviousSample = nNewSample;
} }
@ -838,14 +838,14 @@ namespace olc
// User Process // User Process
for (unsigned int c = 0; c < m_nChannels; c++) for (unsigned int c = 0; c < m_nChannels; c++)
{ {
nNewSample = (short)(clip(GetMixerOutput(c, m_fGlobalTime, fTimeStep), 1.0) * fMaxSample); nNewSample = (short)(clip(GetMixerOutput(c, m_fGlobalTime + fTimeStep * (float)n, fTimeStep), 1.0) * fMaxSample);
m_pBlockMemory[n + c] = nNewSample; m_pBlockMemory[n + c] = nNewSample;
nPreviousSample = nNewSample; nPreviousSample = nNewSample;
} }
m_fGlobalTime = m_fGlobalTime + fTimeStep;
} }
m_fGlobalTime = m_fGlobalTime + fTimeStep * (float)m_nBlockSamples;
// Fill OpenAL data buffer // Fill OpenAL data buffer
alBufferData( alBufferData(
m_qAvailableBuffers.front(), m_qAvailableBuffers.front(),
@ -903,4 +903,4 @@ namespace olc
#endif #endif
#endif #endif
#endif // OLC_PGEX_SOUND #endif // OLC_PGEX_SOUND

Write Preview
Loading…
Cancel
Save