Changeset 6724 in orxonox.OLD for trunk/src/world_entities/weapons/turret.cc

Timestamp:

Jan 25, 2006, 5:35:49 PM (20 years ago)

Author:

bensch

Message:

merged the Spaceshipcontrol back to the trunk

File:

• trunk/src/world_entities/weapons/turret.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/turret.cc

@@ -116 +116 @@
 void Turret::tick(float dt)
 {
-/*
+
   Quaternion quat;
-  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
+  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/
 
   direction.normalize();
@@ -127 +127 @@
     quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
 
-  this->setAbsDirSoft(quat, 5);*/
+  this->setAbsDirSoft(quat, 5);
 }