luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/Irrlicht/CTimer.h
View File

@@ -2,8 +2,8 @@
// 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__
#ifndef IRR_C_IRR_C_TIMER_H_INCLUDED
#define IRR_C_IRR_C_TIMER_H_INCLUDED
#include "ITimer.h"
#include "os.h"
@@ -24,13 +24,13 @@ namespace irr
/** 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 _IRR_OVERRIDE_
virtual u32 getRealTime() const IRR_OVERRIDE
{
return os::Timer::getRealTime();
}
//! Get current time and date in calendar form
virtual RealTimeDate getRealTimeAndDate() const _IRR_OVERRIDE_
virtual RealTimeDate getRealTimeAndDate() const IRR_OVERRIDE
{
return os::Timer::getRealTimeAndDate();
}
@@ -39,13 +39,13 @@ namespace irr
/** 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 _IRR_OVERRIDE_
virtual u32 getTime() const IRR_OVERRIDE
{
return os::Timer::getTime();
}
//! sets current virtual time
virtual void setTime(u32 time) _IRR_OVERRIDE_
virtual void setTime(u32 time) IRR_OVERRIDE
{
os::Timer::setTime(time);
}
@@ -54,7 +54,7 @@ namespace irr
/** 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() _IRR_OVERRIDE_
virtual void stop() IRR_OVERRIDE
{
os::Timer::stopTimer();
}
@@ -63,7 +63,7 @@ namespace irr
/** 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() _IRR_OVERRIDE_
virtual void start() IRR_OVERRIDE
{
os::Timer::startTimer();
}
@@ -71,7 +71,7 @@ namespace irr
//! 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) _IRR_OVERRIDE_
virtual void setSpeed(f32 speed = 1.0f) IRR_OVERRIDE
{
os::Timer::setSpeed(speed);
}
@@ -79,13 +79,13 @@ namespace irr
//! 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 _IRR_OVERRIDE_
virtual f32 getSpeed() const IRR_OVERRIDE
{
return os::Timer::getSpeed();
}
//! Returns if game timer is currently stopped
virtual bool isStopped() const _IRR_OVERRIDE_
virtual bool isStopped() const IRR_OVERRIDE
{
bool ret = os::Timer::isStopped();
return ret;
@@ -95,7 +95,7 @@ namespace irr
/** Makes the virtual timer update the time value based on the real time. This is
called automatically when calling IrrlichtDevice::run(), but you can call it manually
if you don't use this method. */
virtual void tick() _IRR_OVERRIDE_
virtual void tick() IRR_OVERRIDE
{
os::Timer::tick();
}
@@ -104,4 +104,3 @@ namespace irr
} // end namespace
#endif