mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed warnings with -Weverything

Browse Source
This commit is contained in:
Christophe Riccio
2017-08-08 15:17:25 +02:00
parent 0f34103f4f
commit 32054a8fdf
3 changed files with 32 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
test/gtc/gtc_noise.cpp
View File

@@ -1,163 +1,47 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/noise.hpp>
#if GLM_LANG & GLM_LANG_CXX11_FLAG
#include <gli/gli.hpp>
std::size_t const Size = 64;
#include <glm/gtx/raw_data.hpp>
int test_simplex()
{
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::simplex(glm::vec2(x / 64.f, y / 64.f))) * 255.f));
int Error = 0;
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
glm::u8vec4 const PixelSimplex2D(glm::byte(glm::abs(glm::simplex(glm::vec2(0.f, 0.f))) * 255.f));
glm::u8vec4 const PixelSimplex3D(glm::byte(glm::abs(glm::simplex(glm::vec3(0.f, 0.f, 0.f))) * 255.f));
glm::u8vec4 const PixelSimplex4D(glm::byte(glm::abs(glm::simplex(glm::vec4(0.f, 0.f, 0.f, 0.f))) * 255.f));
gli::save(Texture, "texture_simplex2d_256.dds");
}
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::simplex(glm::vec3(x / 64.f, y / 64.f, 0.5f))) * 255.f));
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
gli::save(Texture, "texture_simplex3d_256.dds");
}
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::simplex(glm::vec4(x / 64.f, y / 64.f, 0.5f, 0.5f))) * 255.f));
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
gli::save(Texture, "texture_simplex4d_256.dds");
}
return 0;
return Error;
}
int test_perlin()
{
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
int Error = 0;
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::perlin(glm::vec2(x / 64.f, y / 64.f))) * 255.f));
glm::u8vec4 const PixelPerlin2D(glm::byte(glm::abs(glm::perlin(glm::vec2(0.f, 0.f))) * 255.f));
glm::u8vec4 const PixelPerlin3D(glm::byte(glm::abs(glm::perlin(glm::vec3(0.f, 0.f, 0.f))) * 255.f));
glm::u8vec4 const PixelPerlin4D(glm::byte(glm::abs(glm::perlin(glm::vec4(0.f, 0.f, 0.f, 0.f))) * 255.f));
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
gli::save(Texture, "texture_perlin2d_256.dds");
}
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::perlin(glm::vec3(x / 64.f, y / 64.f, 0.5f))) * 255.f));
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
gli::save(Texture, "texture_perlin3d_256.dds");
}
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::perlin(glm::vec4(x / 64.f, y / 64.f, 0.5f, 0.5f))) * 255.f));
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
gli::save(Texture, "texture_perlin4d_256.dds");
}
return 0;
return Error;
}
int test_perlin_pedioric()
{
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
int Error = 0;
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::perlin(glm::vec2(x / 64.f, y / 64.f), glm::vec2(2.0f))) * 255.f));
glm::u8vec4 const PixelPeriodic2D(glm::byte(glm::abs(glm::perlin(glm::vec2(0.f, 0.f), glm::vec2(2.0f))) * 255.f));
glm::u8vec4 const PixelPeriodic3D(glm::byte(glm::abs(glm::perlin(glm::vec3(0.f, 0.f, 0.f), glm::vec3(2.0f))) * 255.f));
glm::u8vec4 const PixelPeriodic4D(glm::byte(glm::abs(glm::perlin(glm::vec4(0.f, 0.f, 0.f, 0.f), glm::vec4(2.0f))) * 255.f));
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
gli::save(Texture, "texture_perlin_pedioric_2d_256.dds");
}
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::perlin(glm::vec3(x / 64.f, y / 64.f, 0.5f), glm::vec3(2.0f))) * 255.f));
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
gli::save(Texture, "texture_perlin_pedioric_3d_256.dds");
}
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
for(std::size_t y = 0; y < Size; ++y)
for(std::size_t x = 0; x < Size; ++x)
{
glm::u8vec4 Pixel(glm::byte(glm::abs(glm::perlin(glm::vec4(x / 64.f, y / 64.f, 0.5f, 0.5f), glm::vec4(2.0f))) * 255.f));
Texture.store(gli::extent2d(x, y), 0, Pixel);
}
gli::save(Texture, "texture_perlin_pedioric_4d_256.dds");
}
return 0;
return Error;
}
#endif//GLM_LANG & GLM_LANG_CXX11_FLAG
int main()
{
int Error = 0;
# if GLM_LANG & GLM_LANG_CXX11_FLAG
Error += test_simplex();
Error += test_perlin();
Error += test_perlin_pedioric();
# endif
Error += test_simplex();
Error += test_perlin();
Error += test_perlin_pedioric();
return Error;
}