From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Jan 2013 18:54:10 +1000 Subject: Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard. --- libraries/irrlicht-1.8/source/Irrlicht/CTimer.h | 216 ++++++++++++------------ 1 file changed, 108 insertions(+), 108 deletions(-) (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CTimer.h') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CTimer.h b/libraries/irrlicht-1.8/source/Irrlicht/CTimer.h index 8d8b8b8..2fb6a1a 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CTimer.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/CTimer.h @@ -1,108 +1,108 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#ifndef __C_IRR_C_TIMER_H_INCLUDED__ -#define __C_IRR_C_TIMER_H_INCLUDED__ - -#include "ITimer.h" -#include "os.h" - -namespace irr -{ - //! Device independent implementation of the timer - class CTimer : public ITimer - { - public: - - CTimer(bool usePerformanceTimer=true) - { - os::Timer::initTimer(usePerformanceTimer); - } - - //! Returns current real time in milliseconds of the system. - /** This value does not start with 0 when the application starts. - For example in one implementation the value returned could be the - amount of milliseconds which have elapsed since the system was started. */ - virtual u32 getRealTime() const - { - return os::Timer::getRealTime(); - } - - //! Get current time and date in calendar form - virtual RealTimeDate getRealTimeAndDate() const - { - return os::Timer::getRealTimeAndDate(); - } - - //! Returns current virtual time in milliseconds. - /** This value starts with 0 and can be manipulated using setTime(), stopTimer(), - startTimer(), etc. This value depends on the set speed of the timer if the timer - is stopped, etc. If you need the system time, use getRealTime() */ - virtual u32 getTime() const - { - return os::Timer::getTime(); - } - - //! sets current virtual time - virtual void setTime(u32 time) - { - os::Timer::setTime(time); - } - - //! Stops the game timer. - /** The timer is reference counted, which means everything which calls - stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop - corretly again. */ - virtual void stop() - { - os::Timer::stopTimer(); - } - - //! Starts the game timer. - /** The timer is reference counted, which means everything which calls - stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop - corretly again. */ - virtual void start() - { - os::Timer::startTimer(); - } - - //! Sets the speed of the timer - /** The speed is the factor with which the time is running faster or slower then the - real system time. */ - virtual void setSpeed(f32 speed = 1.0f) - { - os::Timer::setSpeed(speed); - } - - //! Returns current speed of the timer - /** The speed is the factor with which the time is running faster or slower then the - real system time. */ - virtual f32 getSpeed() const - { - return os::Timer::getSpeed(); - } - - //! Returns if game timer is currently stopped - virtual bool isStopped() const - { - bool ret = os::Timer::isStopped(); - _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX; - return ret; - } - - //! Advances the virtual time - /** Makes the virtual timer update the time value based on the real time. This is - called automaticly when calling IrrlichtDevice::run(), but you can call it manually - if you don't use this method. */ - virtual void tick() - { - os::Timer::tick(); - } - }; - -} // end namespace - -#endif - +// Copyright (C) 2002-2012 Nikolaus Gebhardt +// This file is part of the "Irrlicht Engine". +// For conditions of distribution and use, see copyright notice in irrlicht.h + +#ifndef __C_IRR_C_TIMER_H_INCLUDED__ +#define __C_IRR_C_TIMER_H_INCLUDED__ + +#include "ITimer.h" +#include "os.h" + +namespace irr +{ + //! Device independent implementation of the timer + class CTimer : public ITimer + { + public: + + CTimer(bool usePerformanceTimer=true) + { + os::Timer::initTimer(usePerformanceTimer); + } + + //! Returns current real time in milliseconds of the system. + /** This value does not start with 0 when the application starts. + For example in one implementation the value returned could be the + amount of milliseconds which have elapsed since the system was started. */ + virtual u32 getRealTime() const + { + return os::Timer::getRealTime(); + } + + //! Get current time and date in calendar form + virtual RealTimeDate getRealTimeAndDate() const + { + return os::Timer::getRealTimeAndDate(); + } + + //! Returns current virtual time in milliseconds. + /** This value starts with 0 and can be manipulated using setTime(), stopTimer(), + startTimer(), etc. This value depends on the set speed of the timer if the timer + is stopped, etc. If you need the system time, use getRealTime() */ + virtual u32 getTime() const + { + return os::Timer::getTime(); + } + + //! sets current virtual time + virtual void setTime(u32 time) + { + os::Timer::setTime(time); + } + + //! Stops the game timer. + /** The timer is reference counted, which means everything which calls + stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop + corretly again. */ + virtual void stop() + { + os::Timer::stopTimer(); + } + + //! Starts the game timer. + /** The timer is reference counted, which means everything which calls + stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop + corretly again. */ + virtual void start() + { + os::Timer::startTimer(); + } + + //! Sets the speed of the timer + /** The speed is the factor with which the time is running faster or slower then the + real system time. */ + virtual void setSpeed(f32 speed = 1.0f) + { + os::Timer::setSpeed(speed); + } + + //! Returns current speed of the timer + /** The speed is the factor with which the time is running faster or slower then the + real system time. */ + virtual f32 getSpeed() const + { + return os::Timer::getSpeed(); + } + + //! Returns if game timer is currently stopped + virtual bool isStopped() const + { + bool ret = os::Timer::isStopped(); + _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX; + return ret; + } + + //! Advances the virtual time + /** Makes the virtual timer update the time value based on the real time. This is + called automaticly when calling IrrlichtDevice::run(), but you can call it manually + if you don't use this method. */ + virtual void tick() + { + os::Timer::tick(); + } + }; + +} // end namespace + +#endif + -- cgit v1.1