claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed random seed when run in benchmark mode

Browse source 
Refs #269
This commit is contained in:
saschawillems 2018-01-15 20:40:17 +01:00
parent cb32e2e89f
commit 5790f30c17
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
base/vulkanexamplebase.h
View file

@ -65,7 +65,6 @@ private:
uint32_t destWidth; uint32_t destWidth;
uint32_t destHeight; uint32_t destHeight;
bool resizing = false; bool resizing = false;
vks::Benchmark benchmark;
vks::UIOverlay *UIOverlay = nullptr; vks::UIOverlay *UIOverlay = nullptr;
// Called if the window is resized and some resources have to be recreatesd // Called if the window is resized and some resources have to be recreatesd
void windowResize(); void windowResize();
@ -140,6 +139,8 @@ public:
/** @brief Returns os specific base asset path (for shaders, models, textures) */ /** @brief Returns os specific base asset path (for shaders, models, textures) */
const std::string getAssetPath(); const std::string getAssetPath();
vks::Benchmark benchmark;
/** @brief Encapsulated physical and logical vulkan device */ /** @brief Encapsulated physical and logical vulkan device */
vks::VulkanDevice *vulkanDevice; vks::VulkanDevice *vulkanDevice;

16
examples/instancing/instancing.cpp
View file

@ -94,7 +94,6 @@ public:
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION) VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
{ {
title = "Instanced mesh rendering"; title = "Instanced mesh rendering";
srand(time(NULL));
zoom = -18.5f; zoom = -18.5f;
rotation = { -17.2f, -4.7f, 0.0f }; rotation = { -17.2f, -4.7f, 0.0f };
cameraPos = { 5.5f, -1.85f, 0.0f }; cameraPos = { 5.5f, -1.85f, 0.0f };
@ -437,22 +436,17 @@ public:
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.starfield)); VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.starfield));
} }
float rnd(float range)
{
return range * (rand() / double(RAND_MAX));
}
void prepareInstanceData() void prepareInstanceData()
{ {
std::vector<InstanceData> instanceData; std::vector<InstanceData> instanceData;
instanceData.resize(INSTANCE_COUNT); instanceData.resize(INSTANCE_COUNT);
std::mt19937 rndGenerator(time(NULL)); std::mt19937 rndGenerator(benchmark.active ? 0 : (unsigned)time(NULL));
std::uniform_real_distribution<float> uniformDist(0.0, 1.0); std::uniform_real_distribution<float> uniformDist(0.0, 1.0);
std::uniform_int_distribution<uint32_t> rndTextureIndex(0, textures.rocks.layerCount);
// Distribute rocks randomly on two different rings // Distribute rocks randomly on two different rings
for (auto i = 0; i < INSTANCE_COUNT / 2; i++) for (auto i = 0; i < INSTANCE_COUNT / 2; i++) {
{
glm::vec2 ring0 { 7.0f, 11.0f }; glm::vec2 ring0 { 7.0f, 11.0f };
glm::vec2 ring1 { 14.0f, 18.0f }; glm::vec2 ring1 { 14.0f, 18.0f };
@ -464,7 +458,7 @@ public:
instanceData[i].pos = glm::vec3(rho*cos(theta), uniformDist(rndGenerator) * 0.5f - 0.25f, rho*sin(theta)); instanceData[i].pos = glm::vec3(rho*cos(theta), uniformDist(rndGenerator) * 0.5f - 0.25f, rho*sin(theta));
instanceData[i].rot = glm::vec3(M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator)); instanceData[i].rot = glm::vec3(M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator));
instanceData[i].scale = 1.5f + uniformDist(rndGenerator) - uniformDist(rndGenerator); instanceData[i].scale = 1.5f + uniformDist(rndGenerator) - uniformDist(rndGenerator);
instanceData[i].texIndex = rnd(textures.rocks.layerCount); instanceData[i].texIndex = rndTextureIndex(rndGenerator);
instanceData[i].scale *= 0.75f; instanceData[i].scale *= 0.75f;
// Outer ring // Outer ring
@ -473,7 +467,7 @@ public:
instanceData[i + INSTANCE_COUNT / 2].pos = glm::vec3(rho*cos(theta), uniformDist(rndGenerator) * 0.5f - 0.25f, rho*sin(theta)); instanceData[i + INSTANCE_COUNT / 2].pos = glm::vec3(rho*cos(theta), uniformDist(rndGenerator) * 0.5f - 0.25f, rho*sin(theta));
instanceData[i + INSTANCE_COUNT / 2].rot = glm::vec3(M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator)); instanceData[i + INSTANCE_COUNT / 2].rot = glm::vec3(M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator), M_PI * uniformDist(rndGenerator));
instanceData[i + INSTANCE_COUNT / 2].scale = 1.5f + uniformDist(rndGenerator) - uniformDist(rndGenerator); instanceData[i + INSTANCE_COUNT / 2].scale = 1.5f + uniformDist(rndGenerator) - uniformDist(rndGenerator);
instanceData[i + INSTANCE_COUNT / 2].texIndex = rnd(textures.rocks.layerCount); instanceData[i + INSTANCE_COUNT / 2].texIndex = rndTextureIndex(rndGenerator);
instanceData[i + INSTANCE_COUNT / 2].scale *= 0.75f; instanceData[i + INSTANCE_COUNT / 2].scale *= 0.75f;
} }

2
examples/subpasses/subpasses.cpp
View file

@ -1009,7 +1009,7 @@ public:
glm::vec3(1.0f, 1.0f, 0.0f), glm::vec3(1.0f, 1.0f, 0.0f),
}; };
std::mt19937 rndGen((unsigned)time(NULL)); std::mt19937 rndGen(benchmark.active ? 0 : (unsigned)time(NULL));
std::uniform_real_distribution<float> rndDist(-1.0f, 1.0f); std::uniform_real_distribution<float> rndDist(-1.0f, 1.0f);
std::uniform_int_distribution<uint32_t> rndCol(0, static_cast<uint32_t>(colors.size()-1)); std::uniform_int_distribution<uint32_t> rndCol(0, static_cast<uint32_t>(colors.size()-1));