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

Timestamp:

May 9, 2019, 11:36:28 AM (5 years ago)

Author:

pomselj

Message:

Worked on Collision, doesn't work yet, compiles tho

File:

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

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

@@ -147 +147 @@
 
             // Create the first Wall.
-            this->LevelUp();
+            this->createWall();
 
             //Create Ship
@@ -213 +213 @@
         this->createWall();
         this->activeWalls_.push_back(this->futureWall_);
+        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++)
+            this->stones_.push_back(this->futureWall_->getStone(i));
         //new location of ship
         //new amount of balls
         //create balls
         //insert new wall
-
     }
 
@@ -243 +244 @@
     }
 
-    
+    OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
+
+        orxout() << "Checking for Collision" << endl;
+        Vector3 BallPosition = Ball->getPosition();
+        for(OrxoBloxStones* someStone : this->stones_)
+        {
+            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) || 
+                (BallPosition.z >= StonePosition.z - size && BallPosition.z <= StonePosition.z + size)) {
+                orxout() << "FOUND ONE" << endl;
+                return someStone;
+            }
+        }
+        orxout() << "Found nothing...." << endl;
+        return nullptr;
+    }
     
 }