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

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

Revision: 714
          http://hgengine.svn.sourceforge.net/hgengine/?rev=714&view=rev
Author:   axlecrusher
Date:     2010-04-29 10:50:54 +0000 (Thu, 29 Apr 2010)

Log Message:
-----------
instance counter for MercuryMatrixMemory singleton

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

Modified: Mercury2/src/MercuryMatrix.cpp
===================================================================
--- Mercury2/src/MercuryMatrix.cpp	2010-04-29 10:32:21 UTC (rev 713)
+++ Mercury2/src/MercuryMatrix.cpp	2010-04-29 10:50:54 UTC (rev 714)
@@ -1,7 +1,7 @@
 #include "MercuryMatrix.h"
 #include <MercuryLog.h>
 
-MercuryMatrixMemory& MercuryMatrixMemory::Instance()
+MercuryMatrixMemory& MercuryMatrixMemory::GetInstance()
 {
 	static MercuryMatrixMemory* mmm = NULL;
 	
@@ -58,21 +58,21 @@
 #endif
 */
 //	*this = Identity();
-	m_matrix = MercuryMatrixMemory::Instance().GetNewMatrix();
+	m_matrix = MercuryMatrixMemory::GetInstance().GetNewMatrix();
 	LoadIdentity();
 }
 
 MercuryMatrix::MercuryMatrix(const MercuryMatrix& m)
 	:m_matrix(0)
 {
-	m_matrix = MercuryMatrixMemory::Instance().GetNewMatrix();
+	m_matrix = MercuryMatrixMemory::GetInstance().GetNewMatrix();
 	Copy16f(m_matrix, m.m_matrix);
 }
 
 MercuryMatrix::~MercuryMatrix()
 {
 	if (m_matrix)
-		MercuryMatrixMemory::Instance().FreeMatrix( m_matrix );
+		MercuryMatrixMemory::GetInstance().FreeMatrix( m_matrix );
 	m_matrix = NULL;
 }
 
@@ -90,10 +90,10 @@
 
 void MercuryMatrix::Zero()
 {
-	ZeroFloatRow( m_matrix[0] );
-	ZeroFloatRow( m_matrix[1] );
-	ZeroFloatRow( m_matrix[2] );
-	ZeroFloatRow( m_matrix[3] );
+	m_matrix[0] = {0,0,0,0};
+	m_matrix[1] = {0,0,0,0};
+	m_matrix[2] = {0,0,0,0};
+	m_matrix[3] = {0,0,0,0};
 }
 
 const MercuryMatrix& MercuryMatrix::Identity()

Modified: Mercury2/src/MercuryMatrix.h
===================================================================
--- Mercury2/src/MercuryMatrix.h	2010-04-29 10:32:21 UTC (rev 713)
+++ Mercury2/src/MercuryMatrix.h	2010-04-29 10:50:54 UTC (rev 714)
@@ -18,7 +18,7 @@
 	free ride into the CPU cache. */
 	public:
 		void Init();
-		static MercuryMatrixMemory& Instance();
+		static MercuryMatrixMemory& GetInstance();
 		FloatRow* GetNewMatrix();
 		void FreeMatrix(FloatRow* m);
 	private:
@@ -81,6 +81,8 @@
 	void Print() const;
 };
 
+static InstanceCounter<MercuryMatrixMemory> MMMcounter("MercuryMatrixMemory");
+
 #endif
 
 /* 


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