diff options
Diffstat (limited to 'examples/vulkan')
| -rw-r--r-- | examples/vulkan/hellovulkancubes/renderer.cpp | 7 | ||||
| -rw-r--r-- | examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/examples/vulkan/hellovulkancubes/renderer.cpp b/examples/vulkan/hellovulkancubes/renderer.cpp index 5ada79ce79..f104d79002 100644 --- a/examples/vulkan/hellovulkancubes/renderer.cpp +++ b/examples/vulkan/hellovulkancubes/renderer.cpp @@ -49,6 +49,7 @@ ****************************************************************************/ #include "renderer.h" +#include "qrandom.h" #include <QVulkanFunctions> #include <QtConcurrentRun> #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_instCount(initialCount) { - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); - m_floorModel.translate(0, -5, 0); m_floorModel.rotate(-90, 1, 0, 0); m_floorModel.scale(20, 100, 1); @@ -793,7 +792,9 @@ void Renderer::ensureInstanceBuffer() qDebug("Preparing instances %d..%d", m_preparedInstCount, m_instCount - 1); char *p = m_instData.data(); 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) { // Apply a random translation to each instance of the mesh. float t[] = { gen(-5, 5), gen(-4, 6), gen(-30, 5) }; diff --git a/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp b/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp index 81daa9bb96..cf95a0e6a0 100644 --- a/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp +++ b/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp @@ -140,12 +140,12 @@ void VulkanRenderer::initResources() m_devFuncs = inst->deviceFunctions(m_window->device()); QString info; - info += QString().sprintf("Number of physical devices: %d\n", m_window->availablePhysicalDevices().count()); + info += QString::asprintf("Number of physical devices: %d\n", m_window->availablePhysicalDevices().count()); QVulkanFunctions *f = inst->functions(); VkPhysicalDeviceProperties props; f->vkGetPhysicalDeviceProperties(m_window->physicalDevice(), &props); - info += QString().sprintf("Active physical device name: '%s' version %d.%d.%d\nAPI version %d.%d.%d\n", + info += QString::asprintf("Active physical device name: '%s' version %d.%d.%d\nAPI version %d.%d.%d\n", props.deviceName, VK_VERSION_MAJOR(props.driverVersion), VK_VERSION_MINOR(props.driverVersion), VK_VERSION_PATCH(props.driverVersion), @@ -154,19 +154,19 @@ void VulkanRenderer::initResources() info += QStringLiteral("Supported instance layers:\n"); for (const QVulkanLayer &layer : inst->supportedLayers()) - info += QString().sprintf(" %s v%u\n", layer.name.constData(), layer.version); + info += QString::asprintf(" %s v%u\n", layer.name.constData(), layer.version); info += QStringLiteral("Enabled instance layers:\n"); for (const QByteArray &layer : inst->layers()) - info += QString().sprintf(" %s\n", layer.constData()); + info += QString::asprintf(" %s\n", layer.constData()); info += QStringLiteral("Supported instance extensions:\n"); for (const QVulkanExtension &ext : inst->supportedExtensions()) - info += QString().sprintf(" %s v%u\n", ext.name.constData(), ext.version); + info += QString::asprintf(" %s v%u\n", ext.name.constData(), ext.version); info += QStringLiteral("Enabled instance extensions:\n"); for (const QByteArray &ext : inst->extensions()) - info += QString().sprintf(" %s\n", ext.constData()); + info += QString::asprintf(" %s\n", ext.constData()); - info += QString().sprintf("Color format: %u\nDepth-stencil format: %u\n", + info += QString::asprintf("Color format: %u\nDepth-stencil format: %u\n", m_window->colorFormat(), m_window->depthStencilFormat()); info += QStringLiteral("Supported sample counts:"); |