Changeset 2362 for code/branches/objecthierarchy2/src/orxonox/objects/controllers

Timestamp:

Dec 9, 2008, 2:16:49 AM (16 years ago)

Author:

landauf

Message:

• Added Bot (the artifical counterpart to HumanPlayer)
• Added ArtificialController, the baseclass of all non-human-controllers
• Added AIController, a simple reimplementation of the old AISpaceShip (but of course without the SpaceShip, just the AI)
• Added currently empty class ScriptController

• Some tweaks in PlayerInfo, ControllableEntity and Controller

• Made Spacetator speed configurable

I don't know where, but there's still an issue in the new code, maybe even caused by the previous commit. The Server seems to crash when a Client disconnects, but only if the Server runs within the debugger.

Location:

code/branches/objecthierarchy2/src/orxonox/objects/controllers

Files:

• AIController.cc (added)
• AIController.h (added)
• ArtificialController.cc (added)
• ArtificialController.h (added)
• CMakeLists.txt (modified) (1 diff)
• Controller.h (modified) (1 diff)
• ScriptController.cc (added)
• ScriptController.h (added)

code/branches/objecthierarchy2/src/orxonox/objects/controllers/CMakeLists.txt

@@ -2 +2 @@
   Controller.cc
   HumanController.cc
+  ArtificialController.cc
+  AIController.cc
+  ScriptController.cc
 )
 

code/branches/objecthierarchy2/src/orxonox/objects/controllers/Controller.h

@@ -47 +47 @@
                 { return this->player_; }
 
-            virtual inline void setControllableEntity(ControllableEntity* entity)
-                { this->controllableEntity_ = entity; }
-            virtual inline ControllableEntity* getControllableEntity() const
+            inline void setControllableEntity(ControllableEntity* entity)
+            {
+                if (entity != this->controllableEntity_)
+                {
+                    this->controllableEntity_ = entity;
+                    this->changedControllableEntity();
+                }
+            }
+            inline ControllableEntity* getControllableEntity() const
                 { return this->controllableEntity_; }
+            virtual void changedControllableEntity() {}
 
         protected: