Christophe Riccio
ago%!(EXTRA string=13 years)
parent
b2f0f4d3f9
commit
6a4677c30e
23 changed files with 344 additions and 428 deletions
@ -0,0 +1,78 @@ |
|||||||
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// OpenGL Mathematics (glm.g-truc.net)
|
||||||
|
///
|
||||||
|
/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
|
||||||
|
/// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
/// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
/// in the Software without restriction, including without limitation the rights
|
||||||
|
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
/// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
/// furnished to do so, subject to the following conditions:
|
||||||
|
///
|
||||||
|
/// The above copyright notice and this permission notice shall be included in
|
||||||
|
/// all copies or substantial portions of the Software.
|
||||||
|
///
|
||||||
|
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
/// THE SOFTWARE.
|
||||||
|
///
|
||||||
|
/// @ref gtc_epsilon
|
||||||
|
/// @file glm/gtc/epsilon.hpp
|
||||||
|
/// @date 2012-04-07 / 2012-04-07
|
||||||
|
/// @author Christophe Riccio
|
||||||
|
///
|
||||||
|
/// @see core (dependence)
|
||||||
|
/// @see gtc_half_float (dependence)
|
||||||
|
/// @see gtc_quaternion (dependence)
|
||||||
|
///
|
||||||
|
/// @defgroup gtc_epsilon GLM_GTC_epsilon: Epsilon comparison
|
||||||
|
/// @ingroup gtc
|
||||||
|
///
|
||||||
|
/// @brief Comparison functions for a user defined epsilon values.
|
||||||
|
///
|
||||||
|
/// <glm/gtc/epsilon.hpp> need to be included to use these functionalities.
|
||||||
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#ifndef GLM_GTC_epsilon |
||||||
|
#define GLM_GTC_epsilon GLM_VERSION |
||||||
|
|
||||||
|
// Dependency:
|
||||||
|
#include "../glm.hpp" |
||||||
|
#include "../gtc/half_float.hpp" |
||||||
|
#include "../gtc/quaternion.hpp" |
||||||
|
|
||||||
|
#if(defined(GLM_MESSAGES) && !defined(glm_ext)) |
||||||
|
# pragma message("GLM: GLM_GTC_epsilon extension included") |
||||||
|
#endif |
||||||
|
|
||||||
|
namespace glm |
||||||
|
{ |
||||||
|
/// @addtogroup gtc_epsilon
|
||||||
|
/// @{
|
||||||
|
|
||||||
|
/// Returns the component-wise compare of |x - y| < epsilon.
|
||||||
|
/// @see gtc_epsilon
|
||||||
|
template <typename genTypeT, typename genTypeU>
|
||||||
|
bool equalEpsilon( |
||||||
|
genTypeT const & x,
|
||||||
|
genTypeT const & y,
|
||||||
|
genTypeU const & epsilon); |
||||||
|
|
||||||
|
/// Returns the component-wise compare of |x - y| >= epsilon.
|
||||||
|
/// @see gtc_epsilon
|
||||||
|
template <typename genTypeT, typename genTypeU> |
||||||
|
bool notEqualEpsilon( |
||||||
|
genTypeT const & x,
|
||||||
|
genTypeT const & y,
|
||||||
|
genTypeU const & epsilon); |
||||||
|
|
||||||
|
/// @}
|
||||||
|
}//namespace glm
|
||||||
|
|
||||||
|
#include "epsilon.inl" |
||||||
|
|
||||||
|
#endif//GLM_GTC_epsilon
|
||||||
@ -1,11 +1,30 @@ |
|||||||
/////////////////////////////////////////////////////////////////////////////////////////////////// |
/////////////////////////////////////////////////////////////////////////////////// |
||||||
// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) |
/// OpenGL Mathematics (glm.g-truc.net) |
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////// |
/// |
||||||
// Created : 2005-12-21 |
/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) |
||||||
// Updated : 2011-06-07 |
/// Permission is hereby granted, free of charge, to any person obtaining a copy |
||||||
// Licence : This source is under MIT License |
/// of this software and associated documentation files (the "Software"), to deal |
||||||
// File : glm/gtx/epsilon.inl |
/// in the Software without restriction, including without limitation the rights |
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////// |
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||||
|
/// copies of the Software, and to permit persons to whom the Software is |
||||||
|
/// furnished to do so, subject to the following conditions: |
||||||
|
/// |
||||||
|
/// The above copyright notice and this permission notice shall be included in |
||||||
|
/// all copies or substantial portions of the Software. |
||||||
|
/// |
||||||
|
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||||
|
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||||
|
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||||
|
/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||||
|
/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||||
|
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
||||||
|
/// THE SOFTWARE. |
||||||
|
/// |
||||||
|
/// @ref gtc_epsilon |
||||||
|
/// @file glm/gtc/epsilon.inl |
||||||
|
/// @date 2012-04-07 / 2012-04-07 |
||||||
|
/// @author Christophe Riccio |
||||||
|
/////////////////////////////////////////////////////////////////////////////////// |
||||||
|
|
||||||
namespace glm |
namespace glm |
||||||
{ |
{ |
||||||
@ -1,199 +0,0 @@ |
|||||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// OpenGL Mathematics Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Created : 2011-04-21
|
|
||||||
// Updated : 2011-04-26
|
|
||||||
// Licence : This source is under MIT licence
|
|
||||||
// File : test/gtx/noise.cpp
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#include <glm/glm.hpp> |
|
||||||
#include <glm/gtx/noise.hpp> |
|
||||||
#include <gli/gli.hpp> |
|
||||||
#include <gli/gtx/loader.hpp> |
|
||||||
#include <iostream> |
|
||||||
|
|
||||||
int test_simplex() |
|
||||||
{ |
|
||||||
std::size_t const Size = 256; |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::simplex(glm::vec2(x / 64.f, y / 64.f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_simplex2d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::simplex(glm::vec3(x / 64.f, y / 64.f, 0.5f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_simplex3d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::simplex(glm::vec4(x / 64.f, y / 64.f, 0.5f, 0.5f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_simplex4d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
return 0; |
|
||||||
} |
|
||||||
|
|
||||||
int test_perlin() |
|
||||||
{ |
|
||||||
std::size_t const Size = 256; |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::perlin(glm::vec2(x / 64.f, y / 64.f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_perlin2d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::perlin(glm::vec3(x / 64.f, y / 64.f, 0.5f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_perlin3d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::perlin(glm::vec4(x / 64.f, y / 64.f, 0.5f, 0.5f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_perlin4d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
return 0; |
|
||||||
} |
|
||||||
|
|
||||||
int test_perlin_pedioric() |
|
||||||
{ |
|
||||||
std::size_t const Size = 256; |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::perlin(glm::vec2(x / 64.f, y / 64.f), glm::vec2(2.0f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_perlin_pedioric_2d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::perlin(glm::vec3(x / 64.f, y / 64.f, 0.5f), glm::vec3(2.0f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_perlin_pedioric_3d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
{ |
|
||||||
std::vector<glm::byte> ImageData(Size * Size * 3); |
|
||||||
|
|
||||||
for(std::size_t y = 0; y < Size; ++y) |
|
||||||
for(std::size_t x = 0; x < Size; ++x) |
|
||||||
{ |
|
||||||
ImageData[(x + y * Size) * 3 + 0] = glm::byte(glm::perlin(glm::vec4(x / 64.f, y / 64.f, 0.5f, 0.5f), glm::vec4(2.0f)) * 128.f + 127.f); |
|
||||||
ImageData[(x + y * Size) * 3 + 1] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
ImageData[(x + y * Size) * 3 + 2] = ImageData[(x + y * Size) * 3 + 0]; |
|
||||||
} |
|
||||||
|
|
||||||
gli::texture2D Texture(1); |
|
||||||
Texture[0] = gli::image2D(glm::uvec2(Size), gli::RGB8U); |
|
||||||
memcpy(Texture[0].data(), &ImageData[0], ImageData.size()); |
|
||||||
gli::saveDDS9(Texture, "texture_perlin_pedioric_4d_256.dds"); |
|
||||||
} |
|
||||||
|
|
||||||
return 0; |
|
||||||
} |
|
||||||
|
|
||||||
int main() |
|
||||||
{ |
|
||||||
int Error = 0; |
|
||||||
|
|
||||||
Error += test_simplex(); |
|
||||||
Error += test_perlin(); |
|
||||||
Error += test_perlin_pedioric(); |
|
||||||
|
|
||||||
return Error; |
|
||||||
} |
|
||||||
Loading…
Reference in New Issue