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

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

Revision: 142
          http://hgengine.svn.sourceforge.net/hgengine/?rev=142&view=rev
Author:   axlecrusher
Date:     2009-01-03 17:50:45 +0000 (Sat, 03 Jan 2009)

Log Message:
-----------
updates

Modified Paths:
--------------
    Mercury2/src/AlignedBuffer.h
    Mercury2/src/MercuryTimer.h

Modified: Mercury2/src/AlignedBuffer.h
===================================================================
--- Mercury2/src/AlignedBuffer.h	2009-01-03 17:48:45 UTC (rev 141)
+++ Mercury2/src/AlignedBuffer.h	2009-01-03 17:50:45 UTC (rev 142)
@@ -14,11 +14,11 @@
 			Free();
 		}
 		
-		void Allocate(unsigned long count)
+		void Allocate(unsigned long count, uint8_t alignment = 32)
 		{
 			SAFE_FREE(m_mem);
 			void * m_memret;
-			m_data = (T*)mmemalign(32, sizeof(T)*count, m_memret);
+			m_data = (T*)mmemalign(alignment, sizeof(T)*count, m_memret);
 			m_mem = (T*)m_memret;
 			m_length = count;
 		}

Modified: Mercury2/src/MercuryTimer.h
===================================================================
--- Mercury2/src/MercuryTimer.h	2009-01-03 17:48:45 UTC (rev 141)
+++ Mercury2/src/MercuryTimer.h	2009-01-03 17:50:45 UTC (rev 142)
@@ -19,7 +19,8 @@
 		float Touch(const MercuryTimer& t);
 		
 		///time between last last touch and this touch
-		inline float Age() { return (m_thisTouch - m_lastTouch)/1000000.0f; }
+		inline float Age() { return MicrosecondAge()/1000000.0f; }
+		inline uint64_t MicrosecondAge() { return m_thisTouch - m_lastTouch; }
 		
 		void Pause();
 		


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