Changeset 12360 for code/branches/OrxoBlox_FS19/src/modules

Timestamp:

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

Author:

pomselj

Message:

bounces moore smoothly

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (2 diffs)
• OrxoBloxBall.cc (modified) (6 diffs)
• OrxoBloxBall.h (modified) (2 diffs)
• OrxoBloxStones.cc (modified) (1 diff)
• OrxoBloxStones.h (modified) (1 diff)
• OrxoBloxWall.cc (modified) (1 diff)
• OrxoBloxWall.h (modified) (1 diff)

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;

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

@@ -67 +67 @@
         this->relMercyOffset_ = 0.05f;
         this->orxoblox_ = this->getOrxoBlox();
+        this->radius_ = 1.5;
 
         this->registerVariables();
@@ -302 +303 @@
         Vector3 myPosition = this->getPosition();
         orxout() << "About to Bounce >D" << endl;
-        //if (positionOtherObject.y < 0) {
-            //this.destroy()
-        //}S
-        //else {
         
             int distance_X = myPosition.x - positionStone.x;
@@ -322 +319 @@
             if (distance_X < distance_Z) {
                 velocity.z = -velocity.z;
-                orxout() << "z" << endl;
+                orxout() << "z" << endl;  
             }
-            if (distance_Z < distance_X) {
+            else if (distance_Z < distance_X) {
                 velocity.x = -velocity.x;
-                orxout() << "x" << endl;
+                orxout() << "x" << endl;       
             }
             else {
@@ -332 +329 @@
                 velocity.z = -velocity.z;
                 orxout() << "both" << endl;
-            }
+            }                                  
+
             this->setVelocity(velocity);
+            this->setPosition(myPosition);
     }
 
@@ -346 +345 @@
         Bounce(Stone);
         //if(otherObject->getHealth() <= 0) {
-            Stone->destroy();
+        Stone->destroy();
+
         //}
         //otherObject->reduceHealth();
@@ -362 +362 @@
     }
 
+    float OrxoBloxBall::getRadius() {
+        return this->radius_;
+    }
+
 
 }

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

@@ -134 +134 @@
             void setDefBoundarySound(const std::string& engineSound);
             const std::string& getDefBoundarySound();
+            float getRadius();
 
-            unsigned int getHealth();
 
         private:
@@ -141 +141 @@
 
             OrxoBlox* getOrxoBlox();
+            float radius_;
             float fieldWidth_; //!< The width of the playing field.
             float fieldHeight_; //!< The height of the playing field.

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

@@ -29 +29 @@
         this->health_ -= 1;
     }
+
+    float OrxoBloxStones::getSize() {
+        return this->size_;
+    }
 }

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

@@ -67 +67 @@
 
             void reduceHealth();
+
+            float getSize();
                 
         private:

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

@@ -98 +98 @@
         return num_Stones_;
     }
+
+    void OrxoBloxWall::setNumberOfStones(int number) {
+        this->num_Stones_ = number;
+    }
+
+    bool OrxoBloxWall::isEmpty() {
+        if (num_Stones_ == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    void OrxoBloxWall::reduceNumberOfStones() {
+        if(num_Stones_ == 0) {
+            orxout() << "Wanted to reduce number of stones, but there were none" << endl;
+        }
+        this->num_Stones_ -= 1;
+    }
 }

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

@@ -43 +43 @@
                 { assert(orxoblox); orxoblox_ = orxoblox; }
             int getNumberOfStones();
+            bool isEmpty();
+            void reduceNumberOfStones();
+            void setNumberOfStones(int number);
         private:
             void createWall(void);