1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use of qrand/qsrand in an example

Browse Source 
Convert an example to use QRandomGenerator::global().
This saves the need for seeding.

At the same time, use continuum random values rather than discrete
ones, to better fit what the example using it is doing.

Change-Id: I0adebaadb2e35832c629e314fda37e60b51f760d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2019-03-27 18:59:47 +00:00
parent f3002b6e20
commit 4690d4efa6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/vulkan/hellovulkancubes/renderer.cpp
View File

@ -49,6 +49,7 @@
****************************************************************************/ ****************************************************************************/
#include "renderer.h" #include "renderer.h"
#include "qrandom.h"
#include <QVulkanFunctions> #include <QVulkanFunctions>
#include <QtConcurrentRun> #include <QtConcurrentRun>
#include <QTime> #include <QTime>
@ -77,8 +78,6 @@ Renderer::Renderer(VulkanWindow *w, int initialCount)
m_cam(QVector3D(0.0f, 0.0f, 20.0f)), // starting camera position m_cam(QVector3D(0.0f, 0.0f, 20.0f)), // starting camera position
m_instCount(initialCount) m_instCount(initialCount)
{ {
qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
m_floorModel.translate(0, -5, 0); m_floorModel.translate(0, -5, 0);
m_floorModel.rotate(-90, 1, 0, 0); m_floorModel.rotate(-90, 1, 0, 0);
m_floorModel.scale(20, 100, 1); m_floorModel.scale(20, 100, 1);
@ -793,7 +792,9 @@ void Renderer::ensureInstanceBuffer()
qDebug("Preparing instances %d..%d", m_preparedInstCount, m_instCount - 1); qDebug("Preparing instances %d..%d", m_preparedInstCount, m_instCount - 1);
char *p = m_instData.data(); char *p = m_instData.data();
p += m_preparedInstCount * PER_INSTANCE_DATA_SIZE; p += m_preparedInstCount * PER_INSTANCE_DATA_SIZE;
auto gen = [](float a, float b) { return float((qrand() % int(b - a + 1)) + a); }; auto gen = [](int a, int b) {
return float(QRandomGenerator::global()->bounded(double(b - a)) + a);
};
for (int i = m_preparedInstCount; i < m_instCount; ++i) { for (int i = m_preparedInstCount; i < m_instCount; ++i) {
// Apply a random translation to each instance of the mesh. // Apply a random translation to each instance of the mesh.
float t[] = { gen(-5, 5), gen(-4, 6), gen(-30, 5) }; float t[] = { gen(-5, 5), gen(-4, 6), gen(-30, 5) };