Changeset 9639 in orxonox.OLD for branches/proxy/src/world_entities/weapons

Timestamp:

Jul 31, 2006, 9:30:52 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: tmuch better lookAt implementation, so that the Turrets are really aiming at the designated target.

File:

• branches/proxy/src/world_entities/weapons/aiming_turret.cc (modified) (5 diffs)

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

@@ -38 +38 @@
 */
 AimingTurret::AimingTurret ()
-  : Weapon(), target(this)
+    : Weapon(), target(this)
 {
   this->init();
@@ -46 +46 @@
 
 AimingTurret::AimingTurret(const TiXmlElement* root)
-  : target(this)
+    : target(this)
 {
   this->init();
@@ -59 +59 @@
 {
   // model will be deleted from WorldEntity-destructor
-//  delete this->target;
+  //  delete this->target;
 }
 
@@ -129 +129 @@
 
   if (likely (this->getParent() != NULL))
-    quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    //quat = Quaternion(direction, this->getParent()->getAbsDirY()) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    quat = Quaternion ( M_PI_2, this->getParent()->getAbsDirY()) * Quaternion::lookAt(this->getAbsCoor(), this->target.getAbsCoor(), this->getParent()->getAbsDirY());
   else
-    quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    //quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    quat = Quaternion ( M_PI_2, Vector(0,1,0)) * Quaternion::lookAt(this->getAbsCoor(), this->target.getAbsCoor(), Vector(0,1,0));
 
   this->setAbsDirSoft(quat, 5);
@@ -144 +146 @@
     return;
 
-  pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(4)
-            /*target.getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
+  pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDirX()*250.0 + VECTOR_RAND(4)
+                                          /*target.getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
   pj->setParent(PNode::getNullParent());