Changeset 12308 for code

Timestamp:

Apr 18, 2019, 3:44:09 PM (6 years ago)

Author:

ahuwyler

Message:

Bats are gone

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxoBlox.cc (modified) (4 diffs)
• OrxoBlox.h (modified) (1 diff)
• OrxoBloxAI.cc (deleted)
• OrxoBloxAI.h (deleted)
• OrxoBloxBall.cc (modified) (5 diffs)
• OrxoBloxBall.h (modified) (2 diffs)
• OrxoBloxBat.cc (deleted)
• OrxoBloxBat.h (deleted)
• OrxoBloxPrereqs.h (modified) (1 diff)
• OrxoBloxWall.cc (modified) (1 diff)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt

@@ -4 +4 @@
   OrxoBloxWall.cc
   OrxoBloxBall.cc
-  OrxoBloxBat.cc
   OrxoBloxBot.cc
   OrxoBloxCenterpoint.cc

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

@@ -33 +33 @@
 
 #include "OrxoBlox.h"
+#include "Highscore.h"
 
 #include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/command/Executor.h"
-#include "core/config/ConfigValueIncludes.h"
+
+
+#include "core/config/ConfigValueIncludes.h"//Remove??
 
 #include "gamestates/GSLevel.h"
-#include "chat/ChatManager.h"
+
+
+#include "chat/ChatManager.h"//Remove?
 
 #include "OrxoBloxCenterpoint.h"
 #include "OrxoBloxBall.h"
-#include "OrxoBloxBat.h"
-#include "OrxoBloxBot.h"
+// #include "OrxoBloxBat.h"//Remove??
+#include "OrxoBloxBot.h"//Remove??
 #include "OrxoBloxStones.h"
 #include "OrxoBloxWall.h"
@@ -52 +57 @@
 namespace orxonox
 {
-    // Events to allow to react to scoring of a player, in the level-file.
-    CreateEventName(OrxoBloxCenterpoint, right);
-    CreateEventName(OrxoBloxCenterpoint, left);
+    
 
     RegisterUnloadableClass(OrxoBlox);
@@ -148 +151 @@
 
 
-
-
-
-            // If one of the bats is missing, create it. Apply the template for the bats as specified in the centerpoint.
-            for (WeakPtr<orxonox::OrxoBloxBat>& bat : this->bat_)
-            {
-                if (bat == nullptr)
-                {
-                    bat = new OrxoBloxBat(this->center_->getContext());
-                    bat->addTemplate(this->center_->getBattemplate());
-                }
-            }
-
-
             // Create the first Wall.
             this->createWall();
-            orxout()<< "helloo"<< endl;
 
         }
@@ -257 +245 @@
     }
 
-    // void OrxoBlox::createWall(void)             //TODO: random rotation offset between 0 and 3 (times 90°)
-    // {
-    //     // create new futureBrick_
-    //     this->futureWall_ = new TetrisBrick(this->center_->getContext());
-
-
-    //     // Apply the stone template to the stone.
-    //     this->futureBrick_->addTemplate(this->center_->getBrickTemplate());
-
-    //     // Attach the brick to the Centerpoint and set the position of the brick to be at the left side.
-    //     this->center_->attach(this->futureBrick_);
-    //     float xPos = (this->center_->getWidth()*1.6f + ((this->center_->getWidth() % 2)*2-1)/2.0f)*this->center_->getStoneSize();
-    //     float yPos = (this->center_->getHeight()-5.1f)*this->center_->getStoneSize();
-        
-    //     this->futureBrick_->setPosition(xPos, yPos, 0.0f);
-    //     this->futureBrick_->setGame(this);
-    // }
 
     /**

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

@@ -96 +96 @@
             WeakPtr<OrxoBloxCenterpoint> center_; //!< The playing field.
             WeakPtr<OrxoBloxBall> ball_; //!< The OrxoBlox ball.
-            WeakPtr<OrxoBloxBat> bat_[0]; //!< The two bats.
+            
             PlayerInfo* player_;
 

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

@@ -39 +39 @@
 #include "gametypes/Gametype.h"
 
-#include "OrxoBloxBat.h"
 
 #include "sound/WorldSound.h"
@@ -61 +60 @@
         this->speed_ = 0;
         this->accelerationFactor_ = 1.0f;
-        this->bat_ = nullptr;
         this->bDeleteBats_ = false;
-        this->batID_ = new unsigned int[2];
-        this->batID_[0] = OBJECTID_UNKNOWN;
-        this->batID_[1] = OBJECTID_UNKNOWN;
         this->relMercyOffset_ = 0.05f;
 
@@ -97 +92 @@
         {
             if (this->bDeleteBats_)
-                delete[] this->bat_;
 
             delete[] this->batID_;
@@ -123 +117 @@
         registerVariable( this->speed_ );
         registerVariable( this->relMercyOffset_ );
-        registerVariable( this->batID_[0] );
-        registerVariable( this->batID_[1], VariableDirection::ToClient, new NetworkCallback<OrxoBloxBall>( this, &OrxoBloxBall::applyBats) );
     }
 
@@ -217 +209 @@
     }
 
-    /**
-    @brief
-        Set the bats for the ball.
-    @param bats
-        An array (of size 2) of weak pointers, to be set as the new bats.
-    */
-    void OrxoBloxBall::setBats(WeakPtr<OrxoBloxBat>* bats)
-    {
-        if (this->bDeleteBats_) // If there are already some bats, delete them.
-        {
-            delete[] this->bat_;
-            this->bDeleteBats_ = false;
-        }
-
-        this->bat_ = bats;
-        // Also store their object IDs, for synchronization.
-        this->batID_[0] = this->bat_[0]->getObjectID();
-        this->batID_[1] = this->bat_[1]->getObjectID();
-    }
-
-    /**
-    @brief
-        Get the bats over the network.
-    */
-    void OrxoBloxBall::applyBats()
-    {
-        // Make space for the bats, if they don't exist, yet.
-        if (this->bat_ == nullptr)
-        {
-            this->bat_ = new WeakPtr<OrxoBloxBat>[2];
-            this->bDeleteBats_ = true;
-        }
-
-        if (this->batID_[0] != OBJECTID_UNKNOWN)
-            this->bat_[0] = orxonox_cast<OrxoBloxBat*>(Synchronisable::getSynchronisable(this->batID_[0]));
-        if (this->batID_[1] != OBJECTID_UNKNOWN)
-            this->bat_[1] = orxonox_cast<OrxoBloxBat*>(Synchronisable::getSynchronisable(this->batID_[1]));
-    }
 
     void OrxoBloxBall::setDefScoreSound(const std::string &OrxoBloxSound)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h

@@ -121 +121 @@
                 { return this->batlength_; }
 
-            void setBats(WeakPtr<OrxoBloxBat>* bats); //!< Set the bats for the ball.
+            
             void applyBats(); //!< Get the bats over the network.
 
@@ -141 +141 @@
             float accelerationFactor_; //!< The acceleration factor of the ball.
             float batlength_; //!< The length of the bats (in z-direction) as percentage of the height of the playing field.
-            WeakPtr<OrxoBloxBat>* bat_; //!< An array with the two bats.
             bool bDeleteBats_; //!< Bool, to keep track, of whether this->bat_ exists or not.
             unsigned int* batID_; //!< The object IDs of the bats, to be able to synchronize them over the network.

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h

@@ -69 +69 @@
 {
     class OrxoBlox;
-    class OrxoBloxAI;
     class OrxoBloxBall;
-    class OrxoBloxBat;
+    
     class OrxoBloxCenterpoint;
     class OrxoBloxWall;

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

@@ -42 +42 @@
             return orxobloxGametype;
         }
-        else orxout()<<"There is no Gametype! ask Anna"<< endl;
+        else orxout()<<"There is no Gametype for OrxoBlox! ask Anna"<< endl;
         return nullptr;
     }