Browse Source

Merge branch '0.9.1' of ssh://ogl-math.git.sourceforge.net/gitroot/ogl-math/ogl-math into 0.9.1

Christophe Riccio 15 years ago
parent
commit
89367d5def

+ 3 - 3
CMakeLists.txt

@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 cmake_policy(VERSION 2.6)
 cmake_policy(VERSION 2.6)
 
 
 project(glm)
 project(glm)
-enable_testing()
+#Delayed for GLM 0.9.2
+#enable_testing()
 
 
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 add_definitions(-pedantic)
 add_definitions(-pedantic)
@@ -16,7 +17,6 @@ add_definitions(-msse2)
 
 
 include_directories(".")
 include_directories(".")
 
 
-
 add_subdirectory(glm)
 add_subdirectory(glm)
 add_subdirectory(test)
 add_subdirectory(test)
 add_subdirectory(bench)
 add_subdirectory(bench)
@@ -27,4 +27,4 @@ if(NOT GLM_TEST_MODE)
 	message(FATAL_ERROR "GLM is a header only library, no need to build it. Set the option GLM_TEST_MODE with ON to build and run the test bench")
 	message(FATAL_ERROR "GLM is a header only library, no need to build it. Set the option GLM_TEST_MODE with ON to build and run the test bench")
 endif()
 endif()
 
 
-install( DIRECTORY glm DESTINATION include )
+install(DIRECTORY glm DESTINATION include)

+ 21 - 1
doc/src/data.xml

@@ -3,6 +3,7 @@
 <glm copyright="Copyright © 2005 - 2011">
 <glm copyright="Copyright © 2005 - 2011">
   <downloads>
   <downloads>
     <section name="GLM - zip files">
     <section name="GLM - zip files">
+		<download name="GLM 0.9.1.0" date="02/03/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.0/glm-0.9.1.0.zip/download"/>
       <download name="GLM 0.9.1.B" date="13/02/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.B/glm-0.9.1.B.zip/download"/>
       <download name="GLM 0.9.1.B" date="13/02/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.B/glm-0.9.1.B.zip/download"/>
       <download name="GLM 0.9.0.8" date="13/02/2010" size="3.3 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.8/glm-0.9.0.8.zip/download"/>
       <download name="GLM 0.9.0.8" date="13/02/2010" size="3.3 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.8/glm-0.9.0.8.zip/download"/>
       <download name="GLM 0.9.1.A" date="31/01/2010" size="3.0 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.A/glm-0.9.1.A.zip/download"/>
       <download name="GLM 0.9.1.A" date="31/01/2010" size="3.0 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.A/glm-0.9.1.A.zip/download"/>
@@ -58,6 +59,7 @@
       <download name="GLM 0.1.0.0" date="02/21/2005" size="29.2 KB" link="http://prdownloads.sourceforge.net/glf/glm-0.1-ur.zip?download"/>
       <download name="GLM 0.1.0.0" date="02/21/2005" size="29.2 KB" link="http://prdownloads.sourceforge.net/glf/glm-0.1-ur.zip?download"/>
     </section>
     </section>
     <section name="GLM - 7z files">
     <section name="GLM - 7z files">
+		<download name="GLM 0.9.1.0" date="02/03/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.0/glm-0.9.1.0.7z/download"/>
       <download name="GLM 0.9.1.B" date="13/02/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.B/glm-0.9.1.B.7z/download"/>
       <download name="GLM 0.9.1.B" date="13/02/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.B/glm-0.9.1.B.7z/download"/>
       <download name="GLM 0.9.0.8" date="13/02/2011" size="1.9 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.8/glm-0.9.0.8.7z/download"/>
       <download name="GLM 0.9.0.8" date="13/02/2011" size="1.9 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.8/glm-0.9.0.8.7z/download"/>
       <download name="GLM 0.9.1.A" date="31/01/2011" size="2.0 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.A/glm-0.9.1.A.7z/download"/>
       <download name="GLM 0.9.1.A" date="31/01/2011" size="2.0 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.A/glm-0.9.1.A.7z/download"/>
@@ -1544,7 +1546,25 @@
 
 
   <page_news>
   <page_news>
 
 
-    <news index="0060" date="13/02/2011" title="GLM 0.9.0.8 and GLM 0.9.1 beta released" image="goodies/logo.png" image-mini="image/logo-mini.png">
+	  <news index="0061" date="02/03/2011" title="GLM 0.9.1.0 final released" image="goodies/logo.png" image-mini="image/logo-mini.png">
+		  <paragraph>
+			  The stable version, GLM 0.9.0.8, adds the operator * for quaternion products and deprecated the cross function previously used for the same purpose.
+			  Also, it clarifies that GLM is a header only library when a user try to build it. Once more, there is nothing to build.
+		  </paragraph>
+		  <paragraph>
+			  The development version, GLM 0.9.1 beta, provides an improved <link href="http://glm.g-truc.net/html-0.9.1/index.html">API documentation</link> by
+			  <link href="http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showprofile&amp;User=23530">Alfonse Reinheart</link>,
+			  author of <link href="http://www.arcsynthesis.org/gltut/">a great OpenGL tutorial</link> which uses GLM.
+			  This version also improves the SIMD extensions and it fixes many bugs.
+		  </paragraph>
+
+		  <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.0/glm-0.9.1.0.zip/download">GLM 0.9.1.0 (zip,)</source>
+		  <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.0/glm-0.9.1.0.7z/download">GLM 0.9.1.0 (7z)</source>
+		  <source type="Link" href="http://glm.g-truc.net/glm-0.9.1.pdf">GLM 0.9.1 manual</source>
+		  <source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source>
+	  </news>
+
+	  <news index="0060" date="13/02/2011" title="GLM 0.9.0.8 and GLM 0.9.1 beta released" image="goodies/logo.png" image-mini="image/logo-mini.png">
       <paragraph>
       <paragraph>
         The stable version, GLM 0.9.0.8, adds the operator * for quaternion products and deprecated the cross function previously used for the same purpose.
         The stable version, GLM 0.9.0.8, adds the operator * for quaternion products and deprecated the cross function previously used for the same purpose.
         Also, it clarifies that GLM is a header only library when a user try to build it. Once more, there is nothing to build.
         Also, it clarifies that GLM is a header only library when a user try to build it. Once more, there is nothing to build.

+ 1 - 1
glm/core/intrinsic_exponential.hpp

@@ -10,7 +10,7 @@
 #ifndef glm_detail_intrinsic_exponential
 #ifndef glm_detail_intrinsic_exponential
 #define glm_detail_intrinsic_exponential
 #define glm_detail_intrinsic_exponential
 
 
-#include "../setup.hpp"
+#include "setup.hpp"
 
 
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #	error "SSE2 instructions not supported or enabled"
 #	error "SSE2 instructions not supported or enabled"

+ 1 - 1
glm/core/intrinsic_matrix.hpp

@@ -10,7 +10,7 @@
 #ifndef glm_detail_intrinsic_matrix
 #ifndef glm_detail_intrinsic_matrix
 #define glm_detail_intrinsic_matrix
 #define glm_detail_intrinsic_matrix
 
 
-#include "../setup.hpp"
+#include "setup.hpp"
 
 
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #	error "SSE2 instructions not supported or enabled"
 #	error "SSE2 instructions not supported or enabled"

+ 1 - 1
glm/core/intrinsic_trigonometric.hpp

@@ -10,7 +10,7 @@
 #ifndef glm_detail_intrinsic_trigonometric
 #ifndef glm_detail_intrinsic_trigonometric
 #define glm_detail_intrinsic_trigonometric
 #define glm_detail_intrinsic_trigonometric
 
 
-#include "../setup.hpp"
+#include "setup.hpp"
 
 
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #	error "SSE2 instructions not supported or enabled"
 #	error "SSE2 instructions not supported or enabled"

+ 1 - 1
glm/core/intrinsic_vector_relational.hpp

@@ -10,7 +10,7 @@
 #ifndef glm_detail_intrinsic_vector_relational
 #ifndef glm_detail_intrinsic_vector_relational
 #define glm_detail_intrinsic_vector_relational
 #define glm_detail_intrinsic_vector_relational
 
 
-#include "../setup.hpp"
+#include "setup.hpp"
 
 
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #	error "SSE2 instructions not supported or enabled"
 #	error "SSE2 instructions not supported or enabled"

+ 1 - 1
glm/core/setup.hpp

@@ -17,7 +17,7 @@
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_PATCH			1
 #define GLM_VERSION_PATCH			1
-#define GLM_VERSION_REVISION		B
+#define GLM_VERSION_REVISION		0
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Compiler
 // Compiler

+ 0 - 2
glm/glm.hpp

@@ -14,8 +14,6 @@
 
 
 //! TODO: to delete
 //! TODO: to delete
 #define GLMvalType typename genType::value_type
 #define GLMvalType typename genType::value_type
-//#define GLMcolType typename genType::col_type
-//#define GLMrowType typename genType::row_type
 
 
 #include <cmath>
 #include <cmath>
 #include <climits>
 #include <climits>

+ 5 - 0
readme.txt

@@ -13,6 +13,11 @@ GLM is a header only library, there is nothing to build, just include it.
 More informations in GLM manual:
 More informations in GLM manual:
 http://glm.g-truc.net/glm-manual.pdf
 http://glm.g-truc.net/glm-manual.pdf
 
 
+================================================================================
+GLM 0.9.1.0: 2010-03-02
+--------------------------------------------------------------------------------
+- Fixed bugs
+
 ================================================================================
 ================================================================================
 GLM 0.9.1.B: 2010-02-13
 GLM 0.9.1.B: 2010-02-13
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------