Changeset 11400 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.h

Timestamp:

Apr 13, 2017, 3:30:24 PM (7 years ago)

Author:

jkindle

Message:

Added jetpack, rotation of player, Questionmark-blocks and Hitlistener for the QBlocks. Made description for David in XML file for usage of hittable blocks

File:

• code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.h (modified) (3 diffs)

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

@@ -33 +33 @@
 #include "worldentities/ControllableEntity.h"
 
+
 namespace orxonox
 {
@@ -47 +48 @@
           
             virtual void boost(bool boost) override;
-            
+            virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+
         
             //virtual void CollisionWithEnemy(SOBEnemy* enemy);
@@ -69 +71 @@
             SOBCenterpoint* sobcenterpoint;
             float pitch_;
+            bool isColliding_;
+            WorldEntity* particlespawner_;