Code cleanup. fixes warnings
This commit is contained in:
parent
3a15ec4eb9
commit
ed4c4684c5
8 changed files with 28 additions and 41 deletions
|
|
@ -339,7 +339,7 @@ public:
|
|||
|
||||
// Inner ring
|
||||
rho = sqrt((pow(ring0[1], 2.0f) - pow(ring0[0], 2.0f)) * uniformDist(rndGenerator) + pow(ring0[0], 2.0f));
|
||||
theta = 2.0f * M_PI * uniformDist(rndGenerator);
|
||||
theta = static_cast<uint32_t>(2.0f * M_PI * uniformDist(rndGenerator));
|
||||
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].scale = 1.5f + uniformDist(rndGenerator) - uniformDist(rndGenerator);
|
||||
|
|
@ -348,7 +348,7 @@ public:
|
|||
|
||||
// Outer ring
|
||||
rho = sqrt((pow(ring1[1], 2.0f) - pow(ring1[0], 2.0f)) * uniformDist(rndGenerator) + pow(ring1[0], 2.0f));
|
||||
theta = 2.0f * M_PI * uniformDist(rndGenerator);
|
||||
theta = static_cast<uint32_t>(2.0f * M_PI * uniformDist(rndGenerator));
|
||||
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].scale = 1.5f + uniformDist(rndGenerator) - uniformDist(rndGenerator);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue