From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/gtc/matrix_integer.hpp | 297 ++++++++++++++-------------- 1 file changed, 149 insertions(+), 148 deletions(-) (limited to 'external/include/glm/gtc/matrix_integer.hpp') diff --git a/external/include/glm/gtc/matrix_integer.hpp b/external/include/glm/gtc/matrix_integer.hpp index fdc816d..59aec12 100644 --- a/external/include/glm/gtc/matrix_integer.hpp +++ b/external/include/glm/gtc/matrix_integer.hpp @@ -6,8 +6,9 @@ /// @defgroup gtc_matrix_integer GLM_GTC_matrix_integer /// @ingroup gtc /// +/// Include to use the features of this extension. +/// /// Defines a number of matrices with integer types. -/// need to be included to use these functionalities. #pragma once @@ -31,302 +32,302 @@ namespace glm /// @addtogroup gtc_matrix_integer /// @{ - /// High-precision signed integer 2x2 matrix. + /// High-qualifier signed integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 highp_imat2; + typedef mat<2, 2, int, highp> highp_imat2; - /// High-precision signed integer 3x3 matrix. + /// High-qualifier signed integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 highp_imat3; + typedef mat<3, 3, int, highp> highp_imat3; - /// High-precision signed integer 4x4 matrix. + /// High-qualifier signed integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 highp_imat4; + typedef mat<4, 4, int, highp> highp_imat4; - /// High-precision signed integer 2x2 matrix. + /// High-qualifier signed integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 highp_imat2x2; + typedef mat<2, 2, int, highp> highp_imat2x2; - /// High-precision signed integer 2x3 matrix. + /// High-qualifier signed integer 2x3 matrix. /// @see gtc_matrix_integer - typedef tmat2x3 highp_imat2x3; + typedef mat<2, 3, int, highp> highp_imat2x3; - /// High-precision signed integer 2x4 matrix. + /// High-qualifier signed integer 2x4 matrix. /// @see gtc_matrix_integer - typedef tmat2x4 highp_imat2x4; + typedef mat<2, 4, int, highp> highp_imat2x4; - /// High-precision signed integer 3x2 matrix. + /// High-qualifier signed integer 3x2 matrix. /// @see gtc_matrix_integer - typedef tmat3x2 highp_imat3x2; + typedef mat<3, 2, int, highp> highp_imat3x2; - /// High-precision signed integer 3x3 matrix. + /// High-qualifier signed integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 highp_imat3x3; + typedef mat<3, 3, int, highp> highp_imat3x3; - /// High-precision signed integer 3x4 matrix. + /// High-qualifier signed integer 3x4 matrix. /// @see gtc_matrix_integer - typedef tmat3x4 highp_imat3x4; + typedef mat<3, 4, int, highp> highp_imat3x4; - /// High-precision signed integer 4x2 matrix. + /// High-qualifier signed integer 4x2 matrix. /// @see gtc_matrix_integer - typedef tmat4x2 highp_imat4x2; + typedef mat<4, 2, int, highp> highp_imat4x2; - /// High-precision signed integer 4x3 matrix. + /// High-qualifier signed integer 4x3 matrix. /// @see gtc_matrix_integer - typedef tmat4x3 highp_imat4x3; + typedef mat<4, 3, int, highp> highp_imat4x3; - /// High-precision signed integer 4x4 matrix. + /// High-qualifier signed integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 highp_imat4x4; + typedef mat<4, 4, int, highp> highp_imat4x4; - /// Medium-precision signed integer 2x2 matrix. + /// Medium-qualifier signed integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 mediump_imat2; + typedef mat<2, 2, int, mediump> mediump_imat2; - /// Medium-precision signed integer 3x3 matrix. + /// Medium-qualifier signed integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 mediump_imat3; + typedef mat<3, 3, int, mediump> mediump_imat3; - /// Medium-precision signed integer 4x4 matrix. + /// Medium-qualifier signed integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 mediump_imat4; + typedef mat<4, 4, int, mediump> mediump_imat4; - /// Medium-precision signed integer 2x2 matrix. + /// Medium-qualifier signed integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 mediump_imat2x2; + typedef mat<2, 2, int, mediump> mediump_imat2x2; - /// Medium-precision signed integer 2x3 matrix. + /// Medium-qualifier signed integer 2x3 matrix. /// @see gtc_matrix_integer - typedef tmat2x3 mediump_imat2x3; + typedef mat<2, 3, int, mediump> mediump_imat2x3; - /// Medium-precision signed integer 2x4 matrix. + /// Medium-qualifier signed integer 2x4 matrix. /// @see gtc_matrix_integer - typedef tmat2x4 mediump_imat2x4; + typedef mat<2, 4, int, mediump> mediump_imat2x4; - /// Medium-precision signed integer 3x2 matrix. + /// Medium-qualifier signed integer 3x2 matrix. /// @see gtc_matrix_integer - typedef tmat3x2 mediump_imat3x2; + typedef mat<3, 2, int, mediump> mediump_imat3x2; - /// Medium-precision signed integer 3x3 matrix. + /// Medium-qualifier signed integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 mediump_imat3x3; + typedef mat<3, 3, int, mediump> mediump_imat3x3; - /// Medium-precision signed integer 3x4 matrix. + /// Medium-qualifier signed integer 3x4 matrix. /// @see gtc_matrix_integer - typedef tmat3x4 mediump_imat3x4; + typedef mat<3, 4, int, mediump> mediump_imat3x4; - /// Medium-precision signed integer 4x2 matrix. + /// Medium-qualifier signed integer 4x2 matrix. /// @see gtc_matrix_integer - typedef tmat4x2 mediump_imat4x2; + typedef mat<4, 2, int, mediump> mediump_imat4x2; - /// Medium-precision signed integer 4x3 matrix. + /// Medium-qualifier signed integer 4x3 matrix. /// @see gtc_matrix_integer - typedef tmat4x3 mediump_imat4x3; + typedef mat<4, 3, int, mediump> mediump_imat4x3; - /// Medium-precision signed integer 4x4 matrix. + /// Medium-qualifier signed integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 mediump_imat4x4; + typedef mat<4, 4, int, mediump> mediump_imat4x4; - /// Low-precision signed integer 2x2 matrix. + /// Low-qualifier signed integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 lowp_imat2; - - /// Low-precision signed integer 3x3 matrix. + typedef mat<2, 2, int, lowp> lowp_imat2; + + /// Low-qualifier signed integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 lowp_imat3; + typedef mat<3, 3, int, lowp> lowp_imat3; - /// Low-precision signed integer 4x4 matrix. + /// Low-qualifier signed integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 lowp_imat4; + typedef mat<4, 4, int, lowp> lowp_imat4; - /// Low-precision signed integer 2x2 matrix. + /// Low-qualifier signed integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 lowp_imat2x2; + typedef mat<2, 2, int, lowp> lowp_imat2x2; - /// Low-precision signed integer 2x3 matrix. + /// Low-qualifier signed integer 2x3 matrix. /// @see gtc_matrix_integer - typedef tmat2x3 lowp_imat2x3; + typedef mat<2, 3, int, lowp> lowp_imat2x3; - /// Low-precision signed integer 2x4 matrix. + /// Low-qualifier signed integer 2x4 matrix. /// @see gtc_matrix_integer - typedef tmat2x4 lowp_imat2x4; + typedef mat<2, 4, int, lowp> lowp_imat2x4; - /// Low-precision signed integer 3x2 matrix. + /// Low-qualifier signed integer 3x2 matrix. /// @see gtc_matrix_integer - typedef tmat3x2 lowp_imat3x2; + typedef mat<3, 2, int, lowp> lowp_imat3x2; - /// Low-precision signed integer 3x3 matrix. + /// Low-qualifier signed integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 lowp_imat3x3; + typedef mat<3, 3, int, lowp> lowp_imat3x3; - /// Low-precision signed integer 3x4 matrix. + /// Low-qualifier signed integer 3x4 matrix. /// @see gtc_matrix_integer - typedef tmat3x4 lowp_imat3x4; + typedef mat<3, 4, int, lowp> lowp_imat3x4; - /// Low-precision signed integer 4x2 matrix. + /// Low-qualifier signed integer 4x2 matrix. /// @see gtc_matrix_integer - typedef tmat4x2 lowp_imat4x2; + typedef mat<4, 2, int, lowp> lowp_imat4x2; - /// Low-precision signed integer 4x3 matrix. + /// Low-qualifier signed integer 4x3 matrix. /// @see gtc_matrix_integer - typedef tmat4x3 lowp_imat4x3; + typedef mat<4, 3, int, lowp> lowp_imat4x3; - /// Low-precision signed integer 4x4 matrix. + /// Low-qualifier signed integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 lowp_imat4x4; + typedef mat<4, 4, int, lowp> lowp_imat4x4; - /// High-precision unsigned integer 2x2 matrix. + /// High-qualifier unsigned integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 highp_umat2; + typedef mat<2, 2, uint, highp> highp_umat2; - /// High-precision unsigned integer 3x3 matrix. + /// High-qualifier unsigned integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 highp_umat3; + typedef mat<3, 3, uint, highp> highp_umat3; - /// High-precision unsigned integer 4x4 matrix. + /// High-qualifier unsigned integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 highp_umat4; + typedef mat<4, 4, uint, highp> highp_umat4; - /// High-precision unsigned integer 2x2 matrix. + /// High-qualifier unsigned integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 highp_umat2x2; + typedef mat<2, 2, uint, highp> highp_umat2x2; - /// High-precision unsigned integer 2x3 matrix. + /// High-qualifier unsigned integer 2x3 matrix. /// @see gtc_matrix_integer - typedef tmat2x3 highp_umat2x3; + typedef mat<2, 3, uint, highp> highp_umat2x3; - /// High-precision unsigned integer 2x4 matrix. + /// High-qualifier unsigned integer 2x4 matrix. /// @see gtc_matrix_integer - typedef tmat2x4 highp_umat2x4; + typedef mat<2, 4, uint, highp> highp_umat2x4; - /// High-precision unsigned integer 3x2 matrix. + /// High-qualifier unsigned integer 3x2 matrix. /// @see gtc_matrix_integer - typedef tmat3x2 highp_umat3x2; + typedef mat<3, 2, uint, highp> highp_umat3x2; - /// High-precision unsigned integer 3x3 matrix. + /// High-qualifier unsigned integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 highp_umat3x3; + typedef mat<3, 3, uint, highp> highp_umat3x3; - /// High-precision unsigned integer 3x4 matrix. + /// High-qualifier unsigned integer 3x4 matrix. /// @see gtc_matrix_integer - typedef tmat3x4 highp_umat3x4; + typedef mat<3, 4, uint, highp> highp_umat3x4; - /// High-precision unsigned integer 4x2 matrix. + /// High-qualifier unsigned integer 4x2 matrix. /// @see gtc_matrix_integer - typedef tmat4x2 highp_umat4x2; + typedef mat<4, 2, uint, highp> highp_umat4x2; - /// High-precision unsigned integer 4x3 matrix. + /// High-qualifier unsigned integer 4x3 matrix. /// @see gtc_matrix_integer - typedef tmat4x3 highp_umat4x3; + typedef mat<4, 3, uint, highp> highp_umat4x3; - /// High-precision unsigned integer 4x4 matrix. + /// High-qualifier unsigned integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 highp_umat4x4; + typedef mat<4, 4, uint, highp> highp_umat4x4; - /// Medium-precision unsigned integer 2x2 matrix. + /// Medium-qualifier unsigned integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 mediump_umat2; + typedef mat<2, 2, uint, mediump> mediump_umat2; - /// Medium-precision unsigned integer 3x3 matrix. + /// Medium-qualifier unsigned integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 mediump_umat3; + typedef mat<3, 3, uint, mediump> mediump_umat3; - /// Medium-precision unsigned integer 4x4 matrix. + /// Medium-qualifier unsigned integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 mediump_umat4; + typedef mat<4, 4, uint, mediump> mediump_umat4; - /// Medium-precision unsigned integer 2x2 matrix. + /// Medium-qualifier unsigned integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 mediump_umat2x2; + typedef mat<2, 2, uint, mediump> mediump_umat2x2; - /// Medium-precision unsigned integer 2x3 matrix. + /// Medium-qualifier unsigned integer 2x3 matrix. /// @see gtc_matrix_integer - typedef tmat2x3 mediump_umat2x3; + typedef mat<2, 3, uint, mediump> mediump_umat2x3; - /// Medium-precision unsigned integer 2x4 matrix. + /// Medium-qualifier unsigned integer 2x4 matrix. /// @see gtc_matrix_integer - typedef tmat2x4 mediump_umat2x4; + typedef mat<2, 4, uint, mediump> mediump_umat2x4; - /// Medium-precision unsigned integer 3x2 matrix. + /// Medium-qualifier unsigned integer 3x2 matrix. /// @see gtc_matrix_integer - typedef tmat3x2 mediump_umat3x2; + typedef mat<3, 2, uint, mediump> mediump_umat3x2; - /// Medium-precision unsigned integer 3x3 matrix. + /// Medium-qualifier unsigned integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 mediump_umat3x3; + typedef mat<3, 3, uint, mediump> mediump_umat3x3; - /// Medium-precision unsigned integer 3x4 matrix. + /// Medium-qualifier unsigned integer 3x4 matrix. /// @see gtc_matrix_integer - typedef tmat3x4 mediump_umat3x4; + typedef mat<3, 4, uint, mediump> mediump_umat3x4; - /// Medium-precision unsigned integer 4x2 matrix. + /// Medium-qualifier unsigned integer 4x2 matrix. /// @see gtc_matrix_integer - typedef tmat4x2 mediump_umat4x2; + typedef mat<4, 2, uint, mediump> mediump_umat4x2; - /// Medium-precision unsigned integer 4x3 matrix. + /// Medium-qualifier unsigned integer 4x3 matrix. /// @see gtc_matrix_integer - typedef tmat4x3 mediump_umat4x3; + typedef mat<4, 3, uint, mediump> mediump_umat4x3; - /// Medium-precision unsigned integer 4x4 matrix. + /// Medium-qualifier unsigned integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 mediump_umat4x4; + typedef mat<4, 4, uint, mediump> mediump_umat4x4; - /// Low-precision unsigned integer 2x2 matrix. + /// Low-qualifier unsigned integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 lowp_umat2; - - /// Low-precision unsigned integer 3x3 matrix. + typedef mat<2, 2, uint, lowp> lowp_umat2; + + /// Low-qualifier unsigned integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 lowp_umat3; + typedef mat<3, 3, uint, lowp> lowp_umat3; - /// Low-precision unsigned integer 4x4 matrix. + /// Low-qualifier unsigned integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 lowp_umat4; + typedef mat<4, 4, uint, lowp> lowp_umat4; - /// Low-precision unsigned integer 2x2 matrix. + /// Low-qualifier unsigned integer 2x2 matrix. /// @see gtc_matrix_integer - typedef tmat2x2 lowp_umat2x2; + typedef mat<2, 2, uint, lowp> lowp_umat2x2; - /// Low-precision unsigned integer 2x3 matrix. + /// Low-qualifier unsigned integer 2x3 matrix. /// @see gtc_matrix_integer - typedef tmat2x3 lowp_umat2x3; + typedef mat<2, 3, uint, lowp> lowp_umat2x3; - /// Low-precision unsigned integer 2x4 matrix. + /// Low-qualifier unsigned integer 2x4 matrix. /// @see gtc_matrix_integer - typedef tmat2x4 lowp_umat2x4; + typedef mat<2, 4, uint, lowp> lowp_umat2x4; - /// Low-precision unsigned integer 3x2 matrix. + /// Low-qualifier unsigned integer 3x2 matrix. /// @see gtc_matrix_integer - typedef tmat3x2 lowp_umat3x2; + typedef mat<3, 2, uint, lowp> lowp_umat3x2; - /// Low-precision unsigned integer 3x3 matrix. + /// Low-qualifier unsigned integer 3x3 matrix. /// @see gtc_matrix_integer - typedef tmat3x3 lowp_umat3x3; + typedef mat<3, 3, uint, lowp> lowp_umat3x3; - /// Low-precision unsigned integer 3x4 matrix. + /// Low-qualifier unsigned integer 3x4 matrix. /// @see gtc_matrix_integer - typedef tmat3x4 lowp_umat3x4; + typedef mat<3, 4, uint, lowp> lowp_umat3x4; - /// Low-precision unsigned integer 4x2 matrix. + /// Low-qualifier unsigned integer 4x2 matrix. /// @see gtc_matrix_integer - typedef tmat4x2 lowp_umat4x2; + typedef mat<4, 2, uint, lowp> lowp_umat4x2; - /// Low-precision unsigned integer 4x3 matrix. + /// Low-qualifier unsigned integer 4x3 matrix. /// @see gtc_matrix_integer - typedef tmat4x3 lowp_umat4x3; + typedef mat<4, 3, uint, lowp> lowp_umat4x3; - /// Low-precision unsigned integer 4x4 matrix. + /// Low-qualifier unsigned integer 4x4 matrix. /// @see gtc_matrix_integer - typedef tmat4x4 lowp_umat4x4; + typedef mat<4, 4, uint, lowp> lowp_umat4x4; #if(defined(GLM_PRECISION_HIGHP_INT)) typedef highp_imat2 imat2; @@ -432,7 +433,7 @@ namespace glm typedef lowp_umat4x3 umat4x3; typedef lowp_umat4x4 umat4x4; #else //if(defined(GLM_PRECISION_MEDIUMP_UINT)) - + /// Unsigned integer 2x2 matrix. /// @see gtc_matrix_integer typedef mediump_umat2 umat2; -- cgit v1.2.3