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.cc
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/timer.cc')
-rw-r--r--src/core/timer.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/core/timer.cc b/src/core/timer.cc
index b614af1..6f2e914 100644
--- a/src/core/timer.cc
+++ b/src/core/timer.cc
@@ -1,7 +1,7 @@
/*
core/timer.cc
- 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
*/
#include "core/timer.h"
@@ -10,12 +10,13 @@
#include <iostream>
#include <cmath>
-namespace core {
+namespace core
+{
Timer::Timer()
{
gettimeofday(&this->timer_tick, &this->timer_tz);
- this->timer_elapsed = 0;
+ this->timer_elapsed = 0;
}
Timer::~Timer()
@@ -28,12 +29,12 @@ void Timer::mark()
}
unsigned long Timer::timestamp()
-{
+{
struct timeval tick;
struct timezone tick_tz;
-
+
gettimeofday(&tick, &tick_tz);
-
+
// calculate elapsed time in 10^-6 seconds
unsigned long delta = 0;
delta = tick.tv_sec * 1000 + tick.tv_usec / 1000;