Changeset 1414 for code/branches/network/src/orxonox

Timestamp:

May 24, 2008, 10:08:42 PM (16 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/src/orxonox

Files:

• GraphicsEngine.h (modified) (1 diff)
• Main.cc (modified) (1 diff)
• Orxonox.cc (modified) (5 diffs)
• OrxonoxPrereqs.h (modified) (1 diff)
• OrxonoxStableHeaders.h (modified) (2 diffs)
• hud/HUD.cc (modified) (2 diffs)
• hud/HUD.h (modified) (1 diff)

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();