Changeset 12340

Timestamp:

May 9, 2019, 9:43:02 AM (5 years ago)

Author:

pomselj

Message:

Some changes in bounce method + added destroy in bounce method to be able to destroy stones

File:

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

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

@@ -43 +43 @@
 #include "sound/WorldSound.h"
 #include "core/XMLPort.h"
+
+#include "OrxoBloxStones.h"
 
 namespace orxonox
@@ -277 +279 @@
 
         Vector3 velocity = this->getVelocity();
-        Vector3 myPosition = otherObject->getPosition();
-        btVector3 positionOtherObject = contactPoint.getPositionWorldOnA();
+        Vector3 positionOtherObject = otherObject->getPosition();
+        btVector3 myPosition = contactPoint.getPositionWorldOnA();
         orxout() << "About to Bounce >D" << endl;
-        //if (positionOtherObject.y < 0) {
-            //this.destroy()
-        //}S
-        //else {
         
-            int distance_X = positionOtherObject.getX() - myPosition.x;
-            int distance_Z = positionOtherObject.getZ() - myPosition.z;
+            int distance_X = myPosition.getX() - positionOtherObject.x;
+            int distance_Z = myPosition.getZ() - positionOtherObject.z;
 
             if (distance_X < 0)
@@ -321 +319 @@
         bool result = MovableEntity::collidesAgainst(otherObject, ownCollisionShape, contactPoint);
         Bounce(otherObject, ownCollisionShape, contactPoint);
+        OrxoBloxStones* stone = orxonox_cast<OrxoBloxStones*>(otherObject);       
+        if(stone != nullptr)
+        {
+            delete stone;
+        }
         return result;
     }