Changeset 11678 for code/branches/Presentation_HS17/src/modules/superorxobros/SOBQBlock.cc

Timestamp:

Dec 16, 2017, 12:24:20 PM (7 years ago)

Author:

patricwi

Message:

merged FlappyOrx and SOBv2

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• src/modules/superorxobros/SOBQBlock.cc (modified) (2 diffs)

code/branches/Presentation_HS17/src/modules/superorxobros/SOBQBlock.cc

@@ -39 +39 @@
 #include "SOBMushroom.h"
 #include "SOBCoin.h"
+#include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
+
 
 namespace orxonox
@@ -62 +64 @@
         //If you hit the QBlock, the visibility of all attached objects get inverted! Pretty easy way to create changing blocks :)
         float v_z = otherObject->getVelocity().z;
-        if (!used_ && v_z > 50.0) {
+        int collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
+        if (!used_ && v_z > 50.0 && collDisZ_ > 0) {
             used_ = true;