Changeset 12212 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

Timestamp:

Mar 21, 2019, 2:19:16 PM (6 years ago)

Author:

ahuwyler

Message:

A new Game is born

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified) (19 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -28 +28 @@
 
 /**
-    @file Pong.cc
-    @brief Implementation of the Pong class.
+    @file OrxoBlox.cc
+    @brief Implementation of the OrxoBlox class.
 */
 
-#include "Pong.h"
+#include "OrxoBlox.h"
 
 #include "core/CoreIncludes.h"
@@ -42 +42 @@
 #include "chat/ChatManager.h"
 
-#include "PongCenterpoint.h"
-#include "PongBall.h"
-#include "PongBat.h"
-#include "PongBot.h"
-#include "PongAI.h"
-
+#include "OrxoBloxCenterpoint.h"
+#include "OrxoBloxBall.h"
+#include "OrxoBloxBat.h"
+#include "OrxoBloxBot.h"
+#include "OrxoBloxAI.h"
 namespace orxonox
 {
     // Events to allow to react to scoring of a player, in the level-file.
-    CreateEventName(PongCenterpoint, right);
-    CreateEventName(PongCenterpoint, left);
-
-    RegisterUnloadableClass(Pong);
+    CreateEventName(OrxoBloxCenterpoint, right);
+    CreateEventName(OrxoBloxCenterpoint, left);
+
+    RegisterUnloadableClass(OrxoBlox);
 
     /**
@@ -60 +59 @@
         Constructor. Registers and initializes the object.
     */
-    Pong::Pong(Context* context) : Deathmatch(context)
-    {
-        RegisterObject(Pong);
+    OrxoBlox::OrxoBlox(Context* context) : Deathmatch(context)
+    {
+        RegisterObject(OrxoBlox);
 
         this->center_ = nullptr;
@@ -69 +68 @@
         this->bat_[1] = nullptr;
 
-        this->setHUDTemplate("PongHUD");
+        this->setHUDTemplate("OrxoBloxHUD");
 
         // Pre-set the timer, but don't start it yet.
-        this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&Pong::startBall, this)));
+        this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&OrxoBlox::startBall, this)));
         this->starttimer_.stopTimer();
 
         // Set the type of Bots for this particular Gametype.
-        this->botclass_ = Class(PongBot);
+        this->botclass_ = Class(OrxoBloxBot);
 
         this->scoreLimit_ = 10;
@@ -86 +85 @@
         Destructor. Cleans up, if initialized.
     */
-    Pong::~Pong()
+    OrxoBlox::~OrxoBlox()
     {
         if (this->isInitialized())
@@ -92 +91 @@
     }
 
-    void Pong::setConfigValues()
+    void OrxoBlox::setConfigValues()
     {
         SetConfigValue(scoreLimit_, 10).description("The player first reaching those points wins.");
@@ -101 +100 @@
         Cleans up the Gametype by destroying the ball and the bats.
     */
-    void Pong::cleanup()
+    void OrxoBlox::cleanup()
     {
         if (this->ball_ != nullptr) // Destroy the ball, if present.
@@ -123 +122 @@
     /**
     @brief
-        Starts the Pong minigame.
-    */
-    void Pong::start()
-    {
-        if (this->center_ != nullptr) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
+        Starts the OrxoBlox minigame.
+    */
+    void OrxoBlox::start()
+    {
+        if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place.
         {
             if (this->ball_ == nullptr) // If there is no ball, create a new ball.
             {
-                this->ball_ = new PongBall(this->center_->getContext());
+                this->ball_ = new OrxoBloxBall(this->center_->getContext());
                 // Apply the template for the ball specified by the centerpoint.
                 this->ball_->addTemplate(this->center_->getBalltemplate());
@@ -145 +144 @@
 
             // If one of the bats is missing, create it. Apply the template for the bats as specified in the centerpoint.
-            for (WeakPtr<orxonox::PongBat>& bat : this->bat_)
+            for (WeakPtr<orxonox::OrxoBloxBat>& bat : this->bat_)
             {
                 if (bat == nullptr)
                 {
-                    bat = new PongBat(this->center_->getContext());
+                    bat = new OrxoBloxBat(this->center_->getContext());
                     bat->addTemplate(this->center_->getBattemplate());
                 }
@@ -173 +172 @@
         else // If no centerpoint was specified, an error is thrown and the level is exited.
         {
-            orxout(internal_error) << "Pong: No Centerpoint specified." << endl;
+            orxout(internal_error) << "OrxoBlox: No Centerpoint specified." << endl;
             GSLevel::startMainMenu();
             return;
@@ -194 +193 @@
     /**
     @brief
-        Ends the Pong minigame.
-    */
-    void Pong::end()
+        Ends the OrxoBlox minigame.
+    */
+    void OrxoBlox::end()
     {
         this->cleanup();
@@ -208 +207 @@
         Spawns players, and fills the rest up with bots.
     */
-    void Pong::spawnPlayersIfRequested()
+    void OrxoBlox::spawnPlayersIfRequested()
     {
         // first spawn human players to assign always the left bat to the player in singleplayer
@@ -226 +225 @@
         The player to be spawned.
     */
-    void Pong::spawnPlayer(PlayerInfo* player)
+    void OrxoBlox::spawnPlayer(PlayerInfo* player)
     {
         assert(player);
@@ -247 +246 @@
 
         // If the player is an AI, it receives a pointer to the ball.
-        if (player->getController() != nullptr && player->getController()->isA(Class(PongAI)))
-        {
-            PongAI* ai = orxonox_cast<PongAI*>(player->getController());
-            ai->setPongBall(this->ball_);
+        if (player->getController() != nullptr && player->getController()->isA(Class(OrxoBloxAI)))
+        {
+            OrxoBloxAI* ai = orxonox_cast<OrxoBloxAI*>(player->getController());
+            ai->setOrxoBloxBall(this->ball_);
         }
     }
@@ -258 +257 @@
         Is called when the player scored.
     */
-    void Pong::playerScored(PlayerInfo* player, int score)
+    void OrxoBlox::playerScored(PlayerInfo* player, int score)
     {
         Deathmatch::playerScored(player, score);
@@ -266 +265 @@
             // Fire an event for the player that has scored, to be able to react to it in the level, e.g. by displaying fireworks.
             if (player == this->getRightPlayer())
-                this->center_->fireEvent(FireEventName(PongCenterpoint, right));
+                this->center_->fireEvent(FireEventName(OrxoBloxCenterpoint, right));
             else if (player == this->getLeftPlayer())
-                this->center_->fireEvent(FireEventName(PongCenterpoint, left));
+                this->center_->fireEvent(FireEventName(OrxoBloxCenterpoint, left));
 
             // Also announce, that the player has scored.
@@ -312 +311 @@
         Starts the ball with some default speed.
     */
-    void Pong::startBall()
+    void OrxoBlox::startBall()
     {
         if (this->ball_ != nullptr && this->center_ != nullptr)
@@ -324 +323 @@
         Returns a pointer to the player playing on the left. If there is no left player, nullptr is returned.
     */
-    PlayerInfo* Pong::getLeftPlayer() const
+    PlayerInfo* OrxoBlox::getLeftPlayer() const
     {
         if (this->bat_[0] != nullptr)
@@ -338 +337 @@
         Returns a pointer to the player playing on the right. If there is no right player, nullptr is returned.
     */
-    PlayerInfo* Pong::getRightPlayer() const
+    PlayerInfo* OrxoBlox::getRightPlayer() const
     {
         if (this->bat_[1] != nullptr)