[Orxonox-commit 4828] r9497 - in code/branches/turret: data/levels src/modules/objects

[moralelastix at orxonox.net]

Author: moralelastix
Date: 2012-12-10 14:56:55 +0100 (Mon, 10 Dec 2012)
New Revision: 9497

Modified:
   code/branches/turret/data/levels/turretTest.oxw
   code/branches/turret/src/modules/objects/Turret.cc
Log:
nix

Modified: code/branches/turret/data/levels/turretTest.oxw
===================================================================
--- code/branches/turret/data/levels/turretTest.oxw	2012-12-10 13:55:56 UTC (rev 9496)
+++ code/branches/turret/data/levels/turretTest.oxw	2012-12-10 13:56:55 UTC (rev 9497)
@@ -43,7 +43,7 @@
 
 
 
-<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 />
     </templates>

Modified: code/branches/turret/src/modules/objects/Turret.cc
===================================================================
--- code/branches/turret/src/modules/objects/Turret.cc	2012-12-10 13:55:56 UTC (rev 9496)
+++ code/branches/turret/src/modules/objects/Turret.cc	2012-12-10 13:56:55 UTC (rev 9497)
@@ -28,6 +28,7 @@
 
 #include "Turret.h"
 #include "core/CoreIncludes.h"
+#include "OgreQuaternion.h"
 #include "core/XMLPort.h"
 #include "controllers/WaypointPatrolController.h"
 
@@ -55,10 +56,9 @@
 
     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;
     }