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

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

Revision: 150
          http://hgengine.svn.sourceforge.net/hgengine/?rev=150&view=rev
Author:   cnlohr
Date:     2009-01-22 16:28:56 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
Cleanup non-sse code.

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

Modified: Mercury2/src/MercuryMath.cpp
===================================================================
--- Mercury2/src/MercuryMath.cpp	2009-01-22 16:27:44 UTC (rev 149)
+++ Mercury2/src/MercuryMath.cpp	2009-01-22 16:28:56 UTC (rev 150)
@@ -35,7 +35,7 @@
 
 void ZeroFloatRow(FloatRow& r)
 {
-	Copy4f(&r, (FloatRow){ 0.0f, 0.0f, 0.0f, 0.0f });
+	Copy4f(&r, &gfrZero );
 }
 
 void Mul4f(const FloatRow* first, const FloatRow* second, FloatRow* out)

Modified: Mercury2/src/MercuryMath.h
===================================================================
--- Mercury2/src/MercuryMath.h	2009-01-22 16:27:44 UTC (rev 149)
+++ Mercury2/src/MercuryMath.h	2009-01-22 16:28:56 UTC (rev 150)
@@ -55,6 +55,8 @@
 void VectorMultiply4f(const FloatRow* matrix, const FloatRow* p, FloatRow* out );
 void TransposeMatrix( FloatRow* m );
 
+const FloatRow gfrZero = { 0.f, 0.f, 0.f, 0.f };
+
 #endif
 
 /*

Modified: Mercury2/src/MercuryMatrix.cpp
===================================================================
--- Mercury2/src/MercuryMatrix.cpp	2009-01-22 16:27:44 UTC (rev 149)
+++ Mercury2/src/MercuryMatrix.cpp	2009-01-22 16:28:56 UTC (rev 150)
@@ -33,10 +33,12 @@
 
 void MercuryMatrix::Identity()
 {
-	Copy4f(&m_matrix[0], (void*)&((FloatRow){ 1.0f, 0.0f, 0.0f, 0.0f }));
-	Copy4f(&m_matrix[1], (void*)&((FloatRow){ 0.0f, 1.0f, 0.0f, 0.0f }));
-	Copy4f(&m_matrix[2], (void*)&((FloatRow){ 0.0f, 0.0f, 1.0f, 0.0f }));
-	Copy4f(&m_matrix[3], (void*)&((FloatRow){ 0.0f, 0.0f, 0.0f, 1.0f }));
+	const static float Identity[16] = { 
+		1.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 1.0f, 0.0f, 0.0f,
+		0.0f, 0.0f, 1.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 1.0f };
+	Copy16f(&m_matrix[0], Identity );
 /*
 	(*this)[0][0] = 1;
 	(*this)[0][1] = 0;


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