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

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/worldentities

Files:

• ControllableEntity.h (modified) (1 diff)
• pawns/Spectator.cc (modified) (5 diffs)
• pawns/Spectator.h (modified) (1 diff)

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);