Changeset 1724 for code/branches/gui/src/core

Timestamp:

Sep 6, 2008, 9:51:01 PM (16 years ago)

Author:

rgrieder

Message:

• changed library dependency dir to lib_precompiled/include/ in msvc properties
• fixed a bug with tolua pkg file in msvc
• (u)int64_t to (unsigned) long long (C-Standard, so most c++ will have it anyway)

Location:

code/branches/gui/src/core

Files:

• Clock.cc (modified) (1 diff)
• Clock.h (modified) (3 diffs)
• GameState.h (modified) (1 diff)

code/branches/gui/src/core/Clock.cc

@@ -72 +72 @@
     }
 
-    uint64_t Clock::getRealMicroseconds() const
+    unsigned long long Clock::getRealMicroseconds() const
     {
         return this->timer_->getMicroseconds();

code/branches/gui/src/core/Clock.h

@@ -40 +40 @@
 #include "CorePrereqs.h"
 #include <OgrePrerequisites.h>
-#include "util/Integers.h"
 
 namespace orxonox
@@ -52 +51 @@
         ~Clock();
 
-        uint64_t getMicroseconds()   const { return tickTime_; }
-        uint64_t getMilliseconds()   const { return tickTime_ / 1000; }
-        int      getSeconds()        const { return tickTime_ / 1000000; }
-        float    getSecondsPrecise() const { return (float)tickTime_ / 1000000.0f; }
+        unsigned long long getMicroseconds()   const { return tickTime_; }
+        unsigned long long getMilliseconds()   const { return tickTime_ / 1000; }
+        int                getSeconds()        const { return tickTime_ / 1000000; }
+        float              getSecondsPrecise() const { return (float)tickTime_ / 1000000.0f; }
 
-        float    getDeltaTime()      const { return tickDtFloat_; }
-        int      getDeltaTimeMicroseconds() const { return tickDt_; }
+        float              getDeltaTime()      const { return tickDtFloat_; }
+        int                getDeltaTimeMicroseconds() const { return tickDt_; }
 
-        uint64_t getRealMicroseconds() const;
+        unsigned long long getRealMicroseconds() const;
 
     private:
@@ -66 +65 @@
         void capture();
 
-        Ogre::Timer*  timer_;
-        uint64_t      storedTime_;
-        uint64_t      tickTime_;
-        int           tickDt_;
-        float         tickDtFloat_;
-        unsigned long lastTimersTime_;
+        Ogre::Timer*       timer_;
+        unsigned long long storedTime_;
+        unsigned long long tickTime_;
+        int                tickDt_;
+        float              tickDtFloat_;
+        unsigned long      lastTimersTime_;
     };
 }

code/branches/gui/src/core/GameState.h

@@ -42 +42 @@
 #include <map>
 #include <cassert>
-#include "util/Integers.h"
 #include "Clock.h"