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

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

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

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

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

Modified: Mercury2/scenegraph.xml
===================================================================
--- Mercury2/scenegraph.xml	2009-03-02 19:51:29 UTC (rev 161)
+++ Mercury2/scenegraph.xml	2009-03-02 20:00:18 UTC (rev 162)
@@ -20,7 +20,7 @@
 				<asset type="quad"/>
 			</node>
 		</node>
-		<node type="rotatornode" movy="0" movz="-2" scalex="0.25" scaley="0.25" scalez="0.25" >
+		<node type="rotatornode" movy="0" movz="-20" 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/BoundingBox.cpp
===================================================================
--- Mercury2/src/BoundingBox.cpp	2009-03-02 19:51:29 UTC (rev 161)
+++ Mercury2/src/BoundingBox.cpp	2009-03-02 20:00:18 UTC (rev 162)
@@ -22,7 +22,7 @@
 	MercuryVertex c = GetGlobalMatrix() * m_bb->GetCenter();
 	
 //	GetGlobalMatrix().Print();
-//	c.Print();
+	c.Print();
 	
 	BoundingBox gbb( c, bb.GetExtend() );
 	

Modified: Mercury2/src/MercuryMatrix.cpp
===================================================================
--- Mercury2/src/MercuryMatrix.cpp	2009-03-02 19:51:29 UTC (rev 161)
+++ Mercury2/src/MercuryMatrix.cpp	2009-03-02 20:00:18 UTC (rev 162)
@@ -203,7 +203,6 @@
 	Float2FloatRow( tmp, &r );
 	VectorMultiply4f( m_matrix, &r, &tvo);
 	FloatRow2Float( &tvo, tmp );
-	MercuryVertex(tmp).Print();
 	return MercuryVertex(tmp);
 }
 

Modified: Mercury2/src/MercuryVertex.cpp
===================================================================
--- Mercury2/src/MercuryVertex.cpp	2009-03-02 19:51:29 UTC (rev 161)
+++ Mercury2/src/MercuryVertex.cpp	2009-03-02 20:00:18 UTC (rev 162)
@@ -20,6 +20,12 @@
 		m_xyz[i] = in[i];
 }
 
+MercuryVertex::MercuryVertex( const MercuryVertex& v)
+{
+	for (unsigned int i = 0; i < 3; ++i)
+		m_xyz[i] = v.m_xyz[i];
+}
+
 void MercuryVertex::NormalizeSelf()
 {
 	float imag = 1.0f/Length();

Modified: Mercury2/src/MercuryVertex.h
===================================================================
--- Mercury2/src/MercuryVertex.h	2009-03-02 19:51:29 UTC (rev 161)
+++ Mercury2/src/MercuryVertex.h	2009-03-02 20:00:18 UTC (rev 162)
@@ -7,6 +7,7 @@
 		MercuryVertex();
 		MercuryVertex( float ix, float iy, float iz );
 		MercuryVertex( const float * in );
+		MercuryVertex( const MercuryVertex& v);
 
 		///Direct conversion to float*
 		operator float* () { return m_xyz; }


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