Changeset 8674
- Timestamp:
- May 30, 2011, 12:01:33 AM (13 years ago)
- Location:
- code/branches/unity_build/src
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/unity_build/src/libraries/tools/Shader.h
r8079 r8674 32 32 #include "tools/ToolsPrereqs.h" 33 33 34 #include < map>34 #include <list> 35 35 #include <string> 36 #include <vector>37 38 36 #include <OgreCompositorInstance.h> 39 37 40 38 #include "util/MultiType.h" 41 #include "util/OgreForwardRefs.h"42 39 #include "core/ViewportEventListener.h" 43 40 -
code/branches/unity_build/src/libraries/tools/Timer.cc
r8079 r8674 42 42 #include "core/command/ConsoleCommand.h" 43 43 #include "core/command/CommandExecutor.h" 44 #include "core/command/Executor.h" 44 45 #include "core/command/Functor.h" 45 46 #include "tools/interfaces/TimeFactorListener.h" … … 175 176 { 176 177 return TimeFactorListener::getTimeFactor(); 178 } 179 180 /** 181 @brief Initializes and starts the timer, which will call an executor after some time. 182 @param interval The timer-interval in seconds 183 @param bLoop If true, the executor gets called every @a interval seconds 184 @param executor The executor that will be called 185 @param bKillAfterCall If true, the timer will be deleted after the executor was called 186 */ 187 void Timer::setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall) 188 { 189 this->setInterval(interval); 190 this->bLoop_ = bLoop; 191 this->executor_ = executor; 192 this->bActive_ = true; 193 194 this->time_ = this->interval_; 195 this->bKillAfterCall_ = bKillAfterCall; 196 197 executor->getFunctor()->setSafeMode(true); 177 198 } 178 199 -
code/branches/unity_build/src/libraries/tools/Timer.h
r8079 r8674 80 80 81 81 #include "core/OrxonoxClass.h" 82 #include "core/command/Executor .h"82 #include "core/command/ExecutorPtr.h" 83 83 84 84 namespace orxonox … … 109 109 Timer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false); 110 110 111 /** 112 @brief Initializes and starts the timer, which will call an executor after some time. 113 @param interval The timer-interval in seconds 114 @param bLoop If true, the executor gets called every @a interval seconds 115 @param executor The executor that will be called 116 @param bKillAfterCall If true, the timer will be deleted after the executor was called 117 */ 118 void setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false) 119 { 120 this->setInterval(interval); 121 this->bLoop_ = bLoop; 122 this->executor_ = executor; 123 this->bActive_ = true; 124 125 this->time_ = this->interval_; 126 this->bKillAfterCall_ = bKillAfterCall; 127 128 executor->getFunctor()->setSafeMode(true); 129 } 111 void setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false); 130 112 131 113 void run(); -
code/branches/unity_build/src/modules/pong/PongAI.cc
r8108 r8674 36 36 #include "core/CoreIncludes.h" 37 37 #include "core/ConfigValueIncludes.h" 38 #include "core/command/Executor.h" 38 39 #include "tools/Timer.h" 39 40 -
code/branches/unity_build/src/modules/weapons/munitions/ReplenishingMunition.cc
r5929 r8674 28 28 29 29 #include "ReplenishingMunition.h" 30 30 31 #include "core/CoreIncludes.h" 32 #include "core/command/Executor.h" 31 33 32 34 namespace orxonox -
code/branches/unity_build/src/modules/weapons/projectiles/LightningGunProjectile.cc
r6417 r8674 31 31 #include "util/Convert.h" 32 32 #include "core/CoreIncludes.h" 33 #include "core/command/Executor.h" 33 34 34 35 namespace orxonox -
code/branches/unity_build/src/orxonox/gametypes/Dynamicmatch.cc
r8327 r8674 48 48 #include "util/Convert.h" 49 49 #include "core/CoreIncludes.h" 50 #include "core/command/Executor.h" 50 51 #include "network/Host.h" 51 52 #include "infos/PlayerInfo.h" -
code/branches/unity_build/src/orxonox/weaponsystem/Munition.cc
r7896 r8674 29 29 30 30 #include "Munition.h" 31 31 32 #include "core/CoreIncludes.h" 33 #include "core/command/Executor.h" 32 34 33 35 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.