Changeset 2839 for code/trunk

Timestamp:

Mar 25, 2009, 3:26:06 AM (16 years ago)

Author:

landauf

Message:

added AI for the Pong gametype
improved Pong gameplay

Location:

code/trunk/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (2 diffs)
• objects/controllers/CMakeLists.txt (modified) (1 diff)
• objects/controllers/PongAI.cc (added)
• objects/controllers/PongAI.h (added)
• objects/gametypes/Gametype.cc (modified) (2 diffs)
• objects/gametypes/Gametype.h (modified) (1 diff)
• objects/gametypes/Pong.cc (modified) (3 diffs)
• objects/infos/CMakeLists.txt (modified) (1 diff)
• objects/infos/PlayerInfo.cc (modified) (1 diff)
• objects/infos/PongBot.cc (added)
• objects/infos/PongBot.h (added)
• objects/worldentities/ControllableEntity.cc (modified) (2 diffs)
• objects/worldentities/ControllableEntity.h (modified) (1 diff)
• objects/worldentities/PongBall.cc (modified) (2 diffs)
• objects/worldentities/PongBall.h (modified) (2 diffs)
• objects/worldentities/PongBat.cc (modified) (3 diffs)
• objects/worldentities/PongBat.h (modified) (2 diffs)

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -192 +192 @@
     class AIController;
     class ScriptController;
+    class PongAI;
 
     class Info;
@@ -197 +198 @@
     class HumanPlayer;
     class Bot;
+    class PongBot;
     class GametypeInfo;
 

code/trunk/src/orxonox/objects/controllers/CMakeLists.txt

@@ -5 +5 @@
   AIController.cc
   ScriptController.cc
+  PongAI.cc
 )

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -200 +200 @@
                 // Reward killer
                 if (killer)
-                    this->playerScored(killer->getPlayer());
+                {
+                    std::map<PlayerInfo*, Player>::iterator it = this->players_.find(killer->getPlayer());
+                    if (it != this->players_.end())
+                        it->second.frags_++;
+                }
 
                 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
@@ -348 +352 @@
     {
         for (unsigned int i = 0; i < amount; ++i)
-            new Bot(this);
+            this->botclass_.fabricate(this);
     }
 

code/trunk/src/orxonox/objects/gametypes/Gametype.h

@@ -142 +142 @@
             float initialStartCountdown_;
             unsigned int numberOfBots_;
+            SubclassIdentifier<Bot> botclass_;
 
             std::map<PlayerInfo*, Player> players_;

code/trunk/src/orxonox/objects/gametypes/Pong.cc

@@ -37 +37 @@
 #include "objects/worldentities/PongBall.h"
 #include "objects/worldentities/PongBat.h"
-#include "objects/infos/PlayerInfo.h"
+#include "objects/infos/HumanPlayer.h"
+#include "objects/infos/PongBot.h"
+#include "objects/controllers/PongAI.h"
 
 namespace orxonox
@@ -56 +58 @@
         this->starttimer_.setTimer(1.0, false, this, createExecutor(createFunctor(&Pong::startBall)));
         this->starttimer_.stopTimer();
+
+        this->botclass_ = Class(PongBot);
     }
 
@@ -133 +137 @@
             this->players_[player].state_ = PlayerState::Alive;
         }
+        else
+            return;
+
+        if (player && player->getController() && player->getController()->isA(Class(PongAI)))
+        {
+            PongAI* ai = dynamic_cast<PongAI*>(player->getController());
+            ai->setPongBall(this->ball_);
+        }
     }
 

code/trunk/src/orxonox/objects/infos/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Bot.cc
+  PongBot.cc
   Info.cc
   PlayerInfo.cc

code/trunk/src/orxonox/objects/infos/PlayerInfo.cc

@@ -110 +110 @@
     void PlayerInfo::createController()
     {
+        if (this->controller_)
+        {
+            delete this->controller_;
+            this->controller_ = 0;
+        }
         this->controller_ = this->defaultController_.fabricate(this);
         assert(this->controller_);

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -251 +251 @@
             }
         }
+
+        this->changedPlayer();
     }
 
@@ -263 +265 @@
         this->bHasHumanController_ = false;
         this->setObjectMode(objectDirection::toclient);
+
+        this->changedPlayer();
 
         if (this->bDestroyWhenPlayerLeft_)

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -49 +49 @@
 
             virtual void changedGametype();
+            virtual void changedPlayer() {}
 
             virtual void setPlayer(PlayerInfo* player);

code/trunk/src/orxonox/objects/worldentities/PongBall.cc

@@ -44 +44 @@
         this->speed_ = 0;
         this->bat_ = 0;
+        this->relMercyOffset_ = 0.05;
     }
 
@@ -67 +68 @@
             if (position.x > this->fieldWidth_ / 2 || position.x < -this->fieldWidth_ / 2)
             {
-                velocity.x = -velocity.x;
                 float distance = 0;
 
-                if (position.x > this->fieldWidth_ / 2)
+                if (this->bat_)
                 {
-                    position.x = this->fieldWidth_ / 2;
-                    if (this->bat_ && this->bat_[1])
+                    if (position.x > this->fieldWidth_ / 2 && this->bat_[1])
                     {
-                        distance = (position.z - this->bat_[1]->getPosition().z) / (this->fieldHeight_ * this->batlength_ / 2);
-                        if (this->getGametype() && this->bat_[0] && fabs(distance) > 1)
+                        distance = (position.z - this->bat_[1]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10) / 2);
+                        if (fabs(distance) <= 1)
                         {
-                            this->getGametype()->playerScored(this->bat_[0]->getPlayer());
-                            return;
+                            position.x = this->fieldWidth_ / 2;
+                            velocity.x = -velocity.x;
+                            velocity.z = distance * distance * sgn(distance) * 1.5 * this->speed_;
+                        }
+                        else if (position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
+                        {
+                            if (this->getGametype() && this->bat_[0])
+                            {
+                                this->getGametype()->playerScored(this->bat_[0]->getPlayer());
+                                return;
+                            }
+                        }
+                    }
+                    if (position.x < -this->fieldWidth_ / 2 && this->bat_[0])
+                    {
+                        distance = (position.z - this->bat_[0]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10) / 2);
+                        if (fabs(distance) <= 1)
+                        {
+                            position.x = -this->fieldWidth_ / 2;
+                            velocity.x = -velocity.x;
+                            velocity.z = distance * distance * sgn(distance) * 1.5 * this->speed_;
+                        }
+                        else if (position.x < -this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
+                        {
+                            if (this->getGametype() && this->bat_[1])
+                            {
+                                this->getGametype()->playerScored(this->bat_[1]->getPlayer());
+                                return;
+                            }
                         }
                     }
                 }
-                if (position.x < -this->fieldWidth_ / 2)
-                {
-                    position.x = -this->fieldWidth_ / 2;
-                    if (this->bat_ && this->bat_[0])
-                    {
-                        distance = (position.z - this->bat_[0]->getPosition().z) / (this->fieldHeight_ * this->batlength_ / 2);
-                        if (this->getGametype() && this->bat_[1] && fabs(distance) > 1)
-                        {
-                            this->getGametype()->playerScored(this->bat_[1]->getPlayer());
-                            return;
-                        }
-                    }
-                }
-
-                velocity.z = distance * distance * sgn(distance) * 1.5 * this->speed_;
             }
 

code/trunk/src/orxonox/objects/worldentities/PongBall.h

@@ -48 +48 @@
             void setFieldDimension(const Vector2& dimension)
                 { this->setFieldDimension(dimension.x, dimension.y); }
+            Vector2 getFieldDimension() const
+                { return Vector2(this->fieldWidth_, this->fieldHeight_); }
 
             void setSpeed(float speed);
@@ -67 +69 @@
             float batlength_;
             PongBat** bat_;
+            float relMercyOffset_;
     };
 }

code/trunk/src/orxonox/objects/worldentities/PongBat.cc

@@ -46 +46 @@
         this->length_ = 0.25;
         this->fieldHeight_ = 100;
+        this->bSteadiedPosition_ = false;
 
         this->registerVariables();
@@ -61 +62 @@
         if (this->hasLocalController())
         {
-            this->movement_ = clamp(this->movement_, -1.0f, 1.0f) * this->speed_;
+            if (this->movement_ != 0)
+            {
+                this->movement_ = clamp(this->movement_, -1.0f, 1.0f) * this->speed_;
 
-            if (this->bMoveLocal_)
-                this->setVelocity(this->getOrientation() * Vector3(this->movement_, 0, 0));
-            else
-                this->setVelocity(0, 0, this->movement_);
+                if (this->bMoveLocal_)
+                    this->setVelocity(this->getOrientation() * Vector3(this->movement_, 0, 0));
+                else
+                    this->setVelocity(0, 0, this->movement_);
 
-            this->movement_ = 0;
+                this->movement_ = 0;
+                this->bSteadiedPosition_ = false;
+            }
+            else if (!this->bSteadiedPosition_)
+            {
+                // To ensure network synchronicity
+                this->setVelocity(0, 0, 0);
+                this->setPosition(this->getPosition());
+                this->bSteadiedPosition_ = true;
+            }
         }
 
         SUPER(PongBat, tick, dt);
 
-        if (this->hasLocalController())
-        {
-            Vector3 position = this->getPosition();
-
-            if (position.z > this->fieldHeight_ / 2 - this->fieldHeight_ * this->length_ / 2)
-                position.z = this->fieldHeight_ / 2 - this->fieldHeight_ * this->length_ / 2;
-            if (position.z < -this->fieldHeight_ / 2 + this->fieldHeight_ * this->length_ / 2)
-                position.z = -this->fieldHeight_ / 2 + this->fieldHeight_ * this->length_ / 2;
-
-            if (position != this->getPosition())
-                this->setPosition(position);
-        }
+        Vector3 position = this->getPosition();
+        if (position.z > this->fieldHeight_ / 2 - this->fieldHeight_ * this->length_ / 2)
+            position.z = this->fieldHeight_ / 2 - this->fieldHeight_ * this->length_ / 2;
+        if (position.z < -this->fieldHeight_ / 2 + this->fieldHeight_ * this->length_ / 2)
+            position.z = -this->fieldHeight_ / 2 + this->fieldHeight_ * this->length_ / 2;
+        if (position != this->getPosition())
+            this->setPosition(position);
     }
 
@@ -98 +105 @@
         this->movement_ = value.x;
     }
+
+    void PongBat::changedPlayer()
+    {
+        this->setVelocity(0, 0, 0);
+    }
 }

code/trunk/src/orxonox/objects/worldentities/PongBat.h

@@ -48 +48 @@
             virtual void moveRightLeft(const Vector2& value);
 
+            virtual void changedPlayer();
+
             void setSpeed(float speed)
                 { this->speed_ = speed; }
@@ -69 +71 @@
             float length_;
             float fieldHeight_;
+            bool bSteadiedPosition_;
     };
 }