Getting GLM 0.9.3.1 release ready
This commit is contained in:
@@ -2,8 +2,9 @@
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
|
||||
|
||||
<title>matrix_interpolation.hpp Source File</title>
|
||||
<title>orthonormalize.hpp Source File</title>
|
||||
<link href="tabs.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="doxygen.css" rel="stylesheet" type="text/css" />
|
||||
|
||||
@@ -31,7 +32,7 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- Generated by Doxygen 1.7.5 -->
|
||||
<!-- Generated by Doxygen 1.7.6.1 -->
|
||||
<div id="navrow1" class="tabs">
|
||||
<ul class="tablist">
|
||||
<li><a href="index.html"><span>Main Page</span></a></li>
|
||||
@@ -46,10 +47,11 @@
|
||||
<li><a href="files.html"><span>File List</span></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="header">
|
||||
<div class="headertitle">
|
||||
<div class="title">matrix_interpolation.hpp</div> </div>
|
||||
</div>
|
||||
<div class="title">orthonormalize.hpp</div> </div>
|
||||
</div><!--header-->
|
||||
<div class="contents">
|
||||
<a href="a00070.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001
|
||||
<a name="l00002"></a>00002
|
||||
@@ -88,49 +90,41 @@
|
||||
<a name="l00035"></a>00035
|
||||
<a name="l00036"></a>00036
|
||||
<a name="l00037"></a>00037
|
||||
<a name="l00038"></a>00038 <span class="preprocessor">#ifndef GLM_GTX_matrix_interpolation</span>
|
||||
<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="preprocessor">#define GLM_GTX_matrix_interpolation GLM_VERSION</span>
|
||||
<a name="l00040"></a>00040 <span class="preprocessor"></span>
|
||||
<a name="l00041"></a>00041 <span class="comment">// Dependency:</span>
|
||||
<a name="l00042"></a>00042 <span class="comment">//#include "../glm.hpp"</span>
|
||||
<a name="l00043"></a>00043
|
||||
<a name="l00044"></a>00044 <span class="preprocessor">#if(defined(GLM_MESSAGES) && !defined(glm_ext))</span>
|
||||
<a name="l00045"></a>00045 <span class="preprocessor"></span><span class="preprocessor"># pragma message("GLM: GLM_GTX_matrix_interpolation extension included")</span>
|
||||
<a name="l00046"></a>00046 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
|
||||
<a name="l00047"></a>00047 <span class="preprocessor"></span>
|
||||
<a name="l00048"></a>00048 <span class="keyword">namespace </span>glm
|
||||
<a name="l00049"></a>00049 {
|
||||
<a name="l00052"></a>00052
|
||||
<a name="l00055"></a>00055 <span class="keyword">template</span> <<span class="keyword">typename</span> T>
|
||||
<a name="l00056"></a>00056 <span class="keywordtype">void</span> <a class="code" href="a00193.html#ga9d83dd69424140379624d570b0a6c238" title="Get the axis and angle of the rotation from a matrix.">axisAngle</a>(
|
||||
<a name="l00057"></a>00057 detail::tmat4x4<T> <span class="keyword">const</span> & mat,
|
||||
<a name="l00058"></a>00058 detail::tvec3<T> & <a class="code" href="a00210.html#ga72457604550d0414e522dbec0d98f276" title="Returns the q rotation axis.">axis</a>,
|
||||
<a name="l00059"></a>00059 T & <a class="code" href="a00210.html#ga69041d18bd8539fe82d6170932d28362" title="Returns the quaternion rotation angle.">angle</a>);
|
||||
<a name="l00060"></a>00060
|
||||
<a name="l00063"></a>00063 <span class="keyword">template</span> <<span class="keyword">typename</span> T>
|
||||
<a name="l00064"></a>00064 detail::tmat4x4<T> <a class="code" href="a00193.html#ga9c35118f46d7e7baf93b63612628b600" title="Build a matrix from axis and angle.">axisAngleMatrix</a>(
|
||||
<a name="l00065"></a>00065 detail::tvec3<T> <span class="keyword">const</span> & <a class="code" href="a00210.html#ga72457604550d0414e522dbec0d98f276" title="Returns the q rotation axis.">axis</a>,
|
||||
<a name="l00066"></a>00066 T <span class="keyword">const</span> <a class="code" href="a00210.html#ga69041d18bd8539fe82d6170932d28362" title="Returns the quaternion rotation angle.">angle</a>);
|
||||
<a name="l00067"></a>00067
|
||||
<a name="l00071"></a>00071 <span class="keyword">template</span> <<span class="keyword">typename</span> T>
|
||||
<a name="l00072"></a>00072 detail::tmat4x4<T> <a class="code" href="a00193.html#ga797ad3192e9cfb80840a93a20b55896a" title="Build a interpolation of 4 * 4 matrixes.">interpolate</a>(
|
||||
<a name="l00073"></a>00073 detail::tmat4x4<T> <span class="keyword">const</span> & m1,
|
||||
<a name="l00074"></a>00074 detail::tmat4x4<T> <span class="keyword">const</span> & m2,
|
||||
<a name="l00075"></a>00075 T <span class="keyword">const</span> delta);
|
||||
<a name="l00076"></a>00076
|
||||
<a name="l00078"></a>00078 }<span class="comment">//namespace glm</span>
|
||||
<a name="l00079"></a>00079
|
||||
<a name="l00080"></a>00080 <span class="preprocessor">#include "matrix_interpolation.inl"</span>
|
||||
<a name="l00081"></a>00081
|
||||
<a name="l00082"></a>00082 <span class="preprocessor">#endif//GLM_GTX_matrix_interpolation</span>
|
||||
</pre></div></div>
|
||||
</div>
|
||||
<a name="l00038"></a>00038
|
||||
<a name="l00039"></a>00039 <span class="preprocessor">#ifndef GLM_GTX_orthonormalize</span>
|
||||
<a name="l00040"></a>00040 <span class="preprocessor"></span><span class="preprocessor">#define GLM_GTX_orthonormalize GLM_VERSION</span>
|
||||
<a name="l00041"></a>00041 <span class="preprocessor"></span>
|
||||
<a name="l00042"></a>00042 <span class="comment">// Dependency:</span>
|
||||
<a name="l00043"></a>00043 <span class="preprocessor">#include "../glm.hpp"</span>
|
||||
<a name="l00044"></a>00044
|
||||
<a name="l00045"></a>00045 <span class="preprocessor">#if(defined(GLM_MESSAGES) && !defined(glm_ext))</span>
|
||||
<a name="l00046"></a>00046 <span class="preprocessor"></span><span class="preprocessor"># pragma message("GLM: GLM_GTX_orthonormalize extension included")</span>
|
||||
<a name="l00047"></a>00047 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
|
||||
<a name="l00048"></a>00048 <span class="preprocessor"></span>
|
||||
<a name="l00049"></a>00049 <span class="keyword">namespace </span>glm
|
||||
<a name="l00050"></a>00050 {
|
||||
<a name="l00053"></a>00053
|
||||
<a name="l00056"></a>00056 <span class="keyword">template</span> <<span class="keyword">typename</span> T>
|
||||
<a name="l00057"></a>00057 detail::tmat3x3<T> orthonormalize(
|
||||
<a name="l00058"></a>00058 <span class="keyword">const</span> detail::tmat3x3<T>& m);
|
||||
<a name="l00059"></a>00059
|
||||
<a name="l00062"></a>00062 <span class="keyword">template</span> <<span class="keyword">typename</span> T>
|
||||
<a name="l00063"></a>00063 detail::tvec3<T> orthonormalize(
|
||||
<a name="l00064"></a>00064 <span class="keyword">const</span> detail::tvec3<T>& x,
|
||||
<a name="l00065"></a>00065 <span class="keyword">const</span> detail::tvec3<T>& y);
|
||||
<a name="l00066"></a>00066
|
||||
<a name="l00068"></a>00068 }<span class="comment">//namespace glm</span>
|
||||
<a name="l00069"></a>00069
|
||||
<a name="l00070"></a>00070 <span class="preprocessor">#include "orthonormalize.inl"</span>
|
||||
<a name="l00071"></a>00071
|
||||
<a name="l00072"></a>00072 <span class="preprocessor">#endif//GLM_GTX_orthonormalize</span>
|
||||
</pre></div></div><!-- contents -->
|
||||
|
||||
|
||||
<hr class="footer"/><address class="footer"><small>
|
||||
Generated by  <a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/>
|
||||
</a> 1.7.5
|
||||
</a> 1.7.6.1
|
||||
</small></address>
|
||||
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user