From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/core/timer.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/core/timer.cc') 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 #include -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; -- cgit v1.2.3