Christophe Riccio преди 14 години
родител
ревизия
83f278f922
променени са 4 файла, в които са добавени 26 реда и са изтрити 3 реда
  1. 22 0
      doc/pages.doxy
  2. 1 0
      glm/core/func_exponential.hpp
  3. 1 1
      glm/gtx/constants.hpp
  4. 2 2
      glm/gtx/integer.hpp

+ 22 - 0
doc/pages.doxy

@@ -28,3 +28,25 @@
 
 
 	These pages are the API reference only. For more information about how to use GLM, please have a look at <a href="http://glm.g-truc.net/glm.pdf">the manual</a>.
 	These pages are the API reference only. For more information about how to use GLM, please have a look at <a href="http://glm.g-truc.net/glm.pdf">the manual</a>.
 **/
 **/
+
+/*!
+	\page pg_differences Differences between GLSL and GLM core
+	
+	GLM comes very close to replicating GLSL, but it is not exact. Here is a list of
+	differences between GLM and GLSL:
+	
+	<ul>
+		<li>
+		Precision qualifiers. In GLSL numeric types can have qualifiers that define
+		the precision of that type. While OpenGL's GLSL ignores these qualifiers, OpenGL
+		ES's version of GLSL uses them.
+		
+		C++ has no language equivalent to precision qualifiers. Instead, GLM provides
+		a set of typedefs for each kind of precision qualifier and type. These types can
+		be found in \ref core_precision "their own section".
+		
+		Functions that take types tend to be templated on those types, so they can 
+		take these qualified types just as well as the regular ones.
+		</li>
+	</ul>
+**/

+ 1 - 0
glm/core/func_exponential.hpp

@@ -44,6 +44,7 @@ namespace glm
 	/// Returns x raised to the y power. 
 	/// Returns x raised to the y power. 
 	///
 	///
 	/// @param x pow function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision.
 	/// @param x pow function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision.
+	/// @param y 
 	/// @tparam genType Floating-point scalar or vector types.
 	/// @tparam genType Floating-point scalar or vector types.
     ///
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/pow.xml">GLSL pow man page</a>
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/pow.xml">GLSL pow man page</a>

+ 1 - 1
glm/gtx/constants.hpp

@@ -20,7 +20,7 @@
 /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 /// THE SOFTWARE.
 /// THE SOFTWARE.
 ///
 ///
-/// @ref constants
+/// @ref gtx_constants
 /// @file glm/gtx/constants.hpp
 /// @file glm/gtx/constants.hpp
 /// @date 2011-09-30 / 2011-09-30
 /// @date 2011-09-30 / 2011-09-30
 /// @author Christophe Riccio
 /// @author Christophe Riccio

+ 2 - 2
glm/gtx/integer.hpp

@@ -60,8 +60,8 @@ namespace glm
 
 
 	//! Returns the log2 of x. Can be reliably using to compute mipmap count from the texture size.
 	//! Returns the log2 of x. Can be reliably using to compute mipmap count from the texture size.
 	//! From GLM_GTX_integer extension.
 	//! From GLM_GTX_integer extension.
-	template <typename genType>
-	genType log2(genType const & x);
+	template <typename genIUType>
+	genIUType log2(genIUType const & x);
 
 
 	//! Returns the floor log2 of x.
 	//! Returns the floor log2 of x.
 	//! From GLM_GTX_integer extension.
 	//! From GLM_GTX_integer extension.