Changeset 3196 for code/trunk/src/orxonox/objects/controllers

Timestamp:

Jun 20, 2009, 9:20:47 AM (15 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/controllers/AIController.cc (modified) (2 diffs)
• src/orxonox/objects/controllers/AIController.h (modified) (1 diff)
• src/orxonox/objects/controllers/ArtificialController.cc (modified) (1 diff)
• src/orxonox/objects/controllers/ArtificialController.h (modified) (1 diff)
• src/orxonox/objects/controllers/Controller.cc (modified) (1 diff)
• src/orxonox/objects/controllers/Controller.h (modified) (1 diff)
• src/orxonox/objects/controllers/HumanController.cc (modified) (1 diff)
• src/orxonox/objects/controllers/HumanController.h (modified) (2 diffs)
• src/orxonox/objects/controllers/PongAI.cc (modified) (5 diffs)
• src/orxonox/objects/controllers/PongAI.h (modified) (1 diff)
• src/orxonox/objects/controllers/ScriptController.cc (modified) (2 diffs)
• src/orxonox/objects/controllers/ScriptController.h (modified) (2 diffs)
• src/orxonox/objects/controllers/WaypointController.cc (modified) (1 diff)
• src/orxonox/objects/controllers/WaypointController.h (modified) (1 diff)
• src/orxonox/objects/controllers/WaypointPatrolController.cc (modified) (1 diff)
• src/orxonox/objects/controllers/WaypointPatrolController.h (modified) (1 diff)

code/trunk/src/orxonox/objects/controllers/AIController.cc

@@ -29 +29 @@
 #include "AIController.h"
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
@@ -107 +108 @@
             this->moveToTargetPosition();
 
-        if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
+        if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0f))
             this->getControllableEntity()->fire(0);
 

code/trunk/src/orxonox/objects/controllers/AIController.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "tools/Timer.h"
+#include "interfaces/Tickable.h"
 #include "ArtificialController.h"
-#include "objects/Tickable.h"
-#include "tools/Timer.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/controllers/ArtificialController.cc

@@ -32 +32 @@
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/worldentities/pawns/Pawn.h"
-
+#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
 #include "objects/gametypes/TeamDeathmatch.h"
 #include "objects/controllers/WaypointPatrolController.h"
-#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/controllers/ArtificialController.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "util/Math.h"
+#include "interfaces/PawnListener.h"
 #include "Controller.h"
-#include "objects/worldentities/pawns/Pawn.h"
-#include "util/Math.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/controllers/Controller.cc

@@ -28 +28 @@
 
 #include "Controller.h"
-
 #include "core/CoreIncludes.h"
-#include "overlays/OverlayGroup.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/controllers/Controller.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "core/BaseObject.h"
 

code/trunk/src/orxonox/objects/controllers/HumanController.cc

@@ -192 +192 @@
             HumanController::localController_s->controllableEntity_->dropItems();
     }
+
+    Pawn* HumanController::getLocalControllerEntityAsPawn()
+    {
+        if (HumanController::localController_s)
+            return dynamic_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
+        else
+            return NULL;
+    }
 }

code/trunk/src/orxonox/objects/controllers/HumanController.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
-#include "util/Math.h"
 #include "Controller.h"
-#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -69 +66 @@
             static inline HumanController* getLocalControllerSingleton()
                 { return HumanController::localController_s; }
-            static inline Pawn* getLocalControllerEntityAsPawn()
-            {
-                if (HumanController::localController_s) {
-                    return dynamic_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
-                } else {
-                    return NULL;
-                }
-            }
-
+            static Pawn* getLocalControllerEntityAsPawn();
             //friend class, for mouselook
             friend class Map;

code/trunk/src/orxonox/objects/controllers/PongAI.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "tools/Timer.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/worldentities/PongBall.h"
-#include "tools/Timer.h"
 
 namespace orxonox
@@ -39 +39 @@
     CreateUnloadableFactory(PongAI);
 
-    const static float MAX_REACTION_TIME = 0.4;
+    const static float MAX_REACTION_TIME = 0.4f;
 
     PongAI::PongAI(BaseObject* creator) : Controller(creator)
@@ -49 +49 @@
         this->ballEndPosition_ = 0;
         this->randomOffset_ = 0;
-        this->relHysteresisOffset_ = 0.02;
-        this->strength_ = 0.5;
+        this->relHysteresisOffset_ = 0.02f;
+        this->strength_ = 0.5f;
         this->movement_ = 0;
         this->oldMove_ = 0;
@@ -171 +171 @@
 
         // The position shouln't be larger than 0.5 (50% of the bat-length from the middle is the end)
-        position *= 0.48;
+        position *= 0.48f;
 
         // Both sides are equally probable
@@ -190 +190 @@
 
         // Calculate bounces
-        for (float limit = 0.35; limit < this->strength_ || this->strength_ > 0.99; limit += 0.4)
+        for (float limit = 0.35f; limit < this->strength_ || this->strength_ > 0.99f; limit += 0.4f)
         {
             // Calculate a random prediction error, based on the vertical speed of the ball and the strength of the AI

code/trunk/src/orxonox/objects/controllers/PongAI.h

@@ -33 +33 @@
 
 #include <list>
-
+#include "util/Math.h"
+#include "interfaces/Tickable.h"
 #include "Controller.h"
-#include "objects/Tickable.h"
-#include "util/Math.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/controllers/ScriptController.cc

@@ -28 +28 @@
 
 #include "ScriptController.h"
-
 #include "core/CoreIncludes.h"
 
@@ -39 +38 @@
         RegisterObject(ScriptController);
     }
-
-    ScriptController::~ScriptController()
-    {
-    }
 }

code/trunk/src/orxonox/objects/controllers/ScriptController.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "ArtificialController.h"
 
@@ -40 +39 @@
         public:
             ScriptController(BaseObject* creator);
-            virtual ~ScriptController();
-
-        protected:
+            virtual ~ScriptController() { }
 
         private:

code/trunk/src/orxonox/objects/controllers/WaypointController.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "objects/worldentities/ControllableEntity.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/controllers/WaypointController.h

@@ -33 +33 @@
 
 #include <vector>
-
+#include "interfaces/Tickable.h"
 #include "ArtificialController.h"
-#include "objects/Tickable.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc

@@ -29 +29 @@
 #include "WaypointPatrolController.h"
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "tools/Timer.h"
 #include "WaypointController.h"
-#include "tools/Timer.h"
 
 namespace orxonox