mirror of
https://github.com/g-truc/glm.git
synced 2024-11-22 17:04:35 +00:00
- Added more information to build messages
This commit is contained in:
parent
10dc67e2b5
commit
a609a0fea6
@ -3,6 +3,24 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Messages
|
||||||
|
|
||||||
|
#ifdef GLM_MESSAGES
|
||||||
|
# pragma message("GLM: GLM_MESSAGES is deprecated, use GLM_FORCE_MESSAGES instead")
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define GLM_MESSAGES_ENABLED 1
|
||||||
|
#define GLM_MESSAGES_DISABLE 0
|
||||||
|
|
||||||
|
#if defined(GLM_FORCE_MESSAGES) || defined(GLM_MESSAGES)
|
||||||
|
# undef GLM_MESSAGES
|
||||||
|
# define GLM_MESSAGES GLM_MESSAGES_ENABLED
|
||||||
|
#else
|
||||||
|
# undef GLM_MESSAGES
|
||||||
|
# define GLM_MESSAGES GLM_MESSAGES_DISABLE
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include "../simd/platform.h"
|
#include "../simd/platform.h"
|
||||||
@ -16,13 +34,13 @@
|
|||||||
#define GLM_VERSION_PATCH 8
|
#define GLM_VERSION_PATCH 8
|
||||||
#define GLM_VERSION_REVISION 0
|
#define GLM_VERSION_REVISION 0
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_VERSION_DISPLAYED)
|
||||||
# define GLM_MESSAGE_VERSION_DISPLAYED
|
# define GLM_MESSAGE_VERSION_DISPLAYED
|
||||||
# pragma message ("GLM: version 0.9.8.0")
|
# pragma message ("GLM: version 0.9.8.0")
|
||||||
#endif//GLM_MESSAGES
|
#endif//GLM_MESSAGES
|
||||||
|
|
||||||
// Report compiler detection
|
// Report compiler detection
|
||||||
#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_COMPILER_DISPLAYED)
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_COMPILER_DISPLAYED)
|
||||||
# define GLM_MESSAGE_COMPILER_DISPLAYED
|
# define GLM_MESSAGE_COMPILER_DISPLAYED
|
||||||
# if GLM_COMPILER & GLM_COMPILER_CUDA
|
# if GLM_COMPILER & GLM_COMPILER_CUDA
|
||||||
# pragma message("GLM: CUDA compiler detected")
|
# pragma message("GLM: CUDA compiler detected")
|
||||||
@ -54,7 +72,7 @@
|
|||||||
# error "GLM_MODEL undefined, your compiler may not be supported by GLM. Add #define GLM_MODEL 0 to ignore this message."
|
# error "GLM_MODEL undefined, your compiler may not be supported by GLM. Add #define GLM_MODEL 0 to ignore this message."
|
||||||
#endif//GLM_MODEL
|
#endif//GLM_MODEL
|
||||||
|
|
||||||
#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_MODEL_DISPLAYED)
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_MODEL_DISPLAYED)
|
||||||
# define GLM_MESSAGE_MODEL_DISPLAYED
|
# define GLM_MESSAGE_MODEL_DISPLAYED
|
||||||
# if(GLM_MODEL == GLM_MODEL_64)
|
# if(GLM_MODEL == GLM_MODEL_64)
|
||||||
# pragma message("GLM: 64 bits model")
|
# pragma message("GLM: 64 bits model")
|
||||||
@ -63,7 +81,7 @@
|
|||||||
# endif//GLM_MODEL
|
# endif//GLM_MODEL
|
||||||
#endif//GLM_MESSAGES
|
#endif//GLM_MESSAGES
|
||||||
|
|
||||||
#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_ARCH_DISPLAYED)
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_ARCH_DISPLAYED)
|
||||||
# define GLM_MESSAGE_ARCH_DISPLAYED
|
# define GLM_MESSAGE_ARCH_DISPLAYED
|
||||||
# if(GLM_ARCH == GLM_ARCH_PURE)
|
# if(GLM_ARCH == GLM_ARCH_PURE)
|
||||||
# pragma message("GLM: Platform independent code")
|
# pragma message("GLM: Platform independent code")
|
||||||
@ -230,7 +248,7 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_LANG_DISPLAYED)
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_LANG_DISPLAYED)
|
||||||
# define GLM_MESSAGE_LANG_DISPLAYED
|
# define GLM_MESSAGE_LANG_DISPLAYED
|
||||||
|
|
||||||
# if GLM_LANG & GLM_LANG_CXX1Z_FLAG
|
# if GLM_LANG & GLM_LANG_CXX1Z_FLAG
|
||||||
@ -526,17 +544,22 @@
|
|||||||
|
|
||||||
// User defines: GLM_FORCE_SWIZZLE
|
// User defines: GLM_FORCE_SWIZZLE
|
||||||
|
|
||||||
#define GLM_SWIZZLE_ENABLED 1
|
#ifdef GLM_SWIZZLE
|
||||||
#define GLM_SWIZZLE_DISABLE 0
|
# pragma message("GLM: GLM_SWIZZLE is deprecated, use GLM_FORCE_SWIZZLE instead")
|
||||||
#if defined(GLM_FORCE_SWIZZLE) || defined(GLM_SWIZZLE)
|
|
||||||
#undef GLM_SWIZZLE
|
|
||||||
#define GLM_SWIZZLE GLM_SWIZZLE_ENABLED
|
|
||||||
#else
|
|
||||||
#undef GLM_SWIZZLE
|
|
||||||
#define GLM_SWIZZLE GLM_SWIZZLE_DISABLE
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED)
|
#define GLM_SWIZZLE_ENABLED 1
|
||||||
|
#define GLM_SWIZZLE_DISABLE 0
|
||||||
|
|
||||||
|
#if defined(GLM_FORCE_SWIZZLE) || defined(GLM_SWIZZLE)
|
||||||
|
# undef GLM_SWIZZLE
|
||||||
|
# define GLM_SWIZZLE GLM_SWIZZLE_ENABLED
|
||||||
|
#else
|
||||||
|
# undef GLM_SWIZZLE
|
||||||
|
# define GLM_SWIZZLE GLM_SWIZZLE_DISABLE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED)
|
||||||
# define GLM_MESSAGE_SWIZZLE_DISPLAYED
|
# define GLM_MESSAGE_SWIZZLE_DISPLAYED
|
||||||
# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||||
# pragma message("GLM: Swizzling operators enabled")
|
# pragma message("GLM: Swizzling operators enabled")
|
||||||
@ -545,6 +568,18 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif//GLM_MESSAGES
|
#endif//GLM_MESSAGES
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Allows using not basic types as genType
|
||||||
|
|
||||||
|
// #define GLM_FORCE_UNRESTRICTED_GENTYPE
|
||||||
|
|
||||||
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_UNRESTRICTED_GENTYPE_DISPLAYED)
|
||||||
|
# define GLM_MESSAGE_UNRESTRICTED_GENTYPE_DISPLAYED
|
||||||
|
# ifdef GLM_FORCE_UNRESTRICTED_GENTYPE
|
||||||
|
# pragma message("GLM: Use unrestricted genType")
|
||||||
|
# endif
|
||||||
|
#endif//GLM_MESSAGES
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
// Clip control
|
// Clip control
|
||||||
|
|
||||||
@ -561,10 +596,14 @@
|
|||||||
# define GLM_DEPTH_CLIP_SPACE GLM_DEPTH_NEGATIVE_ONE_TO_ONE
|
# define GLM_DEPTH_CLIP_SPACE GLM_DEPTH_NEGATIVE_ONE_TO_ONE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_DEPTH_DISPLAYED)
|
||||||
// Allows using not basic types as genType
|
# define GLM_MESSAGE_DEPTH_DISPLAYED
|
||||||
|
# if GLM_DEPTH_CLIP_SPACE == GLM_DEPTH_ZERO_TO_ONE
|
||||||
// #define GLM_FORCE_UNRESTRICTED_GENTYPE
|
# pragma message("GLM: Depth clip space: Zero to one")
|
||||||
|
# else
|
||||||
|
# pragma message("GLM: Depth clip space: negative one to one")
|
||||||
|
# endif
|
||||||
|
#endif//GLM_MESSAGES
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
// Coordinate system, define GLM_FORCE_LEFT_HANDED before including GLM
|
// Coordinate system, define GLM_FORCE_LEFT_HANDED before including GLM
|
||||||
@ -581,7 +620,16 @@
|
|||||||
# define GLM_COORDINATE_SYSTEM GLM_LEFT_HANDED
|
# define GLM_COORDINATE_SYSTEM GLM_LEFT_HANDED
|
||||||
#else
|
#else
|
||||||
# define GLM_COORDINATE_SYSTEM GLM_RIGHT_HANDED
|
# define GLM_COORDINATE_SYSTEM GLM_RIGHT_HANDED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_HANDED_DISPLAYED)
|
||||||
|
# define GLM_MESSAGE_HANDED_DISPLAYED
|
||||||
|
# if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
|
||||||
|
# pragma message("GLM: Coordinate system: left handed")
|
||||||
|
# else
|
||||||
|
# pragma message("GLM: Coordinate system: right handed")
|
||||||
|
# endif
|
||||||
|
#endif//GLM_MESSAGES
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
// Qualifiers
|
// Qualifiers
|
||||||
@ -689,7 +737,7 @@ namespace glm
|
|||||||
# endif
|
# endif
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_FORCE_SIZE_T_LENGTH)
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_FORCE_SIZE_T_LENGTH)
|
||||||
# define GLM_MESSAGE_FORCE_SIZE_T_LENGTH
|
# define GLM_MESSAGE_FORCE_SIZE_T_LENGTH
|
||||||
# if defined GLM_FORCE_SIZE_T_LENGTH
|
# if defined GLM_FORCE_SIZE_T_LENGTH
|
||||||
# pragma message("GLM: .length() returns glm::length_t, a typedef of std::size_t")
|
# pragma message("GLM: .length() returns glm::length_t, a typedef of std::size_t")
|
||||||
|
@ -27,7 +27,9 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED))
|
#include "glm.hpp"
|
||||||
|
|
||||||
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED)
|
||||||
# define GLM_MESSAGE_EXT_INCLUDED_DISPLAYED
|
# define GLM_MESSAGE_EXT_INCLUDED_DISPLAYED
|
||||||
# pragma message("GLM: All extensions included (not recommanded)")
|
# pragma message("GLM: All extensions included (not recommanded)")
|
||||||
#endif//GLM_MESSAGES
|
#endif//GLM_MESSAGES
|
||||||
|
@ -60,7 +60,7 @@
|
|||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include "fwd.hpp"
|
#include "fwd.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED)
|
||||||
# define GLM_MESSAGE_CORE_INCLUDED_DISPLAYED
|
# define GLM_MESSAGE_CORE_INCLUDED_DISPLAYED
|
||||||
# pragma message("GLM: Core library included")
|
# pragma message("GLM: Core library included")
|
||||||
#endif//GLM_MESSAGES
|
#endif//GLM_MESSAGES
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#include "../detail/_vectorize.hpp"
|
#include "../detail/_vectorize.hpp"
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_bitfield extension included")
|
# pragma message("GLM: GLM_GTC_bitfield extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "../vec4.hpp"
|
#include "../vec4.hpp"
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_color_space extension included")
|
# pragma message("GLM: GLM_GTC_color_space extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependencies
|
// Dependencies
|
||||||
#include "../detail/setup.hpp"
|
#include "../detail/setup.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_constants extension included")
|
# pragma message("GLM: GLM_GTC_constants extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../detail/setup.hpp"
|
#include "../detail/setup.hpp"
|
||||||
#include "../detail/precision.hpp"
|
#include "../detail/precision.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_epsilon extension included")
|
# pragma message("GLM: GLM_GTC_epsilon extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "../detail/precision.hpp"
|
#include "../detail/precision.hpp"
|
||||||
#include "../detail/type_vec2.hpp"
|
#include "../detail/type_vec2.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_functions extension included")
|
# pragma message("GLM: GLM_GTC_functions extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "../detail/func_exponential.hpp"
|
#include "../detail/func_exponential.hpp"
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_integer extension included")
|
# pragma message("GLM: GLM_GTC_integer extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../detail/setup.hpp"
|
#include "../detail/setup.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_matrix_access extension included")
|
# pragma message("GLM: GLM_GTC_matrix_access extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include "../mat4x3.hpp"
|
#include "../mat4x3.hpp"
|
||||||
#include "../mat4x4.hpp"
|
#include "../mat4x4.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_matrix_integer extension included")
|
# pragma message("GLM: GLM_GTC_matrix_integer extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../mat3x3.hpp"
|
#include "../mat3x3.hpp"
|
||||||
#include "../mat4x4.hpp"
|
#include "../mat4x4.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_matrix_inverse extension included")
|
# pragma message("GLM: GLM_GTC_matrix_inverse extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#include "../vec4.hpp"
|
#include "../vec4.hpp"
|
||||||
#include "../gtc/constants.hpp"
|
#include "../gtc/constants.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_matrix_transform extension included")
|
# pragma message("GLM: GLM_GTC_matrix_transform extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "../vec3.hpp"
|
#include "../vec3.hpp"
|
||||||
#include "../vec4.hpp"
|
#include "../vec4.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_noise extension included")
|
# pragma message("GLM: GLM_GTC_noise extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "type_precision.hpp"
|
#include "type_precision.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_packing extension included")
|
# pragma message("GLM: GLM_GTC_packing extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "../vec4.hpp"
|
#include "../vec4.hpp"
|
||||||
#include "../gtc/constants.hpp"
|
#include "../gtc/constants.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_quaternion extension included")
|
# pragma message("GLM: GLM_GTC_quaternion extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../vec2.hpp"
|
#include "../vec2.hpp"
|
||||||
#include "../vec3.hpp"
|
#include "../vec3.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_random extension included")
|
# pragma message("GLM: GLM_GTC_random extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependencies
|
// Dependencies
|
||||||
#include "../detail/setup.hpp"
|
#include "../detail/setup.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_reciprocal extension included")
|
# pragma message("GLM: GLM_GTC_reciprocal extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "../common.hpp"
|
#include "../common.hpp"
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_integer extension included")
|
# pragma message("GLM: GLM_GTC_integer extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -9,15 +9,15 @@
|
|||||||
/// @brief Aligned types.
|
/// @brief Aligned types.
|
||||||
/// <glm/gtc/type_aligned.hpp> need to be included to use these features.
|
/// <glm/gtc/type_aligned.hpp> need to be included to use these features.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#if !GLM_HAS_ALIGNED_TYPE
|
#if !GLM_HAS_ALIGNED_TYPE
|
||||||
# error "GLM: Aligned types are not supported on this platform"
|
# error "GLM: Aligned types are not supported on this platform"
|
||||||
#endif
|
#endif
|
||||||
#if(defined(GLM_MESSAGES) && !defined(glm_ext))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_type_aligned extension included")
|
# pragma message("GLM: GLM_GTC_type_aligned extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../vec2.hpp"
|
#include "../vec2.hpp"
|
||||||
#include "../vec3.hpp"
|
#include "../vec3.hpp"
|
||||||
#include "../vec4.hpp"
|
#include "../vec4.hpp"
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#include "../mat4x3.hpp"
|
#include "../mat4x3.hpp"
|
||||||
#include "../mat4x4.hpp"
|
#include "../mat4x4.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_type_precision extension included")
|
# pragma message("GLM: GLM_GTC_type_precision extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
#include "../mat4x4.hpp"
|
#include "../mat4x4.hpp"
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_type_ptr extension included")
|
# pragma message("GLM: GLM_GTC_type_ptr extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../detail/precision.hpp"
|
#include "../detail/precision.hpp"
|
||||||
#include "../detail/type_int.hpp"
|
#include "../detail/type_int.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_ulp extension included")
|
# pragma message("GLM: GLM_GTC_ulp extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../detail/type_vec1.hpp"
|
#include "../detail/type_vec1.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTC_vec1 extension included")
|
# pragma message("GLM: GLM_GTC_vec1 extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_associated_min_max extension included")
|
# pragma message("GLM: GLM_GTX_associated_min_max extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependencies
|
// Dependencies
|
||||||
#include "../gtc/bitfield.hpp"
|
#include "../gtc/bitfield.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_bit extension is deprecated, include GLM_GTC_bitfield and GLM_GTC_integer instead")
|
# pragma message("GLM: GLM_GTX_bit extension is deprecated, include GLM_GTC_bitfield and GLM_GTC_integer instead")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_closest_point extension included")
|
# pragma message("GLM: GLM_GTX_closest_point extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_color_space extension included")
|
# pragma message("GLM: GLM_GTX_color_space extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_color_space_YCoCg extension included")
|
# pragma message("GLM: GLM_GTX_color_space_YCoCg extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "../vec4.hpp"
|
#include "../vec4.hpp"
|
||||||
#include "../gtc/vec1.hpp"
|
#include "../gtc/vec1.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_common extension included")
|
# pragma message("GLM: GLM_GTX_common extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -17,13 +17,13 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtc/quaternion.hpp"
|
#include "../gtc/quaternion.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_compatibility extension included")
|
# pragma message("GLM: GLM_GTX_compatibility extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if(GLM_COMPILER & GLM_COMPILER_VC)
|
#if GLM_COMPILER & GLM_COMPILER_VC
|
||||||
# include <cfloat>
|
# include <cfloat>
|
||||||
#elif(GLM_COMPILER & GLM_COMPILER_GCC)
|
#elif GLM_COMPILER & GLM_COMPILER_GCC
|
||||||
# include <cmath>
|
# include <cmath>
|
||||||
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
|
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
|
||||||
# undef isfinite
|
# undef isfinite
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../detail/setup.hpp"
|
#include "../detail/setup.hpp"
|
||||||
#include "../detail/precision.hpp"
|
#include "../detail/precision.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_component_wise extension included")
|
# pragma message("GLM: GLM_GTX_component_wise extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "../gtc/constants.hpp"
|
#include "../gtc/constants.hpp"
|
||||||
#include "../gtc/quaternion.hpp"
|
#include "../gtc/quaternion.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_dual_quaternion extension included")
|
# pragma message("GLM: GLM_GTX_dual_quaternion extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_euler_angles extension included")
|
# pragma message("GLM: GLM_GTX_euler_angles extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_extend extension included")
|
# pragma message("GLM: GLM_GTX_extend extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_extented_min_max extension included")
|
# pragma message("GLM: GLM_GTX_extented_min_max extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_fast_exponential extension included")
|
# pragma message("GLM: GLM_GTX_fast_exponential extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "../exponential.hpp"
|
#include "../exponential.hpp"
|
||||||
#include "../geometric.hpp"
|
#include "../geometric.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_fast_square_root extension included")
|
# pragma message("GLM: GLM_GTX_fast_square_root extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../gtc/constants.hpp"
|
#include "../gtc/constants.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_fast_trigonometry extension included")
|
# pragma message("GLM: GLM_GTX_fast_trigonometry extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtx/optimum_pow.hpp"
|
#include "../gtx/optimum_pow.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_gradient_paint extension included")
|
# pragma message("GLM: GLM_GTX_gradient_paint extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_handed_coordinate_space extension included")
|
# pragma message("GLM: GLM_GTX_handed_coordinate_space extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtc/integer.hpp"
|
#include "../gtc/integer.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_integer extension included")
|
# pragma message("GLM: GLM_GTX_integer extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "../gtx/closest_point.hpp"
|
#include "../gtx/closest_point.hpp"
|
||||||
#include "../gtx/vector_query.hpp"
|
#include "../gtx/vector_query.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_closest_point extension included")
|
# pragma message("GLM: GLM_GTX_closest_point extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtx/quaternion.hpp"
|
#include "../gtx/quaternion.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(glm_ext))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_io extension included")
|
# pragma message("GLM: GLM_GTX_io extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_log_base extension included")
|
# pragma message("GLM: GLM_GTX_log_base extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_matrix_cross_product extension included")
|
# pragma message("GLM: GLM_GTX_matrix_cross_product extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#include "../gtc/quaternion.hpp"
|
#include "../gtc/quaternion.hpp"
|
||||||
#include "../gtc/matrix_transform.hpp"
|
#include "../gtc/matrix_transform.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_matrix_decompose extension included")
|
# pragma message("GLM: GLM_GTX_matrix_decompose extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_matrix_interpolation extension included")
|
# pragma message("GLM: GLM_GTX_matrix_interpolation extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_matrix_major_storage extension included")
|
# pragma message("GLM: GLM_GTX_matrix_major_storage extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_matrix_operation extension included")
|
# pragma message("GLM: GLM_GTX_matrix_operation extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../gtx/vector_query.hpp"
|
#include "../gtx/vector_query.hpp"
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_matrix_query extension included")
|
# pragma message("GLM: GLM_GTX_matrix_query extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../vec2.hpp"
|
#include "../vec2.hpp"
|
||||||
|
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_matrix_transform_2d extension included")
|
# pragma message("GLM: GLM_GTX_matrix_transform_2d extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_mixed_product extension included")
|
# pragma message("GLM: GLM_GTX_mixed_product extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "../detail/func_geometric.hpp"
|
#include "../detail/func_geometric.hpp"
|
||||||
#include "../gtx/quaternion.hpp"
|
#include "../gtx/quaternion.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_norm extension included")
|
# pragma message("GLM: GLM_GTX_norm extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_normal extension included")
|
# pragma message("GLM: GLM_GTX_normal extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../gtx/fast_square_root.hpp"
|
#include "../gtx/fast_square_root.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_normalize_dot extension included")
|
# pragma message("GLM: GLM_GTX_normalize_dot extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtc/type_precision.hpp"
|
#include "../gtc/type_precision.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_number_precision extension included")
|
# pragma message("GLM: GLM_GTX_number_precision extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_optimum_pow extension included")
|
# pragma message("GLM: GLM_GTX_optimum_pow extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "../mat3x3.hpp"
|
#include "../mat3x3.hpp"
|
||||||
#include "../geometric.hpp"
|
#include "../geometric.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_orthonormalize extension included")
|
# pragma message("GLM: GLM_GTX_orthonormalize extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtx/projection.hpp"
|
#include "../gtx/projection.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_perpendicular extension included")
|
# pragma message("GLM: GLM_GTX_perpendicular extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_polar_coordinates extension included")
|
# pragma message("GLM: GLM_GTX_polar_coordinates extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../geometric.hpp"
|
#include "../geometric.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_projection extension included")
|
# pragma message("GLM: GLM_GTX_projection extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "../gtc/quaternion.hpp"
|
#include "../gtc/quaternion.hpp"
|
||||||
#include "../gtx/norm.hpp"
|
#include "../gtx/norm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_quaternion extension included")
|
# pragma message("GLM: GLM_GTX_quaternion extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "../detail/setup.hpp"
|
#include "../detail/setup.hpp"
|
||||||
#include "../detail/type_int.hpp"
|
#include "../detail/type_int.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_raw_data extension included")
|
# pragma message("GLM: GLM_GTX_raw_data extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "../gtc/epsilon.hpp"
|
#include "../gtc/epsilon.hpp"
|
||||||
#include "../gtc/quaternion.hpp"
|
#include "../gtc/quaternion.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included")
|
# pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtx/transform.hpp"
|
#include "../gtx/transform.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_rotate_vector extension included")
|
# pragma message("GLM: GLM_GTX_rotate_vector extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_extend extension included")
|
# pragma message("GLM: GLM_GTX_extend extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
# error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics"
|
# error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_simd_mat4 extension included")
|
# pragma message("GLM: GLM_GTX_simd_mat4 extension included")
|
||||||
# pragma message("GLM: GLM_GTX_simd_mat4 extension is deprecated and will be removed in GLM 0.9.9. Use mat4 instead and use compiler SIMD arguments.")
|
# pragma message("GLM: GLM_GTX_simd_mat4 extension is deprecated and will be removed in GLM 0.9.9. Use mat4 instead and use compiler SIMD arguments.")
|
||||||
#endif
|
#endif
|
||||||
|
@ -17,15 +17,15 @@
|
|||||||
#include "../gtc/quaternion.hpp"
|
#include "../gtc/quaternion.hpp"
|
||||||
#include "../gtx/fast_trigonometry.hpp"
|
#include "../gtx/fast_trigonometry.hpp"
|
||||||
|
|
||||||
#if(GLM_ARCH != GLM_ARCH_PURE)
|
#if GLM_ARCH != GLM_ARCH_PURE
|
||||||
|
|
||||||
#if(GLM_ARCH & GLM_ARCH_SSE2_BIT)
|
#if GLM_ARCH & GLM_ARCH_SSE2_BIT
|
||||||
# include "../gtx/simd_mat4.hpp"
|
# include "../gtx/simd_mat4.hpp"
|
||||||
#else
|
#else
|
||||||
# error "GLM: GLM_GTX_simd_quat requires compiler support of SSE2 through intrinsics"
|
# error "GLM: GLM_GTX_simd_quat requires compiler support of SSE2 through intrinsics"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_simd_quat extension included")
|
# pragma message("GLM: GLM_GTX_simd_quat extension included")
|
||||||
# pragma message("GLM: GLM_GTX_simd_quat extension is deprecated and will be removed in GLM 0.9.9. Use GLM_GTC_quaternion instead and use compiler SIMD arguments.")
|
# pragma message("GLM: GLM_GTX_simd_quat extension is deprecated and will be removed in GLM 0.9.9. Use GLM_GTC_quaternion instead and use compiler SIMD arguments.")
|
||||||
#endif
|
#endif
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
# error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics"
|
# error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_simd_vec4 extension included")
|
# pragma message("GLM: GLM_GTX_simd_vec4 extension included")
|
||||||
# pragma message("GLM: GLM_GTX_simd_vec4 extension is deprecated and will be removed in GLM 0.9.9. Use *vec4 types instead and use compiler SIMD arguments.")
|
# pragma message("GLM: GLM_GTX_simd_vec4 extension is deprecated and will be removed in GLM 0.9.9. Use *vec4 types instead and use compiler SIMD arguments.")
|
||||||
#endif
|
#endif
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtx/optimum_pow.hpp"
|
#include "../gtx/optimum_pow.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_spline extension included")
|
# pragma message("GLM: GLM_GTX_spline extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_std_based_type extension included")
|
# pragma message("GLM: GLM_GTX_std_based_type extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
# error "GLM_GTX_string_cast is not supported on CUDA compiler"
|
# error "GLM_GTX_string_cast is not supported on CUDA compiler"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_string_cast extension included")
|
# pragma message("GLM: GLM_GTX_string_cast extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtc/matrix_transform.hpp"
|
#include "../gtc/matrix_transform.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_transform extension included")
|
# pragma message("GLM: GLM_GTX_transform extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtx/transform.hpp"
|
#include "../gtx/transform.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_transform2 extension included")
|
# pragma message("GLM: GLM_GTX_transform2 extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../gtc/type_precision.hpp"
|
#include "../gtc/type_precision.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_type_aligned extension included")
|
# pragma message("GLM: GLM_GTX_type_aligned extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "../gtc/quaternion.hpp"
|
#include "../gtc/quaternion.hpp"
|
||||||
#include "../gtx/dual_quaternion.hpp"
|
#include "../gtx/dual_quaternion.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_type_trait extension included")
|
# pragma message("GLM: GLM_GTX_type_trait extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#include "../gtx/quaternion.hpp"
|
#include "../gtx/quaternion.hpp"
|
||||||
#include "../gtx/rotate_vector.hpp"
|
#include "../gtx/rotate_vector.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_vector_angle extension included")
|
# pragma message("GLM: GLM_GTX_vector_angle extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include <cfloat>
|
#include <cfloat>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_vector_query extension included")
|
# pragma message("GLM: GLM_GTX_vector_query extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../gtc/vec1.hpp"
|
#include "../gtc/vec1.hpp"
|
||||||
|
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||||
# pragma message("GLM: GLM_GTX_wrap extension included")
|
# pragma message("GLM: GLM_GTX_wrap extension included")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#endif//
|
#endif//
|
||||||
|
|
||||||
// Report platform detection
|
// Report platform detection
|
||||||
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_PLATFORM_DISPLAYED))
|
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_PLATFORM_DISPLAYED)
|
||||||
# define GLM_MESSAGE_PLATFORM_DISPLAYED
|
# define GLM_MESSAGE_PLATFORM_DISPLAYED
|
||||||
# if(GLM_PLATFORM & GLM_PLATFORM_QNXNTO)
|
# if(GLM_PLATFORM & GLM_PLATFORM_QNXNTO)
|
||||||
# pragma message("GLM: QNX platform detected")
|
# pragma message("GLM: QNX platform detected")
|
||||||
|
@ -84,6 +84,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
|
|||||||
- Use Cuda built-in function for abs function implementation with Cuda compiler
|
- Use Cuda built-in function for abs function implementation with Cuda compiler
|
||||||
- Factorized GLM_COMPILER_LLVM and GLM_COMPILER_APPLE_CLANG into GLM_COMPILER_CLANG
|
- Factorized GLM_COMPILER_LLVM and GLM_COMPILER_APPLE_CLANG into GLM_COMPILER_CLANG
|
||||||
- No more warnings for use of long long
|
- No more warnings for use of long long
|
||||||
|
- Added more information to build messages
|
||||||
|
|
||||||
##### Fixes:
|
##### Fixes:
|
||||||
- Fixed GTX_extended_min_max filename typo #386
|
- Fixed GTX_extended_min_max filename typo #386
|
||||||
@ -101,6 +102,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
|
|||||||
- Deprecated GLM_GTX_simd_mat4 extension
|
- Deprecated GLM_GTX_simd_mat4 extension
|
||||||
- Deprecated GLM_GTX_simd_quat extension
|
- Deprecated GLM_GTX_simd_quat extension
|
||||||
- Deprecated GLM_SWIZZLE, use GLM_FORCE_SWIZZLE instead
|
- Deprecated GLM_SWIZZLE, use GLM_FORCE_SWIZZLE instead
|
||||||
|
- Deprecated GLM_MESSAGES, use GLM_FORCE_MESSAGES instead
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
#### [GLM 0.9.7.6](https://github.com/g-truc/glm/releases/tag/0.9.7.6) - 2016-07-16
|
#### [GLM 0.9.7.6](https://github.com/g-truc/glm/releases/tag/0.9.7.6) - 2016-07-16
|
||||||
|
@ -529,8 +529,8 @@ namespace bitfieldReverse
|
|||||||
{
|
{
|
||||||
int Error = 0;
|
int Error = 0;
|
||||||
|
|
||||||
Error += perf32(Samples);
|
Error += perf32(static_cast<glm::uint32>(Samples));
|
||||||
Error += perf64(Samples);
|
Error += perf64(static_cast<glm::uint64>(Samples));
|
||||||
|
|
||||||
return Error;
|
return Error;
|
||||||
}
|
}
|
||||||
@ -1459,7 +1459,7 @@ namespace bitCount
|
|||||||
// bitCount - TimeIf
|
// bitCount - TimeIf
|
||||||
{
|
{
|
||||||
for(std::size_t i = 0, n = v.size(); i < n; ++i)
|
for(std::size_t i = 0, n = v.size(); i < n; ++i)
|
||||||
v[i] = bitCount_if(i);
|
v[i] = bitCount_if(static_cast<int>(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
std::clock_t TimestampsB = std::clock();
|
std::clock_t TimestampsB = std::clock();
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#define GLM_MESSAGES
|
#define GLM_FORCE_MESSAGES
|
||||||
#define GLM_FORCE_SWIZZLE
|
#define GLM_FORCE_SWIZZLE
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#define GLM_MESSAGES
|
#define GLM_FORCE_MESSAGES
|
||||||
#include <glm/vec3.hpp>
|
#include <glm/vec3.hpp>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#define GLM_MESSAGES
|
#define GLM_FORCE_MESSAGES
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
#if GLM_HAS_ALIGNED_TYPE
|
#if GLM_HAS_ALIGNED_TYPE
|
||||||
|
Loading…
Reference in New Issue
Block a user