Changeset 10004

Timestamp:

Mar 27, 2014, 1:36:50 PM (11 years ago)

Author:

muemart

Message:

first experiments with the turret

Location:

code/branches/turretFS14

Files:

• data/levels/includes/weaponSettingsTurretTest.oxi (added)
• data/levels/templates/spaceshipTurretTest.oxt (added)
• data/levels/turretTest.oxw (modified) (2 diffs)
• src/modules/objects/Turret.cc (modified) (4 diffs)
• src/modules/objects/Turret.h (modified) (4 diffs)

code/branches/turretFS14/data/levels/turretTest.oxw

@@ -17 +17 @@
   include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipTurret.oxt")
+  include("templates/spaceshipTurretTest.oxt")
 ?>
 
@@ -48 +48 @@
 <Turret position="0,10,0" pitch="90" yaw="0" roll="0">
     <templates>
-        <Template link=spaceshipturret />
+        <Template link=spaceshipturrettest />
     </templates>
     <controller>

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

@@ -37 +37 @@
     RegisterClass(Turret);
 
+
+
     /**
      * @brief Constructor
@@ -44 +46 @@
         RegisterObject(Turret);
         this->controller_ = new WaypointPatrolController(this->getContext());
+        gotOrient_ = false;
     }
 
@@ -57 +60 @@
     void Turret::rotatePitch(const Vector2& value)
     {
-        orxout()<< "Turret rotate Pitch"<< endl;
-
-        const Quaternion& orient = this->getOrientation();
-        Radian pitch = orient.getPitch();
-
-        if((value.x > 0 && pitch < Radian(180)) || (value.x < 0 && pitch > Radian(0)))
-            SpaceShip::rotatePitch(value);
+        Radian currentPitch = this->getOrientation().getPitch();
+        Radian startPitch = startOrient_.getPitch();
+        Radian limit = Radian((Degree)45);
+        Radian upperBoundary = startPitch+limit;
+        if(upperBoundary > Radian(Degree(360)))
+        {
+            upperBoundary -= Radian(Degree(360));
+        }
+        Radian lowerBoundary = startPitch-limit;
+        if(lowerBoundary < Radian(Degree(0)))
+        {
+            lowerBoundary += Radian(Degree(360));
+        }
+        //orxout() << "Pitch:\t" << currentPitch << "\t" << startPitch << endl;
+        
+        if(currentPitch > upperBoundary && value.x > 0 ||
+           currentPitch < lowerBoundary && value.x < 0)
+        {
+            return;
+        }
+        
+        //SpaceShip::rotatePitch(value);
     }
 
+    void Turret::rotateYaw(const Vector2& value)
+    {
+
+        Radian currentYaw = this->getOrientation().getYaw();
+        Radian startYaw = startOrient_.getYaw();
+        Radian limit = Radian(Degree(45));
+        Radian upperBoundary = startYaw + limit;
+        Radian lowerBoundary = startYaw - limit;
+        orxout() << currentYaw << " " << this->getOrientation().getRoll() << endl;
+        /*if(upperBoundary >= Radian(Degree(180)));
+        {
+            upperBoundary -= Radian(Degree(180));
+            lowerBoundary -= Radian(Degree(180));
+            currentYaw -= Radian(Degree(180));
+        }
+        if(lowerBoundary <= Radian(Degree(-180)))
+        {
+            lowerBoundary += Radian(Degree(180));
+            upperBoundary += Radian(Degree(180));
+            currentYaw += Radian(Degree(180));
+        }*/
+        //orxout() << "Yaw:\t" << (Degree)currentYaw << "\t" << (Degree)upperBoundary << "\t" << (Degree)lowerBoundary << endl;
+        //if((currentYaw > upperBoundary && value.x > 0) ||
+        //   (currentYaw < lowerBoundary && value.x < 0))
+        if((currentYaw < Radian(1) && value.x < 0) || (currentYaw > Radian(3) && value.x>0))
+        {
+            //return;
+        }
+        SpaceShip::rotateYaw(value);
+    }
+
+    void Turret::rotateRoll(const Vector2& value)
+    {
+        return;
+    }
 
     void Turret::setAlertnessRadius(float value)
@@ -82 +135 @@
     }
 
+    void Turret::tick(float dt)
+    {
+        if(!gotOrient_)
+        {
+            startOrient_ = this->getOrientation();
+            gotOrient_ = true;
+        }
+        SUPER(Turret, tick, dt);
+    }
 
 }

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

@@ -37 +37 @@
 
 #include "objects/ObjectsPrereqs.h"
+#include "OgreQuaternion.h"
 
 #include "worldentities/pawns/SpaceShip.h"
@@ -48 +49 @@
             virtual ~Turret();
 
-            //virtual void tick(float dt);
-
             virtual void rotatePitch(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value);
+            virtual void rotateRoll(const Vector2& value);
 
             void setAlertnessRadius(float value);
@@ -56 +57 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt);
 
 
@@ -61 +63 @@
             WaypointPatrolController* controller_;
         private:
-
+            bool gotOrient_;
+            Quaternion startOrient_;
+            Quaternion firstOrient_;
     };
 }