Merge branch 'master' of https://github.com/g-truc/glm into patch-2

# Conflicts:
#	manual.md
This commit is contained in:
Jesse Talavera-Greenberg 2016-11-12 17:57:51 -05:00
commit 8e789fe4ed
No known key found for this signature in database
GPG Key ID: 100D3E7396EED2B6
122 changed files with 401 additions and 101 deletions

View File

@ -164,7 +164,7 @@ set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm")
install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake"
VERSION ${GLM_VERSION}
COMPATIBILITY AnyNewerVersion
)
@ -188,7 +188,7 @@ configure_package_config_file(
install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake"
DESTINATION ${GLM_INSTALL_CONFIGDIR}
)

View File

@ -54,12 +54,14 @@ namespace detail
return _mm_popcnt_u32(x);
}
# if(GLM_MODEL == GLM_MODEL_64)
template <>
GLM_FUNC_QUALIFIER int bitCount(uint64 x)
{
return static_cast<int>(_mm_popcnt_u64(x));
}
# endif
# endif//GLM_MODEL
# endif//GLM_ARCH
}//namespace glm

View File

@ -1,6 +1,7 @@
/// @ref core
/// @file glm/glm.cpp
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>
#include <glm/gtx/dual_quaternion.hpp>

View File

@ -60,6 +60,7 @@
# include "./gtc/type_aligned.hpp"
#endif
#ifdef GLM_ENABLE_EXPERIMENTAL
#include "./gtx/associated_min_max.hpp"
#include "./gtx/bit.hpp"
#include "./gtx/closest_point.hpp"
@ -116,3 +117,4 @@
#if GLM_HAS_RANGE_FOR
# include "./gtx/range.hpp"
#endif
#endif//GLM_ENABLE_EXPERIMENTAL

View File

@ -2,7 +2,6 @@
/// @file glm/gtc/constants.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
///
/// @defgroup gtc_constants GLM_GTC_constants
/// @ingroup gtc

View File

@ -2,7 +2,6 @@
/// @file glm/gtc/epsilon.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
/// @see gtc_quaternion (dependence)
///
/// @defgroup gtc_epsilon GLM_GTC_epsilon

View File

@ -2,7 +2,6 @@
/// @file glm/gtc/functions.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
/// @see gtc_quaternion (dependence)
///
/// @defgroup gtc_functions GLM_GTC_functions

View File

@ -2,7 +2,6 @@
/// @file glm/gtc/quaternion.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
/// @see gtc_constants (dependence)
///
/// @defgroup gtc_quaternion GLM_GTC_quaternion

View File

@ -2,7 +2,6 @@
/// @file glm/gtc/random.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
/// @see gtx_random (extended)
///
/// @defgroup gtc_random GLM_GTC_random

View File

@ -2,7 +2,6 @@
/// @file glm/gtc/type_precision.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
/// @see gtc_quaternion (dependence)
///
/// @defgroup gtc_type_precision GLM_GTC_type_precision

View File

@ -2,7 +2,6 @@
/// @file glm/gtc/type_ptr.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
/// @see gtc_quaternion (dependence)
///
/// @defgroup gtc_type_ptr GLM_GTC_type_ptr

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GTX_associated_min_max is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_associated_min_max extension included")
#endif

View File

@ -2,7 +2,6 @@
/// @file glm/gtx/bit.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
///
/// @defgroup gtx_bit GLM_GTX_bit
/// @ingroup gtx
@ -16,6 +15,10 @@
// Dependencies
#include "../gtc/bitfield.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_bit is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#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")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_closest_point is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_closest_point extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_color_space is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_color_space extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_color_space_YCoCg is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_color_space_YCoCg extension included")
#endif

View File

@ -2,7 +2,6 @@
/// @file glm/gtx/common.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
///
/// @defgroup gtx_common GLM_GTX_common
/// @ingroup gtx
@ -19,6 +18,10 @@
#include "../vec4.hpp"
#include "../gtc/vec1.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_common is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_common extension included")
#endif

View File

@ -2,7 +2,6 @@
/// @file glm/gtx/compatibility.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
///
/// @defgroup gtx_compatibility GLM_GTX_compatibility
/// @ingroup gtx
@ -17,6 +16,10 @@
#include "../glm.hpp"
#include "../gtc/quaternion.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_compatibility is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_compatibility extension included")
#endif

View File

@ -18,6 +18,10 @@
#include "../detail/setup.hpp"
#include "../detail/precision.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_component_wise is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_component_wise extension included")
#endif

View File

@ -3,7 +3,6 @@
/// @author Maksim Vorobiev (msomeone@gmail.com)
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
/// @see gtc_constants (dependence)
/// @see gtc_quaternion (dependence)
///
@ -21,6 +20,10 @@
#include "../gtc/constants.hpp"
#include "../gtc/quaternion.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_dual_quaternion is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_dual_quaternion extension included")
#endif

View File

@ -2,7 +2,6 @@
/// @file glm/gtx/euler_angles.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
///
/// @defgroup gtx_euler_angles GLM_GTX_euler_angles
/// @ingroup gtx
@ -16,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_euler_angles is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_euler_angles extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_extend is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_extend extension included")
#endif

View File

@ -16,6 +16,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_extented_min_max is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_extented_min_max extension included")
#endif

View File

@ -16,6 +16,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_fast_exponential is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_fast_exponential extension included")
#endif

View File

@ -19,6 +19,10 @@
#include "../exponential.hpp"
#include "../geometric.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_fast_square_root is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_fast_square_root extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../gtc/constants.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_fast_trigonometry is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_fast_trigonometry extension included")
#endif

View File

@ -16,6 +16,10 @@
#include "../glm.hpp"
#include "../gtx/optimum_pow.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_gradient_paint is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_gradient_paint extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_handed_coordinate_space is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_handed_coordinate_space extension included")
#endif

View File

@ -12,6 +12,10 @@
#pragma once
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_hash is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#include <functional>
#include "../vec2.hpp"

View File

@ -16,6 +16,10 @@
#include "../glm.hpp"
#include "../gtc/integer.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_integer is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_integer extension included")
#endif

View File

@ -21,6 +21,10 @@
#include "../gtx/closest_point.hpp"
#include "../gtx/vector_query.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_closest_point is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_closest_point extension included")
#endif

View File

@ -23,6 +23,10 @@
#include "../glm.hpp"
#include "../gtx/quaternion.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_io is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_io extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_log_base is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_log_base extension included")
#endif

View File

@ -16,6 +16,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_matrix_cross_product is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_matrix_cross_product extension included")
#endif

View File

@ -20,6 +20,10 @@
#include "../gtc/quaternion.hpp"
#include "../gtc/matrix_transform.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_matrix_decompose is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_matrix_decompose extension included")
#endif

View File

@ -16,6 +16,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_matrix_interpolation is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_matrix_interpolation extension included")
#endif

View File

@ -16,6 +16,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_matrix_major_storage is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_matrix_major_storage extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_matrix_operation is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_matrix_operation extension included")
#endif

View File

@ -18,6 +18,10 @@
#include "../gtx/vector_query.hpp"
#include <limits>
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_matrix_query is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_matrix_query extension included")
#endif

View File

@ -17,6 +17,9 @@
#include "../mat3x3.hpp"
#include "../vec2.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_matrix_transform_2d is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_matrix_transform_2d extension included")

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_mixed_product is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_mixed_product extension included")
#endif

View File

@ -17,6 +17,10 @@
#include "../detail/func_geometric.hpp"
#include "../gtx/quaternion.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_norm is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_norm extension included")
#endif

View File

@ -16,6 +16,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_normal is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_normal extension included")
#endif

View File

@ -16,6 +16,10 @@
// Dependency:
#include "../gtx/fast_square_root.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_normalize_dot is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_normalize_dot extension included")
#endif

View File

@ -18,6 +18,10 @@
#include "../glm.hpp"
#include "../gtc/type_precision.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_number_precision is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_number_precision extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_optimum_pow is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_optimum_pow extension included")
#endif

View File

@ -18,6 +18,10 @@
#include "../mat3x3.hpp"
#include "../geometric.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_orthonormalize is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_orthonormalize extension included")
#endif

View File

@ -17,6 +17,10 @@
#include "../glm.hpp"
#include "../gtx/projection.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_perpendicular is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_perpendicular extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_polar_coordinates is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_polar_coordinates extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../geometric.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_projection is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_projection extension included")
#endif

View File

@ -19,6 +19,10 @@
#include "../gtc/quaternion.hpp"
#include "../gtx/norm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_quaternion is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_quaternion extension included")
#endif

View File

@ -15,6 +15,10 @@
// Dependencies
#include "../detail/setup.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_range is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if !GLM_HAS_RANGE_FOR
# error "GLM_GTX_range requires C++11 suppport or 'range for'"
#endif

View File

@ -16,6 +16,10 @@
#include "../detail/setup.hpp"
#include "../detail/type_int.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_raw_data is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_raw_data extension included")
#endif

View File

@ -19,6 +19,10 @@
#include "../gtc/epsilon.hpp"
#include "../gtc/quaternion.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_rotate_normalized_axis is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included")
#endif

View File

@ -17,6 +17,10 @@
#include "../glm.hpp"
#include "../gtx/transform.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_rotate_vector is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_rotate_vector extension included")
#endif

View File

@ -14,6 +14,10 @@
#include "../detail/setup.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_scalar_multiplication is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if !GLM_HAS_TEMPLATE_ALIASES && !(GLM_COMPILER & GLM_COMPILER_GCC)
# error "GLM_GTX_scalar_multiplication requires C++11 support or alias templates and if not support for GCC"
#endif

View File

@ -15,6 +15,10 @@
// Dependency:
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_extend is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_extend extension included")
#endif

View File

@ -16,6 +16,10 @@
#include "../glm.hpp"
#include "../gtx/optimum_pow.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_spline is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_spline extension included")
#endif

View File

@ -16,6 +16,10 @@
#include "../glm.hpp"
#include <cstdlib>
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_std_based_type is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_std_based_type extension included")
#endif

View File

@ -2,7 +2,6 @@
/// @file glm/gtx/string_cast.hpp
///
/// @see core (dependence)
/// @see gtc_half_float (dependence)
/// @see gtx_integer (dependence)
/// @see gtx_quaternion (dependence)
///
@ -23,6 +22,10 @@
#include "../gtx/dual_quaternion.hpp"
#include <string>
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_string_cast is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if(GLM_COMPILER & GLM_COMPILER_CUDA)
# error "GLM_GTX_string_cast is not supported on CUDA compiler"
#endif

View File

@ -19,6 +19,10 @@
#include "../glm.hpp"
#include "../gtc/matrix_transform.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_transform is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_transform extension included")
#endif

View File

@ -17,6 +17,10 @@
#include "../glm.hpp"
#include "../gtx/transform.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_transform2 is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_transform2 extension included")
#endif

View File

@ -18,6 +18,10 @@
// Dependency:
#include "../gtc/type_precision.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_type_aligned is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_type_aligned extension included")
#endif

View File

@ -12,6 +12,10 @@
#pragma once
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_type_trait is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
// Dependency:
#include "../detail/type_vec2.hpp"
#include "../detail/type_vec3.hpp"

View File

@ -1,6 +1,22 @@
/// @ref gtx_vec_swizzle
/// @file glm/gtx/vec_swizzle.hpp
///
/// @see core (dependence)
///
/// @defgroup gtx_vec_swizzle GLM_GTX_vec_swizzle
/// @ingroup gtx
///
/// @brief Functions to perform swizzle operation.
///
/// <glm/gtx/vec_swizzle.hpp> need to be included to use these functionalities.
#pragma once
#include <glm/glm.hpp>
#include "../glm.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_vec_swizzle is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
namespace glm {
// xx

View File

@ -20,6 +20,10 @@
#include "../gtx/quaternion.hpp"
#include "../gtx/rotate_vector.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_vector_angle is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_vector_angle extension included")
#endif

View File

@ -17,6 +17,10 @@
#include <cfloat>
#include <limits>
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_vector_query is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_vector_query extension included")
#endif

View File

@ -16,6 +16,10 @@
#include "../glm.hpp"
#include "../gtc/vec1.hpp"
#ifndef GLM_ENABLE_EXPERIMENTAL
# error "GLM: GLM_GTX_wrap is an experimetal extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
#endif
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_wrap extension included")
#endif

175
manual.md
View File

@ -71,17 +71,16 @@
+ [8.3. Vector types](#section8_3)
+ [8.4. Lighting](#section8_4)
+ [9. References](#section9)
+ [9.1. GLM development](#section9_1)
+ [9.2. OpenGL specifications](#section9_2)
+ [9.3. External links](#section9_3)
+ [9.4. Projects using GLM](#section9_4)
+ [9.5. OpenGL tutorials using GLM](#section9_5)
+ [9.6. Equivalent for other languages](#section9_6)
+ [9.7. Alternatives to GLM](#section9_7)
+ [9.1. OpenGL specifications](#section9_1)
+ [9.2. External links](#section9_2)
+ [9.3. Projects using GLM](#section9_3)
+ [9.4. Tutorials using GLM](#section9_4)
+ [9.5. Equivalent for other languages](#section9_5)
+ [9.6. Alternatives to GLM](#section9_6)
+ [9.8. Acknowledgements](#section9_8)
---
## Licenses <a name="section0"></a>
## <a name="section0"></a> Licenses
### The Happy Bunny License (Modified MIT License)
@ -137,8 +136,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
![](https://github.com/g-truc/glm/blob/manual/doc/manual/frontpage2.png)
---
## 1. Getting Started <a name="section1"></a>
### 1.1. Setup <a name="section1_1"></a>
## <a name="section1"></a> 1. Getting Started
### <a name="section1_1"></a> 1.1. Setup
GLM is a header-only library, and thus does not need to be compiled. To use GLM, merely include the `<glm/glm.hpp>` header, which provides GLSL's mathematics functionality.
@ -167,8 +167,7 @@ Core GLM features can be included using individual headers to allow faster user
#include <glm/trigonometric.hpp> // all the GLSL trigonometric functions
#include <glm/vector_relational.hpp> // all the GLSL vector relational functions
```
### 1.2. Faster Compilation <a name="section1_2"></a>
### <a name="section1_2"></a> 1.2. Faster Compilation
GLM makes heavy use of C++ templates, which may significantly increase the compile time for projects that use GLM. Hence, source files should only include the GLM headers they actually use.
@ -182,7 +181,8 @@ To further reduce compilation time, include `<glm/fwd.hpp>`, which provides forw
#include <glm/glm.hpp>
```
### 1.3. Example Usage <a name="section1_3"></a>
### <a name="section1_3"></a> 1.3. Example Usage
```cpp
// Include GLM core features
@ -205,14 +205,14 @@ glm::mat4 transform(glm::vec2 const& Orientation, glm::vec3 const& Translate, gl
}
```
### 1.4. Dependencies <a name="section1_4"></a>
### <a name="section1_4"></a> 1.4. Dependencies
The `<glm/glm.hpp>` header provides all standard GLSL features.
GLM does not depend on external libraries or external headers such as `<gl.h>`, [`<glcorearb.h>`](http://www.opengl.org/registry/api/GL/glcorearb.h), `<gl3.h>`, `<glu.h>`, or `<windows.h>`. However, if `<boost/static_assert.hpp>` is included, then [`Boost.StaticAssert`](http://www.boost.org/doc/libs/release/libs/static_assert) will be used to provide compile-time errors. Otherwise, if using a C++11 compiler, the standard `static_assert` will be used instead. If neither is available, GLM will use its own implementation of `static_assert`.
---
## 2. Swizzle operators <a name="section2"></a>
## <a name="section2"></a> 2. Swizzle operators
A common feature of shader languages like GLSL is the swizzle operators. Those allow selecting multiple components of a vector and change their order. For example, “variable.x”, “variable.xzy” and “variable.zxyy”
form respectively a scalar, a three components vector and a four components vector. With GLSL, swizzle operators can be both R-values and L-values. Finally, vector components can be accessed using “xyzw”,
@ -232,7 +232,7 @@ vec3 C = A.bgr;
GLM supports a subset of this functionality as described in the following sub-sections. Swizzle operators are disabled by default. To enable them GLM\_SWIZZLE must be defined before any inclusion of
&lt;glm/glm.hpp&gt;. Enabling swizzle operators will massively increase the size of compiled files and the compilation time.
### 2.1. Standard C++98 implementation <a name="section2_1"></a>
### <a name="section2_1"></a> 2.1. Standard C++98 implementation
The C++98 implementation exposes the R-value swizzle operators as member functions of vector types.
@ -273,7 +273,7 @@ void foo()
}
```
### 2.2. Anonymous union member implementation <a name="section2_2"></a>
### <a name="section2_2"></a> 2.2. Anonymous union member implementation
Visual C++ supports anonymous structures in union, which is a non-standard language extension, but it enables a very powerful implementation of swizzle operators on Windows supporting both L-value
swizzle operators and a syntax that doesnt require parentheses in some cases. This implementation is only enabled when the language extension is enabled and GLM\_SWIZZLE is defined.
@ -324,9 +324,9 @@ void foo()
```
---
## 3. Preprocessor options <a name="section3"></a>
## <a name="section3"></a> 3. Preprocessor options
### 3.1. Default precision <a name="section3_1"></a>
### <a name="section3_1"></a> 3.1. Default precision
C++ does not provide a way to implement GLSL default precision selection (as defined in GLSL 4.10 specification section 4.5.3) with GLSL-like syntax.
@ -367,7 +367,7 @@ GLM\_PRECISION\_LOWP\_UINT: Low precision
GLM\_PRECISION\_MEDIUMP\_UINT: Medium precision
GLM\_PRECISION\_HIGHP\_UINT: High precision (default)
### 3.2. Compile-time message system <a name="section3_2"></a>
### <a name="section3_2"></a> 3.2. Compile-time message system
GLM includes a notification system which can display some information at build time:
@ -387,7 +387,7 @@ only once per project build.
#include <glm/glm.hpp>
```
### 3.3. C++ language detection <a name="section3_3"></a>
### <a name="section3_3"></a> 3.3. C++ language detection
GLM will automatically take advantage of compilers language extensions when enabled. To increase cross platform compatibility and to avoid compiler extensions, a programmer can define GLM\_FORCE\_CXX98 before
any inclusion of &lt;glm/glm.hpp&gt; to restrict the language feature set C++98:
@ -410,7 +410,7 @@ GLM\_FORCE\_CXX11, GLM\_FORCE\_CXX14.
GLM\_FORCE\_CXX14 overrides GLM\_FORCE\_CXX11 and GLM\_FORCE\_CXX11
overrides GLM\_FORCE\_CXX98 defines.
### 3.4. SIMD support <a name="section3_4"></a>
### <a name="section3_4"></a> 3.4. SIMD support
GLM provides some SIMD optimizations based on [compiler intrinsics](https://msdn.microsoft.com/en-us/library/26td21ds.aspx).
These optimizations will be automatically thanks to compiler arguments.
@ -437,7 +437,7 @@ The use of intrinsic functions by GLM implementation can be avoided using the de
Additionally, GLM provides a low level SIMD API in glm/simd directory for users who are really interested in writing fast algorithms.
### 3.5. Force inline <a name="section3_5"></a>
### <a name="section3_5"></a> 3.5. Force inline
To push further the software performance, a programmer can define GLM\_FORCE\_INLINE before any inclusion of &lt;glm/glm.hpp&gt; to force the compiler to inline GLM code.
@ -446,7 +446,7 @@ To push further the software performance, a programmer can define GLM\_FORCE\_IN
#include <glm/glm.hpp>
```
### 3.6. Vector and matrix static size <a name="section3_6"></a>
### <a name="section3_6"></a> 3.6. Vector and matrix static size
GLSL supports the member function .length() for all vector and matrix types.
@ -475,7 +475,7 @@ void foo(vec4 const & v)
}
```
### 3.7. Disabling default constructor initialization <a name="section3_7"></a>
### <a name="section3_7"></a> 3.7. Disabling default constructor initialization
By default and following GLSL specifications, vector and matrix default constructors initialize the components to zero. This is a reliable behavior but initialization has a cost and its not always necessary.
This behavior can be disable at compilation time by define GLM\_FORCE\_NO\_CTOR\_INIT before any inclusion of &lt;glm/glm.hpp&gt; or other GLM include.
@ -517,7 +517,7 @@ void foo()
}
```
### 3.8. Require explicit conversions <a name="section3_8"></a>
### <a name="section3_8"></a> 3.8. Require explicit conversions
GLSL supports implicit conversions of vector and matrix types. For example, an ivec4 can be implicitly converted into vec4.
@ -554,7 +554,7 @@ void foo()
}
```
### 3.9. Removing genType restriction <a name="section3_9"></a>
### <a name="section3_9"></a> 3.9. Removing genType restriction
By default GLM only supports basic types as genType for vector, matrix and quaternion types:
@ -578,7 +578,7 @@ typedef glm::tvec4<half> my_hvec4;
However, defining GLM\_FORCE\_UNRESTRICTED\_GENTYPE is not compatible with GLM\_FORCE\_SWIZZLE and will generate a compilation error if both are defined at the same time.
---
## 4. Stable extensions <a name="section4"></a>
## <a name="section4"></a> 4. Stable extensions
GLM extends the core GLSL feature set with extensions. These extensions include: quaternion, transformation, spline, matrix inverse, color spaces, etc.
@ -602,61 +602,61 @@ int foo()
When an extension is included, all the dependent core functionalities and extensions will be included as well.
### 4.1. GLM_GTC_bitfield <a name="section4_1"></a>
### <a name="section4_1"></a> 4.1. GLM_GTC_bitfield
Fast bitfield operations on scalar and vector variables.
&lt;glm/gtc/bitfield.hpp&gt; need to be included to use these features.
### 4.2. GLM_GTC_color_space <a name="section4_2"></a>
### <a name="section4_2"></a> 4.2. GLM_GTC_color_space
Conversion between linear RGB and sRGB color spaces.
&lt;glm/gtc/color\_space.hpp&gt; need to be included to use these features.
### 4.3. GLM\_GTC\_constants <a name="section4_3"></a>
### <a name="section4_3"></a> 4.3. GLM\_GTC\_constants
Provide a list of built-in constants.
&lt;glm/gtc/constants.hpp&gt; need to be included to use these features.
### 4.4. GLM\_GTC\_epsilon <a name="section4_4"></a>
### <a name="section4_4"></a> 4.4. GLM\_GTC\_epsilon
Approximate equality comparisons for floating-point numbers, possibly with a user-defined epsilon.
&lt;glm/gtc/epsilon.hpp&gt; need to be included to use these features.
### 4.5. GLM\_GTC\_functions <a name="section4_5"></a>
### <a name="section4_5"></a> 4.5. GLM\_GTC\_functions
Useful functions.
&lt;glm/gtc/functions.hpp&gt; need to be included to use these features.
### 4.6. GLM\_GTC\_integer <a name="section4_6"></a>
### <a name="section4_6"></a> 4.6. GLM\_GTC\_integer
Integer variants of core GLM functions.
&lt;glm/gtc/integer.hpp&gt; need to be included to use these features.
### 4.7. GLM\_GTC\_matrix\_access <a name="section4_7"></a>
### <a name="section4_7"></a> 4.7. GLM\_GTC\_matrix\_access
Functions to conveniently access the individual rows or columns of a matrix.
&lt;glm/gtc/matrix\_access.hpp&gt; need to be included to use these features.
### 4.8. GLM\_GTC\_matrix\_integer <a name="section4_8"></a>
### <a name="section4_8"></a> 4.8. GLM\_GTC\_matrix\_integer
Integer matrix types similar to the core floating-point matrices. Some operations (such as inverse and determinant) are not supported.
&lt;glm/gtc/matrix\_integer.hpp&gt; need to be included to use these features.
### 4.9. GLM\_GTC\_matrix\_inverse <a name="section4_9"></a>
### <a name="section4_9"></a> 4.9. GLM\_GTC\_matrix\_inverse
Additional matrix inverse functions.
&lt;glm/gtc/matrix\_inverse.hpp&gt; need to be included to use these features.
### 4.10. GLM\_GTC\_matrix\_transform <a name="section4_10"></a>
### <a name="section4_10"></a> 4.10. GLM\_GTC\_matrix\_transform
Matrix transformation functions that follow the OpenGL fixed-function conventions.
@ -667,7 +667,7 @@ projective matrix functions (***perspective***, ***ortho***, etc) are designed t
&lt;glm/gtc/matrix\_transform.hpp&gt; need to be included to use these features.
### 4.11. GLM\_GTC\_noise <a name="section4_11"></a>
### <a name="section4_11"></a> 4.11. GLM\_GTC\_noise
Define 2D, 3D and 4D procedural noise functions.
@ -709,19 +709,19 @@ Figure 4.11.8: glm::perlin(glm::vec3(x / 16.f, y / 16.f, 0.5f), glm::vec3(2.0f))
Figure 4.11.9: glm::perlin(glm::vec4(x / 16.f, y / 16.f, glm::vec2(0.5f)), glm::vec4(2.0f));
### 4.12. GLM\_GTC\_packing <a name="section4_12"></a>
### <a name="section4_12"></a> 4.12. GLM\_GTC\_packing
Convert scalar and vector types to and from packed formats, saving space at the cost of precision. However, packing a value into a format that it was previously unpacked from is guaranteed to be lossless.
&lt;glm/gtc/packing.hpp&gt; need to be included to use these features.
### 4.13. GLM\_GTC\_quaternion <a name="section4_13"></a>
### <a name="section4_13"></a> 4.13. GLM\_GTC\_quaternion
Quaternions and operations upon thereof.
&lt;glm/gtc/quaternion.hpp&gt; need to be included to use these features.
### 4.14. GLM\_GTC\_random <a name="section4_14"></a>
### <a name="section4_14"></a> 4.14. GLM\_GTC\_random
Probability distributions in up to four dimensions.
@ -751,25 +751,25 @@ Figure 4.14.5: glm::vec4(glm::ballRand(1.0f), 1);
Figure 4.14.6: glm::vec4(glm::gaussRand(glm::vec3(0), glm::vec3(1)), 1);
### 4.15. GLM\_GTC\_reciprocal <a name="section4_15"></a>
### <a name="section4_15"></a> 4.15. GLM\_GTC\_reciprocal
Reciprocal trigonometric functions (e.g. secant, cosecant, tangent).
&lt;glm/gtc/reciprocal.hpp&gt; need to be included to use these functionalities.
### 4.16. GLM\_GTC\_round <a name="section4_16"></a>
### <a name="section4_16"></a> 4.16. GLM\_GTC\_round
Various rounding operations and common special cases thereof.
&lt;glm/gtc/round.hpp&gt; need to be included to use these functionalities.
### 4.17. GLM\_GTC\_type\_aligned <a name="section4_17"></a>
### <a name="section4_17"></a> 4.17. GLM\_GTC\_type\_aligned
Aligned vector types.
&lt;glm/gtc/type\_aligned.hpp&gt; need to be included to use these functionalities.
### 4.18. GLM\_GTC\_type\_precision <a name="section4_18"></a>
### <a name="section4_18"></a> 4.18. GLM\_GTC\_type\_precision
Vector and matrix types with defined precisions, e.g. i8vec4, which is a 4D vector of signed 8-bit integers.
@ -837,7 +837,7 @@ Available defines for 64-bit floating-point types (glm::f64vec\*, glm::f64mat\*,
&lt;glm/gtc/type\_precision.hpp&gt; need to be included to use these functionalities.
### 4.19. GLM\_GTC\_type\_ptr <a name="section4_19"></a>
### <a name="section4_19"></a> 4.19. GLM\_GTC\_type\_ptr
Facilitate interactions between pointers to basic types (e.g. float*) and GLM types (e.g. mat4).
@ -875,22 +875,22 @@ implicit cast in this example. However cast operators may produce programs runni
&lt;glm/gtc/type\_ptr.hpp&gt; need to be included to use these features.
### 4.20. GLM\_GTC\_ulp <a name="section4_20"></a>
### <a name="section4_20"></a> 4.20. GLM\_GTC\_ulp
Measure a function's accuracy given a reference implementation of it. This extension works on floating-point data and provides results in [ULP](http://ljk.imag.fr/membres/Carine.Lucas/TPScilab/JMMuller/ulp-toms.pdf).
&lt;glm/gtc/ulp.hpp&gt; need to be included to use these features.
### 4.21. GLM\_GTC\_vec1 <a name="section4_21"></a>
### <a name="section4_21"></a> 4.21. GLM\_GTC\_vec1
Add \*vec1 types.
&lt;glm/gtc/vec1.hpp&gt; need to be included to use these features.
---
## 5. OpenGL interoperability <a name="section5"></a>
## <a name="section5"></a> 5. OpenGL interoperability
### 5.1. GLM replacements for deprecated OpenGL functions <a name="section5_1"></a>
### <a name="section5_1"></a> 5.1. GLM replacements for deprecated OpenGL functions
OpenGL 3.1 specification has deprecated some features that have been removed from OpenGL 3.2 core profile specification. GLM provides some replacement functions.
@ -975,7 +975,7 @@ glm::dmat4 glm::ortho(double left, double right, double bottom, double top, doub
From GLM\_GTC\_matrix\_transform extension: &lt;glm/gtc/matrix\_transform.hpp&gt;
### 5.2. GLM replacements for GLU functions <a name="section5_2"></a>
### <a name="section5_2"></a> 5.2. GLM replacements for GLU functions
[***gluLookAt: ***](https://www.opengl.org/sdk/docs/man2/xhtml/gluLookAt.xml)
@ -1034,15 +1034,15 @@ glm::dvec3 unProject(glm::dvec3 const& win, glm::dmat4 const& model, glm::dmat4
From GLM\_GTC\_matrix\_transform extension: &lt;glm/gtc/matrix\_transform.hpp&gt;
---
## 6. Known issues <a name="section6"></a>
## <a name="section6"></a> 6. Known issues
This section reports GLSL features that GLM can't accurately emulate due to language restrictions.
### 6.1. not function <a name="section6_1"></a>
### <a name="section6_1"></a> 6.1. not function
The GLSL function 'not' is a keyword in C++. To prevent name collisions and ensure a consistent API, the name not\_ (note the underscore) is used instead.
### 6.2. Precision qualifiers support <a name="section6_2"></a>
### <a name="section6_2"></a> 6.2. Precision qualifiers support
GLM supports GLSL precision qualifiers through prefixes instead of qualifiers. For example, GLM exposes \verb|lowp_vec4|, \verb|mediump_vec4| and \verb|highp_vec4| as variations of \verb|vec4|.
@ -1075,42 +1075,44 @@ ivec3 foo(const vec4 & v)
The syntax for default precision specifications in GLM differs from that in GLSL; for more information, see section Default Precision <a name="section3_1"></a>.
---
## 7. FAQ <a name="section7"></a>
## <a name="section7"></a> 7. FAQ
### 7.1 Why GLM follows GLSL specification and conventions? <a name="section7_1"></a>
### <a name="section7_1"></a> 7.1 Why GLM follows GLSL specification and conventions?
Following GLSL conventions is a really strict policy of GLM. It has been designed following the idea that everyone does its own math library with his own conventions. The idea is that brilliant developers (the OpenGL ARB) worked together and agreed to make GLSL. Following GLSL conventions
is a way to find consensus. Moreover, basically when a developer knows GLSL, he knows GLM.
### 7.2. Does GLM run GLSL program? <a name="section7_2"></a>
### <a name="section7_2"></a> 7.2. Does GLM run GLSL program?
No, GLM is a C++ implementation of a subset of GLSL.
### 7.3. Does a GLSL compiler build GLM codes? <a name="section7_3"></a>
### <a name="section7_3"></a> 7.3. Does a GLSL compiler build GLM codes?
No, this is not what GLM attends to do.
### 7.4. Should I use GTX extensions? <a name="section7_4"></a>
### <a name="section7_4"></a> 7.4. Should I use GTX extensions?
GTX extensions are qualified to be experimental extensions. In GLM this means that these extensions might change from version to version without any restriction. In practice, it doesnt really change except time to
time. GTC extensions are stabled, tested and perfectly reliable in time. Many GTX extensions extend GTC extensions and provide a way to explore features and implementations and APIs and then are promoted to GTC
extensions. This is fairly the way OpenGL features are developed; through extensions.
### 7.5. Where can I ask my questions? <a name="section7_5"></a>
Stating with GLM 0.9.9, to use experimental extensions, an application but define GLM_ENABLE_EXPERIMENTAL.
### <a name="section7_5"></a> 7.5. Where can I ask my questions?
A good place is [stackoverflow](http://stackoverflow.com/search?q=GLM) using the GLM tag.
### 7.6. Where can I find the documentation of extensions? <a name="section7_6"></a>
### <a name="section7_6"></a> 7.6. Where can I find the documentation of extensions?
The Doxygen generated documentation includes a complete list of all extensions available. Explore this [*API documentation*](http://glm.g-truc.net/html/index.html) to get a complete
view of all GLM capabilities!
### 7.7. Should I use using namespace glm;? <a name="section7_7"></a>
### <a name="section7_7"></a> 7.7. Should I use using namespace glm;?
NO! Chances are that if using namespace glm; is called, especially in a header file, name collisions will happen as GLM is based on GLSL which uses common tokens for types and functions. Avoiding using namespace
glm; will a higher compatibility with third party library and SDKs.
### 7.8. Is GLM fast? <a name="section7_8"></a>
### <a name="section7_8"></a> 7.8. Is GLM fast?
GLM is mainly designed to be convenient and that's why it is written against the GLSL specification.
@ -1119,26 +1121,26 @@ mediump and highp qualifiers, GLM provides approximations which trade precision
However, on performance critical code paths, we should expect that dedicated algorithms should be written to reach peak performance.
### 7.9. When I build with Visual C++ with /W4 warning level, I have warnings... <a name="section7_9"></a>
### <a name="section7_9"></a> 7.9. When I build with Visual C++ with /W4 warning level, I have warnings...
You should not have any warnings even in /W4 mode. However, if you expect such level for your code, then you should ask for the same level to the compiler by at least disabling the Visual C++ language extensions
(/Za) which generates warnings when used. If these extensions are enabled, then GLM will take advantage of them and the compiler will generate warnings.
### 7.10. Why some GLM functions can crash because of division by zero? <a name="section7_10"></a>
### <a name="section7_10"></a> 7.10. Why some GLM functions can crash because of division by zero?
GLM functions crashing is the result of a domain error. Such behavior follows the precedent set by C and C++'s standard library. For example, its a domain error to pass a null vector (all zeroes) to glm::normalize function, or to pass a negative number into std::sqrt.
### 7.11. What unit for angles is used in GLM? <a name="section7_11"></a>
### <a name="section7_11"></a> 7.11. What unit for angles is used in GLM?
GLSL is using radians but GLU is using degrees to express angles. This has caused GLM to use inconsistent units for angles. Starting with GLM 0.9.6, all GLM functions are using radians. For more information, follow
the [link](http://www.g-truc.net/post-0693.html#menu).
---
## 8. Code samples <a name="section8"></a>
## <a name="section8"></a> 8. Code samples
This series of samples only shows various GLM features without consideration of any sort.
### 8.1. Compute a triangle normal <a name="section8_1"></a>
### <a name="section8_1"></a> 8.1. Compute a triangle normal
```cpp
#include <glm/glm.hpp> // vec3 normalize cross
@ -1158,7 +1160,7 @@ glm::vec3 computeNormal(glm::vec3 const& a, glm::vec3 const& b, glm::vec3 const&
}
```
### 8.2. Matrix transform <a name="section8_2"></a>
### <a name="section8_2"></a> 8.2. Matrix transform
```cpp
#include <glm/glm.hpp> // vec3, vec4, ivec4, mat4
@ -1181,7 +1183,7 @@ void setUniformMVP(GLuint Location, glm::vec3 const& Translate, glm::vec3 const&
}
```
### 8.3. Vector types <a name="section8_3"></a>
### <a name="section8_3"></a> 8.3. Vector types
```cpp
#include <glm/glm.hpp> // vec2
@ -1230,7 +1232,7 @@ glm::i32vec2 const PositionDataI32[VertexCount] =
};
```
### 8.4. Lighting <a name="section8_4"></a>
### <a name="section8_4"></a> 8.4. Lighting
```cpp
#include <glm/glm.hpp> // vec3 normalize reflect dot pow
@ -1268,19 +1270,19 @@ glm::vec3 lighting(intersection const& Intersection, material const& Material, l
```
---
## 9. References <a name="section9"></a>
## <a name="section9"></a> 9. References
### 9.1. OpenGL specifications <a name="section9_1"></a>
### <a name="section9_1"></a> 9.1. OpenGL specifications
* OpenGL 4.3 core specification
* [GLSL 4.30 specification](http://www.opengl.org/registry/doc/GLSLangSpec.4.30.7.diff.pdf)
![](media/image21.png){width="2.859722222222222in" height="1.6083333333333334in"}- [*GLU 1.3 specification*](http://www.opengl.org/documentation/specs/glu/glu1_3.pdf)
### 9.2. External links <a name="section9_2"></a>
### <a name="section9_2"></a> 9.2. External links
* [GLM on stackoverflow](http://stackoverflow.com/search?q=GLM)
### 9.3. Projects using GLM <a name="section9_3"></a>
### <a name="section9_3"></a> 9.3. Projects using GLM
***[Leos Forture](http://www.leosfortune.com/) ***
@ -1322,11 +1324,11 @@ A 3D planetary engine for seamless planet rendering from space down to the surfa
![](/doc/manual/references-outerra4.jpg)
***Falcor***
[***Falcor***](https://github.com/NVIDIA/Falcor)
Real-time rendering research framework by NVIDIA.
***Cinder***
[***Cinder***](https://libcinder.org/)
Cinder is a free and open source library for professional-quality creative coding in C++.
@ -1346,10 +1348,16 @@ Simple, easy-to-follow examples with GLSL source code, as well as a basic descri
![](/doc/manual/references-opencloth3.png)
[***LibreOffice***](https://www.libreoffice.org/)
LibreOffice includes several applications that make it the most powerful Free and Open Source office suite on the market.
[***Are you using GLM in a project?***](mailto:glm@g-truc.net)
### 9.4. OpenGL tutorials using GLM <a name="section9_4"></a>
### <a name="section9_4"></a> 9.4. Tutorials using GLM
* [Sascha Willems' Vulkan examples](https://github.com/SaschaWillems/Vulkan), Examples and demos for the new Vulkan API
* [VKTS](https://github.com/McNopper/Vulkan) Vulkan examples using VulKan ToolS (VKTS)
* [*The OpenGL Samples Pack*](http://www.g-truc.net/project-0026.html#menu), samples that show how to set up all the different new features
* [*Learning Modern 3D Graphics programming*](http://www.arcsynthesis.org/gltut/), a great OpenGL tutorial using GLM by Jason L. McKesson
* [*Morten Nobel-Jørgensens*](http://blog.nobel-joergensen.com/2011/04/02/glm-brilliant-math-library-for-opengl/) review and use an [*OpenGL renderer*](https://github.com/mortennobel/RenderE)
@ -1364,25 +1372,26 @@ Simple, easy-to-follow examples with GLSL source code, as well as a basic descri
* [Learn OpenGL](mailto:http://learnopengl.com/), OpenGL tutorial
** [Are you using GLM in a tutorial?](mailto:glm@g-truc.net)*
### 9.5. Equivalent for other languages <a name="section9_5"></a>
### <a name="section9_5"></a> 9.5. Equivalent for other languages
* [*GlmSharp*](https://github.com/Philip-Trettner/GlmSharp): Open-source semi-generated GLM-flavored math library for .NET/C\#.
* [glm-js](https://github.com/humbletim/glm-js): JavaScript adaptation of the OpenGL Mathematics (GLM) C++ library interfaces
* [Java OpenGL Mathematics (GLM)](https://github.com/java-graphics/glm)
* [JGLM](https://github.com/jroyalty/jglm) - Java OpenGL Mathematics Library
* [SwiftGL Math Library](https://github.com/SwiftGL/Math/blob/master/Sources/glm.swift)
* [SwiftGL Math Library](https://github.com/SwiftGL/Math/blob/master/Sources/glm.swift) GLM for Swift
* [glm-go](https://github.com/jbowtie/glm-go): Simple linear algebra library similar in spirit to GLM
* [openll](https://github.com/Polkm/openll): Lua bindings for OpenGL, GLM, GLFW, OpenAL, SOIL and PhysicsFS
* [glm-rs](https://github.com/dche/glm-rs): GLSL mathematics for Rust programming language
* [glmpython](https://github.com/Queatz/glmpython): GLM math library for Python
### 9.6. Alternatives to GLM <a name="section9_6"></a>
### <a name="section9_6"></a> 9.6. Alternatives to GLM
* [*CML*](http://cmldev.net/): The CML (Configurable Math Library) is a free C++ math library for games and graphics.
* [*Eigen*](http://eigen.tuxfamily.org/): A more heavy weight math library for general linear algebra in C++.
* [*glhlib*](http://glhlib.sourceforge.net/): A much more than glu C library.
* Are you using or developing an alternative library to GLM?
### 9.7. Acknowledgements <a name="section9_7"></a>
### <a name="section9_7"></a> 9.7. Acknowledgements
GLM is developed and maintained by [*Christophe Riccio*](http://www.g-truc.net) but many contributors have made this project what it is.

View File

@ -55,12 +55,14 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Added RGBM encoding in GTC_packing #420
- Added GTC_color_encoding extension
- Added GTX_vec_swizzle, faster compile time swizzling then swizzle operator #558
- Added [GLM_ENABLE_EXPERIMENTAL](manual.md#section7_4) to enable experimental features.
#### Improvements:
- Added lowp variant of GTC_colorspace convertLinearToSRGB #419
- Replaced the manual by a markdown version #458
#### Fixes:
- Removed doxygen references to GTC_half_float which was removed in 0.9.4
#### Deprecation:
- Removed GLM_GTX_simd_vec4 extension
@ -72,13 +74,19 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Removed GLM_LEFT_HANDED, use GLM_FORCE_LEFT_HANDED instead
---
### [GLM 0.9.8.3](https://github.com/g-truc/glm/tree/0.9.8) - 2016-XX-XX
### [GLM 0.9.8.4](https://github.com/g-truc/glm/tree/0.9.8) - 201X-XX-XX
---
### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12
#### Improvements:
- Broader support of GLM_FORCE_UNRESTRICTED_GENTYPE #378
#### Fixes:
- Fixed Android build error with C++11 compiler but C++98 STL #284 #564
- Fixed GTX_transform2 shear* functions #403
- Fixed interaction between GLM_FORCE_UNRESTRICTED_GENTYPE and ortho function #568
- Fixed bitCount with AVX on 32 bit builds #567
- Fixed CMake find_package with version specification #572 #573
---
### [GLM 0.9.8.2](https://github.com/g-truc/glm/releases/tag/0.9.8.2) - 2016-11-01

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#define GLM_FORCE_INLINE
#include <glm/gtc/epsilon.hpp>
#include <glm/gtc/integer.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/noise.hpp>
#include <gli/gli.hpp>
#include <gli/gtx/loader.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/type_precision.hpp>
#include <glm/gtx/associated_min_max.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/closest_point.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/color_space.hpp>
int test_saturation()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/color_space_YCoCg.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/common.hpp>
#include <glm/gtc/integer.hpp>
#include <glm/gtc/epsilon.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/compatibility.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/component_wise.hpp>
#include <glm/gtc/type_precision.hpp>
#include <glm/gtc/epsilon.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/dual_quaternion.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/epsilon.hpp>

View File

@ -1,5 +1,6 @@
// Code sample from Filippo Ramaciotti
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/epsilon.hpp>
#include <glm/gtx/string_cast.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/extend.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/extended_min_max.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/fast_exponential.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/fast_square_root.hpp>
#include <glm/gtc/type_precision.hpp>
#include <glm/gtc/epsilon.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/type_precision.hpp>
#include <glm/gtx/fast_trigonometry.hpp>
#include <glm/gtx/integer.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/gradient_paint.hpp>
int test_radialGradient()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/handed_coordinate_space.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/exponential.hpp>
#include <glm/gtc/epsilon.hpp>
#include <glm/gtx/integer.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/intersect.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/type_precision.hpp>
#include <glm/gtx/io.hpp>
#include <iostream>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/log_base.hpp>
#include <glm/gtc/vec1.hpp>
#include <glm/gtc/epsilon.hpp>

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/matrix_cross_product.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/matrix_decompose.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/matrix_interpolation.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/matrix_major_storage.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/matrix_operation.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/matrix_query.hpp>
int test_isNull()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/matrix_transform_2d.hpp>
int main()

View File

@ -1,3 +1,4 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/norm.hpp>
int main()

Some files were not shown because too many files have changed in this diff Show More