Changeset 12066 for code/branches/OrxoKart_HS18/src

Timestamp:

Oct 31, 2018, 11:23:24 AM (6 years ago)

Author:

emustafa

Message:

OrxoKartKart controls optimized

Location:

code/branches/OrxoKart_HS18/src/modules

Files:

• hover/HoverShip.cc (modified) (1 diff)
• orxokart/OrxoKartKart.cc (modified) (7 diffs)
• orxokart/OrxoKartKart.h (modified) (3 diffs)

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

@@ -49 +49 @@
 
     void HoverShip::moveFrontBack(const Vector2& value)
-        { this->steering_.z -= value.x; }
+        { 
+            this->steering_.z -= value.x; 
+            orxout() << "mFB" << endl;
+        }
 
     void HoverShip::moveRightLeft(const Vector2& value)
-        { this->steering_.x += value.x; }
+        { 
+            this->rotateYaw(value);
+            orxout() << "mRL" << endl;
+        }
 
     void HoverShip::moveUpDown(const Vector2& value)
-        { this->steering_.y += value.x; }
+        { 
+            this->steering_.y += value.x; 
+            orxout() << "mUD" << endl;
+        }
 
     void HoverShip::rotateYaw(const Vector2& value)
-    {
-        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() + value.x);
-
-        Pawn::rotateYaw(value);
-    }
+        {
+            this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
+            //orxout() << value;
+            Pawn::rotateYaw(value);
+        }
 
     void HoverShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc

@@ -26 +26 @@
 
 /**
-    @file HoverShip.cc
-    @brief Implementation of the HoverShip control
+    @file OrxoKartKart.cc
+    @brief Implementation of the OrxoKartKart control
 */
 
-#include "HoverShip.h"
+#include "OrxoKartKart.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    RegisterClass(HoverShip);
+    RegisterClass(OrxoKartKart);
 
-    HoverShip::HoverShip(Context* context) : SpaceShip(context)
+    OrxoKartKart::OrxoKartKart(Context* context) : SpaceShip(context)
     {
-        RegisterObject(HoverShip);
+        RegisterObject(OrxoKartKart);
         enableCollisionCallback();
         isFloor_ = false;
@@ -48 +48 @@
     }
 
-    void HoverShip::moveFrontBack(const Vector2& value)
-        { this->steering_.z -= value.x; }
+    void OrxoKartKart::moveFrontBack(const Vector2& value)
+        { 
+            this->steering_.z -= value.x; 
+            orxout() << "mFB" << endl;
+        }
 
-    void HoverShip::moveRightLeft(const Vector2& value)
-        { this->steering_.x += value.x; }
+    void OrxoKartKart::moveRightLeft(const Vector2& value)
+        { 
+            this->rotateYaw(value);
+            orxout() << "mRL" << endl;
+        }
 
-    void HoverShip::moveUpDown(const Vector2& value)
-        { this->steering_.y += value.x; }
+    void OrxoKartKart::moveUpDown(const Vector2& value)
+        { 
+            this->steering_.y += value.x; 
+            orxout() << "mUD" << endl;
+        }
 
-    void HoverShip::rotateYaw(const Vector2& value)
+    void OrxoKartKart::rotateYaw(const Vector2& value)
+        {
+            this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
+            //orxout() << value;
+            Pawn::rotateYaw(value);
+        }
+
+    void OrxoKartKart::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() + value.x);
+        SUPER(OrxoKartKart, XMLPort, xmlelement, mode);
 
-        Pawn::rotateYaw(value);
-    }
-
-    void HoverShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(HoverShip, XMLPort, xmlelement, mode);
-
-        XMLPortParam(HoverShip, "jumpBoost", setJumpBoost, getJumpBoost, xmlelement, mode);
+        XMLPortParam(OrxoKartKart, "jumpBoost", setJumpBoost, getJumpBoost, xmlelement, mode);
     }
 
@@ -76 +85 @@
     @param value
     */
-    void HoverShip::rotatePitch(const Vector2& value) { }
+    void OrxoKartKart::rotatePitch(const Vector2& value) { }
 
     /**
@@ -83 +92 @@
     @param value
     */
-    void HoverShip::rotateRoll(const Vector2& value) { }
+    void OrxoKartKart::rotateRoll(const Vector2& value) { }
 
     /**
@@ -89 +98 @@
         Checks if the ship is touching the floor. The ship can only jump if there is contact with someting beneath it.
     */
-    bool HoverShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
+    bool OrxoKartKart::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
         SpaceShip::collidesAgainst(otherObject, cs, contactPoint);
-        //SUPER(HoverShip, collidesAgainst, otherObject, cs, contactPoint);
+        //SUPER(OrxoKartKart, collidesAgainst, otherObject, cs, contactPoint);
 
         if (contactPoint.m_normalWorldOnB.y() > 0.6
@@ -109 +118 @@
     @param bBoost
     */
-    void HoverShip::boost(bool bBoost) {
+    void OrxoKartKart::boost(bool bBoost) {
         if (bBoost && this->isFloor_)
         {

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.h

@@ -26 +26 @@
 
 /**
-    @file HoverShip.h
-    @brief Declaration of the HoverShip class.
+    @file OrxoKartKart.h
+    @brief Declaration of the OrxoKartKart class.
 */
 
-#ifndef _HoverShip_H__
-#define _HoverShip_H__
+#ifndef _OrxoKartKart_H__
+#define _OrxoKartKart_H__
 
-#include "HoverPrereqs.h"
+#include "OrxoKartPrereqs.h"
 
 #include "worldentities/pawns/SpaceShip.h"
@@ -39 +39 @@
 namespace orxonox
 {
-    class _HoverExport HoverShip : public SpaceShip
+    class _OrxoKartExport OrxoKartKart : public SpaceShip
     {
         public:
-            HoverShip(Context* context);
+            OrxoKartKart(Context* context);
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -75 +75 @@
 }
 
-#endif /* _HoverShip_H__ */
+#endif /* _OrxoKartKart_H__ */