FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made the osg::Timer::tick() method a const method.

Browse Source
This commit is contained in:
Robert Osfield
2002-01-18 14:11:46 +00:00
parent 5cff1c7a6f
commit 25bb70a86b
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/osg/Timer
View File

@@ -36,9 +36,9 @@ class SG_EXPORT Timer {
#if defined __DARWIN_OSX__ || defined macintosh
// PJA MAC OSX - inline Tick() pollutes namespace so badly
// we cant compile, due to Carbon.h ...
Timer_t tick();
Timer_t tick() const;
#else
inline Timer_t tick();
inline Timer_t tick() const;
#endif
inline double delta_s( Timer_t t1, Timer_t t2 ) const { return (double)(t2 - t1)*_secsPerClick; }
@@ -67,7 +67,7 @@ class SG_EXPORT Timer {
namespace osg{
inline Timer_t Timer::tick( void )
inline Timer_t Timer::tick( void ) const
{
if (_useStandardClock) return clock();
@@ -100,7 +100,7 @@ namespace osg{
namespace osg{
inline Timer_t Timer::tick()
inline Timer_t Timer::tick() const
{
if (_useStandardClock)
{
@@ -122,7 +122,7 @@ namespace osg{
namespace osg{
inline Timer_t Timer::tick()
inline Timer_t Timer::tick() const
{
if (_useStandardClock)
{
@@ -142,7 +142,7 @@ namespace osg{
#include <sys/time.h>
namespace osg{
inline Timer_t Timer::tick()
inline Timer_t Timer::tick() const
{
struct timeval tv;
gettimeofday(&tv, NULL);
@@ -156,7 +156,7 @@ namespace osg{
namespace osg{
inline Timer_t Timer::tick( void ) { return std::clock(); }
inline Timer_t Timer::tick( void ) const { return std::clock(); }
};
#endif

38
src/osg/Timer.cpp
View File

@@ -197,29 +197,31 @@ using namespace osg;
}
}
#elif defined (__DARWIN_OSX__) || defined (macintosh)
#if defined (__DARWIN_OSX__)
#include <Carbon/Carbon.h> // do I really have to link against the Carbon framework just for this?
#else
#include <MacTypes.h>
#include <Timer.h>
#endif
#if defined (__DARWIN_OSX__)
#include <Carbon/Carbon.h> // do I really have to link against the Carbon framework just for this?
#else
#include <MacTypes.h>
#include <Timer.h>
#endif
Timer_t Timer::tick(void)
{
UnsignedWide usecs;
Microseconds(&usecs);
return (usecs.hi * 4294967296.0) + usecs.lo;
}
Timer::Timer( void )
{
_useStandardClock = false;
_secsPerClick = 1e-6; // Carbon timer's precision.
Timer::Timer( void )
{
_useStandardClock = false;
_secsPerClick = 1e-6; // Carbon timer's precision.
}
}
Timer_t Timer::tick(void) const
{
UnsignedWide usecs;
Microseconds(&usecs);
return (usecs.hi * 4294967296.0) + usecs.lo;
}
#elif defined(unix)