Vantha/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Update random_shuffle usage for C++17

Browse Source 
C++14 deprecates and C++17 removes functions we use for random sounds.
This makes FastRand() fit the URG interface, and uses the appropriate
function.

Refs #5862

Differential Revision: https://code.wildfiregames.com/D3107
This was SVN commit r24302.
This commit is contained in:
wraitii 2020-11-30 15:52:16 +00:00
parent 46399371ed
commit 48c31ce03f
3 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/simulation2/tests/test_EntityMap.h
View File

@ -23,6 +23,9 @@
#include "simulation2/system/EntityMap.h"
#include <algorithm>
#include <random>
class TestEntityMap : public CxxTest::TestSuite
{
public:
@ -226,7 +229,8 @@ public:
std::vector<int> vec;
for (int i = 1; i <= 200000; ++i)
vec.push_back(i);
std::random_shuffle(vec.begin(), vec.end());
std::shuffle(vec.begin(), vec.end(), std::mt19937{});
for (int i = 1; i <= 200000; ++i)
test.insert(i,i);

40
source/soundmanager/scripting/SoundGroup.cpp
View File

@ -33,22 +33,46 @@
#include "soundmanager/SoundManager.h"
#include <algorithm>
#include <random>
extern CGame *g_Game;
#if CONFIG2_AUDIO
inline u32 CSoundGroup::FastRand()
/**
* Low randomness, quite-a-lot-faster-than-std::mt19937 random number generator.
* It matches the interface of UniformRandomBitGenerator for use in std::shuffle.
*/
class CFastRand
{
public:
using result_type = u32;
constexpr static result_type min() { return 0; }
constexpr static result_type max() { return 0xFFFF; }
static result_type Rand(result_type& seed)
{
// This is a mixed linear congruential random number generator.
// The magic numbers are chosen so that they generate pseudo random numbers over a big enough period (0xFFFF).
m_Seed = 214013 * m_Seed + 2531011;
return (m_Seed >> 16) & 0xFFFF;
seed = 214013 * seed + 2531011;
return (seed >> 16) & max();
}
float CSoundGroup::RandFloat(float min, float max)
static float RandFloat(result_type& seed, float min, float max)
{
return (static_cast<float>(FastRand()) / (0xFFFF)) * (max - min) + min;
return (static_cast<float>(Rand(seed)) / (0xFFFF)) * (max - min) + min;
}
CFastRand() {};
CFastRand(result_type init) : m_Seed(init) {};
result_type operator()()
{
return Rand(m_Seed);
}
result_type m_Seed;
};
#endif
void CSoundGroup::SetGain(float gain)
@ -194,10 +218,10 @@ void CSoundGroup::UploadPropertiesAndPlay(size_t index, const CVector3D& positio
if (cmpVisual)
m_Seed = cmpVisual->GetActorSeed();
hSound->SetPitch(TestFlag(eRandPitch) ? RandFloat(m_PitchLower, m_PitchUpper) : m_Pitch);
hSound->SetPitch(TestFlag(eRandPitch) ? CFastRand::RandFloat(m_Seed, m_PitchLower, m_PitchUpper) : m_Pitch);
if (TestFlag(eRandGain))
m_Gain = RandFloat(m_GainLower, m_GainUpper);
m_Gain = CFastRand::RandFloat(m_Seed, m_GainLower, m_GainUpper);
hSound->SetCone(m_ConeInnerAngle, m_ConeOuterAngle, m_ConeOuterGain);
static_cast<CSoundManager*>(g_SoundManager)->PlayGroupItem(hSound, m_Gain);
@ -242,7 +266,7 @@ void CSoundGroup::Reload()
}
if (TestFlag(eRandOrder))
random_shuffle(m_SoundGroups.begin(), m_SoundGroups.end());
std::shuffle(m_SoundGroups.begin(), m_SoundGroups.end(), CFastRand(m_Seed));
#endif
}

3
source/soundmanager/scripting/SoundGroup.h
View File

@ -81,9 +81,6 @@ private:
void SetDefaultValues();
#if CONFIG2_AUDIO
inline u32 FastRand();
// Contains the current sound seed for the generator
float RandFloat(float min, float max);
// We store the handles so we can load now and play later
std::vector<CSoundData*> m_SoundGroups;
#endif