Changeset 4966 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Jul 28, 2005, 5:53:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Turret is fixed onto the ship as it should.
TestGun fires staight again
PNode now know getParent(), as this is a quite usefull function
Vector still has an error in the getNormalized function, and i am not able to determine the cause of this

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• test_gun.cc (modified) (1 diff)
• turret.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -160 +160 @@
   Projectile* pj =  dynamic_cast<Projectile*>(this->getProjectileFactory()->resurrect());
 
+/*
   PNode* target = this->getWeaponManager()->getFixedTarget();
-
   if (target != NULL)
   {
     pj->setVelocity(this->getVelocity()+(target->getAbsCoor() - this->getAbsCoor())*.5);//this->getVelocity());
   }
-  else
-    pj->setVelocity(target->getVelocity());
-
+  else*/
+  pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*20);
 
   pj->setAbsCoor(this->getEmissionPoint());

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -93 +93 @@
   Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
   direction.normalize();
-  Quaternion quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+  Quaternion quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
 
   this->setAbsDir(quat);