Changeset 12356 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc

Timestamp:

May 9, 2019, 2:20:32 PM (5 years ago)

Author:

pomselj

Message:

Bounces ok-ish, still seg fault… stones get destroyed but models stay, maybe destroy wals too

File:

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

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

@@ -33 +33 @@
 
 #include "OrxoBloxBall.h"
+#include "OrxoBloxStones.h"
 #include "OrxoBlox.h"
 #include <bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
@@ -295 +296 @@
 
 
-    void OrxoBloxBall::Bounce(OrxoBloxStones* otherObject) {
+    void OrxoBloxBall::Bounce(OrxoBloxStones* Stone) {
 
         Vector3 velocity = this->getVelocity();
-        Vector3 positionOtherObject = otherObject->getPosition();
+        Vector3 positionStone = Stone->getPosition();
         Vector3 myPosition = this->getPosition();
         orxout() << "About to Bounce >D" << endl;
@@ -306 +307 @@
         //else {
         
-            int distance_X = myPosition.x - positionOtherObject.x;
-            int distance_Z = myPosition.z - positionOtherObject.z;
+            int distance_X = myPosition.x - positionStone.x;
+            int distance_Z = myPosition.z - positionStone.z;
 
             if (distance_X < 0)
@@ -336 +337 @@
 
 
-    void OrxoBloxBall::Collides(OrxoBloxStones* otherObject)
-    {
-
-        if(otherObject == nullptr)
+    void OrxoBloxBall::Collides(OrxoBloxStones* Stone)
+    {
+
+        if(Stone == nullptr)
             return;
 
         orxout() << "About to Bounce >D" << endl;
-        Bounce(otherObject);
+        Bounce(Stone);
+        //if(otherObject->getHealth() <= 0) {
+            Stone->destroy();
+        //}
+        //otherObject->reduceHealth();
     }