Further GUS optimization.

Author: Franticware

src/Makefile.djgpp

@@ -1,7 +1,6 @@
 #ARCH        = -march=i386 -mtune=i486
 ARCH        =
 CFLAGS = \
--DM_PI=3.14159265358979323846 \
 -I./q2dos/dos/3rdparty/include \
 -I./djgpp/jpeg \
 -I./djgpp/libpng \

src/gamemng.cpp

@@ -268,7 +268,7 @@ void Gamemng::set_far(int far1)
 void Gamemng::init_sound()
 {
     p_sound_crash = new Sound_crash;
-    p_sound_crash->init(p_sound_game_static.p_hit_stream); // nulové *p_audiodevice je ošéfované uvnitř
+    p_sound_crash->init(p_sound_game_static.p_hit_stream, p_sound_game_static.p_hit_sample); // nulové *p_audiodevice je ošéfované uvnitř
 }
 
 void Gamemng::unset_scissor()

src/minial_gus.cpp

@@ -123,44 +123,13 @@ void MinialGUS::GenSources(ALsizei n, ALuint* sources)
             }
         }
     }
-
-    /*
-    generateStuff(n, sources, sourceMap, sourceCounter);
-
-    for (int i = 0; i != n; ++i)
-    {
-        MA_GUS_Source& src = (sourceMap)[sources[i]];
-        bool mapped = false;
-        for (int j = 0; j != m_gusVoices; ++j)
-        {
-            if (gusVoiceMap[j] == 0)
-            {
-                src.gusVoice = j;
-                gusVoiceMap[j] = 1;
-                mapped = true;
-                break;
-            }
-        }
-        if (!mapped)
-        {
-            printf("unmapped voice!\n");
-        }
-    }
-    */
 }
 void MinialGUS::GenBuffers(ALsizei n, ALuint* buffers)
 {
     generateStuff(n, buffers, bufferMap, bufferCounter);
 }
 void MinialGUS::DeleteSources(ALsizei n, const ALuint* sources)
 {
-    /*for (int i = 0; i != n; ++i)
-    {
-        MA_GUS_Source& src = (sourceMap)[sources[i]];
-        gusVoiceMap[src.gusVoice] = 0;
-    }
-    deleteStuff(n, sources, sourceMap);*/
-
     for (ALsizei i = 0; i != n; ++i)
     {
         if (sources[i] > 0 && sources[i] <= (ALuint)m_gusVoices)

src/minial_sb.cpp

@@ -95,22 +95,26 @@ void MinialSB::ma_callback(void* userdata, Uint8* stream, int len)
                         (*floatBuff)[i] += buff.samples[src.pos] * src.gain;
 #endif
 #if MA_FILTER == MA_FILTER_LINEAR
-                        uint32_t ipos0 = src.pos;
-                        uint32_t ipos1 = ipos0 + 1;
-                        Sint16 smp0 = buff.samples[ipos0];
-                        Sint16 smp1 = 0;
-                        if (ipos1 >= buff.samples.size())
+                        if (src.gain > 0.f && m_listenerGain > 0.f)
                         {
-                            if (src.looping)
+                            uint32_t ipos0 = src.pos;
+                            uint32_t ipos1 = ipos0 + 1;
+                            Sint16 smp0 = buff.samples[ipos0];
+                            Sint16 smp1 = 0;
+                            if (ipos1 >= buff.samples.size())
                             {
-                                smp1 = buff.samples[0];
+                                if (src.looping)
+                                {
+                                    smp1 = buff.samples[0];
+                                }
                             }
+                            else
+                            {
+                                smp1 = buff.samples[ipos1];
+                            }
+                            (floatBuff)[i] +=
+                                (float(smp0) + (float(smp1) - float(smp0)) * (src.pos - ipos0)) * src.gain;
                         }
-                        else
-                        {
-                            smp1 = buff.samples[ipos1];
-                        }
-                        (floatBuff)[i] += (float(smp0) + (float(smp1) - float(smp0)) * (src.pos - ipos0)) * src.gain;
 #endif
 #if MA_FILTER == MA_FILTER_HIGH_QUALITY
 #error "Hight quality audio filter is currently not implemented"

src/soundmng.cpp

@@ -36,6 +36,7 @@ void Sound_game_static::playSoundTest(float gain)
 {
     alSourceStop(p_hit_stream[0]);
     alSourceRewind(p_hit_stream[0]);
+    alSourcei(p_hit_stream[0], AL_BUFFER, p_hit_sample[0]);
     alSourcef(p_hit_stream[0], AL_GAIN, 1.0);
     alSourcef(p_hit_stream[0], AL_PITCH, 1.0);
     alListenerf(AL_GAIN, gain);
@@ -66,12 +67,10 @@ void Sound_game_static::init()
     for (unsigned int i = 0; i != 4; ++i) {
         p_skid_stream[i] = createSource(p_skid_sample);
     }
-    for (int j = 0; j != 2; ++j)
-        for (int i = 0; i != hitStreamCount/2; ++i) {
-            p_hit_stream[i+j*(hitStreamCount/2)] = createSource(p_hit_sample[j]);
-        }
-
-    //p_test_stream = createSource(p_hit_sample[0]);
+    for (int i = 0; i != hitStreamCount; ++i)
+    {
+        p_hit_stream[i] = createSource(0);
+    }
 }
 
 void Sound_game_static::load(unsigned int i, ALbuffer engine0_sample, ALbuffer engine1_sample)
@@ -106,7 +105,6 @@ static constexpr float engine1_volume0 = 0.75f;
 
 void Sound_car::frame(float deltaT, int engine_state /*0 - nultý, 1 - první, 2 - první potichu*/, float engine_pitch, const float velocity[2])
 {
-    //
     p_time += deltaT;
     if (p_time >= p_T) p_time = 0.f; else return;
     if (!p_engine_on && engine_state == 2)
@@ -216,9 +214,10 @@ void Sound_car::init(ALsource stream_engine, ALbuffer sample_idle, ALbuffer samp
     p_engine_on = 0;
 }
 
-void Sound_crash::init(ALsource* stream_hit) // load zvuků
+void Sound_crash::init(const ALsource* stream_hit, const ALbuffer* sample_hit) // load zvuků
 {
-    p_hit_stream = stream_hit;
+    p_hit_streams = stream_hit;
+    p_hit_samples = sample_hit;
 }
 
 void Sound_crash::play(float c_j) // přehraje zvuk nárazu
@@ -228,17 +227,19 @@ void Sound_crash::play(float c_j) // přehraje zvuk nárazu
     if (volume > 1.f) volume = 1.f;
     if (volume < 0.f) volume = 0.f;
     static const int sampleIndexer[6] = {0, 1, 0, 1, 0, 1};
-    int sample_sel =sampleIndexer[randn1(5)];
-    int stream_sel = p_fronta_pos[sample_sel]++;
-    p_fronta_pos[sample_sel] %= p_width;
-    int sel = stream_sel+sample_sel*p_width;
+    int sample_sel = sampleIndexer[randn1(5)];
+
+    ALuint stream = p_hit_streams[p_currentStream];
 
-    alSourceStop(p_hit_stream[sel]);
-    alSourceRewind(p_hit_stream[sel]);
-    alSourcef(p_hit_stream[sel], AL_GAIN, volume);
+    alSourceStop(stream);
+    alSourceRewind(stream);
+    alSourcei(stream, AL_BUFFER, p_hit_samples[sample_sel]);
+    alSourcef(stream, AL_GAIN, volume);
 
     float pitch_min = 0.88;
     float pitch = pitch_min+randn1(int((1.f-pitch_min)*2.f*1000.f))*0.001;
-    alSourcef(p_hit_stream[sel], AL_PITCH, pitch);
-    alSourcePlay(p_hit_stream[sel]);
+    alSourcef(stream, AL_PITCH, pitch);
+    alSourcePlay(stream);
+
+    p_currentStream = (p_currentStream + 1) % Sound_game_static::hitStreamCount;
 }

src/soundmng.h

@@ -31,7 +31,8 @@ typedef ALuint ALsource;
 
 class Sound_game_static {
 public:
-    static constexpr int hitStreamCount = 6;
+    static constexpr int hitStreamCount = 5;
+    static constexpr int hitSampleCount = 2;
     Sound_game_static() {
         for (int i = 0; i != 4; ++i)
         {
@@ -71,7 +72,7 @@ class Sound_game_static {
     ALsource p_hit_stream[hitStreamCount];
 
     ALbuffer p_skid_sample;
-    ALbuffer p_hit_sample[2];
+    ALbuffer p_hit_sample[hitSampleCount];
 
     //ALsource p_laprecord_stream;
     //ALbuffer p_laprecord_sample;
@@ -110,21 +111,14 @@ class Sound_car {
 
 class Sound_crash {
 public:
-    Sound_crash() { p_sz_samples = 2; p_width = 3; p_hit_stream = 0; p_fronta_pos[0] = 0; p_fronta_pos[1] = 0; }
+    Sound_crash() { p_hit_streams = 0; p_hit_samples = 0; p_currentStream = 0; }
     ~Sound_crash() {
     }
-    void init(ALsource* stream_hit); // load zvuků
+    void init(const ALsource* stream_hit, const ALbuffer* sample_hit); // load zvuků
     void play(float c_j); // přehraje zvuk nárazu
-    int p_sz_samples;
-    int p_width; // šířka fronty
-    ALsource* p_hit_stream;
-    int p_fronta_pos[10]; // stačí 2
-
-    // n = 3
-    // f = 5
-    // samply[n]
-    // fronty[f*n]
-    // fronty_i[n]
+    const ALsource* p_hit_streams;
+    const ALbuffer* p_hit_samples;
+    ALuint p_currentStream;
 };
 
 #endif