[Hgengine-cvs] SF.net SVN: hgengine:[686] Mercury2/src

[<cn...@us...>]

Revision: 686
          http://hgengine.svn.sourceforge.net/hgengine/?rev=686&view=rev
Author:   cnlohr
Date:     2010-03-14 23:04:33 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Working MQuat

Modified Paths:
--------------
    Mercury2/src/MQuaternion.cpp
    Mercury2/src/MQuaternion.h

Modified: Mercury2/src/MQuaternion.cpp
===================================================================
--- Mercury2/src/MQuaternion.cpp	2010-03-03 09:07:37 UTC (rev 685)
+++ Mercury2/src/MQuaternion.cpp	2010-03-14 23:04:33 UTC (rev 686)
@@ -7,7 +7,7 @@
 	m_wxyz[0] = 0;
 	m_wxyz[1] = 0;
 	m_wxyz[2] = 0;
-	m_wxyz[3] = 0;
+	m_wxyz[3] = 1;
 }
 
 MQuaternion::MQuaternion(float W, float X, float Y, float Z)

Modified: Mercury2/src/MQuaternion.h
===================================================================
--- Mercury2/src/MQuaternion.h	2010-03-03 09:07:37 UTC (rev 685)
+++ Mercury2/src/MQuaternion.h	2010-03-14 23:04:33 UTC (rev 686)
@@ -86,6 +86,9 @@
 ///Produce a matrix out of a rotation x, then y then z (how Mercury does it)
 void AngleMatrix (const MercuryVector & angles, MercuryMatrix & mat );
 
+///Spherically interpolate between two quaternions t = 0..1
+MQuaternion SLERP( const MQuaternion &a, const MQuaternion &b,float t);
+
 #endif
 
 /****************************************************************************


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.