[Hgengine-cvs] SF.net SVN: hgengine:[163] Mercury2

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

Revision: 163
          http://hgengine.svn.sourceforge.net/hgengine/?rev=163&view=rev
Author:   axlecrusher
Date:     2009-03-02 20:07:37 +0000 (Mon, 02 Mar 2009)

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

Modified Paths:
--------------
    Mercury2/scenegraph.xml
    Mercury2/src/MercuryMatrix.cpp

Modified: Mercury2/scenegraph.xml
===================================================================
--- Mercury2/scenegraph.xml	2009-03-02 20:00:18 UTC (rev 162)
+++ Mercury2/scenegraph.xml	2009-03-02 20:07:37 UTC (rev 163)
@@ -20,7 +20,7 @@
 				<asset type="quad"/>
 			</node>
 		</node>
-		<node type="rotatornode" movy="0" movz="-20" scalex="0.25" scaley="0.25" scalez="0.25" >
+		<node type="rotatornode" movy="0" movz="-2" scalex="0.25" scaley="0.25" scalez="0.25" >
 			<node type="renderablenode">
 				<asset type="texture" file="gunther.png"/>
 				<asset type="hgmdlmodel" file="gunther.hgmdl"/>

Modified: Mercury2/src/MercuryMatrix.cpp
===================================================================
--- Mercury2/src/MercuryMatrix.cpp	2009-03-02 20:00:18 UTC (rev 162)
+++ Mercury2/src/MercuryMatrix.cpp	2009-03-02 20:07:37 UTC (rev 163)
@@ -198,11 +198,13 @@
 MercuryVector MercuryMatrix::operator*(const MercuryVector& v) const
 {
 	float tmp[4];
+	FloatRow r, tvo;
+	
 	v.ConvertToVector4( tmp );
-	FloatRow r, tvo;
 	Float2FloatRow( tmp, &r );
 	VectorMultiply4f( m_matrix, &r, &tvo);
 	FloatRow2Float( &tvo, tmp );
+	
 	return MercuryVertex(tmp);
 }
 


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