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

Timestamp:

May 9, 2019, 3:32:40 PM (6 years ago)

Author:

pomselj

Message:

bounces moore smoothly

File:

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

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

@@ -242 +242 @@
             this->stones_.push_back(this->futureWall_->getStone(i));
         }
+
+        for(OrxoBloxWall* wall : this->activeWalls_) {
+            if(wall->isEmpty()) {
+                wall->destroy();
+            }
+            int NumberOfStones = 0;
+            for(int i = 0; i < 10; i++) {
+                if(wall->getStone(i) == nullptr) {
+                    continue;
+                }
+                else {
+                    NumberOfStones++;
+                }
+
+            }
+        }
         //new location of ship
         //new amount of balls
@@ -283 +299 @@
             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)) {
+            int size = someStone->getSize()/2;
+            if((BallPosition.x - Ball->getRadius() >= StonePosition.x - size && BallPosition.x + Ball->getRadius() <= StonePosition.x + size) && 
+                (BallPosition.z - Ball->getRadius() >= StonePosition.z - size && BallPosition.z + Ball->getRadius() <= StonePosition.z + size)) {
                 orxout() << "FOUND ONE" << endl;
                 return someStone;