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

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/orxonox

Files:

• OrxonoxStableHeaders.h (modified) (5 diffs)
• gamestates/GSGraphics.cc (modified) (2 diffs)
• gamestates/GSGraphics.h (modified) (1 diff)
• tools/Timer.h (modified) (3 diffs)

code/branches/gui/src/orxonox/OrxonoxStableHeaders.h

@@ -28 +28 @@
 
 /**
- @file  OrxonoxStableHeaders.h
- @brief Contains the bigger (or smaller) header files in order to precompile them with MSVC
+ @file
+ @brief Contains the frequently used header files of our own writing
  */
 
@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
 
 // including std headers here is useless since they're already precompiled
@@ -45 +45 @@
 #  define WIN32_LEAN_AND_MEAN
 #endif
-
 #include <Ogre.h>
 #include <CEGUI.h>
@@ -53 +52 @@
 #include <boost/thread/thread.hpp>
 
-//-----------------------------------------------------------------------
-// ORXONOX HEADERS
-//-----------------------------------------------------------------------
-
 #include "tinyxml/ticpp.h"
 #include "tinyxml/tinyxml.h"
+
+
+//----------- Our files ----------
+//--------------------------------
+// only include when not debugging so that we may find issues with missing headers quicker
+#if defined(NDEBUG)
 
 #include "util/Convert.h"
@@ -88 +89 @@
 //#include "objects/WorldEntity.h"
 
-#endif /* Compiler MSVC */
+#endif /* ifdef NDEBUG */
+
+#endif /* ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) */
 
 #endif /* _OrxonoxStableHeaders_H__ */

code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

@@ -160 +160 @@
     void GSGraphics::ticked(const Clock& time)
     {
-        uint64_t timeBeforeTick = time.getRealMicroseconds();
+        unsigned long long timeBeforeTick = time.getRealMicroseconds();
         float dt = time.getDeltaTime();
 
@@ -168 +168 @@
         this->tickChild(time);
         
-        uint64_t timeAfterTick = time.getRealMicroseconds();
+        unsigned long long timeAfterTick = time.getRealMicroseconds();
 
         tickTime_ += (unsigned int)(timeAfterTick - timeBeforeTick);

code/branches/gui/src/orxonox/gamestates/GSGraphics.h

@@ -80 +80 @@
         unsigned long         frameCount_;
         unsigned int          statisticsRefreshCycle_;
-        uint64_t              statisticsStartTime_;
+        unsigned long long    statisticsStartTime_;
         unsigned long         statisticsStartCount_;
         unsigned int          tickTime_;

code/branches/gui/src/orxonox/tools/Timer.h

@@ -62 +62 @@
 
 #include "OrxonoxPrereqs.h"
-#include "util/Integers.h"
 #include "core/OrxonoxClass.h"
 
@@ -101 +100 @@
             /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
             inline void addTime(float time)
-                { if (time > 0.0f) this->time_ += (int64_t)(time * 1000000.0f); }
+                { if (time > 0.0f) this->time_ += (long long)(time * 1000000.0f); }
             /** @brief Decreases the remaining time of the Timer. @param time The amount of time to remove */
             inline void removeTime(float time)
-                { if (time > 0.0f) this->time_ -= (int64_t)(time * 1000000.0f); }
+                { if (time > 0.0f) this->time_ -= (long long)(time * 1000000.0f); }
             /** @brief Sets the interval of the Timer. @param interval The interval */
             inline void setInterval(float interval)
-                { this->interval_ = (int64_t)(interval * 1000000.0f); }
+                { this->interval_ = (long long)(interval * 1000000.0f); }
             /** @brief Sets bLoop to a given value. @param bLoop True = loop */
             inline void setLoop(bool bLoop)
@@ -119 +118 @@
             Executor* executor_; //!< The executor of the function that should be called when the time expires
 
-            int64_t interval_;  //!< The time-interval in micro seconds
+            long long interval_; //!< The time-interval in micro seconds
             bool bLoop_;         //!< If true, the function gets called every 'interval' seconds
             bool bActive_;       //!< If true, the Timer ticks and calls the function if the time's up
 
-            int64_t time_;      //!< Internal variable, counting the time till the next function-call
+            long long time_;     //!< Internal variable, counting the time till the next function-call
     };