Fix Gestures to use GetTime() if it's available (#2733)
This commit is contained in:
parent
03f5fce672
commit
0daaaddeef
1 changed files with 6 additions and 0 deletions
|
@ -151,6 +151,7 @@ float GetGesturePinchAngle(void); // Get gesture pinch ang
|
||||||
|
|
||||||
#if defined(GESTURES_IMPLEMENTATION)
|
#if defined(GESTURES_IMPLEMENTATION)
|
||||||
|
|
||||||
|
#if defined(GESTURES_STANDALONE)
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
extern "C" { // Prevents name mangling of functions
|
extern "C" { // Prevents name mangling of functions
|
||||||
|
@ -175,6 +176,7 @@ float GetGesturePinchAngle(void); // Get gesture pinch ang
|
||||||
#include <mach/clock.h> // Required for: clock_get_time()
|
#include <mach/clock.h> // Required for: clock_get_time()
|
||||||
#include <mach/mach.h> // Required for: mach_timespec_t
|
#include <mach/mach.h> // Required for: mach_timespec_t
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
// Defines and Macros
|
// Defines and Macros
|
||||||
|
@ -526,6 +528,9 @@ static double rgGetCurrentTime(void)
|
||||||
{
|
{
|
||||||
double time = 0;
|
double time = 0;
|
||||||
|
|
||||||
|
#if !defined(GESTURES_STANDALONE)
|
||||||
|
time = GetTime();
|
||||||
|
#else
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
unsigned long long int clockFrequency, currentTime;
|
unsigned long long int clockFrequency, currentTime;
|
||||||
|
|
||||||
|
@ -558,6 +563,7 @@ static double rgGetCurrentTime(void)
|
||||||
unsigned long long int nowTime = (unsigned long long int)now.tv_sec*1000000000LLU + (unsigned long long int)now.tv_nsec; // Time in nanoseconds
|
unsigned long long int nowTime = (unsigned long long int)now.tv_sec*1000000000LLU + (unsigned long long int)now.tv_nsec; // Time in nanoseconds
|
||||||
|
|
||||||
time = ((double)nowTime/1000000.0); // Time in miliseconds
|
time = ((double)nowTime/1000000.0); // Time in miliseconds
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return time;
|
return time;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue