Changeset 12360 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.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/OrxoBloxBall.cc (modified) (6 diffs)

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_;
+    }
+
 
 }