[Orxonox-commit 6035] r10694 - code/branches/hoverHS15/src/modules/hover

[bucyril at orxonox.net]

Author: bucyril
Date: 2015-10-26 13:36:43 +0100 (Mon, 26 Oct 2015)
New Revision: 10694

Modified:
   code/branches/hoverHS15/src/modules/hover/HoverShip.cc
   code/branches/hoverHS15/src/modules/hover/HoverShip.h
Log:
Made the code compile


Modified: code/branches/hoverHS15/src/modules/hover/HoverShip.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverShip.cc	2015-10-25 21:48:18 UTC (rev 10693)
+++ code/branches/hoverHS15/src/modules/hover/HoverShip.cc	2015-10-26 12:36:43 UTC (rev 10694)
@@ -48,6 +48,41 @@
         SUPER(HoverShip, tick, dt);
     }
 
+    void HoverShip::moveFrontBack(const Vector2& value)
+                { this->steering_.z -= value.x; }
+
+    void HoverShip::moveRightLeft(const Vector2& value)
+        { this->steering_.x += value.x; }
+
+    void HoverShip::moveUpDown(const Vector2& value)
+        { this->steering_.y += value.x; }
+
+    void HoverShip::rotateYaw(const Vector2& value) {}
+    void HoverShip::rotatePitch(const Vector2& value) {}
+    void HoverShip::rotateRoll(const Vector2& value) {}
+
+    bool HoverShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    {
+        /*if (contactPoint.m_normalWorldOnB.y() > 0.6)
+            this->isFloor_ = true;
+        else
+            this->isFloor_ = false;
+
+        return false;*/
+        return false;
+    }
+
+    void HoverShip::boost(bool bBoost) {
+        /*if (this->isFloor_)
+        {
+            if (!this->thisTickBoost_)
+                this->localVelocity_.y = jumpValue_;
+            //this->physicalBody_->applyCentralImpulse(btVector3(0, jumpvalue, 0));
+            this->thisTickBoost_ = true;
+            this->isFloor_ = false;
+        }*/
+    }
+
    /* Hover* HoverShip::getGame()
     {
         if (game == NULL)

Modified: code/branches/hoverHS15/src/modules/hover/HoverShip.h
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverShip.h	2015-10-25 21:48:18 UTC (rev 10693)
+++ code/branches/hoverHS15/src/modules/hover/HoverShip.h	2015-10-26 12:36:43 UTC (rev 10694)
@@ -52,7 +52,23 @@
 
             virtual void tick(float dt);
 
-    };
+		    virtual void moveFrontBack(const Vector2& value);
+
+		    virtual void moveRightLeft(const Vector2& value);
+
+		    virtual void moveUpDown(const Vector2& value);
+
+		    virtual void rotateYaw(const Vector2& value);
+
+		    virtual void rotatePitch(const Vector2& value);
+		    
+		    virtual void rotateRoll(const Vector2& value);
+
+		    virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+
+		    virtual void boost(bool bBoost);
+
+	};
 }
 
 #endif /* _HoverShip_H__ */