organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-10 07:18:54 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed GTX_mixed_product build

Browse source
This commit is contained in:
Christophe Riccio 2013-12-18 19:16:42 +01:00
parent e818afba4d
commit aa318f6a43
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
glm/ext.hpp
View file

@ -73,7 +73,6 @@
#include "./gtc/quaternion.hpp"
#include "./gtc/random.hpp"
#include "./gtc/reciprocal.hpp"
#include "./gtc/swizzle.hpp"
#include "./gtc/type_precision.hpp"
#include "./gtc/type_ptr.hpp"
#include "./gtc/ulp.hpp"
@ -81,7 +80,6 @@
#include "./gtx/associated_min_max.hpp"
#include "./gtx/bit.hpp"
#include "./gtx/closest_point.hpp"
#include "./gtx/color_cast.hpp"
#include "./gtx/color_space.hpp"
#include "./gtx/color_space_YCoCg.hpp"
#include "./gtx/compatibility.hpp"

4
glm/gtx/mixed_product.hpp
View file

@ -51,8 +51,8 @@ namespace glm
/// @{
/// @brief Mixed product of 3 vectors (from GLM_GTX_mixed_product extension)
template <typename valType>
valType mixedProduct(
template <typename T, precision P>
T mixedProduct(
detail::tvec3<T, P> const & v1,
detail::tvec3<T, P> const & v2,
detail::tvec3<T, P> const & v3);

4
glm/gtx/mixed_product.inl
View file

@ -9,8 +9,8 @@
namespace glm
{
template <typename valType>
GLM_FUNC_QUALIFIER valType mixedProduct
template <typename T, precision P>
GLM_FUNC_QUALIFIER T mixedProduct
(
detail::tvec3<T, P> const & v1,
detail::tvec3<T, P> const & v2,

2
test/core/core_setup_precision.cpp
View file

@ -7,8 +7,10 @@
// File : test/core/setup_precision_highp.cpp
///////////////////////////////////////////////////////////////////////////////////////////////////
#define GLM_FORCE_INLINE
#define GLM_PRECISION_HIGHP_FLOAT
#include <glm/glm.hpp>
#include <glm/ext.hpp>
static int test_mat()
{