Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert b3Clock changes and use reset method instead.

Browse Source
This commit is contained in:
Benjamin Ellenberger
2017-06-04 20:39:10 +02:00
parent cd153eb6a5
commit b5a80a08aa
3 changed files with 31 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/Evolution/NN3DWalkers.cpp
View File

@@ -160,7 +160,8 @@ public:
m_filterCallback(NULL) m_filterCallback(NULL)
{ {
b3Clock clock; b3Clock clock;
srand(clock.getSystemTimeMilliseconds()); // Set random milliseconds based on system time srand(clock.getTimeMilliseconds()); // Set random milliseconds based on system time
clock.reset(true); // Reset clock to zero to get new random seed
} }
virtual ~NN3DWalkersExample() virtual ~NN3DWalkersExample()

72
examples/Utils/b3Clock.cpp
View File

@@ -46,7 +46,6 @@ struct b3ClockData
#ifdef B3_USE_WINDOWS_TIMERS #ifdef B3_USE_WINDOWS_TIMERS
LARGE_INTEGER mClockFrequency; LARGE_INTEGER mClockFrequency;
DWORD mStartTick;
LARGE_INTEGER mStartTime; LARGE_INTEGER mStartTime;
#else #else
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
@@ -88,11 +87,24 @@ b3Clock& b3Clock::operator=(const b3Clock& other)
/// Resets the initial reference time. /// Resets the initial reference time.
void b3Clock::reset() void b3Clock::reset(bool zeroReference)
{ {
if (zeroReference)
{
#ifdef B3_USE_WINDOWS_TIMERS
m_data->mStartTime.QuadPart = 0;
#else
#ifdef __CELLOS_LV2__
m_data->mStartTime = 0;
#else
m_data->mStartTime = (struct timeval){0};
#endif
#endif
} else
{
#ifdef B3_USE_WINDOWS_TIMERS #ifdef B3_USE_WINDOWS_TIMERS
QueryPerformanceCounter(&m_data->mStartTime); QueryPerformanceCounter(&m_data->mStartTime);
m_data->mStartTick = GetTickCount();
#else #else
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
@@ -105,6 +117,7 @@ void b3Clock::reset()
gettimeofday(&m_data->mStartTime, 0); gettimeofday(&m_data->mStartTime, 0);
#endif #endif
#endif #endif
}
} }
/// Returns the time in ms since the last call to reset or since /// Returns the time in ms since the last call to reset or since
@@ -112,14 +125,16 @@ void b3Clock::reset()
unsigned long int b3Clock::getTimeMilliseconds() unsigned long int b3Clock::getTimeMilliseconds()
{ {
#ifdef B3_USE_WINDOWS_TIMERS #ifdef B3_USE_WINDOWS_TIMERS
LARGE_INTEGER currentTime, elapsedTime; LARGE_INTEGER currentTime;
QueryPerformanceCounter(&currentTime); QueryPerformanceCounter(&currentTime);
elapsedTime.QuadPart = currentTime.QuadPart - LONGLONG elapsedTime = currentTime.QuadPart -
m_data->mStartTime.QuadPart; m_data->mStartTime.QuadPart;
elapsedTime.QuadPart *= 1000; // Compute the number of millisecond ticks elapsed.
elapsedTime.QuadPart /= m_data->mClockFrequency.QuadPart; unsigned long msecTicks = (unsigned long)(1000 * elapsedTime /
m_data->mClockFrequency.QuadPart);
return (unsigned long long) elapsedTime.QuadPart;
return msecTicks;
#else #else
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
@@ -141,41 +156,8 @@ unsigned long int b3Clock::getTimeMilliseconds()
#endif #endif
} }
/// Gets the system time in milliseconds /// Returns the time in us since the last call to reset or since
unsigned long int b3Clock::getSystemTimeMilliseconds() { /// the Clock was created.
#ifdef B3_USE_WINDOWS_TIMERS
LARGE_INTEGER currentTime, elapsedTime;
QueryPerformanceCounter(&currentTime);
elapsedTime.QuadPart = currentTime.QuadPart;
elapsedTime.QuadPart *= 1000;
elapsedTime.QuadPart /= m_data->mClockFrequency.QuadPart;
return (unsigned long long) elapsedTime.QuadPart;
#else
#ifdef __CELLOS_LV2__
uint64_t freq = sys_time_get_timebase_frequency();
double dFreq = ((double)freq) / 1000.0;
typedef uint64_t ClockSize;
ClockSize newTime;
SYS_TIMEBASE_GET(newTime);
//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
return (unsigned long int)((double(newTime)) / dFreq);
#else
struct timeval currentTime;
gettimeofday(&currentTime, 0);
return (currentTime.tv_sec) * 1000 +
(currentTime.tv_usec) / 1000;
#endif //__CELLOS_LV2__
#endif
}
/// Returns the time in us since the last call to reset or since
/// the Clock was created.
unsigned long long int b3Clock::getTimeMicroseconds() unsigned long long int b3Clock::getTimeMicroseconds()
{ {
#ifdef B3_USE_WINDOWS_TIMERS #ifdef B3_USE_WINDOWS_TIMERS

7
examples/Utils/b3Clock.h
View File

@@ -13,16 +13,13 @@ public:
~b3Clock(); ~b3Clock();
/// Resets the initial reference time. /// Resets the initial reference time. If zeroReference is true, will set reference to absolute 0.
void reset(); void reset(bool zeroReference=false);
/// Returns the time in ms since the last call to reset or since /// Returns the time in ms since the last call to reset or since
/// the b3Clock was created. /// the b3Clock was created.
unsigned long int getTimeMilliseconds(); unsigned long int getTimeMilliseconds();
/// Gets the system time in milliseconds
unsigned long int getSystemTimeMilliseconds();
/// Returns the time in us since the last call to reset or since /// Returns the time in us since the last call to reset or since
/// the Clock was created. /// the Clock was created.
unsigned long long int getTimeMicroseconds(); unsigned long long int getTimeMicroseconds();