Changeset 5765 in orxonox.OLD for branches/guidedmissile/src/world_entities/weapons/aiming_turret.cc

Timestamp:

Nov 24, 2005, 5:24:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/guidedmissile: more balanced

File:

• branches/guidedmissile/src/world_entities/weapons/aiming_turret.cc (modified) (3 diffs)

branches/guidedmissile/src/world_entities/weapons/aiming_turret.cc

@@ -84 +84 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setStateDuration(WS_SHOOTING, .1);
-  this->setStateDuration(WS_RELOADING, .1);
+  this->setStateDuration(WS_SHOOTING, 1.0);
+  this->setStateDuration(WS_RELOADING, 2.0);
   this->setStateDuration(WS_ACTIVATING, .4);
   this->setStateDuration(WS_DEACTIVATING, .4);
@@ -127 +127 @@
   direction.normalize();
 
-  if (likely (this->getParent() != NULL))
-    quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
-  else
-    quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+//   if (likely (this->getParent() != NULL))
+//     quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+//   else
+//     quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
 
-  this->setAbsDirSoft(quat, 5);
+   quat = Quaternion(.5, Vector(0,0,1));
+
+  this->setRelDir(quat);
 
   this->target->tick(dt);
@@ -143 +145 @@
     return;
 
-    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
+    pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*50.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
     pj->setTarget(this->target->getParent());