Changeset 10734 in orxonox.OLD

Timestamp:

Jun 20, 2007, 2:44:33 PM (17 years ago)

Author:

snellen

Message:

better flight behaviour for the ActionBox Enemy by rennerc

Location:

branches/presentation/src/world_entities

Files:

• npcs/actionbox_enemy.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)

branches/presentation/src/world_entities/npcs/actionbox_enemy.cc

@@ -257 +257 @@
 void ActionboxEnemy::moveTowardsBox( ActionBox * box, float dt )
 {
-    
   Vector targetPos = box->getAbsCoor() + box->getAbsDir().apply( Vector( 1, 0, 0 ) )*box->getDepth()*0.66f;
   Vector targetDir = targetPos - myCoor;
+  
+  Vector boxDir = box->getAbsDir().apply( Vector(1, 0, 0 ) );
+  float boxDist = boxDir.dot( targetDir );
+  
+  if ( boxDist > 0 )
+  {
+    Vector myRelCoor = this->getAbsCoor() - box->getAbsCoor();
+    float newDist = boxDir.dot( myRelCoor );
+    targetPos = box->getAbsCoor() + box->getAbsDir().apply( Vector( 1, 0, 0 ) )* newDist * 0.8;
+    targetDir = targetPos - myCoor;
+  }
   
   moveTowards(targetPos, targetDir, dt);

branches/presentation/src/world_entities/space_ships/space_ship.cc

@@ -574 +574 @@
     this->bSecFire = event.bPressed;
   else if( event.type == KeyMapper::PEV_FIRE1)
+  {
+    printf(" %f, %f, %f \n",this->getAbsCoor().x,this->getAbsCoor().y,this->getAbsCoor().z );
     this->bFire = event.bPressed;
+  }
   else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
   {