Changeset 9497

Timestamp:

Dec 10, 2012, 2:56:55 PM (12 years ago)

Author:

moralelastix

Message:

nix

Location:

code/branches/turret

Files:

• data/levels/turretTest.oxw (modified) (1 diff)
• src/modules/objects/Turret.cc (modified) (2 diffs)

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

@@ -44 +44 @@
 
 
-<SpaceShip position="0,10,0" pitch="-45" yaw="225" roll="0">
+<SpaceShip position="0,10,0" pitch="90" yaw="0" roll="0">
     <templates>
         <Template link=spaceshipturret />

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

@@ -29 +29 @@
 #include "Turret.h"
 #include "core/CoreIncludes.h"
+#include "OgreQuaternion.h"
 #include "core/XMLPort.h"
 #include "controllers/WaypointPatrolController.h"
@@ -56 +57 @@
     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);
+        /*this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x*0.8f);
+        Pawn::rotatePitch(value);*/
+        orxout()<< "Turret rotate Pitch"<< endl;
     }