Code-style consistency improvement:
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files. make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type. This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#elif __MACH__
|
||||
@@ -29,93 +29,97 @@
|
||||
#include <time.h>
|
||||
#endif
|
||||
|
||||
namespace VHACD {
|
||||
namespace VHACD
|
||||
{
|
||||
#ifdef _WIN32
|
||||
class Timer {
|
||||
class Timer
|
||||
{
|
||||
public:
|
||||
Timer(void)
|
||||
{
|
||||
m_start.QuadPart = 0;
|
||||
m_stop.QuadPart = 0;
|
||||
QueryPerformanceFrequency(&m_freq);
|
||||
};
|
||||
~Timer(void){};
|
||||
void Tic()
|
||||
{
|
||||
QueryPerformanceCounter(&m_start);
|
||||
}
|
||||
void Toc()
|
||||
{
|
||||
QueryPerformanceCounter(&m_stop);
|
||||
}
|
||||
double GetElapsedTime() // in ms
|
||||
{
|
||||
LARGE_INTEGER delta;
|
||||
delta.QuadPart = m_stop.QuadPart - m_start.QuadPart;
|
||||
return (1000.0 * delta.QuadPart) / (double)m_freq.QuadPart;
|
||||
}
|
||||
Timer(void)
|
||||
{
|
||||
m_start.QuadPart = 0;
|
||||
m_stop.QuadPart = 0;
|
||||
QueryPerformanceFrequency(&m_freq);
|
||||
};
|
||||
~Timer(void){};
|
||||
void Tic()
|
||||
{
|
||||
QueryPerformanceCounter(&m_start);
|
||||
}
|
||||
void Toc()
|
||||
{
|
||||
QueryPerformanceCounter(&m_stop);
|
||||
}
|
||||
double GetElapsedTime() // in ms
|
||||
{
|
||||
LARGE_INTEGER delta;
|
||||
delta.QuadPart = m_stop.QuadPart - m_start.QuadPart;
|
||||
return (1000.0 * delta.QuadPart) / (double)m_freq.QuadPart;
|
||||
}
|
||||
|
||||
private:
|
||||
LARGE_INTEGER m_start;
|
||||
LARGE_INTEGER m_stop;
|
||||
LARGE_INTEGER m_freq;
|
||||
LARGE_INTEGER m_start;
|
||||
LARGE_INTEGER m_stop;
|
||||
LARGE_INTEGER m_freq;
|
||||
};
|
||||
|
||||
#elif __MACH__
|
||||
class Timer {
|
||||
class Timer
|
||||
{
|
||||
public:
|
||||
Timer(void)
|
||||
{
|
||||
memset(this, 0, sizeof(Timer));
|
||||
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &m_cclock);
|
||||
};
|
||||
~Timer(void)
|
||||
{
|
||||
mach_port_deallocate(mach_task_self(), m_cclock);
|
||||
};
|
||||
void Tic()
|
||||
{
|
||||
clock_get_time(m_cclock, &m_start);
|
||||
}
|
||||
void Toc()
|
||||
{
|
||||
clock_get_time(m_cclock, &m_stop);
|
||||
}
|
||||
double GetElapsedTime() // in ms
|
||||
{
|
||||
return 1000.0 * (m_stop.tv_sec - m_start.tv_sec + (1.0E-9) * (m_stop.tv_nsec - m_start.tv_nsec));
|
||||
}
|
||||
Timer(void)
|
||||
{
|
||||
memset(this, 0, sizeof(Timer));
|
||||
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &m_cclock);
|
||||
};
|
||||
~Timer(void)
|
||||
{
|
||||
mach_port_deallocate(mach_task_self(), m_cclock);
|
||||
};
|
||||
void Tic()
|
||||
{
|
||||
clock_get_time(m_cclock, &m_start);
|
||||
}
|
||||
void Toc()
|
||||
{
|
||||
clock_get_time(m_cclock, &m_stop);
|
||||
}
|
||||
double GetElapsedTime() // in ms
|
||||
{
|
||||
return 1000.0 * (m_stop.tv_sec - m_start.tv_sec + (1.0E-9) * (m_stop.tv_nsec - m_start.tv_nsec));
|
||||
}
|
||||
|
||||
private:
|
||||
clock_serv_t m_cclock;
|
||||
mach_timespec_t m_start;
|
||||
mach_timespec_t m_stop;
|
||||
clock_serv_t m_cclock;
|
||||
mach_timespec_t m_start;
|
||||
mach_timespec_t m_stop;
|
||||
};
|
||||
#else
|
||||
class Timer {
|
||||
class Timer
|
||||
{
|
||||
public:
|
||||
Timer(void)
|
||||
{
|
||||
memset(this, 0, sizeof(Timer));
|
||||
};
|
||||
~Timer(void){};
|
||||
void Tic()
|
||||
{
|
||||
clock_gettime(CLOCK_REALTIME, &m_start);
|
||||
}
|
||||
void Toc()
|
||||
{
|
||||
clock_gettime(CLOCK_REALTIME, &m_stop);
|
||||
}
|
||||
double GetElapsedTime() // in ms
|
||||
{
|
||||
return 1000.0 * (m_stop.tv_sec - m_start.tv_sec + (1.0E-9) * (m_stop.tv_nsec - m_start.tv_nsec));
|
||||
}
|
||||
Timer(void)
|
||||
{
|
||||
memset(this, 0, sizeof(Timer));
|
||||
};
|
||||
~Timer(void){};
|
||||
void Tic()
|
||||
{
|
||||
clock_gettime(CLOCK_REALTIME, &m_start);
|
||||
}
|
||||
void Toc()
|
||||
{
|
||||
clock_gettime(CLOCK_REALTIME, &m_stop);
|
||||
}
|
||||
double GetElapsedTime() // in ms
|
||||
{
|
||||
return 1000.0 * (m_stop.tv_sec - m_start.tv_sec + (1.0E-9) * (m_stop.tv_nsec - m_start.tv_nsec));
|
||||
}
|
||||
|
||||
private:
|
||||
struct timespec m_start;
|
||||
struct timespec m_stop;
|
||||
struct timespec m_start;
|
||||
struct timespec m_stop;
|
||||
};
|
||||
#endif
|
||||
}
|
||||
#endif // VHACD_TIMER_H
|
||||
} // namespace VHACD
|
||||
#endif // VHACD_TIMER_H
|
||||
|
||||
Reference in New Issue
Block a user