From b81cf7c03bad4fb8ef859b6921c94b472131029d Mon Sep 17 00:00:00 2001
From: Vegard Storheil Eriksen <zyp@jvnv.net>
Date: Sat, 29 Jan 2011 20:18:17 +0100
Subject: Renamed time to timer to avoid conflict.

---
 timer.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 timer.cpp

(limited to 'timer.cpp')

diff --git a/timer.cpp b/timer.cpp
new file mode 100644
index 0000000..1285d65
--- /dev/null
+++ b/timer.cpp
@@ -0,0 +1,41 @@
+#include "timer.h"
+
+Clock::Clock() {
+	reset();
+	running = false;
+}
+
+void Clock::reset() {
+	base = 0;
+	clock.Reset();
+}
+
+void Clock::start() {
+	running = true;
+	clock.Reset();
+}
+
+void Clock::stop() {
+	running = false;
+	base += clock.GetElapsedTime();
+}
+
+float Clock::elapsed() const {
+	if(running) {
+		return base + clock.GetElapsedTime();
+	} else {
+		return base;
+	}
+}
+
+Timer::Timer(const Clock& clock_) : clock(clock_) {
+	reset();
+}
+
+void Timer::reset() {
+	starttime = clock.elapsed();
+}
+
+float Timer::elapsed() const {
+	return clock.elapsed() - starttime;
+}
-- 
cgit v1.2.3