Changeset 1414

Timestamp:

May 24, 2008, 10:08:42 PM (17 years ago)

Author:

rgrieder

Message:

• moved OrxonoxPlatform.h to util (didn't even notice util recently)
• therefore was able to define uint32_t, etc. for all our libs in OrxonoxPlatform.h
• made use of OgreRenderWindow::getAverageFPS() in HUD

Location:

code/branches/network

Files:

• src/audio/AudioPrereqs.h (modified) (1 diff)
• src/core/CorePrereqs.h (modified) (1 diff)
• src/core/InputManager.cc (modified) (1 diff)
• src/core/KeyBinder.cc (modified) (3 diffs)
• src/core/KeyBinder.h (modified) (2 diffs)
• src/network/NetworkPrereqs.h (modified) (2 diffs)
• src/orxonox/GraphicsEngine.h (modified) (1 diff)
• src/orxonox/Main.cc (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (5 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)
• src/orxonox/hud/HUD.cc (modified) (2 diffs)
• src/orxonox/hud/HUD.h (modified) (1 diff)
• src/util/OrxonoxPlatform.h (moved) (moved from code/branches/network/src/orxonox/OrxonoxPlatform.h) (4 diffs)
• src/util/UtilPrereqs.h (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (1 diff)
• visual_studio/vc8/util.vcproj (modified) (1 diff)

code/branches/network/src/audio/AudioPrereqs.h

@@ -35 +35 @@
 #define _AudioPrereqs_H__
 
-#include "OrxonoxPlatform.h"
+#include "util/OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------

code/branches/network/src/core/CorePrereqs.h

@@ -35 +35 @@
 #define _CorePrereqs_H__
 
-#include "OrxonoxPlatform.h"
+#include "util/OrxonoxPlatform.h"
 
 #include <string>

code/branches/network/src/core/InputManager.cc

@@ -421 +421 @@
 
         case IS_GUI:
-          // TODO: do stuff
           break;
 

code/branches/network/src/core/KeyBinder.cc

@@ -188 +188 @@
         // check for param command
         int paramIndex = eval.getEvaluatedExecutor()->getAxisParamIndex();
-        // TODO: check in Executor for correct paramIndex
         if (paramIndex >= 0)
         {
@@ -231 +230 @@
           cmd->evaluation_ = eval;
 
-          //TODO: check CommandEvaluation for correct KeybindMode
           if (mode == KeybindMode::None)
             mode = eval.getEvaluatedExecutor()->getKeybindMode();
@@ -757 +755 @@
   void KeyBinder::joyStickAxisMoved(int joyStickID, int axis, int value)
   {
-    // TODO: check whether 16 bit integer as general axis value is a good idea (works under windows)
+    // TODO: Use proper calibration values instead of generally 16-bit integer
     int i = 8 + axis * 2;
     if (value >= 0)

code/branches/network/src/core/KeyBinder.h

@@ -48 +48 @@
 namespace orxonox
 {
-  class _CoreExport BaseCommand
-  {
-  public:
-    virtual ~BaseCommand() { }
-    virtual bool execute(float abs = 1.0f, float rel = 1.0f) = 0;
-  };
-
   class _CoreExport BufferedParamCommand
   {
@@ -65 +58 @@
     int paramIndex_;
     CommandEvaluation evaluation_;
+  };
+
+  class _CoreExport BaseCommand
+  {
+  public:
+    virtual ~BaseCommand() { }
+    virtual bool execute(float abs = 1.0f, float rel = 1.0f) = 0;
   };
 

code/branches/network/src/network/NetworkPrereqs.h

@@ -35 +35 @@
 #define _NetworkPrereqs_H__
 
-#include "OrxonoxPlatform.h"
+#include "util/OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------
@@ -54 +54 @@
 #else
 #  define _NetworkExport
-#endif
-
-//-----------------------------------------------------------------------
-// fixed width integers
-//-----------------------------------------------------------------------
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
-typedef __int8            int8_t;
-typedef __int16           int16_t;
-typedef __int32           int32_t;
-typedef __int64           int64_t;
-typedef unsigned __int8   uint8_t;
-typedef unsigned __int16  uint16_t;
-typedef unsigned __int32  uint32_t;
-typedef unsigned __int64  uint64_t;
-#else
-# include "inttypes.h"
 #endif
 

code/branches/network/src/orxonox/GraphicsEngine.h

@@ -72 +72 @@
             int getWindowWidth() const;
             int getWindowHeight() const;
+            float getAverageFPS() const
+            { if (renderWindow_) return this->renderWindow_->getAverageFPS(); else return 0.0f; }
 
             void windowMoved       (Ogre::RenderWindow* rw);

code/branches/network/src/orxonox/Main.cc

@@ -36 +36 @@
 #include <exception>
 
-#include "OrxonoxPlatform.h"
+#include "util/OrxonoxPlatform.h"
 #include "core/SignalHandler.h"
 #include "Orxonox.h"

code/branches/network/src/orxonox/Orxonox.cc

@@ -456 +456 @@
     // Contains the times of recently fired events
     // eventTimes[4] is the list for the times required for the fps counter
-    std::deque<unsigned long> eventTimes[4];
+    std::deque<unsigned long> eventTimes[3];
     // Clear event times
-    for (int i = 0; i < 4; ++i)
+    for (int i = 0; i < 3; ++i)
       eventTimes[i].clear();
-    // fill the fps time list with zeros
-    for (int i = 0; i < 50; i++)
-      eventTimes[3].push_back(0);
 
     // use the ogre timer class to measure time.
@@ -478 +475 @@
       // get current time
       unsigned long now = timer_->getMilliseconds();
-      eventTimes[3].push_back(now);
-      eventTimes[3].erase(eventTimes[3].begin());
 
       // create an event to pass to the frameStarted method in ogre
@@ -487 +482 @@
 
       // show the current time in the HUD
-//      orxonoxHUD_->setTime((int)now, 0);
-//      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
-      if (eventTimes[3].back() - eventTimes[3].front() != 0)
-        HUD::getSingleton().setFPS(50000.0f/(eventTimes[3].back() - eventTimes[3].front()));
-
-      // Iterate through all Tickables and call their tick(dt) function
+      // HUD::getSingleton().setTime(now);
+
+      // Call those objects that need the real time
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame * this->timefactor_);
-      // Iterate through all TickableReals and call their tick(dt) function
+      // Call the scene objects
       for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame);
+      // TODO: currently a hack. Somehow the console doesn't work with OrxonoxClass
       orxonoxConsole_->tick((float)evt.timeSinceLastFrame);
 
@@ -504 +497 @@
       ogreRoot._fireFrameStarted(evt);
 
-      // server still renders at the moment
-      //if (mode_ != SERVER)
       ogreRoot._updateAllRenderTargets(); // only render in non-server mode
 
@@ -517 +508 @@
       // again, just to be sure ogre works fine
       ogreRoot._fireFrameEnded(evt);
-      //msleep(50);
           }
 
-    if(mode_==CLIENT)
+    if (mode_==CLIENT)
       network::Client::getSingleton()->closeConnection();
-    else if(mode_==SERVER)
+    else if (mode_==SERVER)
       server_g->close();
+
     return true;
   }

code/branches/network/src/orxonox/OrxonoxPrereqs.h

@@ -35 +35 @@
 #define _OrxonoxPrereqs_H__
 
-#include "OrxonoxPlatform.h"
+#include "util/OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------

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

@@ -35 +35 @@
 #define _OrxonoxStableHeaders_H__
 
-#include "OrxonoxPlatform.h"
+#include "util/OrxonoxPlatform.h"
 
 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
@@ -109 +109 @@
 #include "network/Synchronisable.h"
 
-#include "OrxonoxPlatform.h"
 #include "OrxonoxPrereqs.h"
 #include "tools/Timer.h"

code/branches/network/src/orxonox/hud/HUD.cc

@@ -38 +38 @@
 #include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"
+#include "GraphicsEngine.h"
 #include "BarOverlayElement.h"
 #include "RadarObject.h"
@@ -129 +130 @@
 
         nav->update();
-    }
 
-    void HUD::setFPS(float fps){
+        float fps = GraphicsEngine::getSingleton().getAverageFPS();
         fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
     }

code/branches/network/src/orxonox/hud/HUD.h

@@ -58 +58 @@
       public:
         virtual void tick(float);
-        void setFPS(float fps);
         void addRadarObject(Vector3 pos);
         RadarObject* getFirstRadarObject();

code/branches/network/src/util/OrxonoxPlatform.h

@@ -36 +36 @@
 #define _OrxonoxPlatform_H__
 
-namespace orxonox {
 /* Initial platform/compiler-related stuff to set.
 */
@@ -191 +190 @@
 #endif
 
-// Integer formats of fixed bit width
-// FIXME: consider 64 bit platforms!
-//typedef unsigned int uint32;
-//typedef unsigned short uint16;
-//typedef unsigned char uint8;
-// proper approach
-
+//-----------------------------------------------------------------------
+// fixed width integers
+//-----------------------------------------------------------------------
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+typedef __int8            int8_t;
+typedef __int16           int16_t;
+typedef __int32           int32_t;
+typedef __int64           int64_t;
+typedef unsigned __int8   uint8_t;
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int32  uint32_t;
+typedef unsigned __int64  uint64_t;
+#else
+# include "inttypes.h"
+#endif
+
+namespace orxonox {
 #ifdef ORXONOX_DOUBLE_PRECISION
 typedef double Real;
@@ -203 +212 @@
 typedef float Real;
 #endif
+}
 
 
@@ -270 +280 @@
 //#include <vld.h>
 
-} /* namespace orxonox */
-
 #endif /* _OrxonoxPlatform_H__ */

code/branches/network/src/util/UtilPrereqs.h

@@ -35 +35 @@
 #define _UtilPrereqs_H__
 
-#include "OrxonoxPlatform.h"
+#include "util/OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------

code/branches/network/visual_studio/vc8/orxonox.vcproj

@@ -451 +451 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\orxonox\OrxonoxPlatform.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\orxonox\OrxonoxPrereqs.h"
                                 >

code/branches/network/visual_studio/vc8/util.vcproj

@@ -227 +227 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\OrxonoxPlatform.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\Sleep.h"
                                 >