Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/core/timer.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/timer.h')
-rw-r--r--src/core/timer.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/timer.h b/src/core/timer.h
index b878875..5157811 100644
--- a/src/core/timer.h
+++ b/src/core/timer.h
@@ -1,7 +1,7 @@
/*
core/timer.h
- This file is part of the Osirion project and is distributed under
- the terms and conditions of the GNU General Public License version 2
+ This file is part of the Osirion project and is distributed under
+ the terms and conditions of the GNU General Public License version 2
*/
#ifndef __INCLUDED_CORE_TIMER_H__
@@ -9,13 +9,15 @@
#include <sys/time.h>
-namespace core {
+namespace core
+{
/// a timer measures intervals in seconds
/*! A timer class measures the time elapsed
* between the last two calls to its mark() function.
*/
-class Timer {
+class Timer
+{
public:
/// Constructor
Timer();
@@ -25,7 +27,7 @@ public:
/// mark the current time as zero
/*! Reset the timer, all subsequent calls too elapsed() will
* use the current timestamp as reference
- */
+ */
void mark();
/*! return the time elapsed since the last mark, in seconds