[Hgengine-cvs] SF.net SVN: hgengine:[289] Mercury2/src/MercuryMatrix.h

[<axl...@us...>]

Revision: 289
          http://hgengine.svn.sourceforge.net/hgengine/?rev=289&view=rev
Author:   axlecrusher
Date:     2009-05-31 04:26:48 +0000 (Sun, 31 May 2009)

Log Message:
-----------
update

Modified Paths:
--------------
    Mercury2/src/MercuryMatrix.h

Modified: Mercury2/src/MercuryMatrix.h
===================================================================
--- Mercury2/src/MercuryMatrix.h	2009-05-31 04:26:04 UTC (rev 288)
+++ Mercury2/src/MercuryMatrix.h	2009-05-31 04:26:48 UTC (rev 289)
@@ -5,9 +5,8 @@
 #include "MercuryMath.h"
 #include "MercuryUtil.h"
 #include <MercuryVertex.h>
+#include <MQuaternion.h>
 
-class MercuryMatrix;
-
 ///General Purpose 4x4 row-major matrix
 class MercuryMatrix
 {
@@ -42,7 +41,12 @@
 	
 	///Rotate a given amount (fAngle) in degrees around pAxis
 	void RotateAngAxis( float fAngle, float x, float y, float z );
+	
+	void Rotate(const MQuaternion& q);
+	
 	void Scale(float x, float y, float z);
+	inline void Scale(const MercuryVertex& v) { Scale(v[0], v[1], v[2]); }
+	
 	void Transotale( float tX, float tY, float tZ, float rX, float rY, float rZ, float sX, float sY, float sZ );
 	inline void Transpose() { TransposeMatrix( m_matrix ); }
 


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