瀏覽代碼

Fixed 0x2013 dash character in comments that cause issue in Windows

Christophe Riccio 13 年之前
父節點
當前提交
a4aa39f9bd
共有 5 個文件被更改,包括 10 次插入7 次删除
  1. 2 2
      glm/core/func_common.hpp
  2. 1 1
      glm/core/func_common.inl
  3. 2 2
      glm/core/func_integer.hpp
  4. 2 2
      glm/gtx/simd_vec4.hpp
  5. 3 0
      readme.txt

+ 2 - 2
glm/core/func_common.hpp

@@ -278,8 +278,8 @@ namespace glm
 	/// you would want a threshold function with a smooth
 	/// transition. This is equivalent to:
 	/// genType t;
-	/// t = clamp ((x – edge0) / (edge1 – edge0), 0, 1);
-	/// return t * t * (3  2 * t);
+	/// t = clamp ((x - edge0) / (edge1 - edge0), 0, 1);
+	/// return t * t * (3 - 2 * t);
 	/// Results are undefined if edge0 >= edge1.
 	///
 	/// @tparam genType Floating-point scalar or vector types.

+ 1 - 1
glm/core/func_common.inl

@@ -275,7 +275,7 @@ namespace detail
 	//// Only valid if (INT_MIN <= x-y <= INT_MAX)
 	//// min(x,y)
 	//r = y + ((x - y) & ((x - y) >> (sizeof(int) *
-	//CHAR_BIT  1)));
+	//CHAR_BIT - 1)));
 	//// max(x,y)
 	//r = x - ((x - y) & ((x - y) >> (sizeof(int) *
 	//CHAR_BIT - 1)));

+ 2 - 2
glm/core/func_integer.hpp

@@ -105,7 +105,7 @@ namespace glm
 	/// returning them in the least significant bits of the result.
 	/// For unsigned data types, the most significant bits of the
 	/// result will be set to zero. For signed data types, the
-	/// most significant bits will be set to the value of bit offset + base  1.
+	/// most significant bits will be set to the value of bit offset + base - 1.
 	///
 	/// If bits is zero, the result will be zero. The result will be
 	/// undefined if offset or bits is negative, or if the sum of
@@ -125,7 +125,7 @@ namespace glm
 	/// Returns the insertion the bits least-significant bits of insert into base.
 	///
 	/// The result will have bits [offset, offset + bits - 1] taken
-	/// from bits [0, bits  1] of insert, and all other bits taken
+	/// from bits [0, bits - 1] of insert, and all other bits taken
 	/// directly from the corresponding bits of base. If bits is
 	/// zero, the result will simply be base. The result will be
 	/// undefined if offset or bits is negative, or if the sum of

+ 2 - 2
glm/gtx/simd_vec4.hpp

@@ -305,8 +305,8 @@ namespace detail
 	//! you would want a threshold function with a smooth
 	//! transition. This is equivalent to:
 	//! genType t;
-	//! t = clamp ((x – edge0) / (edge1 – edge0), 0, 1);
-	//! return t * t * (3  2 * t);
+	//! t = clamp ((x - edge0) / (edge1 - edge0), 0, 1);
+	//! return t * t * (3 - 2 * t);
 	//! Results are undefined if edge0 >= edge1.
 	//! (From GLM_GTX_simd_vec4 extension, common function)
 	detail::fvec4SIMD smoothstep(

+ 3 - 0
readme.txt

@@ -45,6 +45,9 @@ GLM 0.9.4.2: 2013-01-XX
 - Fixed GLM_FORCE_RADIANS on glm::perspective
 - Fixed GCC warnings
 - Fixed packDouble2x32 on XCode
+- Fixed mix for vec4 SSE implementation
+- Fixed 0x2013 dash character in comments that cause issue in Windows 
+  Japanese mode
 
 ================================================================================
 GLM 0.9.4.1: 2012-12-22