Changeset 8674

Timestamp:

May 30, 2011, 12:01:33 AM (14 years ago)

Author:

rgrieder

Message:

Reduced some header file dependencies in tools:

• moved Timer::setTimer() to source file

Location:

code/branches/unity_build/src

Files:

• libraries/tools/Shader.h (modified) (1 diff)
• libraries/tools/Timer.cc (modified) (2 diffs)
• libraries/tools/Timer.h (modified) (2 diffs)
• modules/pong/PongAI.cc (modified) (1 diff)
• modules/weapons/munitions/ReplenishingMunition.cc (modified) (1 diff)
• modules/weapons/projectiles/LightningGunProjectile.cc (modified) (1 diff)
• orxonox/gametypes/Dynamicmatch.cc (modified) (1 diff)
• orxonox/weaponsystem/Munition.cc (modified) (1 diff)

code/branches/unity_build/src/libraries/tools/Shader.h

@@ -32 +32 @@
 #include "tools/ToolsPrereqs.h"
 
-#include <map>
+#include <list>
 #include <string>
-#include <vector>
-
 #include <OgreCompositorInstance.h>
 
 #include "util/MultiType.h"
-#include "util/OgreForwardRefs.h"
 #include "core/ViewportEventListener.h"
 

code/branches/unity_build/src/libraries/tools/Timer.cc

@@ -42 +42 @@
 #include "core/command/ConsoleCommand.h"
 #include "core/command/CommandExecutor.h"
+#include "core/command/Executor.h"
 #include "core/command/Functor.h"
 #include "tools/interfaces/TimeFactorListener.h"
@@ -175 +176 @@
     {
         return TimeFactorListener::getTimeFactor();
+    }
+
+    /**
+        @brief Initializes and starts the timer, which will call an executor after some time.
+        @param interval         The timer-interval in seconds
+        @param bLoop            If true, the executor gets called every @a interval seconds
+        @param executor         The executor that will be called
+        @param bKillAfterCall   If true, the timer will be deleted after the executor was called
+    */
+    void Timer::setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall)
+    {
+        this->setInterval(interval);
+        this->bLoop_ = bLoop;
+        this->executor_ = executor;
+        this->bActive_ = true;
+
+        this->time_ = this->interval_;
+        this->bKillAfterCall_ = bKillAfterCall;
+
+        executor->getFunctor()->setSafeMode(true);
     }
 

code/branches/unity_build/src/libraries/tools/Timer.h

@@ -80 +80 @@
 
 #include "core/OrxonoxClass.h"
-#include "core/command/Executor.h"
+#include "core/command/ExecutorPtr.h"
 
 namespace orxonox
@@ -109 +109 @@
             Timer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
 
-            /**
-                @brief Initializes and starts the timer, which will call an executor after some time.
-                @param interval         The timer-interval in seconds
-                @param bLoop            If true, the executor gets called every @a interval seconds
-                @param executor         The executor that will be called
-                @param bKillAfterCall   If true, the timer will be deleted after the executor was called
-            */
-            void setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false)
-            {
-                this->setInterval(interval);
-                this->bLoop_ = bLoop;
-                this->executor_ = executor;
-                this->bActive_ = true;
-
-                this->time_ = this->interval_;
-                this->bKillAfterCall_ = bKillAfterCall;
-
-                executor->getFunctor()->setSafeMode(true);
-            }
+            void setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
 
             void run();

code/branches/unity_build/src/modules/pong/PongAI.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/command/Executor.h"
 #include "tools/Timer.h"
 

code/branches/unity_build/src/modules/weapons/munitions/ReplenishingMunition.cc

@@ -28 +28 @@
 
 #include "ReplenishingMunition.h"
+
 #include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
 
 namespace orxonox

code/branches/unity_build/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -31 +31 @@
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
 
 namespace orxonox

code/branches/unity_build/src/orxonox/gametypes/Dynamicmatch.cc

@@ -48 +48 @@
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
 #include "network/Host.h"
 #include "infos/PlayerInfo.h"

code/branches/unity_build/src/orxonox/weaponsystem/Munition.cc

@@ -29 +29 @@
 
 #include "Munition.h"
+
 #include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
 
 namespace orxonox