Changeset 10656 in orxonox.OLD

Timestamp:

May 14, 2007, 11:27:18 AM (17 years ago)

Author:

rennerc

Message:

ActionboxEnemy does not rotate around its z-axix more than ±pi/2-epsilon

Location:

branches/vs-enhencements/src/world_entities/npcs

Files:

• actionbox_enemy.cc (modified) (7 diffs)
• actionbox_enemy.h (modified) (1 diff)

branches/vs-enhencements/src/world_entities/npcs/actionbox_enemy.cc

@@ -38 +38 @@
   this->isActive = true;
   
-  //TODO init to zero for non-debug
   this->pitch = 0.0f;
-  this->dPitch = PI;
+  this->dPitch = 0.0;
   
   if ( root )
@@ -57 +56 @@
 void ActionboxEnemy::tick( float dt )
 {
+  myDir = this->getAbsDir();
+  myCoor = this->getAbsCoor();
+  
   this->pitch += this->dPitch*dt;
+  while ( pitch > 2*PI )
+    pitch -= 2*PI;
+  while ( pitch < 0 )
+    pitch += 2*PI;
+  
+  myDir *= qPitch.inverse();
+  
+  qPitch = Quaternion( pitch, Vector( 1, 0, 0 ) );
   
   moveTowardsBox( NULL, dt );
-  return;
-  
+    
   if ( isActive && State::getActionBox() )
   {
@@ -74 +83 @@
     }
   }
+  
+  myDir *= qPitch;
+  
+  this->setAbsDir( myDir );
+  this->setAbsCoor( myCoor );
 }
 
@@ -83 +97 @@
 {
   Vector targetPos = State::getPlayer()->getPlayable()->getAbsCoor();
-  Vector targetDir = targetPos - this->getAbsCoor();
+  Vector targetDir = targetPos - myCoor;
   
-  
-  Quaternion cur = this->getAbsDir();
+  Quaternion cur = myDir;
   Quaternion rx( 5*dt, Vector( 0, 0, 1 ) );
   
@@ -92 +105 @@
   Quaternion tmp2 = cur * rx.inverse();
   
+  Quaternion dec;
   if ( tmp1.apply( Vector(1, 0, 0) ).dot(targetDir) > tmp2.apply( Vector(1, 0, 0)).dot(targetDir) )
-    cur = tmp1;
+    dec = tmp1;
   else
-    cur = tmp2;
+    dec = tmp2;
+  
+  float dp = dec.apply( Vector(1, 0, 0) ).dot(Vector(0, 1, 0));
+  if ( dp > -0.9 && dp < 0.9 )
+  {
+    cur = dec;
+  }
   
   Quaternion ry( 5*dt, cur.inverse().apply( Vector( 0, 1, 0 ) ) );
@@ -107 +127 @@
     cur = tmp2;
   
-  this->setAbsDir( cur ); 
+  myDir = cur; 
 }
 
 void ActionboxEnemy::draw( ) const
 {
+#if 0
   Vector fw = this->getAbsDir().apply( Vector( 1, 0, 0 ) );
   fw.normalize();
@@ -173 +194 @@
 
   glPopMatrix();
-  
+#enif
   WorldEntity::draw();
 }

branches/vs-enhencements/src/world_entities/npcs/actionbox_enemy.h

@@ -24 +24 @@
     float pitch;      // rotate angle around x-axix
     float dPitch;     // change pitch += dPitch*dt
+    Quaternion qPitch;
+    
+    Quaternion myDir;
+    Vector     myCoor;
     
     void attackPlayer( ActionBox* box, float dt );