Changeset 11418 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc

Timestamp:

May 18, 2017, 1:24:43 PM (7 years ago)

Author:

jkindle

Message:

IMPROVED JUMP ALGORITHM OH GHAD YEES JEES

File:

• code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (modified) (8 diffs)

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc

@@ -45 +45 @@
 #include "SOBFlagstone.h"
 #include "SOBCastlestone.h"
+#include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
 namespace orxonox
@@ -63 +64 @@
         moveDownPressed_ = false;
         firePressed_ = false;
-        
+        collDisZ_ = 0;
         //Times and turning
         timeSinceLastFire_ = 0.0;
@@ -90 +91 @@
     bool SOBFigure::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
 
+        //Inform tick fct that player is colliding and tell him how far away the collision point is from player middle point in z dir
         isColliding_ = true;
+        collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
+
 
         //Orxocast returns object with casted type if otherObject has that class, and if not a nullptr
@@ -116 +120 @@
               setVelocity(vel);
               predead_=true; 
+              SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+              SOBGame->setDone(true);
 
           } else {
@@ -132 +138 @@
         reachedLvlEndState_ = 1;
         SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+        SOBGame->setDone(true);
         SOBGame->addPoints(flagstone->getPoints());
+        
 
     }
@@ -201 +209 @@
         if (!predead_)
             velocity.y = 0;
+        //If player falls in a hole
         if (position.z < -100) {
             dead_ = true;
+            SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+            SOBGame->setDone(true);
         }
 
@@ -233 +244 @@
 
 
-        //If player hits space and does not move in z-dir
-        if (inputAllowed && firePressed_ && isColliding_ && std::abs(velocity.z) < 0.1 && std::abs(lastSpeed_z) < 0.1) {
+        //If player hits space and collides against an object under him then jump
+        if (inputAllowed && firePressed_ && isColliding_ && (collDisZ_ >= 7.75 && collDisZ_ <+ 8.25)) {
             gravityAcceleration_ = 100.0;
-            velocity.z = 110; //150
+            velocity.z = 110; 
         }
 
@@ -310 +321 @@
 
     isColliding_ = false;
+    collDisZ_ = 0;
 
 }