Changeset 916

Timestamp:

Mar 21, 2008, 3:50:44 PM (17 years ago)

Author:

rgrieder

Message:

• removed all our FrameListeners except one (OrxListener will soon be vanished too) —> all timers are now tickable
• some minor irrelevant changes in orxonox.cc

Location:

code/branches/input

Files:

• src/orxonox/Orxonox.cc (modified) (12 diffs)
• src/orxonox/objects/Tickable.h (modified) (2 diffs)
• src/orxonox/tools/OrxListener.cc (added)
• src/orxonox/tools/OrxListener.h (added)
• src/orxonox/tools/Timer.cc (modified) (1 diff)
• src/orxonox/tools/Timer.h (modified) (3 diffs)
• visual_studio/orxonox_vc8.sln (modified) (2 diffs)
• visual_studio/vc8/orxonox.vcproj (modified) (3 diffs)

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

@@ -58 +58 @@
 #include "util/Sleep.h"
 
-// loader and audio
-//#include "loader/LevelLoader.h"
+// audio
 #include "audio/AudioManager.h"
 
@@ -70 +69 @@
 #include "objects/Tickable.h"
 #include "tools/Timer.h"
-#include "objects/NPC.h"
+#include "tools/OrxListener.h"
 #include "core/ArgReader.h"
 #include "core/Factory.h"
@@ -83 +82 @@
 namespace orxonox
 {
-   // put this in a seperate Class or solve the problem in another fashion
-  class OrxListener : public Ogre::FrameListener
-  {
-    public:
-      OrxListener(OIS::Keyboard *keyboard, audio::AudioManager*  auMan, gameMode mode)
-      {
-        mKeyboard = keyboard;
-        mode_=mode;
-        auMan_ = auMan;
-      }
-
-      bool frameStarted(const Ogre::FrameEvent& evt)
-      {
-        auMan_->update();
-        updateAI();
-
-        if(mode_ == PRESENTATION)
-          server_g->tick(evt.timeSinceLastFrame);
-        else if(mode_ == CLIENT)
-          client_g->tick(evt.timeSinceLastFrame);
-
-        usleep(10);
-
-        mKeyboard->capture();
-        return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
-      }
-
-      void updateAI()
-      {
-        for(Iterator<NPC> it = ObjectList<NPC>::start(); it; ++it)
-        {
-          it->update();
-        }
-      }
-
-    private:
-      gameMode mode_;
-      OIS::Keyboard *mKeyboard;
-      audio::AudioManager*  auMan_;
-  };
-
-  // init static singleton reference of Orxonox
+  /// init static singleton reference of Orxonox
   Orxonox* Orxonox::singletonRef_ = NULL;
 
@@ -134 +92 @@
     this->ogre_ = new GraphicsEngine();
     this->dataPath_ = "";
-//    this->loader_ = 0;
     this->auMan_ = 0;
     this->singletonRef_ = 0;
@@ -143 +100 @@
     this->root_ = 0;
     // turn frame smoothing on by setting a value different from 0
-    this->frameSmoothingTime_ = 0.1f;
+    this->frameSmoothingTime_ = 0.0f;
   }
 
@@ -157 +114 @@
    * initialization of Orxonox object
    * @param argc argument counter
-   * @param argv list of arguments
+   * @param argv list of argumenst
    * @param path path to config (in home dir or something)
    */
@@ -174 +131 @@
     ar.checkArgument("data", this->dataPath_, false);
     ar.checkArgument("ip", serverIp_, false);
-    //mode = "presentation";
     if(ar.errorHandling()) die();
     if(mode == std::string("server"))
@@ -451 +407 @@
   void Orxonox::createFrameListener()
   {
-    //TickFrameListener* TickFL = new TickFrameListener();
-    //ogre_->getRoot()->addFrameListener(TickFL);
-
-    //TimerFrameListener* TimerFL = new TimerFrameListener();
-    //ogre_->getRoot()->addFrameListener(TimerFL);
-
-    //if(mode_!=CLIENT) // FIXME just a hack ------- remove this in future
-      frameListener_ = new OrxListener(keyboard_, auMan_, mode_);
-    ogre_->getRoot()->addFrameListener(frameListener_);
+    frameListener_ = new OrxListener(auMan_, mode_);
   }
 
@@ -477 +425 @@
       ms.height = height;
     }
-    //ogre_->getRoot()->startRendering();
     mainLoop();
   }
@@ -509 +456 @@
           while (true)
           {
-                  //Pump messages in all registered RenderWindows
+                  // Pump messages in all registered RenderWindows
       Ogre::WindowEventUtilities::messagePump();
 
@@ -531 +478 @@
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; )
         (it++)->tick((float)evt.timeSinceLastFrame);
-
-      // Update the timers
-      updateTimers((float)evt.timeSinceLastFrame);
 
       if (mode_ != SERVER)
@@ -554 +498 @@
   }
 
-  /**
-    Timer updater function.
-    Updates all timers with the current dt.
-    Timers have been tested since their displacement.
-    @param dt The delta time
-  */
-  void Orxonox::updateTimers(float dt)
-  {
-    // Iterate through all Timers
-    for (Iterator<TimerBase> it = ObjectList<TimerBase>::start(); it; )
-    {
-      if (it->isActive())
-      {
-        // If active: Decrease the timer by the duration of the last frame
-        it->time_ -= dt;
-
-        if (it->time_ <= 0)
-        {
-          // It's time to call the function
-          if (it->bLoop_)
-            it->time_ += it->interval_; // Q: Why '+=' and not '='? A: Think about it. It's more accurate like that. Seriously.
-          else
-            it->stopTimer(); // Stop the timer if we don't want to loop
-
-          (it++)->run();
-        }
-        else
-        ++it;
-      }
-      else
-      ++it;
-    }
-
-  }
   /**
     Method for calculating the average time between recently fired events.

code/branches/input/src/orxonox/objects/Tickable.h

@@ -41 +41 @@
 #define _Tickable_H__
 
-#include <OgreFrameListener.h>
-
 #include "../OrxonoxPrereqs.h"
 #include "core/OrxonoxClass.h"
@@ -64 +62 @@
     };
 
-#if 0
-    //! The TickFrameListener calls the tick(dt) function of all Tickables every frame.
-    class _OrxonoxExport TickFrameListener : public Ogre::FrameListener
-    {
-        private:
-            /** @brief Gets called before a frame gets rendered. */
-            bool frameStarted(const Ogre::FrameEvent &evt)
-            {
-                // Iterate through all Tickables and call their tick(dt) function
-                for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; )
-                    (it++)->tick(evt.timeSinceLastFrame);
-
-                return FrameListener::frameStarted(evt);
-            }
-    };
-#endif
 }
 

code/branches/input/src/orxonox/tools/Timer.cc

@@ -46 +46 @@
         this->time_ = 0;
     }
+
+    /**
+        @brief Updates the timer before the frames are rendered.
+    */
+    void TimerBase::tick(float dt)
+    {
+        if (this->bActive_)
+        {
+            // If active: Decrease the timer by the duration of the last frame
+            this->time_ -= dt;
+
+            if (this->time_ <= 0)
+            {
+                // It's time to call the function
+                if (this->bLoop_)
+                    // Q: Why '+=' and not '='? A: Think about it. It's more accurate like that. Seriously.
+                    this->time_ += this->interval_;
+                else
+                    this->stopTimer(); // Stop the timer if we don't want to loop
+
+                this->run();
+            }
+        }
+    }
+
 }

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

@@ -58 +58 @@
 #define _Timer_H__
 
-#include <OgreFrameListener.h>
 #include "../OrxonoxPrereqs.h"
+#include "objects/Tickable.h"
 
 namespace orxonox
 {
     //! TimerBase is the parent of the Timer class.
-    class _OrxonoxExport TimerBase : public OrxonoxClass
+    class _OrxonoxExport TimerBase : public Tickable
     {
-        //friend class TimerFrameListener;
-        friend class Orxonox;
-
         public:
             TimerBase();
@@ -84 +81 @@
             /** @brief Returns true if the Timer is active (= not stoped, not paused). @return True = Time is active */
             inline bool isActive() const { return this->bActive_; }
+
+            void tick(float dt);
 
         protected:
@@ -146 +145 @@
     };
 
-#if 0
-    //! The TimerFrameListener manages all Timers in the game.
-    class TimerFrameListener : public Ogre::FrameListener
-    {
-        private:
-            /** @brief Gets called before a frame gets rendered. */
-            bool frameStarted(const Ogre::FrameEvent &evt)
-            {
-                // Iterate through all Timers
-                for (Iterator<TimerBase> it = ObjectList<TimerBase>::start(); it; )
-                {
-                    if (it->isActive())
-                    {
-                        // If active: Decrease the timer by the duration of the last frame
-                        it->time_ -= evt.timeSinceLastFrame;
-
-                        if (it->time_ <= 0)
-                        {
-                            // It's time to call the function
-                            if (it->bLoop_)
-                                it->time_ += it->interval_; // Q: Why '+=' and not '='? A: Think about it. It's more accurate like that. Seriously.
-                            else
-                                it->stopTimer(); // Stop the timer if we don't want to loop
-
-                            (it++)->run();
-                        }
-                        else
-                            ++it;
-                    }
-                    else
-                        ++it;
-                }
-
-                return FrameListener::frameStarted(evt);
-            }
-    };
-#endif
 }
 

code/branches/input/visual_studio/orxonox_vc8.sln

@@ -19 +19 @@
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
-        EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader", "vc8\loader.vcproj", "{E283910F-F911-40FB-A09D-D025CA821912}"
-        ProjectSection(WebsiteProperties) = preProject
-                Debug.AspNetCompiler.Debug = "True"
-                Release.AspNetCompiler.Debug = "False"
-        EndProjectSection
-        ProjectSection(ProjectDependencies) = postProject
-                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
         EndProjectSection
 EndProject
@@ -89 +80 @@
                 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.ActiveCfg = Release|Win32
                 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.Build.0 = Release|Win32
-                {E283910F-F911-40FB-A09D-D025CA821912}.Debug|Win32.ActiveCfg = Debug|Win32
-                {E283910F-F911-40FB-A09D-D025CA821912}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32
-                {E283910F-F911-40FB-A09D-D025CA821912}.Release_SSE2|Win32.ActiveCfg = Release_SSE2|Win32
-                {E283910F-F911-40FB-A09D-D025CA821912}.Release|Win32.ActiveCfg = Release|Win32
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.ActiveCfg = Debug|Win32
                 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.Build.0 = Debug|Win32

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

@@ -287 +287 @@
                                 RelativePath="..\..\src\orxonox\InputManager.cc"
                                 >
+                                <FileConfiguration
+                                        Name="Debug|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
                         </File>
                         <File
@@ -632 +640 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\tools\OrxListener.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\tools\Timer.cc"
-                                        >
-                                </File>
-                        </Filter>
-                        <Filter
-                                Name="loader"
-                                >
-                                <File
-                                        RelativePath="..\..\src\loader\LevelLoader.cc"
                                         >
                                 </File>
@@ -806 +810 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\tools\OrxListener.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\tools\Timer.h"
-                                        >
-                                </File>
-                        </Filter>
-                        <Filter
-                                Name="loader"
-                                >
-                                <File
-                                        RelativePath="..\..\src\loader\LevelLoader.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\loader\LoaderPrereqs.h"
                                         >
                                 </File>