Changeset 12349 for code/branches/OrxoBlox_FS19/src

Timestamp:

May 9, 2019, 1:33:42 PM (6 years ago)

Author:

ahuwyler

Message:

cleanup active Walls

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (5 diffs)
• OrxoBloxBall.cc (modified) (2 diffs)
• OrxoBloxBall.h (modified) (1 diff)

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

@@ -109 +109 @@
         if (this->futureWall_)
             {
-                this->futureWall_->destroy();
-                this->futureWall_ = nullptr;
-            }
+            this->futureWall_->destroy();
+            this->futureWall_ = nullptr;
+            }
+
+        for (OrxoBloxWall* wall : this->activeWalls_)
+            wall->destroy();
+        this->activeWalls_.clear();
+        
 
         for (OrxoBloxStones* stone : this->stones_)
@@ -147 +152 @@
 
             // Create the first Wall.
-            this->createWall();
+            this->LevelUp();
 
             //Create Ship
@@ -212 +217 @@
         level_++;
         this->createWall();
+
+        for(OrxoBloxWall* Wall : this->activeWalls_){
+            int x_=(Wall->getPosition()).x;
+            orxout()<<x_<<endl;
+            Wall->setPosition(0,0,x_+10.0f);
+        }
+
         this->activeWalls_.push_back(this->futureWall_);
+
+
         for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++)
             this->stones_.push_back(this->futureWall_->getStone(i));
@@ -244 +258 @@
     }
 
-    OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
+    /*OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
 
         orxout() << "Checking for Collision" << endl;
@@ -261 +275 @@
         orxout() << "Found nothing...." << endl;
         return nullptr;
-    }
+    }*/
     
 }

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

@@ -150 +150 @@
                 position.z = this-> fieldHeight_ / 2;
                 // Set the velocity to zero
+                
+                orxoblox_->LevelUp();
+
 
                 //this->setSpeed(0); // doesn't work here, why??;
@@ -209 +212 @@
         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/OrxoBloxBall.h

@@ -151 +151 @@
             WorldSound* defBoundarySound_;
             OrxoBlox* orxoblox_;
-            OrxoBlox* getOrxoBlox();
+        
     };
 }