Changeset 9489 for code/branches/turret/src/modules

Timestamp:

Dec 3, 2012, 5:46:12 PM (12 years ago)

Author:

moralelastix

Message:

What ever

Location:

code/branches/turret/src/modules/objects

Files:

• Turret.cc (modified) (2 diffs)
• Turret.h (modified) (2 diffs)

code/branches/turret/src/modules/objects/Turret.cc

@@ -39 +39 @@
      * @brief Constructor
      */
-    Turret::Turret(BaseObject* creator) : Pawn(creator)
+    Turret::Turret(BaseObject* creator) : SpaceShip(creator)
     {
         RegisterObject(Turret);
@@ -53 +53 @@
     }
 
-    /*void Turret::rotateYaw(const Vector2& value)
-    {
-
-    }
-
 
     void Turret::rotatePitch(const Vector2& value)
     {
-
+        Vector2 pitch = value;
+        float nextPitch = this->localAngularAcceleration_.x() + pitch.x*0.8f;
+        // Einschraenken auf 0 bis 180
+        this->localAngularAcceleration_.setX(nextPitch);
     }
 
-    void Turret::rotateRoll(const Vector2& value)
-    {
-
-    }*/
 
     void Turret::setAlertnessRadius(float value)

code/branches/turret/src/modules/objects/Turret.h

@@ -38 +38 @@
 #include "objects/ObjectsPrereqs.h"
 
-#include "worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/SpaceShip.h"
 
 namespace orxonox
 {
-    class _ObjectsExport Turret : public Pawn
+    class _ObjectsExport Turret : public SpaceShip
     {
         public:
@@ -49 +49 @@
 
             //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);*/
 
             void setAlertnessRadius(float value);