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

Timestamp:

May 9, 2019, 11:36:28 AM (5 years ago)

Author:

pomselj

Message:

Worked on Collision, doesn't work yet, compiles tho

File:

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

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

@@ -55 +55 @@
     */
     OrxoBloxBall::OrxoBloxBall(Context* context)
-        : MovableEntity(context)
+        : Pawn(context)
     {
         RegisterObject(OrxoBloxBall);
@@ -63 +63 @@
         this->bDeleteBats_ = false;
         this->relMercyOffset_ = 0.05f;
+        this->orxoblox_ = this->getOrxoBlox();
 
         this->registerVariables();
@@ -206 +207 @@
         if (position != this->getPosition())
             this->setPosition(position);
+        this->Collides((this->orxoblox_->CheckForCollision(this)));
+
+ 
     }
 
@@ -287 +291 @@
 
 
-    void OrxoBloxBall::Bounce(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
+    void OrxoBloxBall::Bounce(OrxoBloxStones* otherObject) {
 
         Vector3 velocity = this->getVelocity();
-        Vector3 myPosition = otherObject->getPosition();
-        btVector3 positionOtherObject = contactPoint.getPositionWorldOnA();
+        Vector3 positionOtherObject = otherObject->getPosition();
+        Vector3 myPosition = this->getPosition();
         orxout() << "About to Bounce >D" << endl;
         //if (positionOtherObject.y < 0) {
@@ -298 +302 @@
         //else {
         
-            int distance_X = positionOtherObject.getX() - myPosition.x;
-            int distance_Z = positionOtherObject.getZ() - myPosition.z;
+            int distance_X = myPosition.x - positionOtherObject.x;
+            int distance_Z = myPosition.z - positionOtherObject.z;
 
             if (distance_X < 0)
@@ -325 +329 @@
             }
             this->setVelocity(velocity);
-        //}
-    }
-
-
-    bool OrxoBloxBall::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
-    {
+    }
+
+
+    void OrxoBloxBall::Collides(OrxoBloxStones* otherObject)
+    {
+
+        if(otherObject == nullptr)
+            return;
+
         orxout() << "About to Bounce >D" << endl;
-        bool result = MovableEntity::collidesAgainst(otherObject, ownCollisionShape, contactPoint);
-        Bounce(otherObject, ownCollisionShape, contactPoint);
-        return result;
+        Bounce(otherObject);
+    }
+
+    OrxoBlox* OrxoBloxBall::getOrxoBlox()
+    {
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(OrxoBlox)))
+        {
+            OrxoBlox* orxobloxGametype = orxonox_cast<OrxoBlox*>(this->getGametype());
+            return orxobloxGametype;
+        }
+        else orxout()<<"There is no Gametype for OrxoBlox! ask Anna"<< endl;
+        return nullptr;
     }