Changeset 10760 for code/branches/hoverHS15/src/modules/hover/HoverShip.h

Timestamp:

Nov 2, 2015, 6:01:56 PM (9 years ago)

Author:

fvultier

Message:

2 problems fixed: The collidesAgainst function in the hovership get now properly called. The Hoverhalls have a collisionShape that works.

File:

• code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified) (2 diffs)

code/branches/hoverHS15/src/modules/hover/HoverShip.h

@@ -53 +53 @@
             virtual void tick(float dt);
 
-                    virtual void moveFrontBack(const Vector2& value);
+                    /*virtual void moveFrontBack(const Vector2& value);
 
                     virtual void moveRightLeft(const Vector2& value);
@@ -63 +63 @@
                     virtual void rotatePitch(const Vector2& value);
                     
-                    virtual void rotateRoll(const Vector2& value);
+                    virtual void rotateRoll(const Vector2& value);*/
 
-                    virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+                    virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
                     virtual void boost(bool bBoost);