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

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.cc (modified) (2 diffs)

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

@@ -49 +49 @@
     }
 
-    void HoverShip::moveFrontBack(const Vector2& value)
+    /*void HoverShip::moveFrontBack(const Vector2& value)
                 { this->steering_.z -= value.x; }
 
@@ -60 +60 @@
     void HoverShip::rotateYaw(const Vector2& value) {}
     void HoverShip::rotatePitch(const Vector2& value) {}
-    void HoverShip::rotateRoll(const Vector2& value) {}
+    void HoverShip::rotateRoll(const Vector2& value) {}*/
 
-    bool HoverShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool HoverShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
+        orxout() << "collision" << endl;
+
         /*if (contactPoint.m_normalWorldOnB.y() > 0.6)
             this->isFloor_ = true;