Fixed merge

glm/core/_detail.hpp

@@ -445,6 +445,13 @@ namespace detail
 #	define GLM_RESTRICT __declspec(restrict)
 #	define GLM_RESTRICT_VAR __restrict
 #	define GLM_CONSTEXPR 
+#elif(GLM_COMPILER & GLM_COMPILER_INTEL)
+#   define GLM_DEPRECATED
+#   define GLM_ALIGN(x) __declspec(align(x))
+#   define GLM_ALIGNED_STRUCT(x) __declspec(align(x)) struct
+#   define GLM_RESTRICT
+#   define GLM_RESTRICT_VAR __restrict
+#   define GLM_CONSTEXPR
 #elif((GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_LLVM_GCC)) && (GLM_COMPILER >= GLM_COMPILER_GCC31))
 #	define GLM_DEPRECATED __attribute__((__deprecated__))
 #	define GLM_ALIGN(x) __attribute__((aligned(x)))

glm/core/func_common.inl

@@ -811,6 +811,8 @@ namespace detail
 #			else
 				return std::isnan(x);
 #			endif
+#		elif(GLM_COMPILER & GLM_COMPILER_CUDA)
+            return isnan(x) != 0;
 #       else
 			return std::isnan(x);
 #       endif
@@ -866,6 +868,9 @@ namespace detail
 #			else
 				return std::isinf(x);
 #			endif
+#		elif(GLM_COMPILER & GLM_COMPILER_CUDA)
+            // http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/docs/online/group__CUDA__MATH__DOUBLE_g13431dd2b40b51f9139cbb7f50c18fab.html#g13431dd2b40b51f9139cbb7f50c18fab
+            return isinf(double(x)) != 0;
 #       else
 			return std::isinf(x);
 #       endif

glm/core/setup.hpp

@@ -36,7 +36,7 @@
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_PATCH			4
-#define GLM_VERSION_REVISION		0
+#define GLM_VERSION_REVISION		2
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Platform

glm/gtc/matrix_transform.inl

@@ -236,7 +236,13 @@ namespace glm
 		valType const & zFar
 	)
 	{
-		valType range = tan(radians(fovy / valType(2))) * zNear;	
+#ifdef GLM_FORCE_RADIANS
+		valType const rad = fovy;
+#else
+		valType const rad = glm::radians(fovy);
+#endif
+        
+		valType range = tan(radians(rad / valType(2))) * zNear;	
 		valType left = -range * aspect;
 		valType right = range * aspect;
 		valType bottom = -range;

readme.txt

@@ -7,7 +7,7 @@ glm@g-truc.net
 ================================================================================
 The MIT License
 --------------------------------------------------------------------------------
-Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
+Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -40,6 +40,9 @@ http://glm.g-truc.net/glm.pdf
 GLM 0.9.4.2: 2013-01-XX
 --------------------------------------------------------------------------------
 - Fixed compAdd from GTX_component_wise
+- Fixed SIMD support for Intel compiler on Windows
+- Fixed isnan and isinf for CUDA compiler
+- Fixed GLM_FORCE_RADIANS on glm::perspective
 - Fixed GCC warnings
 
 ================================================================================