mewin/glm
1
0
Fork 0
Code Releases Activity

Moved color_encoding to experimental

Browse Source
This commit is contained in:
Christophe Riccio
2016-11-20 21:50:12 +01:00
parent e6ee4bc90d
commit d4019aab40
8 changed files with 20 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/gtc/CMakeLists.txt
View File

@@ -1,5 +1,4 @@
glmCreateTestGTC(gtc_bitfield)
glmCreateTestGTC(gtc_color_encoding)
glmCreateTestGTC(gtc_color_space)
glmCreateTestGTC(gtc_constants)
glmCreateTestGTC(gtc_epsilon)

51
test/gtc/gtc_color_encoding.cpp
View File

@@ -1,51 +0,0 @@
#include <glm/gtc/color_encoding.hpp>
#include <glm/gtc/color_space.hpp>
#include <glm/gtc/epsilon.hpp>
#include <glm/gtc/constants.hpp>
namespace srgb
{
int test()
{
int Error(0);
glm::vec3 const ColorSourceRGB(1.0, 0.5, 0.0);
/*
{
glm::vec3 const ColorSRGB = glm::convertLinearSRGBToD65XYZ(ColorSourceRGB);
glm::vec3 const ColorRGB = glm::convertD65XYZToLinearSRGB(ColorSRGB);
Error += glm::all(glm::epsilonEqual(ColorSourceRGB, ColorRGB, 0.00001f)) ? 0 : 1;
}
*/
{
glm::vec3 const ColorSRGB = glm::convertLinearToSRGB(ColorSourceRGB, 2.8f);
glm::vec3 const ColorRGB = glm::convertSRGBToLinear(ColorSRGB, 2.8f);
Error += glm::all(glm::epsilonEqual(ColorSourceRGB, ColorRGB, 0.00001f)) ? 0 : 1;
}
glm::vec4 const ColorSourceRGBA(1.0, 0.5, 0.0, 1.0);
{
glm::vec4 const ColorSRGB = glm::convertLinearToSRGB(ColorSourceRGBA);
glm::vec4 const ColorRGB = glm::convertSRGBToLinear(ColorSRGB);
Error += glm::all(glm::epsilonEqual(ColorSourceRGBA, ColorRGB, 0.00001f)) ? 0 : 1;
}
{
glm::vec4 const ColorSRGB = glm::convertLinearToSRGB(ColorSourceRGBA, 2.8f);
glm::vec4 const ColorRGB = glm::convertSRGBToLinear(ColorSRGB, 2.8f);
Error += glm::all(glm::epsilonEqual(ColorSourceRGBA, ColorRGB, 0.00001f)) ? 0 : 1;
}
return Error;
}
}//namespace srgb
int main()
{
int Error(0);
Error += srgb::test();
return Error;
}

17
test/gtc/gtc_packing.cpp
View File

@@ -174,13 +174,6 @@ int test_Snorm3x10_1x2()
glm::uint32 p1 = glm::packSnorm3x10_1x2(v0);
glm::vec4 v1 = glm::unpackSnorm3x10_1x2(p1);
<<<<<<< HEAD
=======
printf("Snorm3x10_1x2: p0: %x; v0: %3.2f, %3.2f, %3.2f, %3.2f; p1: %x; v1: %3.2f, %3.2f, %3.2f, %3.2f\n",
p0, v0.x, v0.y, v0.z, v0.w,
p1, v1.x, v1.y, v1.z, v1.w);
>>>>>>> 0.9.8
Error += glm::all(glm::epsilonEqual(v0, v1, 0.01f)) ? 0 : 1;
}
@@ -206,13 +199,6 @@ int test_Unorm3x10_1x2()
glm::uint32 p1 = glm::packUnorm3x10_1x2(v0);
glm::vec4 v1 = glm::unpackUnorm3x10_1x2(p1);
<<<<<<< HEAD
=======
printf("Unorm3x10_1x2: p0: %x; v0: %3.2f, %3.2f, %3.2f, %3.2f; p1: %x; v1: %3.2f, %3.2f, %3.2f, %3.2f\n",
p0, v0.x, v0.y, v0.z, v0.w,
p1, v1.x, v1.y, v1.z, v1.w);
>>>>>>> 0.9.8
Error += glm::all(glm::epsilonEqual(v0, v1, 0.001f)) ? 0 : 1;
}
@@ -705,10 +691,7 @@ int main()
Error += test_F3x9_E1x5();
Error += test_RGBM();
Error += test_Unorm3x10_1x2();
<<<<<<< HEAD
Error += test_Snorm3x10_1x2();
=======
>>>>>>> 0.9.8
Error += test_I3x10_1x2();
Error += test_U3x10_1x2();