Changeset 12350

Timestamp:

May 9, 2019, 1:56:28 PM (6 years ago)

Author:

pomselj

Message:

Eliminated nullptrs in stones_ that were there due to wrong size of num_stones. Still Seg fault when exiting

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (5 diffs)
• OrxoBloxBall.cc (modified) (2 diffs)
• OrxoBloxWall.cc (modified) (3 diffs)

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

@@ -225 +225 @@
 
         this->activeWalls_.push_back(this->futureWall_);
-
-
-        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++)
+        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++) {
+            if (this->futureWall_->getStone(i) == nullptr) {
+                orxout() << "Added nullptr to std::list stones_" << endl;
+            }
+
             this->stones_.push_back(this->futureWall_->getStone(i));
+        }
         //new location of ship
         //new amount of balls
@@ -235 +238 @@
     }
 
-    void OrxoBlox::createWall(void){
+    void OrxoBlox::createWall(){
         this->futureWall_ = new OrxoBloxWall(this->center_->getContext());
         // Apply the stone template to the stone.
@@ -258 +261 @@
     }
 
-    /*OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
+    OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
 
         orxout() << "Checking for Collision" << endl;
@@ -264 +267 @@
         for(OrxoBloxStones* someStone : this->stones_)
         {
+            if(someStone == nullptr) 
+            {
+                continue;
+            }
             orxout() << "Checking a stone" << endl;
             const Vector3& StonePosition = someStone->getPosition(); //!< Saves the position of the currentStone
             int size = someStone->getSize();
-            if((BallPosition.x >= StonePosition.x - size && BallPosition.x <= StonePosition.x + size) || 
+            if((BallPosition.x >= StonePosition.x - size && BallPosition.x <= StonePosition.x + size) && 
                 (BallPosition.z >= StonePosition.z - size && BallPosition.z <= StonePosition.z + size)) {
                 orxout() << "FOUND ONE" << endl;
@@ -275 +282 @@
         orxout() << "Found nothing...." << endl;
         return nullptr;
-    }*/
+    }
     
 }

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

@@ -149 +149 @@
                 // Set the ball to be exactly at the boundary.
                 position.z = this-> fieldHeight_ / 2;
-                // Set the velocity to zero
                 
                 orxoblox_->LevelUp();
@@ -212 +211 @@
         if (position != this->getPosition())
             this->setPosition(position);
-        //this->Collides((this->orxoblox_->CheckForCollision(this)));
+        this->Collides((this->orxoblox_->CheckForCollision(this)));
 
  

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

@@ -29 +29 @@
 
 
-    void OrxoBloxWall::createWall(void){
+    void OrxoBloxWall::createWall(){
         for (unsigned int i=0; i<this->num_Stones_;++i){
             unsigned int j=1 + static_cast<unsigned int>(rnd(2.0f)); //<! random number between 0 and 2;
@@ -35 +35 @@
                 this->size_ = 9.0f;
                 OrxoBloxStones* stone = new OrxoBloxStones(this->getContext());
+                if (stone == nullptr) {
+                    std::abort();
+                }
                 this->TotalStones_.push_back(stone);
                 this->attach(stone);
@@ -56 +59 @@
 
         }
+
+        this->num_Stones_ = TotalStones_.size();