sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another lot of warnings from Clang

Browse Source 
Closes #90
Closes #91
Closes #92
Closes #93
This commit is contained in:
Lynix
2016-10-17 16:01:05 +02:00
parent 7e594a861f
commit 4c6f049e0d
26 changed files with 87 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Nazara/Noise/Simplex.cpp
View File

@@ -51,11 +51,12 @@ namespace Nz
d[2] = d[0] + Vector2f(1.f - 2.f * s_UnskewCoeff2D);
Vector2i offset(skewedCubeOrigin.x & 255, skewedCubeOrigin.y & 255);
std::array<std::size_t, 3> gi =
{
m_permutations[offset.x + m_permutations[offset.y]] & 7,
m_permutations[offset.x + off1.x + m_permutations[offset.y + off1.y]] & 7,
m_permutations[offset.x + 1 + m_permutations[offset.y + 1]] & 7
std::array<std::size_t, 3> gi = {
{
m_permutations[offset.x + m_permutations[offset.y]] & 7,
m_permutations[offset.x + off1.x + m_permutations[offset.y + off1.y]] & 7,
m_permutations[offset.x + 1 + m_permutations[offset.y + 1]] & 7
}
};
float n = 0.f;

23
src/Nazara/Noise/Worley.cpp
View File

@@ -12,12 +12,13 @@ namespace Nz
{
namespace
{
static constexpr std::array<float, 4> m_functionScales =
{
1.f / float(M_SQRT2),
0.5f / float(M_SQRT2),
0.5f / float(M_SQRT2),
0.5f / float(M_SQRT2)
static constexpr std::array<float, 4> m_functionScales = {
{
1.f / float(M_SQRT2),
0.5f / float(M_SQRT2),
0.5f / float(M_SQRT2),
0.5f / float(M_SQRT2)
}
};
}
Worley::Worley() :
@@ -111,11 +112,21 @@ namespace Nz
float Worley::Get(float x, float y, float z, float scale) const
{
NazaraUnused(x);
NazaraUnused(y);
NazaraUnused(z);
NazaraUnused(scale);
throw std::runtime_error("Worley 3D not available yet.");
}
float Worley::Get(float x, float y, float z, float w, float scale) const
{
NazaraUnused(x);
NazaraUnused(y);
NazaraUnused(z);
NazaraUnused(scale);
throw std::runtime_error("Worley 4D not available yet.");
}