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

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

Files:

• controllers/AIController.cc (added)
• controllers/AIController.h (added)
• controllers/ArtificialController.cc (added)
• controllers/ArtificialController.h (added)
• controllers/CMakeLists.txt (modified) (1 diff)
• controllers/Controller.h (modified) (1 diff)
• controllers/ScriptController.cc (added)
• controllers/ScriptController.h (added)
• infos/Bot.cc (added)
• infos/Bot.h (added)
• infos/CMakeLists.txt (modified) (1 diff)
• infos/HumanPlayer.h (modified) (1 diff)
• infos/PlayerInfo.cc (modified) (2 diffs)
• infos/PlayerInfo.h (modified) (1 diff)
• worldentities/ControllableEntity.h (modified) (1 diff)
• worldentities/pawns/Spectator.cc (modified) (5 diffs)
• worldentities/pawns/Spectator.h (modified) (1 diff)

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:

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

@@ -1 +1 @@
 SET( SRC_FILES
+  Bot.cc
   Info.cc
   PlayerInfo.cc

code/branches/objecthierarchy2/src/orxonox/objects/infos/HumanPlayer.h

@@ -33 +33 @@
 
 #include "PlayerInfo.h"
-#include "core/Identifier.h"
-#include "objects/controllers/Controller.h"
 
 namespace orxonox

code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc

@@ -46 +46 @@
         this->bLocalPlayer_ = false;
         this->bReadyToSpawn_ = false;
+        this->bSetUnreadyAfterSpawn_ = true;
         this->controller_ = 0;
         this->controllableEntity_ = 0;
@@ -122 +123 @@
             this->controllableEntityID_ = entity->getObjectID();
             entity->setPlayer(this);
-            this->bReadyToSpawn_ = false;
+            this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
         }
         else

code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.h

@@ -73 +73 @@
         protected:
             void createController();
-            void networkcallback_changedcontrollableentityID();
 
             bool bHumanPlayer_;
             bool bLocalPlayer_;
+            bool bSetUnreadyAfterSpawn_;
+            SubclassIdentifier<Controller> defaultController_;
+            unsigned int clientID_;
+
+        private:
+            void networkcallback_changedcontrollableentityID();
+
             bool bReadyToSpawn_;
-            SubclassIdentifier<Controller> defaultController_;
             Controller* controller_;
             ControllableEntity* controllableEntity_;
             unsigned int controllableEntityID_;
-            unsigned int clientID_;
     };
 }

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -64 +64 @@
             virtual void rotatePitch(const Vector2& value) {}
             virtual void rotateRoll(const Vector2& value) {}
+
+            inline void moveFrontBack(float value)
+                { this->moveFrontBack(Vector2(value, 0)); }
+            inline void moveRightLeft(float value)
+                { this->moveRightLeft(Vector2(value, 0)); }
+            inline void moveUpDown(float value)
+                { this->moveUpDown(Vector2(value, 0)); }
+
+            inline void rotateYaw(float value)
+                { this->rotateYaw(Vector2(value, 0)); }
+            inline void rotatePitch(float value)
+                { this->rotatePitch(Vector2(value, 0)); }
+            inline void rotateRoll(float value)
+                { this->rotateRoll(Vector2(value, 0)); }
 
             virtual void fire() {}

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
 #include "core/Core.h"
 #include "objects/worldentities/Model.h"
@@ -49 +50 @@
         RegisterObject(Spectator);
 
-        this->speed_ = 100;
+        this->speed_ = 200;
         this->rotationSpeed_ = 3;
 
@@ -68 +69 @@
         this->bGreeting_ = false;
 
+        this->setConfigValues();
         this->registerVariables();
     }
@@ -84 +86 @@
     }
 
+    void Spectator::setConfigValues()
+    {
+        SetConfigValue(speed_, 200.0f);
+        SetConfigValue(rotationSpeed_, 3.0f);
+    }
+
     void Spectator::registerVariables()
     {
@@ -137 +145 @@
     {
         ControllableEntity::startLocalHumanControl();
-//        if (this->hasLocalController())
-//            this->testmesh_->setVisible(false);
     }
 

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.h

@@ -42 +42 @@
             virtual ~Spectator();
 
+            void setConfigValues();
             void registerVariables();
             virtual void tick(float dt);