Changeset 12310 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Timestamp:

Apr 18, 2019, 4:04:33 PM (6 years ago)

Author:

pomselj

Message:

oxw file cleaned up

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

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

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

@@ -49 +49 @@
 #include "OrxoBloxCenterpoint.h"
 #include "OrxoBloxBall.h"
-// #include "OrxoBloxBat.h"//Remove??
 #include "OrxoBloxBot.h"//Remove??
 #include "OrxoBloxStones.h"

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

@@ -33 +33 @@
 
 #include "OrxoBloxBall.h"
+#include <bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
 #include "core/CoreIncludes.h"
@@ -260 +261 @@
         return BLANKSTRING;
     }
+
+
+    void OrxoBloxBall::Bounce(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
+
+        Vector3 velocity = this->getVelocity();
+        Vector3 myPosition = otherObject->getPosition();
+        btVector3 positionOtherObject = 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;
+
+            if (distance_X < 0)
+                distance_X = -distance_X;
+    
+
+            if (distance_Z < 0)
+                distance_Z = -distance_Z;
+
+            orxout() << distance_X << endl;
+            orxout() << distance_Z << endl;
+
+            if (distance_X < distance_Z) {
+                velocity.z = -velocity.z;
+                orxout() << "z" << endl;
+            }
+            if (distance_Z < distance_X) {
+                velocity.x = -velocity.x;
+                orxout() << "x" << endl;
+            }
+            else {
+                velocity.x = -velocity.x;
+                velocity.z = -velocity.z;
+                orxout() << "both" << endl;
+            }
+            this->setVelocity(velocity);
+        //}
+    }
+
+
+    bool OrxoBloxBall::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
+    {
+        orxout() << "About to Bounce >D" << endl;
+        bool result = MovableEntity::collidesAgainst(otherObject, ownCollisionShape, contactPoint);
+        Bounce(otherObject, ownCollisionShape, contactPoint);
+        return result;
+    }
+
+
 }

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

@@ -41 +41 @@
 
 #include "worldentities/MovableEntity.h"
+#include <bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
 
@@ -132 +133 @@
             void setDefBoundarySound(const std::string& engineSound);
             const std::string& getDefBoundarySound();
+            void Bounce(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
         private: