Skip to content

Commit

Permalink
Added files for EXT packing extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
Groovounet committed Feb 7, 2020
1 parent 65c8ff2 commit 6bd53cc
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 1 deletion.
Empty file added glm/ext/scalar_packing.hpp
Empty file.
Empty file added glm/ext/scalar_packing.inl
Empty file.
32 changes: 32 additions & 0 deletions glm/ext/vector_packing.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/// @ref vector_packing
/// @file glm/ext/vector_packing.hpp
///
/// @see core (dependence)
///
/// @defgroup ext_vector_packing GLM_EXT_vector_packing
/// @ingroup ext
///
/// Include <glm/ext/vector_packing.hpp> to use the features of this extension.
///
/// This extension provides a set of function to convert vertors to packed
/// formats.

#pragma once

// Dependency:
#include "../detail/qualifier.hpp"

#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_EXT_vector_packing extension included")
#endif

namespace glm
{
/// @addtogroup ext_vector_packing
/// @{


/// @}
}// namespace glm

#include "vector_packing.inl"
Empty file added glm/ext/vector_packing.inl
Empty file.
2 changes: 1 addition & 1 deletion glm/gtc/packing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

// Dependency:
#include "type_precision.hpp"
#include "../ext/vector_packing.hpp"

#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTC_packing extension included")
Expand Down Expand Up @@ -721,7 +722,6 @@ namespace glm
/// @see int packUint2x16(u32vec2 const& v)
GLM_FUNC_DECL u32vec2 unpackUint2x32(uint64 p);


/// @}
}// namespace glm

Expand Down
28 changes: 28 additions & 0 deletions test/ext/ext_scalar_packing.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#include <glm/ext/scalar_packing.hpp>
#include <glm/ext/scalar_relational.hpp>

int test_packUnorm()
{
int Error = 0;


return Error;
}

int test_packSnorm()
{
int Error = 0;


return Error;
}

int main()
{
int Error = 0;

Error += test_packUnorm();
Error += test_packSnorm();

return Error;
}
58 changes: 58 additions & 0 deletions test/ext/ext_vector_packing.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#include <glm/ext/vector_packing.hpp>
#include <glm/ext/vector_relational.hpp>
#include <glm/ext/vector_uint2_sized.hpp>
#include <glm/ext/vector_int2_sized.hpp>
#include <glm/gtc/packing.hpp>
#include <glm/vec2.hpp>
#include <vector>

int test_packUnorm()
{
int Error = 0;

std::vector<glm::vec2> A;
A.push_back(glm::vec2(1.0f, 0.7f));
A.push_back(glm::vec2(0.5f, 0.1f));

for (std::size_t i = 0; i < A.size(); ++i)
{
glm::vec2 B(A[i]);
glm::u16vec2 C = glm::packUnorm<glm::uint16>(B);
glm::vec2 D = glm::unpackUnorm<float>(C);
Error += glm::all(glm::equal(B, D, 1.0f / 255.f)) ? 0 : 1;
assert(!Error);
}

return Error;
}

int test_packSnorm()
{
int Error = 0;

std::vector<glm::vec2> A;
A.push_back(glm::vec2(1.0f, 0.0f));
A.push_back(glm::vec2(-0.5f, -0.7f));
A.push_back(glm::vec2(-0.1f, 0.1f));

for (std::size_t i = 0; i < A.size(); ++i)
{
glm::vec2 B(A[i]);
glm::i16vec2 C = glm::packSnorm<glm::int16>(B);
glm::vec2 D = glm::unpackSnorm<float>(C);
Error += glm::all(glm::equal(B, D, 1.0f / 32767.0f * 2.0f)) ? 0 : 1;
assert(!Error);
}

return Error;
}

int main()
{
int Error = 0;

Error += test_packUnorm();
Error += test_packSnorm();

return Error;
}

0 comments on commit 6bd53cc

Please sign in to comment.